From 11b2ab5ee261e8af1065f15e2e69290e15e9e4ea Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 14 Nov 2022 16:22:54 -0700 Subject: [PATCH] package/gstreamer1/gst1-plugins-bad: add zxing plugin support Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-bad/Config.in | 9 +++++++++ package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 1e89cd124f..d477924eec 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -738,6 +738,15 @@ comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.0" depends on !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 +config BR2_PACKAGE_GST1_PLUGINS_BAD_ZXING + bool "zxing" + depends on !BR2_STATIC_LIBS # zxing-cpp + depends on BR2_INSTALL_LIBSTDCPP # zxing-cpp + select BR2_PACKAGE_ZXING_CPP + +comment "zxing plugin needs a toolchain w/ C++, dynamic library" + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP + endif comment "gst1-plugins-bad needs a toolchain w/ C++" diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index dfe1f1c9eb..edac818985 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -70,7 +70,6 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ -Dsvthevcenc=disabled \ -Dtranscode=disabled \ -Dwasapi2=disabled \ - -Dzxing=disabled \ -Dmagicleap=disabled \ -Disac=disabled \ -Diqa=disabled \ @@ -812,6 +811,13 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dzbar=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_ZXING),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dzxing=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += zxing-cpp +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dzxing=disabled +endif + # Add GPL license if GPL licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dgpl=enabled