aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Peter Seiderer <ps.report@gmx.net>2019-03-09 22:50:36 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2019-03-12 23:11:53 +0100
commit031a033eb267d1db98c88c87177ebb743e57f839 (patch)
tree60facac853777cc7c2c2a543fa83240b95a4682e
parent8729c4ef881b02ff85b7645b0ad309d6ae44fccf (diff)
downloadbuildroot-031a033eb267d1db98c88c87177ebb743e57f839.tar.gz
buildroot-031a033eb267d1db98c88c87177ebb743e57f839.tar.bz2
package/gst1-plugins-bad: add zbar plugin option
Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/gstreamer1/gst1-plugins-bad/Config.in13
-rw-r--r--package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk8
2 files changed, 20 insertions, 1 deletions
diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in
index a2ceeb9035..869f0a9d45 100644
--- a/package/gstreamer1/gst1-plugins-bad/Config.in
+++ b/package/gstreamer1/gst1-plugins-bad/Config.in
@@ -587,4 +587,17 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265
comment "x265 needs a toolchain w/ C++, dynamic library"
depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
+config BR2_PACKAGE_GST1_PLUGINS_BAD_ZBAR
+ bool "zbar"
+ depends on BR2_TOOLCHAIN_HAS_THREADS # zbar-> libv4l
+ depends on BR2_USE_MMU # zbar-> libv4l
+ depends on BR2_INSTALL_LIBSTDCPP # zbar-> libv4l
+ depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # zbar -> libv4l
+ select BR2_PACKAGE_ZBAR
+
+comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.0"
+ depends on BR2_USE_MMU
+ depends on !BR2_TOOLCHAIN_HAS_THREADS \
+ || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
+
endif
diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
index ac39f1e5ce..f5b081f972 100644
--- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -57,7 +57,6 @@ GST1_PLUGINS_BAD_CONF_OPTS += \
--disable-gme \
--disable-vdpau \
--disable-schro \
- --disable-zbar \
--disable-spandsp \
--disable-gtk3
@@ -719,6 +718,13 @@ else
GST1_PLUGINS_BAD_CONF_OPTS += --disable-x265
endif
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_ZBAR),y)
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-zbar
+GST1_PLUGINS_BAD_DEPENDENCIES += zbar
+else
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-zbar
+endif
+
# Add GPL license if GPL licensed plugins enabled.
ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y)
GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), GPL-2.0+