zbar: Update to 0.23.1

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: zbar: Update to 0.23.1
From: Leonardo Taccari <leot%NetBSD.org@localhost>
Date: Sun, 14 Jun 2020 10:32:34 +0000
Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sun Jun 14 12:32:34 2020 +0200
Changeset:	6dcfbc87e070de9fca0089cec41d7b58ef2f0201

Modified Files:
	zbar/Makefile
	zbar/distinfo
	zbar/patches/patch-configure
	zbar/patches/patch-test_test__examples.sh.in
Added Files:
	zbar/TODO

Log Message:
zbar: Update to 0.23.1

Please note that this update is broken and the build fails with:

 | Making all in .
 |   CC       zbarimg/zbarimg-zbarimg.o
 | zbarimg/zbarimg.c:43:10: fatal error: ../zbar/gettext.h: No such file or directory
 |  #include "../zbar/gettext.h"
 |           ^~~~~~~~~~~~~~~~~~~
 | compilation terminated.
 | *** [zbarimg/zbarimg-zbarimg.o] Error code 1

(also documented in TODO.)

Changes:
0.23.1
------
  * Add i18n translation support and add a pt_BR translation
  * Change default to autodetect python and gtk versions
  * Improve tests and builds on travisCI
  * Some documentation updates
  * Add support for binary data extraction
  * Add support for raw decoding without charset conversions
  * Add one shot scanning mode
  * Improved OSX and iphone support
  * Fix help messages
  * Fix some makefile issues
  * Fix error detection in video4linux read
  * Fix pkgconfig for zbar-qt5
  * Fix a double-free condition

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6dcfbc87e070de9fca0089cec41d7b58ef2f0201

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 zbar/Makefile                                |   3 +-
 zbar/TODO                                    |   9 ++
 zbar/distinfo                                |  12 +--
 zbar/patches/patch-configure                 | 121 +++------------------------
 zbar/patches/patch-test_test__examples.sh.in |   7 +-
 5 files changed, 34 insertions(+), 118 deletions(-)

diffs:
diff --git a/zbar/Makefile b/zbar/Makefile
index 6ffc6f9d1e..dee1cf04d5 100644
--- a/zbar/Makefile
+++ b/zbar/Makefile
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.7 2020/06/02 08:24:08 adam Exp $
 
-DISTNAME=	zbar-0.23
-PKGREVISION=	4
+DISTNAME=	zbar-0.23.1
 CATEGORIES=	graphics
 MASTER_SITES=	https://linuxtv.org/downloads/zbar/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/zbar/TODO b/zbar/TODO
new file mode 100644
index 0000000000..5ac4f1a128
--- /dev/null
+++ b/zbar/TODO
@@ -0,0 +1,9 @@
+Builds fails with:
+
+ | Making all in .
+ |   CC       zbarimg/zbarimg-zbarimg.o
+ | zbarimg/zbarimg.c:43:10: fatal error: ../zbar/gettext.h: No such file or directory
+ |  #include "../zbar/gettext.h"
+ |           ^~~~~~~~~~~~~~~~~~~
+ | compilation terminated.
+ | *** [zbarimg/zbarimg-zbarimg.o] Error code 1
diff --git a/zbar/distinfo b/zbar/distinfo
index fc5a846e5f..76a8989714 100644
--- a/zbar/distinfo
+++ b/zbar/distinfo
@@ -1,9 +1,9 @@
 $NetBSD: distinfo,v 1.2 2020/03/26 21:51:11 joerg Exp $
 
-SHA1 (zbar-0.23.tar.bz2) = 11a1d3f1aa8ef905fe16d88347a191909705d7ab
-RMD160 (zbar-0.23.tar.bz2) = 59ecd5c78fa91f6951a129377b4fa477307676bb
-SHA512 (zbar-0.23.tar.bz2) = 7eef2ee99760edd693ecc12a36e04b71a156b93b4c1977ca4f6da103a955284cf640b55adb185477e1d4cc65345bb01608ed9528f6518abb514ccbc58e5d350b
-Size (zbar-0.23.tar.bz2) = 1168183 bytes
-SHA1 (patch-configure) = 7cbc332aae614096b4dcc76af0dd831284639fcc
+SHA1 (zbar-0.23.1.tar.bz2) = 6a047e29895dd9248cc3dbac6fe0ac454d86f45b
+RMD160 (zbar-0.23.1.tar.bz2) = d4a8f17d7bc5874677c5bc301028b2fd236f221c
+SHA512 (zbar-0.23.1.tar.bz2) = e27765d380daa907b50817f4efa9b16a906f01ddb4ad7d7fd4a5193582a3fabc5a34d01c5dd8bdeb16cad9ccb62e6d72279294fbdcf8163815394be9722bfba4
+Size (zbar-0.23.1.tar.bz2) = 1195599 bytes
+SHA1 (patch-configure) = 892299ec1faaae69449b1d27d61c910005787359
 SHA1 (patch-gtk_Makefile.in) = bf32ac312d0d00ed7ac152ddd849dae0fc681e74
-SHA1 (patch-test_test__examples.sh.in) = d8a91cf9f8d619723825d6b50c26e781b5411a43
+SHA1 (patch-test_test__examples.sh.in) = d5739c5e4670d602b36ac62e7544f25709fc0d61
diff --git a/zbar/patches/patch-configure b/zbar/patches/patch-configure
index 3b8e8a5880..18a06b3ff4 100644
--- a/zbar/patches/patch-configure
+++ b/zbar/patches/patch-configure
@@ -1,64 +1,22 @@
 $NetBSD: patch-configure,v 1.1 2019/12/04 11:17:32 leot Exp $
 
-- Avoid unportable `==' test(1) operator
 - Avoid `${parameter/pattern/string}' bash-ism
 - Only honor `--with-python' configure argument and completely ignore
   possible PYTHON environment variable that could be passed via
   CONFIGURE_ENV by pkgsrc
+- Use standard `=' test(1) operator
 
-`==' unportable test(1) operator commited upstream as
-f326730fff1cb3ea7c98d30f67fc94481468d468.
-
---- configure.orig	2019-05-23 21:12:06.000000000 +0000
+--- configure.orig	2020-04-20 21:13:55.000000000 +0000
 +++ configure
-@@ -21590,7 +21590,7 @@ fi
- 
- 
- 
--if test "x$with_gtk" == "xgtk3" || test "x$with_gtk" == "xauto"; then :
-+if test "x$with_gtk" = "xgtk3" || test "x$with_gtk" = "xauto"; then :
- 
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK3" >&5
-@@ -21693,7 +21693,7 @@ fi
- 
- fi
- 
--if test "x$with_gtk" == "xgtk2" || test "x$with_gtk" == "xauto"; then :
-+if test "x$with_gtk" = "xgtk2" || test "x$with_gtk" = "xauto"; then :
- 
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK2" >&5
-@@ -21844,8 +21844,9 @@ fi
+@@ -23896,6 +23896,7 @@ fi
  
  
  
 +if false; then
  if test -z "$PYTHON"; then :
--  if test "x$with_python" == "xauto"; then :
-+  if test "x$with_python" = "xauto"; then :
+   if test "x$with_python" = "xauto"; then :
    for ac_prog in python3 python2 python
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -21893,7 +21894,7 @@ done
- test -n "$PYTHON" || PYTHON=":"
- 
- else
--  if test "x$with_python" == "xpython3"; then :
-+  if test "x$with_python" = "xpython3"; then :
-   for ac_prog in python3 python
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -21941,7 +21942,7 @@ done
- test -n "$PYTHON" || PYTHON=":"
- 
- else
--  if test "x$with_python" == "xpython2"; then :
-+  if test "x$with_python" = "xpython2"; then :
-   for ac_prog in python2 python
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -22000,6 +22001,7 @@ else
+@@ -24052,6 +24053,7 @@ else
    with_python="auto"
  
  fi
@@ -66,16 +24,7 @@ f326730fff1cb3ea7c98d30f67fc94481468d468.
  
  if test "x$with_python" != "xno"; then :
  
-@@ -22450,7 +22452,7 @@ fi
- 
- 
- 
--if test "x$with_gir" == "xyes" && test "x$with_gtk" != "xno"; then :
-+if test "x$with_gir" = "xyes" && test "x$with_gtk" != "xno"; then :
- 
- 
- 
-@@ -23002,7 +23004,7 @@ else
+@@ -25064,7 +25066,7 @@ else
  fi
  
  
@@ -84,56 +33,12 @@ f326730fff1cb3ea7c98d30f67fc94481468d468.
  
  # Javah was obsoleted on Java 8 and removed on Java 11. So, we need to
  # look strictly at the $JAVA_HOME in order to avoid mixing different versions
-@@ -23110,7 +23112,7 @@ fi
- done
- test -n "$JAR" || JAR=":"
- 
--if test "x$JAR" == "x:"; then :
-+if test "x$JAR" = "x:"; then :
-   have_java="no"
- fi
- 
-@@ -23163,7 +23165,7 @@ test -n "$JAVA" || JAVA="/bin/false"
- 
- 
+@@ -29146,7 +29150,7 @@ fi
+ echo ""
+ echo "please verify that the detected configuration matches your expectations:"
+ echo "------------------------------------------------------------------------"
+-if test "x$USE_NLS" == "xyes"; then :
++if test "x$USE_NLS" = "xyes"; then :
+   echo    "gettext                $USE_NLS"
  
--if test "x$CLASSPATH" == "x"; then :
-+if test "x$CLASSPATH" = "x"; then :
-   CLASSPATH="."
- fi
- 
-@@ -26981,7 +26985,7 @@ echo "GTK                    --with-gtk=
- echo "GObject introspection  --with-gir=$with_gir"
- echo "Qt                     --with-qt=$with_qt            Qt${QT_VERSION}"
- echo "Java                   --with-java=$with_java"
--if test "x$win32" == "xno"; then :
-+if test "x$win32" = "xno"; then :
-   echo "Dbus                   --with-dbus=$with_dbus"
- fi
- if test "x$have_GM" = "xyes"; then :
-@@ -27012,7 +27016,7 @@ fi
- if test "x$have_GM" = "xyes"; then :
-   echo "        => ImageMagick is preferred, as GraphicsMagick doesn't support https"
- fi
--if test "x$with_gtk" == "xno"; then :
-+if test "x$with_gtk" = "xno"; then :
-   echo "        => GTK support will *NOT* be built"
- fi
- if test "x$with_pygtk2" != "xyes" && test "xPYTHON_VERSION_MAJOR" = "x2"; then :
-@@ -27021,7 +27025,7 @@ fi
- if test "x$with_qt" != "xyes"; then :
-   echo "        => the Qt widget will *NOT* be built"
- fi
--if test "x$with_qt" == "xyes" && test "x$enable_static_qt" == "xyes" ; then :
-+if test "x$with_qt" = "xyes" && test "x$enable_static_qt" = "xyes" ; then :
-   echo "        => Building a static Qt library"
- fi
- if test "x$with_java" != "xyes"; then :
-@@ -27033,6 +27037,6 @@ fi
- #echo "NPAPI Plugin     --with-npapi=$with_npapi"
- #AS_IF([test "x$with_mozilla" != "xyes"],
- #  [echo "       => the Mozilla/Firefox/OpenOffice plugin will *NOT* be built"])
--if test "x$enable_pdf417" == "xyes"; then :
-+if test "x$enable_pdf417" = "xyes"; then :
-   echo "        => the pdf417 code support is incomplete!"
  fi
diff --git a/zbar/patches/patch-test_test__examples.sh.in b/zbar/patches/patch-test_test__examples.sh.in
index 129fc2ced2..5f8720ad44 100644
--- a/zbar/patches/patch-test_test__examples.sh.in
+++ b/zbar/patches/patch-test_test__examples.sh.in
@@ -1,6 +1,8 @@
 $NetBSD: patch-test_test__examples.sh.in,v 1.1 2020/03/26 21:51:11 joerg Exp $
 
---- test/test_examples.sh.in.orig	2020-03-26 11:48:50.144837043 +0000
+Use standard `=' test(1) operator.
+
+--- test/test_examples.sh.in.orig	2020-03-13 09:49:04.000000000 +0000
 +++ test/test_examples.sh.in
 @@ -31,28 +31,28 @@ test()
  	fi
@@ -37,7 +39,7 @@ $NetBSD: patch-test_test__examples.sh.in,v 1.1 2020/03/26 21:51:11 joerg Exp $
          test -Sean2.enable ean-2.png
          test -Sean5.enable ean-5.png
          test ean-8.png
-@@ -62,27 +62,27 @@ if [ "@ENABLE_EAN@" == "1" ]; then
+@@ -62,28 +62,28 @@ if [ "@ENABLE_EAN@" == "1" ]; then
          test -Supca.enable code-upc-a.png
  fi
  
@@ -50,6 +52,7 @@ $NetBSD: patch-test_test__examples.sh.in,v 1.1 2020/03/26 21:51:11 joerg Exp $
 +if [ "@ENABLE_QRCODE@" = "1" ]; then
          test qr-code.png
          test -Stest-inverted qr-code-inverted.png
+         test '--raw --oneshot -Sbinary' qr-code-binary.png
  fi
  
 -if [ "@ENABLE_SQCODE@" == "1" ]; then
Prev by Date: zbar: Update PKGPATH of zbar in bl3 for wip
Next by Date: zbar: Explicitly disable NLS support
Previous by Thread: zbar: Update PKGPATH of zbar in bl3 for wip
Next by Thread: zbar: Explicitly disable NLS support
Indexes:
Home | Main Index | Thread Index | Old Index