diff mbox

[FFmpeg-devel,2/3] configure: enable autodetected libraries after option parsing

Message ID b3692bdc-e7c2-9663-1e8a-a22e8b369cb8@googlemail.com
State Superseded
Headers show

Commit Message

Andreas Cadhalpun Dec. 1, 2016, 11:27 p.m. UTC 
On 01.12.2016 11:01, Hendrik Leppkes wrote:
> If those are enabled after option parsing, doesn't this then prevent
> me from turning them off?

Good catch, they should only be enabled, if they haven't been disabled.
Updated patch is attached.

Best regards,
Andreas

Comments

Hendrik Leppkes Dec. 2, 2016, 12:05 a.m. UTC | #1 
On Fri, Dec 2, 2016 at 12:27 AM, Andreas Cadhalpun
<andreas.cadhalpun@googlemail.com> wrote:
> On 01.12.2016 11:01, Hendrik Leppkes wrote:
>> If those are enabled after option parsing, doesn't this then prevent
>> me from turning them off?
>
> Good catch, they should only be enabled, if they haven't been disabled.
> Updated patch is attached.
>

I'm not 100% sure, but maybe enable_weak might work? It should only
affect the value if its still entirely unset, which should be what we
want?
Would look nicer then the manual loopery.

- Hendrik
diff mbox

Patch

From 88b3c4ffc2b02ca7dad1febda7cd6e3e02b8cf5f Mon Sep 17 00:00:00 2001
From: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Date: Wed, 30 Nov 2016 23:49:35 +0100
Subject: [PATCH 2/3] configure: enable autodetected libraries after option
 parsing

And only enable them, if they haven't been disabled.

This is needed for the following patch.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
---
 configure | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index 2ce7555..c0f31a7 100755
--- a/configure
+++ b/configure
@@ -3237,15 +3237,6 @@  enable valgrind_backtrace
 sws_max_filter_size_default=256
 set_default sws_max_filter_size
 
-# Enable platform codecs by default.
-enable audiotoolbox
-
-# Enable hwaccels by default.
-enable d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc
-enable xlib
-
-enable cuda cuvid nvenc vda_framework videotoolbox videotoolbox_encoder
-
 # build settings
 SHFLAGS='-shared -Wl,-soname,$$(@F)'
 LIBPREF="lib"
@@ -3491,6 +3482,13 @@  for e in $env; do
     eval "export $e"
 done
 
+# Enable platform codecs by default.
+# Enable hwaccels by default.
+for lib in audiotoolbox d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc xlib \
+           cuda cuvid nvenc vda_framework videotoolbox videotoolbox_encoder; do
+    ! disabled $lib && enable $lib
+done
+
 disabled logging && logfile=/dev/null
 
 # Disable all the library-specific components if the library itself
-- 
2.10.2