Commit 3e0b1c9a authored by Diego Biurrun's avatar Diego Biurrun

configure: cosmetics: sort some lists where appropriate

parent 3c62a714
...@@ -1060,8 +1060,8 @@ HAVE_LIST=" ...@@ -1060,8 +1060,8 @@ HAVE_LIST="
dev_bktr_ioctl_bt848_h dev_bktr_ioctl_bt848_h
dev_bktr_ioctl_meteor_h dev_bktr_ioctl_meteor_h
dev_ic_bt8xx_h dev_ic_bt8xx_h
dev_video_meteor_ioctl_meteor_h
dev_video_bktr_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h
dev_video_meteor_ioctl_meteor_h
dlfcn_h dlfcn_h
dlopen dlopen
dos_paths dos_paths
...@@ -1080,7 +1080,6 @@ HAVE_LIST=" ...@@ -1080,7 +1080,6 @@ HAVE_LIST="
GetProcessTimes GetProcessTimes
getrusage getrusage
gnu_as gnu_as
struct_rusage_ru_maxrss
ibm_asm ibm_asm
inet_aton inet_aton
inline_asm inline_asm
...@@ -1106,28 +1105,29 @@ HAVE_LIST=" ...@@ -1106,28 +1105,29 @@ HAVE_LIST="
memalign memalign
mkstemp mkstemp
mmap mmap
poll_h
posix_memalign posix_memalign
round round
roundf roundf
sdl sdl
sdl_video_size sdl_video_size
setmode setmode
setrlimit
sndio_h sndio_h
socklen_t socklen_t
soundcard_h soundcard_h
poll_h
setrlimit
strerror_r strerror_r
strptime strptime
strtok_r strtok_r
struct_addrinfo struct_addrinfo
struct_ipv6_mreq struct_ipv6_mreq
struct_rusage_ru_maxrss
struct_sockaddr_in6 struct_sockaddr_in6
struct_sockaddr_sa_len struct_sockaddr_sa_len
struct_sockaddr_storage struct_sockaddr_storage
symver symver
symver_gnu_asm
symver_asm_label symver_asm_label
symver_gnu_asm
sys_mman_h sys_mman_h
sys_resource_h sys_resource_h
sys_select_h sys_select_h
...@@ -1242,8 +1242,8 @@ fast_64bit_if_any="alpha ia64 mips64 parisc64 ppc64 sparc64 x86_64" ...@@ -1242,8 +1242,8 @@ fast_64bit_if_any="alpha ia64 mips64 parisc64 ppc64 sparc64 x86_64"
fast_clz_if_any="alpha armv5te avr32 mips ppc x86" fast_clz_if_any="alpha armv5te avr32 mips ppc x86"
fast_unaligned_if_any="armv6 ppc x86" fast_unaligned_if_any="armv6 ppc x86"
need_memalign="altivec neon sse"
inline_asm_deps="!tms470" inline_asm_deps="!tms470"
need_memalign="altivec neon sse"
symver_if_any="symver_asm_label symver_gnu_asm" symver_if_any="symver_asm_label symver_gnu_asm"
...@@ -1307,28 +1307,28 @@ loco_decoder_select="golomb" ...@@ -1307,28 +1307,28 @@ loco_decoder_select="golomb"
mjpeg_encoder_select="aandct" mjpeg_encoder_select="aandct"
mlp_decoder_select="mlp_parser" mlp_decoder_select="mlp_parser"
mp1_decoder_select="mpegaudiodsp" mp1_decoder_select="mpegaudiodsp"
mp2_decoder_select="mpegaudiodsp"
mp3adu_decoder_select="mpegaudiodsp"
mp3_decoder_select="mpegaudiodsp"
mp3on4_decoder_select="mpegaudiodsp"
mp1float_decoder_select="mpegaudiodsp" mp1float_decoder_select="mpegaudiodsp"
mp2_decoder_select="mpegaudiodsp"
mp2float_decoder_select="mpegaudiodsp" mp2float_decoder_select="mpegaudiodsp"
mp3_decoder_select="mpegaudiodsp"
mp3adu_decoder_select="mpegaudiodsp"
mp3adufloat_decoder_select="mpegaudiodsp" mp3adufloat_decoder_select="mpegaudiodsp"
mp3float_decoder_select="mpegaudiodsp" mp3float_decoder_select="mpegaudiodsp"
mp3on4_decoder_select="mpegaudiodsp"
mp3on4float_decoder_select="mpegaudiodsp" mp3on4float_decoder_select="mpegaudiodsp"
mpeg1video_encoder_select="aandct"
mpeg2video_encoder_select="aandct"
mpeg4_decoder_select="h263_decoder mpeg4video_parser"
mpeg4_encoder_select="h263_encoder"
mpeg_vdpau_decoder_select="vdpau mpegvideo_decoder" mpeg_vdpau_decoder_select="vdpau mpegvideo_decoder"
mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h"
mpeg_xvmc_decoder_select="mpegvideo_decoder"
mpeg1_vdpau_decoder_select="vdpau mpeg1video_decoder" mpeg1_vdpau_decoder_select="vdpau mpeg1video_decoder"
mpeg1video_encoder_select="aandct"
mpeg2_dxva2_hwaccel_deps="dxva2api_h" mpeg2_dxva2_hwaccel_deps="dxva2api_h"
mpeg2_dxva2_hwaccel_select="dxva2 mpeg2video_decoder" mpeg2_dxva2_hwaccel_select="dxva2 mpeg2video_decoder"
mpeg2_vaapi_hwaccel_select="vaapi mpeg2video_decoder" mpeg2_vaapi_hwaccel_select="vaapi mpeg2video_decoder"
mpeg2video_encoder_select="aandct"
mpeg4_decoder_select="h263_decoder mpeg4video_parser"
mpeg4_encoder_select="h263_encoder"
mpeg4_vaapi_hwaccel_select="vaapi mpeg4_decoder" mpeg4_vaapi_hwaccel_select="vaapi mpeg4_decoder"
mpeg4_vdpau_decoder_select="vdpau mpeg4_decoder" mpeg4_vdpau_decoder_select="vdpau mpeg4_decoder"
mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h"
mpeg_xvmc_decoder_select="mpegvideo_decoder"
msmpeg4v1_decoder_select="h263_decoder" msmpeg4v1_decoder_select="h263_decoder"
msmpeg4v1_encoder_select="h263_encoder" msmpeg4v1_encoder_select="h263_encoder"
msmpeg4v2_decoder_select="h263_decoder" msmpeg4v2_decoder_select="h263_decoder"
...@@ -1514,8 +1514,6 @@ avformat_deps="avcodec" ...@@ -1514,8 +1514,6 @@ avformat_deps="avcodec"
postproc_deps="gpl" postproc_deps="gpl"
# programs # programs
ffmpeg_deps="avcodec avformat swscale"
ffmpeg_select="buffer_filter"
avconv_deps="avcodec avformat swscale" avconv_deps="avcodec avformat swscale"
avconv_select="buffer_filter" avconv_select="buffer_filter"
avplay_deps="avcodec avformat swscale sdl" avplay_deps="avcodec avformat swscale sdl"
...@@ -1523,6 +1521,8 @@ avplay_select="rdft" ...@@ -1523,6 +1521,8 @@ avplay_select="rdft"
avprobe_deps="avcodec avformat" avprobe_deps="avcodec avformat"
avserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer" avserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer"
avserver_extralibs='$ldl' avserver_extralibs='$ldl'
ffmpeg_deps="avcodec avformat swscale"
ffmpeg_select="buffer_filter"
doc_deps="texi2html" doc_deps="texi2html"
...@@ -1545,7 +1545,6 @@ mxf_d10_test_deps="avfilter" ...@@ -1545,7 +1545,6 @@ mxf_d10_test_deps="avfilter"
seek_lavf_mxf_d10_test_deps="mxf_d10_test" seek_lavf_mxf_d10_test_deps="mxf_d10_test"
test_deps _encoder _decoder \ test_deps _encoder _decoder \
adpcm_g726=g726 \
adpcm_ima_qt \ adpcm_ima_qt \
adpcm_ima_wav \ adpcm_ima_wav \
adpcm_ms \ adpcm_ms \
...@@ -1561,6 +1560,7 @@ test_deps _encoder _decoder \ ...@@ -1561,6 +1560,7 @@ test_deps _encoder _decoder \
flac \ flac \
flashsv \ flashsv \
flv \ flv \
adpcm_g726=g726 \
gif \ gif \
h261 \ h261 \
h263="h263 h263p" \ h263="h263 h263p" \
...@@ -1646,9 +1646,9 @@ objformat="elf" ...@@ -1646,9 +1646,9 @@ objformat="elf"
pkg_config_default=pkg-config pkg_config_default=pkg-config
ranlib="ranlib" ranlib="ranlib"
yasmexe="yasm" yasmexe="yasm"
nogas=":"
nm_opts='-g' nm_opts='-g'
nogas=":"
# machine # machine
arch_default=$(uname -m) arch_default=$(uname -m)
...@@ -1664,20 +1664,22 @@ enable avdevice ...@@ -1664,20 +1664,22 @@ enable avdevice
enable avfilter enable avfilter
enable avformat enable avformat
enable avutil enable avutil
enable asm enable postproc
enable debug enable swscale
enable doc
enable fastdiv
enable ffmpeg
enable avconv enable avconv
enable avplay enable avplay
enable avprobe enable avprobe
enable avserver enable avserver
enable ffmpeg
enable asm
enable debug
enable doc
enable fastdiv
enable network enable network
enable optimizations enable optimizations
enable postproc
enable static enable static
enable swscale
enable swscale_alpha enable swscale_alpha
# build settings # build settings
...@@ -1897,14 +1899,14 @@ tmpfile(){ ...@@ -1897,14 +1899,14 @@ tmpfile(){
trap 'rm -f -- $TMPFILES' EXIT trap 'rm -f -- $TMPFILES' EXIT
tmpfile TMPASM .asm
tmpfile TMPC .c tmpfile TMPC .c
tmpfile TMPE $EXESUF tmpfile TMPE $EXESUF
tmpfile TMPH .h tmpfile TMPH .h
tmpfile TMPO .o tmpfile TMPO .o
tmpfile TMPS .S tmpfile TMPS .S
tmpfile TMPV .ver
tmpfile TMPSH .sh tmpfile TMPSH .sh
tmpfile TMPASM .asm tmpfile TMPV .ver
unset -f mktemp unset -f mktemp
...@@ -1923,9 +1925,9 @@ EOF ...@@ -1923,9 +1925,9 @@ EOF
die "Sanity test failed." die "Sanity test failed."
fi fi
filter_asflags=echo
filter_cflags=echo filter_cflags=echo
filter_cppflags=echo filter_cppflags=echo
filter_asflags=echo
if $cc -v 2>&1 | grep -q '^gcc.*LLVM'; then if $cc -v 2>&1 | grep -q '^gcc.*LLVM'; then
cc_type=llvm_gcc cc_type=llvm_gcc
...@@ -3336,13 +3338,13 @@ get_version(){ ...@@ -3336,13 +3338,13 @@ get_version(){
eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> config.mak eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> config.mak
} }
get_version LIBSWSCALE libswscale/swscale.h
get_version LIBPOSTPROC libpostproc/postprocess.h
get_version LIBAVCODEC libavcodec/version.h get_version LIBAVCODEC libavcodec/version.h
get_version LIBAVDEVICE libavdevice/avdevice.h get_version LIBAVDEVICE libavdevice/avdevice.h
get_version LIBAVFILTER libavfilter/avfilter.h
get_version LIBAVFORMAT libavformat/version.h get_version LIBAVFORMAT libavformat/version.h
get_version LIBAVUTIL libavutil/avutil.h get_version LIBAVUTIL libavutil/avutil.h
get_version LIBAVFILTER libavfilter/avfilter.h get_version LIBPOSTPROC libpostproc/postprocess.h
get_version LIBSWSCALE libswscale/swscale.h
cat > $TMPH <<EOF cat > $TMPH <<EOF
/* Automatically generated by configure - do not modify! */ /* Automatically generated by configure - do not modify! */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment