Skip to contentSkip to conversation

package/zbar: switch to linuxtv zbar fork

PATCH New james.hilliard1 at gmail.com 2 participants 2 messages Jan 14, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 package/zbar: switch to linuxtv zbar fork

From: James Hilliard <[email protected]>

The zbar upstream previously used has been abandoned since 2012. The linuxtv fork appears to be the most actively maintained fork. Removed all patches which are merged upstream or fixed upstream. Changed configure flags to match new upstream.

---
Changes v2 -> v3:
- update to latest upstream
- removed all patches

Changes v1 -> v2:
- regenerate patch series
- add details to commit message

---
 ...onf-by-reducing-the-warning-error-checkin.patch | 26 -------
 ...n-protoype-to-be-compatible-with-recent-l.patch | 27 --------
 .../zbar/0003-Disable-building-documentation.patch | 27 --------
 ...p-logical-not-operations-into-parentheses.patch | 80 ----------------------
 package/zbar/Config.in                             |  2 +-
 package/zbar/zbar.hash                             |  2 +-
 package/zbar/zbar.mk                               | 12 ++--
 7 files changed, 9 insertions(+), 167 deletions(-)
 delete mode 100644 package/zbar/0001-Fix-autoreconf-by-reducing-the-warning-error-checkin.patch
 delete mode 100644 package/zbar/0002-Fix-function-protoype-to-be-compatible-with-recent-l.patch
 delete mode 100644 package/zbar/0003-Disable-building-documentation.patch
 delete mode 100644 package/zbar/0004-Wrap-logical-not-operations-into-parentheses.patch
