Преглед на файлове

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>
Peter Korsgaard преди 11 години
родител
ревизия
457b6467ed
променени са 1 файла, в които са добавени 5 реда и са изтрити 0 реда
  1. 5 0
      package/ffmpeg/ffmpeg.mk

+ 5 - 0
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