ffmpeg: add user-defined configure parameters

Closes #401

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index f0822d57b09b3b4da52ee1e47a19bef81d03d158..ac9e74410eb8b1bba0ffc1cbe0f380b510c50ae3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@
 
        New GTK-based configurator, usable using 'make gconfig'.
 
-       New packages: cgilua, copas, coxpcall, luafilesystem,
+       New packages: cgilua, copas, coxpcall, ffmpeg, luafilesystem,
        luasocket, rings, wsapi, xavante
 
        Updated/fixed packages: busybox, cdrkit, file, gawk,
@@ -19,6 +19,7 @@
 
        Issues resolved (http://bugs.uclibc.org):
 
+       #401:  new package: ffmpeg
        #1753: lmbench: convert to generic package infrastructure
        #1771: Fakeroot and the target/generic/device_table.txt create bad...
        #1807: LZMA 4.32.7, Required header file(s) are missing

diff --git a/package/multimedia/ffmpeg/Config.in b/package/multimedia/ffmpeg/Config.in
index c9fdd540138aa5d77bf51110261ce371f78faea6..fb6591baf8418743386a599ac9f21dc7b6138a77 100644 (file)
--- a/package/multimedia/ffmpeg/Config.in
+++ b/package/multimedia/ffmpeg/Config.in
@@ -135,4 +135,11 @@ config BR2_PACKAGE_FFMPEG_OUTDEVS
        bool "Enable output devices"
        default y
 
+config BR2_PACKAGE_FFMPEG_EXTRACONF
+       string "Additional parameters for ./configure"
+       default ""
+       help
+        Extra parameters that will be appended to FFmpeg's
+        ./configure commandline.
+
 endif

diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index eea76f7cc5ca165611fd5c76ff98f95831d0d797..81984f1a784744c9832592c93a5c8832fd03663e 100644 (file)
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -114,6 +114,8 @@ else
 FFMPEG_CONF_OPT += --disable-zlib
 endif
 
+FFMPEG_CONF_OPT += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF))
+
 # Override FFMPEG_CONFIGURE_CMDS: FFmpeg does not support --target and others
 define FFMPEG_CONFIGURE_CMDS
        (cd $(FFMPEG_SRCDIR) && rm -rf config.cache && \