[Buildroot] [PATCH v4 1/1] package/ffmpeg: Add support for GnuTLS
Bernd Kuhls
bernd.kuhls at t-online.de
Sat Oct 17 19:38:56 UTC 2015
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 <bernd.kuhls at t-online.de>
---
v4: Removed Kconfig options (Thomas)
v3: rebased
v2: OpenSSL and gpl'ed code from ffmpeg play together when nonfree
package/ffmpeg/ffmpeg.mk | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 287338d..d4815ca 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.6.1
More information about the buildroot
mailing list