diff mbox

[FFmpeg-devel,8/8,v2] build: add --disable-autodetect switch

Message ID 20170728142825.GB22239@golem.pkh.me
State Superseded
Headers show

Commit Message

Clément Bœsch July 28, 2017, 2:28 p.m. UTC 
On Fri, Jul 28, 2017 at 01:51:45PM +0200, Clément Bœsch wrote:
> From: Clément Bœsch <cboesch@gopro.com>
> 
> ---
>  Changelog | 1 +
>  configure | 6 ++++--
>  2 files changed, 5 insertions(+), 2 deletions(-)
> 

new version attached, fixing link problems.

I still have some stuff I'd like to drop though:

☭ ldd ./ffmpeg
	linux-vdso.so.1 (0x00007ffce3bc9000)
	libjack.so.0 => /usr/lib/libjack.so.0 (0x00007f4f96965000)
	libasound.so.2 => /usr/lib/libasound.so.2 (0x00007f4f96655000)
	libm.so.6 => /usr/lib/libm.so.6 (0x00007f4f96343000)
	libpthread.so.0 => /usr/lib/libpthread.so.0 (0x00007f4f96125000)
	libc.so.6 => /usr/lib/libc.so.6 (0x00007f4f95d7f000)
	libdb-5.3.so => /usr/lib/libdb-5.3.so (0x00007f4f959c0000)
	libdl.so.2 => /usr/lib/libdl.so.2 (0x00007f4f957bc000)
	librt.so.1 => /usr/lib/librt.so.1 (0x00007f4f955b4000)
	/lib64/ld-linux-x86-64.so.2 (0x00007f4f96b86000)

typically jack and asound. Maybe some others.
diff mbox

Patch

From a6000be09142b1a086256dba93ecb17998099c7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <cboesch@gopro.com>
Date: Fri, 28 Jul 2017 13:44:07 +0200
Subject: [PATCH 8/8] build: add --disable-autodetect switch

---
 Changelog |  1 +
 configure | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index 187ae7950a..50409118e6 100644
--- a/Changelog
+++ b/Changelog
@@ -29,6 +29,7 @@  version <next>:
 - limiter video filter
 - libvmaf video filter
 - Dolby E decoder and SMPTE 337M demuxer
+- add --disable-autodetect build switch
 
 version 3.3:
 - CrystalHD decoder moved to new decode API
diff --git a/configure b/configure
index fa1b1d334a..4a4c36be34 100755
--- a/configure
+++ b/configure
@@ -109,6 +109,7 @@  Configuration options:
   --enable-gray            enable full grayscale support (slower color)
   --disable-swscale-alpha  disable alpha channel support in swscale
   --disable-all            disable building components, libraries and programs
+  --disable-autodetect     disable automatically detected external libraries [no]
 
 Program options:
   --disable-programs       do not build command line programs
@@ -1683,6 +1684,7 @@  CONFIG_LIST="
     $LIBRARY_LIST
     $PROGRAM_LIST
     $SUBSYSTEM_LIST
+    autodetect
     fontconfig
     memory_poisoning
     neon_clobber_test
@@ -3579,13 +3581,19 @@  for e in $env; do
     eval "export $e"
 done
 
+if disabled autodetect; then
+    disable_weak $EXTERNAL_AUTODETECT_LIBRARY_LIST
+    disable_weak $HWACCEL_AUTODETECT_LIBRARY_LIST
+fi
 # Mark specifically enabled, but normally autodetected libraries as requested.
 for lib in $AUTODETECT_LIBS; do
     enabled $lib && request $lib
 done
 #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
+if ! disabled autodetect; then
+    enable_weak $EXTERNAL_AUTODETECT_LIBRARY_LIST
+    enable_weak $HWACCEL_AUTODETECT_LIBRARY_LIST
+fi
 
 disabled logging && logfile=/dev/null
 
-- 
2.13.3