NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffmpeg: fix build with gpl suboption and openssl

Browse Source 
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>
This commit is contained in:
Peter Korsgaard 2014-01-13 13:11:39 +01:00
parent 8b2e235743
commit 457b6467ed
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/ffmpeg/ffmpeg.mk
View File

@ -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