summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-08-14 16:19:21 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-16 09:18:47 +0100
commitd2562cfe4517d85328e961f968db2c7cd3c6c6f2 (patch)
tree0a120ad6ae253f9b7864c13c1627607eb01dba4d
parent50f1902cb44724aa4b030e4e42b115231217acc9 (diff)
downloadopenembedded-core-contrib-d2562cfe4517d85328e961f968db2c7cd3c6c6f2.tar.gz
openembedded-core-contrib-d2562cfe4517d85328e961f968db2c7cd3c6c6f2.tar.bz2
openembedded-core-contrib-d2562cfe4517d85328e961f968db2c7cd3c6c6f2.zip
gstreamer1.0-plugins-bad: do not provide a fallback to openssl 1.0
This does not work as intended: enabling either of the alternatives causes the other alternative to append a --disable-hls flag to configure. Anyone needing openssl 1.0 should set it up manually via EXTRA_OECONF_append or similar. Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc2
1 files changed, 0 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
index 7bcd6db292..2e466fef37 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
@@ -41,8 +41,6 @@ PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,--disable-fluidsynth,fluid
PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2"
PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3"
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"