[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7147/8267] gstreamer-plugins-bad: replace openssl dependency with nettle for hls plugin

[Emmanuele Bassi <ebassi src gnome org>]

commit 43d52e785b42a9b38419ae2959cc5983bd017deb
Author: Alexander Kanavin <alexander kanavin linux intel com>
Date:   Wed Aug 9 14:16:02 2017 +0300

    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.
    
    (From OE-Core rev: 624aed5d450664b0f0a36b14d658248202f864ed)
    
    Signed-off-by: Alexander Kanavin <alexander kanavin linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../gstreamer/gstreamer1.0-plugins-bad.inc         |    6 +++---
 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 e964fef..dc47f58 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"