Skip to contentSkip to conversation

zbar: bump version to 0.22

PATCH Superseded Peter Seiderer 2 participants 3 messages Mar 8, 2019 – Mar 9, 2019

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 zbar: bump version to 0.22

- change from git download to official release and download site (drop need for autoreconf)

- drop dependency on kernel headers >= 3.17 (should be fixed with commit 'v4l2: make ZBar build and run on Kernels < 3.16' (see [1]), propagate removal to gst-plugins-bad

[1] https://git.linuxtv.org/zbar.git/commit/?id=fa5c48127ec1e3670e28540c2e6a03431ebac5b8

---
Changes v1 -> v2:
- rebased on current master

Changes v2 -> v3:
- propagate removal of header dependency to gst-plugins-bad (suggested by Thomas Petazzoni)

Note:
Previous commit dd08ca7aa98209222a077d1db97323bbc3b563b2 lifted the kernel headers dependency from >= 3.0 to >= 3.17, a complete test-pkg run without headers dependency showed no error, so remove the kernel headers dependency...

---
 package/gstreamer/gst-plugins-bad/Config.in | 6 ++----
 package/zbar/Config.in                      | 6 ++----
 package/zbar/zbar.hash                      | 2 +-
 package/zbar/zbar.mk                        | 6 +++---
 4 files changed, 8 insertions(+), 12 deletions(-)
package/gstreamer/gst-plugins-bad/Config.in +2 -4
index 411e4b6174..39139c0458 100644
@@ -321,12 +321,10 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_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_17 # zbar
 	select BR2_PACKAGE_ZBAR
 
-comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.17"
+comment "zbar plugin needs a toolchain w/ threads, C++"
 	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HAS_THREADS \
-		|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
 
 endif
package/zbar/Config.in +2 -4
index e850c1f02b..e0b28365fc 100644
@@ -3,7 +3,6 @@ config BR2_PACKAGE_ZBAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libv4l
 	depends on BR2_USE_MMU # libv4l
 	depends on BR2_INSTALL_LIBSTDCPP # libv4l
-	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # v4l2_query_ext_ctrl
 	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_LIBV4L
 	help
@@ -11,7 +10,6 @@ config BR2_PACKAGE_ZBAR
 
 	  https://git.linuxtv.org/zbar.git/about/
 
-comment "zbar needs a toolchain w/ threads, C++ and headers >= 3.17"
+comment "zbar needs a toolchain w/ threads, C++"
 	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HAS_THREADS \
-		|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
package/zbar/zbar.hash +1 -1
index 47a080af12..0f44d0f5c0 100644
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256 7eb73c180c787184ede0f98806c52b23eb9c24609673e1ed51210504ea2937f5 zbar-681b0f305fb5c5bb0df8437f7d740b29a93a7889.tar.gz
+sha256 1ba9e94c7217a8bd3800f9f3abddf3ed393a62cdf141a709765aad2788744eb7 zbar-0.22.tar.bz2
 sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 LICENSE
package/zbar/zbar.mk +3 -3
index 2146aee85b..63220774b9 100644
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-ZBAR_VERSION = 681b0f305fb5c5bb0df8437f7d740b29a93a7889
-ZBAR_SITE = git://linuxtv.org/zbar.git
+ZBAR_VERSION = 0.22
+ZBAR_SOURCE = zbar-$(ZBAR_VERSION).tar.bz2
+ZBAR_SITE = https://www.linuxtv.org/downloads/zbar
 ZBAR_LICENSE = LGPL-2.1+
 ZBAR_LICENSE_FILES = LICENSE
 ZBAR_INSTALL_STAGING = YES
-ZBAR_AUTORECONF = YES
 ZBAR_DEPENDENCIES = libv4l jpeg
 # add host-gettext for AM_ICONV macro
 ZBAR_DEPENDENCIES += host-gettext
Signature · 1 line
2.21.0
#1 lore raw

PATCH v3 1/1 zbar: bump version to 0.22

Hello Peter,

Quoted 10 lines · On Fri, 8 Mar 2019 23:19:47 +0100 Peter Seiderer <[email protected]> wrote:

- change from git download to official release and download site (drop need for autoreconf)

- drop dependency on kernel headers >= 3.17 (should be fixed with commit 'v4l2: make ZBar build and run on Kernels < 3.16' (see [1]), propagate removal to gst-plugins-bad

[1] https://git.linuxtv.org/zbar.git/commit/?id=fa5c48127ec1e3670e28540c2e6a03431ebac5b8

I didn't pay attention, but in fact this is still not correct.

zbar selects libv4l, and libv4l has a dependency on headers >= 3.0. So zbar should keep a dependency on >= 3.0, and so should the gst-plugins-bad zbar option. Otherwise, you can enable zbar on < 3.0 headers, but libv4l is not selectable, violating the kconfig correctness of the configuration.

Conclusion: we need a headers >= 3.0 dependency on zbar and the gst-plugins-bad zbar option.

Could you fix this and resend ?

Thanks a lot!

Thomas Petazzoni

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH v3 1/1 zbar: bump version to 0.22

Hello Thomas,

Quoted 18 lines · Thomas Petazzoni

Hello Peter,

Quoted 10 lines · On Fri, 8 Mar 2019 23:19:47 +0100 Peter Seiderer <[email protected]> wrote:

- change from git download to official release and download site (drop need for autoreconf)

- drop dependency on kernel headers >= 3.17 (should be fixed with commit 'v4l2: make ZBar build and run on Kernels < 3.16' (see [1]), propagate removal to gst-plugins-bad

[1] https://git.linuxtv.org/zbar.git/commit/?id=fa5c48127ec1e3670e28540c2e6a03431ebac5b8

I didn't pay attention, but in fact this is still not correct.

Quoted 8 lines

zbar selects libv4l, and libv4l has a dependency on headers >= 3.0. So zbar should keep a dependency on >= 3.0, and so should the gst-plugins-bad zbar option. Otherwise, you can enable zbar on < 3.0 headers, but libv4l is not selectable, violating the kconfig correctness of the configuration.

Conclusion: we need a headers >= 3.0 dependency on zbar and the gst-plugins-bad zbar option.

O.k.

Quoted 2 lines

Could you fix this and resend ?

Yes, updated patch will follow....

Regards,
Peter

Quoted 4 lines

Thanks a lot!

Thomas Petazzoni