From 5f7411e171d81f5fa87d16e6c370cdb2df1b8c57 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 17 Oct 2015 21:38:56 +0200 Subject: [PATCH] package/ffmpeg: Add support for GnuTLS Besides OpenSSL ffmpeg also supports GnuTLS. If both GnuTLS and OpenSSL are enabled, the former takes precedence over the latter: http://git.videolan.org/?p=ffmpeg.git;a=blob;f=configure;h=7f9fed31a491ed0991aee2d354dba82e54e3291e;hb=refs/heads/release/2.8#l2719 Signed-off-by: Bernd Kuhls Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/ffmpeg/ffmpeg.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 287338d955..d4815cac68 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -200,6 +200,11 @@ else FFMPEG_CONF_OPTS += --disable-libfdk-aac endif +ifeq ($(BR2_PACKAGE_GNUTLS),y) +FFMPEG_CONF_OPTS += --enable-gnutls --disable-openssl +FFMPEG_DEPENDENCIES += gnutls +else +FFMPEG_CONF_OPTS += --disable-gnutls ifeq ($(BR2_PACKAGE_OPENSSL),y) # openssl isn't license compatible with GPL ifeq ($(BR2_PACKAGE_FFMPEG_GPL)x$(BR2_PACKAGE_FFMPEG_NONFREE),yx) @@ -211,6 +216,7 @@ endif else FFMPEG_CONF_OPTS += --disable-openssl endif +endif ifeq ($(BR2_PACKAGE_LIBDCADEC),y) FFMPEG_CONF_OPTS += --enable-libdcadec -- 2.30.2