Skip to content
Snippets Groups Projects
Commit 7caf48e0 authored by Diego Biurrun's avatar Diego Biurrun
Browse files

configure: miscellaneous cosmetics

Sort lists of components. Add some whitespace where it helps readability.
Consistently use double instead of single quotes around component lists.
parent 77e9123f
Branches
Tags
No related merge requests found
...@@ -1158,6 +1158,7 @@ HWACCEL_LIST=" ...@@ -1158,6 +1158,7 @@ HWACCEL_LIST="
vda vda
vdpau vdpau
" "
LIBRARY_LIST=" LIBRARY_LIST="
avcodec avcodec
avdevice avdevice
...@@ -1196,8 +1197,8 @@ CONFIG_LIST=" ...@@ -1196,8 +1197,8 @@ CONFIG_LIST="
neon_clobber_test neon_clobber_test
network network
nonfree nonfree
pod2man
pic pic
pod2man
rdft rdft
runtime_cpudetect runtime_cpudetect
safe_bitstream_reader safe_bitstream_reader
...@@ -1212,18 +1213,18 @@ CONFIG_LIST=" ...@@ -1212,18 +1213,18 @@ CONFIG_LIST="
xmm_clobber_test xmm_clobber_test
" "
THREADS_LIST=' THREADS_LIST="
pthreads pthreads
w32threads w32threads
' "
ATOMICS_LIST=' ATOMICS_LIST="
atomics_gcc atomics_gcc
atomics_suncc atomics_suncc
atomics_win32 atomics_win32
' "
ARCH_LIST=' ARCH_LIST="
aarch64 aarch64
alpha alpha
arm arm
...@@ -1248,23 +1249,22 @@ ARCH_LIST=' ...@@ -1248,23 +1249,22 @@ ARCH_LIST='
x86 x86
x86_32 x86_32
x86_64 x86_64
' "
ARCH_EXT_LIST_ARM=' ARCH_EXT_LIST_ARM="
armv5te armv5te
armv6 armv6
armv6t2 armv6t2
neon neon
vfp vfp
vfpv3 vfpv3
' "
ARCH_EXT_LIST_X86_SIMD=' ARCH_EXT_LIST_X86_SIMD="
amd3dnow amd3dnow
amd3dnowext amd3dnowext
avx avx
avx2 avx2
xop
fma3 fma3
fma4 fma4
mmx mmx
...@@ -1275,7 +1275,8 @@ ARCH_EXT_LIST_X86_SIMD=' ...@@ -1275,7 +1275,8 @@ ARCH_EXT_LIST_X86_SIMD='
sse4 sse4
sse42 sse42
ssse3 ssse3
' xop
"
ARCH_EXT_LIST_X86=" ARCH_EXT_LIST_X86="
$ARCH_EXT_LIST_X86_SIMD $ARCH_EXT_LIST_X86_SIMD
...@@ -1291,16 +1292,16 @@ ARCH_EXT_LIST=" ...@@ -1291,16 +1292,16 @@ ARCH_EXT_LIST="
vis vis
" "
HAVE_LIST_CMDLINE=' HAVE_LIST_CMDLINE="
inline_asm inline_asm
symver symver
yasm yasm
' "
HAVE_LIST_PUB=' HAVE_LIST_PUB="
bigendian bigendian
fast_unaligned fast_unaligned
' "
MATH_FUNCS=" MATH_FUNCS="
atanf atanf
...@@ -1333,11 +1334,11 @@ HAVE_LIST=" ...@@ -1333,11 +1334,11 @@ HAVE_LIST="
$ARCH_EXT_LIST $ARCH_EXT_LIST
$(add_suffix _external $ARCH_EXT_LIST) $(add_suffix _external $ARCH_EXT_LIST)
$(add_suffix _inline $ARCH_EXT_LIST) $(add_suffix _inline $ARCH_EXT_LIST)
$ATOMICS_LIST
$HAVE_LIST_CMDLINE $HAVE_LIST_CMDLINE
$HAVE_LIST_PUB $HAVE_LIST_PUB
$THREADS_LIST
$ATOMICS_LIST
$MATH_FUNCS $MATH_FUNCS
$THREADS_LIST
aligned_malloc aligned_malloc
aligned_stack aligned_stack
alsa_asoundlib_h alsa_asoundlib_h
...@@ -1378,16 +1379,16 @@ HAVE_LIST=" ...@@ -1378,16 +1379,16 @@ HAVE_LIST="
GetProcessAffinityMask GetProcessAffinityMask
GetProcessMemoryInfo GetProcessMemoryInfo
GetProcessTimes GetProcessTimes
GetSystemTimeAsFileTime
getrusage getrusage
getservbyport getservbyport
GetSystemTimeAsFileTime
gettimeofday gettimeofday
gnu_as gnu_as
gsm_h gsm_h
ibm_asm ibm_asm
inet_aton inet_aton
io_h
inline_asm_labels inline_asm_labels
io_h
isatty isatty
jack_port_get_latency_range jack_port_get_latency_range
ldbrx ldbrx
...@@ -1440,8 +1441,6 @@ HAVE_LIST=" ...@@ -1440,8 +1441,6 @@ HAVE_LIST="
symver_asm_label symver_asm_label
symver_gnu_asm symver_gnu_asm
sync_val_compare_and_swap sync_val_compare_and_swap
sysconf
sysctl
sys_mman_h sys_mman_h
sys_param_h sys_param_h
sys_resource_h sys_resource_h
...@@ -1450,6 +1449,8 @@ HAVE_LIST=" ...@@ -1450,6 +1449,8 @@ HAVE_LIST="
sys_time_h sys_time_h
sys_un_h sys_un_h
sys_videoio_h sys_videoio_h
sysconf
sysctl
threads threads
unistd_h unistd_h
usleep usleep
...@@ -1511,7 +1512,7 @@ CMDLINE_SELECT=" ...@@ -1511,7 +1512,7 @@ CMDLINE_SELECT="
optimizations optimizations
" "
PATHS_LIST=' PATHS_LIST="
bindir bindir
datadir datadir
docdir docdir
...@@ -1520,7 +1521,7 @@ PATHS_LIST=' ...@@ -1520,7 +1521,7 @@ PATHS_LIST='
mandir mandir
prefix prefix
shlibdir shlibdir
' "
CMDLINE_SET=" CMDLINE_SET="
$PATHS_LIST $PATHS_LIST
...@@ -1724,8 +1725,8 @@ mdec_decoder_select="dsputil error_resilience mpegvideo" ...@@ -1724,8 +1725,8 @@ mdec_decoder_select="dsputil error_resilience mpegvideo"
metasound_decoder_select="lsp mdct sinewin" metasound_decoder_select="lsp mdct sinewin"
mimic_decoder_select="dsputil hpeldsp" mimic_decoder_select="dsputil hpeldsp"
mjpeg_decoder_select="dsputil hpeldsp" mjpeg_decoder_select="dsputil hpeldsp"
mjpegb_decoder_select="mjpeg_decoder"
mjpeg_encoder_select="aandcttables dsputil mpegvideoenc" mjpeg_encoder_select="aandcttables dsputil mpegvideoenc"
mjpegb_decoder_select="mjpeg_decoder"
mlp_decoder_select="dsputil mlp_parser" mlp_decoder_select="dsputil mlp_parser"
motionpixels_decoder_select="dsputil" motionpixels_decoder_select="dsputil"
mp1_decoder_select="mpegaudio" mp1_decoder_select="mpegaudio"
...@@ -1783,9 +1784,9 @@ svq3_decoder_select="h264_decoder hpeldsp mpegvideo" ...@@ -1783,9 +1784,9 @@ svq3_decoder_select="h264_decoder hpeldsp mpegvideo"
svq3_decoder_suggest="zlib" svq3_decoder_suggest="zlib"
tak_decoder_select="dsputil" tak_decoder_select="dsputil"
theora_decoder_select="vp3_decoder" theora_decoder_select="vp3_decoder"
thp_decoder_select="mjpeg_decoder"
tiff_decoder_suggest="zlib" tiff_decoder_suggest="zlib"
tiff_encoder_suggest="zlib" tiff_encoder_suggest="zlib"
thp_decoder_select="mjpeg_decoder"
truehd_decoder_select="mlp_decoder" truehd_decoder_select="mlp_decoder"
truemotion2_decoder_select="dsputil" truemotion2_decoder_select="dsputil"
truespeech_decoder_select="dsputil" truespeech_decoder_select="dsputil"
...@@ -1999,8 +2000,8 @@ ffrtmpcrypt_protocol_select="tcp_protocol" ...@@ -1999,8 +2000,8 @@ ffrtmpcrypt_protocol_select="tcp_protocol"
ffrtmphttp_protocol_deps="!librtmp_protocol" ffrtmphttp_protocol_deps="!librtmp_protocol"
ffrtmphttp_protocol_select="http_protocol" ffrtmphttp_protocol_select="http_protocol"
gopher_protocol_select="network" gopher_protocol_select="network"
httpproxy_protocol_select="tcp_protocol"
http_protocol_select="tcp_protocol" http_protocol_select="tcp_protocol"
httpproxy_protocol_select="tcp_protocol"
https_protocol_select="tls_protocol" https_protocol_select="tls_protocol"
librtmp_protocol_deps="librtmp" librtmp_protocol_deps="librtmp"
librtmpe_protocol_deps="librtmp" librtmpe_protocol_deps="librtmp"
...@@ -2040,8 +2041,8 @@ frei0r_src_filter_deps="frei0r dlopen" ...@@ -2040,8 +2041,8 @@ frei0r_src_filter_deps="frei0r dlopen"
frei0r_src_filter_extralibs='$ldl' frei0r_src_filter_extralibs='$ldl'
hqdn3d_filter_deps="gpl" hqdn3d_filter_deps="gpl"
interlace_filter_deps="gpl" interlace_filter_deps="gpl"
resample_filter_deps="avresample"
ocv_filter_deps="libopencv" ocv_filter_deps="libopencv"
resample_filter_deps="avresample"
scale_filter_deps="swscale" scale_filter_deps="swscale"
# examples # examples
...@@ -2436,7 +2437,7 @@ case "$toolchain" in ...@@ -2436,7 +2437,7 @@ case "$toolchain" in
add_ldflags -fprofile-arcs -ftest-coverage add_ldflags -fprofile-arcs -ftest-coverage
;; ;;
hardened) hardened)
add_cflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fno-strict-overflow -fstack-protector-all add_cflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fno-strict-overflow -fstack-protector-all
add_ldflags -Wl,-z,relro -Wl,-z,now add_ldflags -Wl,-z,relro -Wl,-z,now
;; ;;
?*) ?*)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment