From 457b6467edcfbfe73da3de398d3dbefac79ef472 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 13 Jan 2014 13:11:39 +0100 Subject: [PATCH] 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 --- package/ffmpeg/ffmpeg.mk | 5 +++++ 1 file changed, 5 insertions(+) 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 -- 2.30.2