package/zbar/0001-Fix-autoreconf-by-reducing-the-warning-error-checkin.patch deleted +0 -26
deleted file mode 100644
index 57fbeb1..0000000
@@ -1,26 +0,0 @@
-From e593d6529cff515d94d80a24b5f3a953fd46004c Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Sat, 19 Dec 2015 18:56:36 +0100
-Subject: [PATCH] Fix autoreconf by reducing the warning/error checking
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 256aedb..e0b6046 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3,7 +3,7 @@ AC_PREREQ([2.61])
- AC_INIT([zbar], [0.10], [spadix at users.sourceforge.net])
- AC_CONFIG_AUX_DIR(config)
- AC_CONFIG_MACRO_DIR(config)
--AM_INIT_AUTOMAKE([1.10 -Wall -Werror foreign subdir-objects std-options dist-bzip2])
-+AM_INIT_AUTOMAKE([1.10 foreign subdir-objects std-options dist-bzip2])
- AC_CONFIG_HEADERS([include/config.h])
- AC_CONFIG_SRCDIR(zbar/scanner.c)
- LT_PREREQ([2.2])
--- 
-2.6.4
-
package/zbar/0002-Fix-function-protoype-to-be-compatible-with-recent-l.patch deleted +0 -27
deleted file mode 100644
index 82dd4e9..0000000
@@ -1,27 +0,0 @@
-From 5dc8322b4f9a3de29b3da70b69e16356a2a1764c Mon Sep 17 00:00:00 2001
-From: Viacheslav Volkov <[email protected]>
-Date: Sat, 19 Dec 2015 19:07:09 +0100
-Subject: [PATCH] Fix function protoype to be compatible with recent libjpeg
-
-Signed-off-by: Viacheslav Volkov <[email protected]>
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- zbar/jpeg.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/zbar/jpeg.c b/zbar/jpeg.c
-index 972bfea..fdd1619 100644
---- a/zbar/jpeg.c
-+++ b/zbar/jpeg.c
-@@ -68,7 +68,7 @@ void init_source (j_decompress_ptr cinfo)
-     cinfo->src->bytes_in_buffer = img->datalen;
- }
- 
--int fill_input_buffer (j_decompress_ptr cinfo)
-+boolean fill_input_buffer (j_decompress_ptr cinfo)
- {
-     /* buffer underrun error case */
-     cinfo->src->next_input_byte = fake_eoi;
--- 
-2.6.4
-
package/zbar/0003-Disable-building-documentation.patch deleted +0 -27
deleted file mode 100644
index 729f926..0000000
@@ -1,27 +0,0 @@
-From 58027d5bb0492142a5b72ded772d3a1be9fa8d87 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Sun, 20 Dec 2015 12:05:57 +0100
-Subject: [PATCH] Disable building documentation
-
-The documentation requires xmlto, and we don't need it in Buildroot.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- Makefile.am | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index e18499a..db4411f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -45,7 +45,6 @@ if HAVE_NPAPI
- include $(srcdir)/plugin/Makefile.am.inc
- endif
- include $(srcdir)/test/Makefile.am.inc
--include $(srcdir)/doc/Makefile.am.inc
- 
- EXTRA_DIST += zbar.ico zbar.nsi
- 
--- 
-2.6.4
-
package/zbar/0004-Wrap-logical-not-operations-into-parentheses.patch deleted +0 -80

80 lines not on this page · raw message

package/zbar/Config.in +1 -1
index 05c9b76..0f4d115 100644
@@ -9,7 +9,7 @@ config BR2_PACKAGE_ZBAR
 	help
 	  QR and barcode scanner
 
-	  http://zbar.sourceforge.net/
+	  https://git.linuxtv.org/zbar.git/about/
 
 comment "zbar needs a toolchain w/ threads, C++ and headers >= 3.0"
 	depends on BR2_USE_MMU
package/zbar/zbar.hash +1 -1
index 54441a8..2093076 100644
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256 38f8535a3c4c526ecaa968a992efcbf7392623e68db45dc2f181d4c9d3002d69 zbar-854a5d97059e395807091ac4d80c53f7968abb8f.tar.gz
+sha256 115486dfb314da0dab26c745ab3056eb56f16f74a9fddda89a1ea9d0d51007ae zbar-006b465a267ad3c6c754b88bbe77bb1c1f49f40b.tar.gz
package/zbar/zbar.mk +7 -5
index c8fc899..b3b16e1 100644
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-# github have some additional commits for compiling with recent kernel
-ZBAR_VERSION = 854a5d97059e395807091ac4d80c53f7968abb8f
-ZBAR_SITE = $(call github,ZBar,Zbar,$(ZBAR_VERSION))
+ZBAR_VERSION = 006b465a267ad3c6c754b88bbe77bb1c1f49f40b
+ZBAR_SITE = git://linuxtv.org/zbar.git
 ZBAR_LICENSE = LGPL-2.1+
 ZBAR_LICENSE_FILES = LICENSE
 ZBAR_INSTALL_STAGING = YES
@@ -15,10 +14,13 @@ ZBAR_DEPENDENCIES = libv4l jpeg
 # add host-gettext for AM_ICONV macro
 ZBAR_DEPENDENCIES += host-gettext
 ZBAR_CONF_OPTS = \
+	--disable-doc \
 	--without-imagemagick \
 	--without-qt \
+	--without-qt5 \
 	--without-gtk \
-	--without-python \
-	--without-x
+	--without-python2 \
+	--without-x \
+	--without-java
 
 $(eval $(autotools-package))
Signature · 1 line
2.7.4
#1 lore raw

PATCH v3 1/1 package/zbar: switch to linuxtv zbar fork

Hello,

Quoted 7 lines · On Mon, 14 Jan 2019 21:27:00 +0800, james.hilliard1 at gmail.com wrote:

From: James Hilliard <[email protected]>

The zbar upstream previously used has been abandoned since 2012. The linuxtv fork appears to be the most actively maintained fork. Removed all patches which are merged upstream or fixed upstream. Changed configure flags to match new upstream.

Quoted 5 lines

---
Changes v2 -> v3:
- update to latest upstream
- removed all patches

Applied to master, thanks.

Thomas

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