diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-08-14 16:19:21 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-17 00:21:15 +0100 |
commit | 867b88ae53eaa9e37933280a27b0542ff6fdeb91 (patch) | |
tree | 02cc6befb08c013cb23d05ced1eac7c8f6b5e459 /meta | |
parent | afb2ba67fea2f6e545676ad4f3ade0abc7d84e63 (diff) | |
download | poky-867b88ae53eaa9e37933280a27b0542ff6fdeb91.tar.gz |
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.
(From OE-Core rev: d2562cfe4517d85328e961f968db2c7cd3c6c6f2)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc | 2 |
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 | |||
41 | PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2" | 41 | PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2" |
42 | PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3" | 42 | PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3" |
43 | PACKAGECONFIG[hls] = "--enable-hls --with-hls-crypto=nettle,--disable-hls,nettle" | 43 | PACKAGECONFIG[hls] = "--enable-hls --with-hls-crypto=nettle,--disable-hls,nettle" |
44 | # Provide a fallback to openssl 1.0 when using nettle is not acceptable or desirable | ||
45 | PACKAGECONFIG[hls_openssl10] = "--enable-hls --with-hls-crypto=openssl,--disable-hls,openssl10" | ||
46 | PACKAGECONFIG[kms] = "--enable-kms,--disable-kms,libdrm" | 44 | PACKAGECONFIG[kms] = "--enable-kms,--disable-kms,libdrm" |
47 | PACKAGECONFIG[libmms] = "--enable-libmms,--disable-libmms,libmms" | 45 | PACKAGECONFIG[libmms] = "--enable-libmms,--disable-libmms,libmms" |
48 | PACKAGECONFIG[libssh2] = "--enable-libssh2,--disable-libssh2,libssh2" | 46 | PACKAGECONFIG[libssh2] = "--enable-libssh2,--disable-libssh2,libssh2" |