aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2019-03-05 23:01:04 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2019-03-19 21:33:07 +0100
commit5fdc928ab8d47ea80b820fbd51ed81e13236edb8 (patch)
treeedb93a1c75444230b0e467d02bb642c2b7957d2c
parent3b75fc839a8470913d853d4ca4d1430c48acd244 (diff)
downloadbuildroot-5fdc928ab8d47ea80b820fbd51ed81e13236edb8.tar.gz
buildroot-5fdc928ab8d47ea80b820fbd51ed81e13236edb8.tar.bz2
package/gst-plugins-bad: remove apexsink support
apexsink does not build with OpenSSL 1.1.x so remove this option especially because there is no more apexsink option in gstreamer1 (since version 1.12) Fixes: - http://autobuild.buildroot.org/results/a29e8a8509190fc4b3c419dae2301cf72a601f62 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> (cherry picked from commit c8421565b1c4c5edd94d0c65e4fad5cbcfd46e10) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--Config.in.legacy6
-rw-r--r--package/gstreamer/gst-plugins-bad/Config.in4
-rw-r--r--package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk8
3 files changed, 7 insertions, 11 deletions
diff --git a/Config.in.legacy b/Config.in.legacy
index 25b48fba82..7e8b515088 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
comment "Legacy options removed in 2019.02"
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK
+ bool "gst-plugins-bad apexsink option removed"
+ select BR2_LEGACY
+ help
+ The gst-plugins-bad apexsink option was removed.
+
config BR2_PACKAGE_QT
bool "qt package removed"
select BR2_LEGACY
diff --git a/package/gstreamer/gst-plugins-bad/Config.in b/package/gstreamer/gst-plugins-bad/Config.in
index fe8457f6d2..411e4b6174 100644
--- a/package/gstreamer/gst-plugins-bad/Config.in
+++ b/package/gstreamer/gst-plugins-bad/Config.in
@@ -242,10 +242,6 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_Y4M
comment "plugins with external dependencies (there may be more available)"
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK
- bool "apexsink"
- select BR2_PACKAGE_OPENSSL
-
config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BZ2
bool "bz2"
select BR2_PACKAGE_BZIP2
diff --git a/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk b/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
index 856ff9665d..a98eac4235 100644
--- a/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
@@ -12,6 +12,7 @@ GST_PLUGINS_BAD_LICENSE = LGPL-2.1+, GPL-2.0+
GST_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB COPYING
GST_PLUGINS_BAD_CONF_OPTS = \
+ --disable-apexsink \
--disable-examples \
--disable-spandsp
@@ -472,13 +473,6 @@ GST_PLUGINS_BAD_CONF_OPTS += --disable-y4m
endif
# plugins with deps
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK),y)
-GST_PLUGINS_BAD_CONF_OPTS += --enable-apexsink
-GST_PLUGINS_BAD_DEPENDENCIES += openssl
-else
-GST_PLUGINS_BAD_CONF_OPTS += --disable-apexsink
-endif
-
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BZ2),y)
GST_PLUGINS_BAD_CONF_OPTS += --enable-bz2
GST_PLUGINS_BAD_DEPENDENCIES += bzip2