All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v1] package/gst1-plugins-bad: add zbar plugin option
@ 2019-03-09 21:50 Peter Seiderer
  2019-03-12 22:12 ` Thomas Petazzoni
  0 siblings, 1 reply; 2+ messages in thread
From: Peter Seiderer @ 2019-03-09 21:50 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
Note: patch depends on '[PATCH v4] package/zbar: bump version to 0.22'
      https://patchwork.ozlabs.org/patch/1053876
---
 package/gstreamer1/gst1-plugins-bad/Config.in       | 13 +++++++++++++
 .../gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk |  8 +++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

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+
-- 
2.21.0

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [Buildroot] [PATCH v1] package/gst1-plugins-bad: add zbar plugin option
  2019-03-09 21:50 [Buildroot] [PATCH v1] package/gst1-plugins-bad: add zbar plugin option Peter Seiderer
@ 2019-03-12 22:12 ` Thomas Petazzoni
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2019-03-12 22:12 UTC (permalink / raw)
  To: buildroot

On Sat,  9 Mar 2019 22:50:36 +0100
Peter Seiderer <ps.report@gmx.net> wrote:

> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
> Note: patch depends on '[PATCH v4] package/zbar: bump version to 0.22'
>       https://patchwork.ozlabs.org/patch/1053876
> ---
>  package/gstreamer1/gst1-plugins-bad/Config.in       | 13 +++++++++++++
>  .../gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk |  8 +++++++-
>  2 files changed, 20 insertions(+), 1 deletion(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-03-12 22:12 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-09 21:50 [Buildroot] [PATCH v1] package/gst1-plugins-bad: add zbar plugin option Peter Seiderer
2019-03-12 22:12 ` Thomas Petazzoni

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.