From a688b64fcf4abf0554b10d5446f019ec73121c1d Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Fri, 6 Oct 2017 01:52:45 +0200 Subject: [PATCH 1/4] configure: Drop feature for randomly disabling/enabling components This feature was never used for anything. --- configure | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/configure b/configure index 960c1ed032..18939f2cf3 100755 --- a/configure +++ b/configure @@ -342,14 +342,6 @@ Developer options (useful when working on Libav itself): used only for debugging purposes) --enable-xmm-clobber-test check XMM registers for clobbering (Win64-only; should be used only for debugging purposes) - --enable-random randomly enable/disable components - --disable-random - --enable-random=LIST randomly enable/disable specific components or - --disable-random=LIST component groups. LIST is a comma-separated list - of NAME[:PROB] entries where NAME is a component - (group) and PROB the probability associated with - NAME (default 0.5). - --random-seed=VALUE seed value for --enable/disable-random --disable-valgrind-backtrace do not print a backtrace under Valgrind (only applies to --disable-optimizations builds) --ignore-tests=TESTS comma-separated list (without "fate-" prefix @@ -1855,7 +1847,6 @@ CMDLINE_SET=" optflags pkg_config pkg_config_flags - random_seed samples sysinclude sysroot @@ -2794,27 +2785,6 @@ show_list() { exit 0 } -rand_list(){ - IFS=', ' - set -- $* - unset IFS - for thing; do - comp=${thing%:*} - prob=${thing#$comp} - prob=${prob#:} - is_in ${comp} $COMPONENT_LIST && eval comp=\$$(toupper ${comp%s})_LIST - echo "prob ${prob:-0.5}" - printf '%s\n' $comp - done -} - -do_random(){ - action=$1 - shift - random_seed=$(awk "BEGIN { srand($random_seed); print srand() }") - $action $(rand_list "$@" | awk "BEGIN { srand($random_seed) } \$1 == \"prob\" { prob = \$2; next } rand() < prob { print }") -} - for opt do optval="${opt#*=}" case "$opt" in @@ -2846,14 +2816,6 @@ for opt do map 'eval unset \${$(toupper ${v%s})_LIST}' $COMPONENT_LIST disable $LIBRARY_LIST $PROGRAM_LIST doc ;; - --enable-random|--disable-random) - action=${opt%%-random} - do_random ${action#--} $COMPONENT_LIST - ;; - --enable-random=*|--disable-random=*) - action=${opt%%-random=*} - do_random ${action#--} $optval - ;; --enable-*=*|--disable-*=*) eval $(echo "${opt%%=*}" | sed 's/--/action=/;s/-/ thing=/') is_in "${thing}s" $COMPONENT_LIST || die_unknown "$opt" @@ -5287,9 +5249,6 @@ echo "shared ${shared-no}" echo "network support ${network-no}" echo "threading support ${thread_type-no}" echo "safe bitstream reader ${safe_bitstream_reader-no}" -test -n "$random_seed" && - echo "random seed ${random_seed}" -echo echo "External libraries:" print_enabled '' $EXTERNAL_LIBRARY_LIST | print_3_columns From 8594ec3dd59ed8ec303ca62587aaaf3045fce676 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Fri, 6 Oct 2017 01:57:40 +0200 Subject: [PATCH 2/4] configure: Drop fallback for deprecated avserver command line options --- configure | 5 ----- 1 file changed, 5 deletions(-) diff --git a/configure b/configure index 18939f2cf3..c061111a28 100755 --- a/configure +++ b/configure @@ -110,7 +110,6 @@ Program options: --disable-avconv disable avconv build --disable-avplay disable avplay build --disable-avprobe disable avprobe build - --disable-avserver deprecated, does nothing Component options: --disable-doc do not build documentation @@ -2823,10 +2822,6 @@ for opt do name=$(echo "${optval}" | sed "s/,/_${thing}|/g")_${thing} $action $(filter "$name" $list) ;; - --enable-avserver|--disable-avserver*) - warn "avserver has been removed, the ${opt} option is only"\ - "provided for compatibility and will be removed in the future" - ;; --enable-yasm|--disable-yasm) warn "The ${opt} option is only provided for compatibility and will be\n"\ "removed in the future. Use --enable-x86asm / --disable-x86asm instead." From 3613063e87307e5421707aa2ffb22054ad5d62b8 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 23 Sep 2017 17:05:00 +0200 Subject: [PATCH 3/4] configure: Simplify nvenc check (and move it to the correct spot) --- configure | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/configure b/configure index c061111a28..240410bf19 100755 --- a/configure +++ b/configure @@ -4747,6 +4747,7 @@ enabled mmal && { check_lib mmal interface/mmal/mmal.h mmal_port_co check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host; } || die "ERROR: mmal not found" && check_func_headers interface/mmal/mmal.h "MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS"; } +enabled nvenc && require_cpp_condition nvEncodeAPI.h "NVENCAPI_MAJOR_VERSION >= 6" enabled omx && require_header OMX_Core.h enabled omx_rpi && { check_header OMX_Core.h || { ! enabled cross_compile && add_cflags -isystem/opt/vc/include/IL && check_header OMX_Core.h ; } || @@ -4760,11 +4761,6 @@ enabled openssl && { { check_pkg_config openssl openssl openssl/ssl.h enabled gnutls && check_lib gmp gmp.h mpz_export -lgmp -if enabled nvenc; then - require_header nvEncodeAPI.h - require_cpp_condition nvEncodeAPI.h "NVENCAPI_MAJOR_VERSION >= 6" -fi - # SDL adds some CFLAGS that should not be part of the general CFLAGS. enabled avplay && test_pkg_config sdl "sdl >= 1.2.1 sdl < 1.3.0" SDL_events.h SDL_PollEvent From 4f6401df43d7ee9082ea591037b9f9284217d834 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 23 Sep 2017 17:07:50 +0200 Subject: [PATCH 4/4] configure: Merge separate parts of GnuTLS test --- configure | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 240410bf19..bc29d1912f 100755 --- a/configure +++ b/configure @@ -4686,7 +4686,8 @@ enabled avxsynth && require_header avxsynth/avxsynth_c.h enabled cuda && require cuda cuda.h cuInit -lcuda enabled cuvid && require cuvid cuviddec.h cuvidCreateDecoder -lnvcuvid enabled frei0r && require_header frei0r.h -enabled gnutls && require_pkg_config gnutls gnutls gnutls/gnutls.h gnutls_global_init +enabled gnutls && require_pkg_config gnutls gnutls gnutls/gnutls.h gnutls_global_init && + check_lib gmp gmp.h mpz_export -lgmp enabled libbs2b && require_pkg_config libbs2b libbs2b bs2b.h bs2b_open enabled libdc1394 && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new enabled libdcadec && require libdcadec libdcadec/dca_context.h dcadec_context_create -ldcadec @@ -4759,8 +4760,6 @@ enabled openssl && { { check_pkg_config openssl openssl openssl/ssl.h check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 || die "ERROR: openssl not found"; } -enabled gnutls && check_lib gmp gmp.h mpz_export -lgmp - # SDL adds some CFLAGS that should not be part of the general CFLAGS. enabled avplay && test_pkg_config sdl "sdl >= 1.2.1 sdl < 1.3.0" SDL_events.h SDL_PollEvent