From 624aed5d450664b0f0a36b14d658248202f864ed Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 9 Aug 2017 14:16:02 +0300 Subject: 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 Signed-off-by: Ross Burton --- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc | 6 +++--- 1 file 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" -- cgit 1.2.3-korg