diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2014-01-13 13:11:39 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-01-13 13:11:39 +0100 |
| commit | 457b6467edcfbfe73da3de398d3dbefac79ef472 (patch) | |
| tree | 07d925dc87b0a30acd0aff2746295669e62e8e05 | |
| parent | 8b2e235743260872bbd7753a41f8cf56a628260e (diff) | |
| download | buildroot-457b6467edcfbfe73da3de398d3dbefac79ef472.tar.gz buildroot-457b6467edcfbfe73da3de398d3dbefac79ef472.zip | |
ffmpeg: fix build with gpl suboption and openssl
Openssl's license isn't compatible with GPL, so ffmpeg's configure script
only allows this combination if nonfree is enabled.
Fixes http://autobuild.buildroot.net/results/ed6/ed6129d584229ebe4a0b291bc6a1dd0be23cc92a/
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| -rw-r--r-- | package/ffmpeg/ffmpeg.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 2168785246..e60ced740b 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -198,8 +198,13 @@ FFMPEG_CONF_OPT += --disable-bzlib endif ifeq ($(BR2_PACKAGE_OPENSSL),y) +# openssl isn't license compatible with GPL +ifeq ($(BR2_PACKAGE_FFMPEG_GPL)x$(BR2_PACKAGE_FFMPEG_NONFREE),yx) +FFMPEG_CONF_OPT += --disable-openssl +else FFMPEG_CONF_OPT += --enable-openssl FFMPEG_DEPENDENCIES += openssl +endif else FFMPEG_CONF_OPT += --disable-openssl endif |
