diff mbox

[FFmpeg-devel,7/8] build: simplify weak-enabling of autodetected libraries

Message ID 20170728115145.23169-8-u@pkh.me
State Accepted
Commit 9ef5a2f5f30bdc4ac86275ae4b4708ab4681b21d
Headers show

Commit Message

Clément Bœsch July 28, 2017, 11:51 a.m. UTC
From: Clément Bœsch <cboesch@gopro.com>

---
 configure | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

Comments

Michael Niedermayer July 28, 2017, 8:28 p.m. UTC | #1
On Fri, Jul 28, 2017 at 01:51:44PM +0200, Clément Bœsch wrote:
> From: Clément Bœsch <cboesch@gopro.com>
> 
> ---
>  configure | 18 +++---------------
>  1 file changed, 3 insertions(+), 15 deletions(-)

breaks mingw64 build

configure --cc='ccache x86_64-w64-mingw32-gcc'   --enable-xmm-clobber-test  --samples=/home/michael/fatesamples/fate/fate-suite/ --arch=x86_64 --target-os=mingw32 --cross-prefix=x86_64-w64-mingw32- --enable-gpl --target_exec=wine
...

src/libavdevice/sdl2.c:26:17: fatal error: SDL.h: No such file or directory
 #include <SDL.h>
                 ^
compilation terminated.
CC      libavdevice/utils.o
make: *** [libavdevice/sdl2.o] Error 1
make: *** Waiting for unfinished jobs....
src/libavdevice/dshow.c: In function ‘dshow_show_filter_properties’:
src/libavdevice/dshow.c:516:5: warning: missing braces around initializer [-Wmissing-braces]
     FILTER_INFO filter_info = {0}; /* a warning on this line is false positive GCC bug 53119 AFAICT */
     ^
src/libavdevice/dshow.c:516:5: warning: (near initialization for ‘filter_info.achName’) [-Wmissing-braces]

[...]
diff mbox

Patch

diff --git a/configure b/configure
index 6ddda239de..fa1b1d334a 100755
--- a/configure
+++ b/configure
@@ -3583,21 +3583,9 @@  done
 for lib in $AUTODETECT_LIBS; do
     enabled $lib && request $lib
 done
-
-# Enable platform codecs by default.
-enable_weak audiotoolbox
-
-# Enable hwaccels by default.
-enable_weak crystalhd d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc
-enable_weak xlib libxcb libxcb_shm libxcb_shape libxcb_xfixes
-
-enable_weak cuda cuvid nvenc videotoolbox videotoolbox_encoder
-
-# Enable compression/decompression libraries by default
-enable_weak zlib bzlib lzma
-
-enable_weak iconv
-enable_weak securetransport schannel
+#TODO: switch to $AUTODETECT_LIBS when $THREADS_LIST is supported the same way
+enable_weak $EXTERNAL_AUTODETECT_LIBRARY_LIST
+enable_weak $HWACCEL_AUTODETECT_LIBRARY_LIST
 
 disabled logging && logfile=/dev/null