summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-08-09 14:16:02 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-11 00:08:33 +0100
commit624aed5d450664b0f0a36b14d658248202f864ed (patch)
tree783ff186920ecf62b4fcf5645aca660dc705ebb3
parent88a4a872a7f22be52faa965bc05c57d8466e0eed (diff)
downloadopenembedded-core-contrib-624aed5d450664b0f0a36b14d658248202f864ed.tar.gz
openembedded-core-contrib-624aed5d450664b0f0a36b14d658248202f864ed.tar.bz2
openembedded-core-contrib-624aed5d450664b0f0a36b14d658248202f864ed.zip
gstreamer-plugins-bad: replace openssl dependency with nettle for hls plugin
It has not been ported to openssl 1.1 (and there's nothing in upstream git), but it's possible to use nettle or gcrypt intead. Also, provide a fallback option to use openssl 1.0 when necessary. Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
index e964fef3f2..dc47f581af 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
@@ -40,9 +40,9 @@ PACKAGECONFIG[flite] = "--enable-flite,--disable-flite,flite-alsa"
PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,--disable-fluidsynth,fluidsynth"
PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2"
PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3"
-# ensure OpenSSL is used for HLS AES description instead of nettle
-# (OpenSSL is a shared dependency with dtls)
-PACKAGECONFIG[hls] = "--enable-hls --with-hls-crypto=openssl,--disable-hls,openssl"
+PACKAGECONFIG[hls] = "--enable-hls --with-hls-crypto=nettle,--disable-hls,nettle"
+# Provide a fallback to openssl 1.0 when using nettle is not acceptable or desirable
+PACKAGECONFIG[hls_openssl10] = "--enable-hls --with-hls-crypto=openssl,--disable-hls,openssl10"
PACKAGECONFIG[kms] = "--enable-kms,--disable-kms,libdrm"
PACKAGECONFIG[libmms] = "--enable-libmms,--disable-libmms,libmms"
PACKAGECONFIG[libssh2] = "--enable-libssh2,--disable-libssh2,libssh2"