diff options
| author | Luca Ceresoli <luca@lucaceresoli.net> | 2010-06-14 21:41:45 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-06-15 08:52:17 +0200 |
| commit | 5db7204c80454fe5211c1f7df5490c36b9470af3 (patch) | |
| tree | 28a534f9bb4df0a293ba02e73cbbd929398fa37b | |
| parent | 56e4d692549d84e40035f551e9f87ab052138915 (diff) | |
ffmpeg: add user-defined configure parameters
Closes #401
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | package/multimedia/ffmpeg/Config.in | 7 | ||||
| -rw-r--r-- | package/multimedia/ffmpeg/ffmpeg.mk | 2 |
3 files changed, 11 insertions, 1 deletions
@@ -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 c9fdd5401..fb6591baf 100644 --- 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 eea76f7cc..81984f1a7 100644 --- 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 && \ |