wip/zbar: Update to version 0.23

[ng0 <ng0%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	ng0 <ng0%NetBSD.org@localhost>
Pushed By:	ng0
Date:		Tue Dec 3 10:39:52 2019 +0000
Changeset:	ff7d719fa674eb6efebdb54413e91d20af3af5f1

Modified Files:
	zbar/Makefile
	zbar/distinfo
Added Files:
	zbar/TODO
	zbar/patches/patch-configure.ac
Removed Files:
	zbar/patches/patch-include_zbar_Exception.h

Log Message:
wip/zbar: Update to version 0.23

Changelog:

0.23:

  * Windows: added support for DirectShow
  * Text files at main dir converted to Markdown notation
  * HACKING.md text now reflects the procedures we use since 0.20
  * ZBar's URL locations updated on several places
  * Added support for using Gtk3 with zbarcam-gtk
  * Added support for using GObject Integration (GIR) with pygobject-3.0
  * Added support for Python3 bindings
  * Python scripts now runs with either python2 or python3
  * added Travis checks for Gtk3 with Python3 and GIR
  * added Travis builds for cross-compilation with winGW
  * added Travis builds for Windows native build
  * added a test script for checking python bindings
  * Added a test script for Python with Gtk support via GIR
  * Suppressed gcc warnings when building with Gtk3
  * Got rid of gdk_threads for good at zbarcam-gtk, using an idle hook to
    handle async messages
  * The debian/ and travis/ directories were removed from distribution files
  * Java sources added to the distribution tarball

0.22.2:

  * Improve some pkg check logic, in order to solve some
    ./configure issues
  * Fix logic that allows disabling Qt support
  * Add support for Java 11 detection
  * Fix Java detection logic
  * Fix Travis CI breakages due to the usage of Java 11 on Debian Sid
  * Fix some issues with MinGW Windows build
  * Search for new ImageMagick 7 header location

0.22.1:

  * Ensure that version.xml and reldate.xml will be placed at the source dir
  * Make use of glib thread names
  * Windows: Make zbargtk build
  * Windows: Use -no-undefined for libzbargtk
  * Windows: Disable zbarcam-gtk
  * Windows: Check for clock_gettime on pthread library as well
  * Windows: Specify correct path to barcode.png
  * Windows: Include windows.h for vfw
  * Makefile.am: Add missing extra-dist-file
  * configure.ac: allow building libzbar-qt as a static library

0.22:

  * zbarcam-qt: allow changing resolutions in real time
  * zbarcam-qt: better support ZBar options
  * zbarcam-qt: do several visual improvements
  * zbarcam-qt: make it remember the geometry
  * zbarcam-qt: allow show/hide control and options bars
  * zbarcam-qt: remember lastly used settings and camera controls
  * zbarcam-qt: allow changing ZBar decode options via GUI
  * Add API to allow get/set resolutions
  * img_scanner: add handler for color-inverted codes
  * img_scanner: fix get_config parameter validation
  * scan_video: improve logic to remove duplicated/invalid devnodes
  * symbol.c: fix symbol hash logic (prevents crash with QR options)
  * configure.ac: fix an error at libv4l2 package check
  * fix some typos
  * exit gracefully when decoding split QR codes

0.21:

  * zbarcam-qt: allow selecting codes via GUI interface
  * When both enabled, ISBN-13 has precedence over ISBN-10
  * ZBar is now using Travis CI for continuous integration tests
  * Convert INSTALL and README to markdown and update them
  * Improve ZBar testing code and make easier to run the tests
  * Fix build with Clang
  * Add simple dbus IPC API to zbarcam.
  * zbarimg: display only the compiled symbologies
  * v4l2: make ZBar build and run on Kernels < 3.16
  * configure.ac: The pdf417 code is incomplete. Warn about that
  * Add Debian packaging and Travis CI configuration
  * Add barcode examples for different supported symbologies
  * Several improvements at the building system
  * Add support for SQ code symbology
  * v4l2: add fallback for systems without v4l2_ext_controls which field
  * v4l2: use device_caps instead of capabilities
  * v4l2: make v4l2_request_buffers() more generic
  * release video buffers after probing and request them again when needed
  * Ignore ENOTTY errors when calling VIDIOC_S_CROP
  * doc/Makefile.am.inc: clean html generated files
  * Add --disable-doc configure option to disable building docs
  * Fix function prototype to be compatible with recent libjpeg
  * Wrap logical not operations into parentheses
  * INSTALL: warn that autoconf should be called before configure
  * code128: fix error logic
  * convert: ensure that it will not use a freed value
  * zbar: use g_thread_new() instead of g_tread_create()
  * zbargtk: add a missing break
  * gtk/zbargtk: add a missing check if zbar->window is not null

0.20.1:
  * Be sure to use python2, as /usr/bin/python is being removed
    (or made non-functional) on some distributions
  * Prefer using pygobject-codegen-2.0 instead of pygtk-codegen-2.0
  * Make it work with modern versions of python 2

0.20:
  * As upstream became abandoned, created a ZBar fork at linuxtv.org
  * Use libv4l2 for V4L2 support, using emulated formats as last resort
  * Add support for Qt5
  * Add zbarcam-qt and zbarcam-gtk (from the example codes)
  * Add support for v4l2 controls
  * Add the needed GUI bits for zbarcam-qt to work with controls
  * Fix compilation issues with newer automake versions

0.11:
  * Codabar reliability enhancements
    - fix missing check
    - require minimum quality
    - bump default uncertainty
  * tweak Codabar bar/space ratio validation
  * finish Codabar support for python, perl, java and iPhone interfaces
    - reduce Codabar uncertainty to minimum
  * add core support for Codabar symbology
    - TBD: python, perl, java and iPhone interfaces
  * fix v4l config and build variations (bug #3348888)
    - thanks to jarekczek for reporting this!
    - NB v4l1 removed from kernel as of 2.6.38
  * fix missing python thread initialization (bug #3349199)
    - thanks to jarekczek for reporting this problem!
  * fix missing configure check for Python.h (bug #3092663)
    - thanks to Zoltan Kovacs for reporting this problem!
  * fix C++ wrapper missing Symbol.quality (bug #3076524)
    - thanks to Rudy Melli for pointing this out!
  * fix C++ wrapper bugs (bug #3396068)
    - thanks to anotheruser1 for reporting this!
    - add new C++ wrapper test
  * fix avoid compositing ISBN10 data
  * add support for GraphicsMagick as ImageMagick alternative
  * mention xmlto in HACKING (patch #3297039)
    - thanks to jarekczek for the patch!
  * disable addons by default until synchronization with main symbol is working
  * fix image scanner min quality filtering
  * fix i25 buffer overrun corner case
  * fix EAN addon enables
  * fix zbarimg to accept autodetected stdin (lone dash)
  * fix Qt 4.6.3 compilation error (patch #3178244)
    - thanks to hrhristov for the patch!
  * add Python Processor support for request_size interface
  * fix Python Processor support for GIL, allowing asynchronous scanning
  * fix jpeg decoder skip handling
    - thanks to jarekczek for the patch!
  * rename dprintf macro to avoid conflicts (patch #3128538)
    - thanks to maurochehab for the patch!
  * add support for EAN/UPC 2 and 5 digit add-on symbols
    - deprecate original, unfinished add-on APIs
    - add self-checking to test_decode
  * fix support for GS1 AIs
    - thanks to jockusch for a patch!
    - add decoder/symbol "modifier" flags and config read access
    - set flags or emit GS appropriately for Code 128 FNC1
    - add iphone, java, perl, python bindings for modifiers and configs
  * add support for Code 93 symbology
  * add video size request to (Py)GTK widget (req #3034522)
    - thanks to Jerome Charaoui for the patch!
  * add support for GS1 DataBar Expanded (RSS Expanded) symbology
  * add language bindings for DataBar
  * add preliminary support for GS1 DataBar (RSS-14) symbology
  * enhance decoder reliability (EAN, Code 39, Code 128)
    - enhance decoder test
  * fix documentation of command exit codes (bug #3017322)
  * fix C++ video callback bug
    - add C and C++ processor examples
  * add per-symbology cache consistency
    - reliable symbologies decode immediately by default
    - no more need to disable cache with video
    - also fix crop bugs w/video scanning
  * add support for scanning partial images (cropping)
    - update c++, python, perl, java bindings and tests
  * fix couple of leaks
  * remove doc hints about GFDL (bug #3004411)
    - apply LGPL to API docs
  * relax Code 39 width ratio checks
  * core library portability improvements
    - remove some unnecessary C99 syntax
    - add configure checks for errno
    - enhance C++ Symbol interface
  * adjust Python module README (add examples and note DLL in path)
  * fix QR Code missing from man pages (bug #2969857)
  * cleanup decoder assertions and locking (bug #2966916)
  * add Java interface to library via JNI
    - add Java tools and JNI build tests to configure
    - fix compiler warnings from binary output changes
  * fix output of binary data in zbarimg and zbarcam
    - thanks to fukuchi for a patch!
    - add base64 format for binary xml output
  * add coarse symbol orientation information (patch #2913094)
    - thanks to Anssi for a patch!
    - add decode direction feedback to decoder
    - update C++, Python, Perl and ObjC wrappers
    - add orientation to test suites
  * fix inconsistent fourcc endian handling bugs (bug #2918994)
    - thanks to jdccdevel for a patch!
    - add fourcc conversion and parse interfaces to zbar.h
  * report QR immediately for video (no inter-frame consistency check)
  * add python distutils build infrastructure

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

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

diffstat:
 zbar/Makefile                               |  17 +++--
 zbar/TODO                                   |   4 +
 zbar/distinfo                               |  10 +--
 zbar/patches/patch-configure.ac             | 114 ++++++++++++++++++++++++++++
 zbar/patches/patch-include_zbar_Exception.h |  14 ----
 5 files changed, 133 insertions(+), 26 deletions(-)

diffs:
diff --git a/zbar/Makefile b/zbar/Makefile
index 4646f983da..04f7640c32 100644
--- a/zbar/Makefile
+++ b/zbar/Makefile
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.5 2015/07/07 18:50:58 leot1990 Exp $
 
-DISTNAME=	zbar-0.10
-PKGREVISION=	2
+DISTNAME=	zbar-0.23
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=zbar/}
+MASTER_SITES=	https://linuxtv.org/downloads/zbar/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	leot%NetBSD.org@localhost
@@ -13,18 +12,21 @@ LICENSE=	gnu-lgpl-v2.1
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
+USE_TOOLS+=	pkg-config bash gmake
 USE_LANGUAGES=	c c++	# c++ needed only for test
 
 CONFIGURE_ARGS+=	--with-jpeg
 CONFIGURE_ARGS+=	--disable-video
 CONFIGURE_ARGS+=	--without-gtk
 CONFIGURE_ARGS+=	--without-python
+CONFIGURE_ARGS+=	--without-java
 CONFIGURE_ARGS+=	--without-qt
 
 # pkgsrc ImageMagick always provide also <MagickWand.h> there is no need
 # to check it also manually (and this breaks with ImageMagick-7)
 CONFIGURE_ENV+=		ac_cv_header_wand_MagickWand_h=yes
+# \todo: JAVAC=${JAVAC/ecj/ecj -1.5} is a bashim: ${parm/?/pat[/str]}
+CONFIG_SHELL=		${TOOLS_PATH.bash}
 
 PKGCONFIG_OVERRIDE+=	zbar-gtk.pc.in
 PKGCONFIG_OVERRIDE+=	zbar-qt.pc.in
@@ -32,9 +34,10 @@ PKGCONFIG_OVERRIDE+=	zbar.pc.in
 
 TEST_TARGET=	check
 
-REPLACE_PYTHON+=		test/barcodetest.py
-PYTHON_FOR_BUILD_ONLY=		test
-PYTHON_VERSIONS_ACCEPTED=	27	# tests not ported to Python 3
+# Examples and tests require python
+REPLACE_PYTHON+=		test/barcodetest.py examples/upcrpc.py
+PYTHON_FOR_BUILD_ONLY=		yes
+PYTHON_VERSIONS_ACCEPTED=	27	# tests not ported to Python 3?
 .include "../../lang/python/application.mk"
 
 .include "options.mk"
diff --git a/zbar/TODO b/zbar/TODO
new file mode 100644
index 0000000000..2d76fe30a6
--- /dev/null
+++ b/zbar/TODO
@@ -0,0 +1,4 @@
+* ImageMagick is not properly detected as version 7, as the guard for
+  it doesn't pick up version 7 include.
+
+* python3 support must be tested (new in this release)
diff --git a/zbar/distinfo b/zbar/distinfo
index 17f143ffcd..5bd84ced73 100644
--- a/zbar/distinfo
+++ b/zbar/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.2 2015/07/07 17:16:35 leot1990 Exp $
 
-SHA1 (zbar-0.10.tar.bz2) = 273b47c26788faba4325baecc34063e27a012963
-RMD160 (zbar-0.10.tar.bz2) = a68db3e81d596a506e50e797c3540a05b8b84a9f
-SHA512 (zbar-0.10.tar.bz2) = 76cb8a469e3ac9ea7932a95c500cf933501249cdb8dce4df558bf5681bd44c62111327b494e6e887079a5fd30b32154887dcc12962e6d27b1453f55457483db4
-Size (zbar-0.10.tar.bz2) = 592602 bytes
-SHA1 (patch-include_zbar_Exception.h) = 9addd50c1d7a6041e76b301620329d910a51d10f
+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.ac) = c460ffa7e595b2ea54012191a55c681078bd08e7
 SHA1 (patch-zbarimg_zbarimg.c) = 52011ebc05ab10ac98b39c296c2bed679160a693
diff --git a/zbar/patches/patch-configure.ac b/zbar/patches/patch-configure.ac
new file mode 100644
index 0000000000..1b80a47f38
--- /dev/null
+++ b/zbar/patches/patch-configure.ac
@@ -0,0 +1,114 @@
+# $NetBSD$
+
+portability patches.
+commited upstream as f326730fff1cb3ea7c98d30f67fc94481468d468.
+
+--- configure~	2019-12-03 00:20:34.563193890 +0000
++++ configure	2019-12-03 00:26:36.840747736 +0000
+@@ -21590,7 +21590,7 @@
+ 
+ 
+ 
+-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
+ 
+-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
+@@ -21845,7 +21845,7 @@
+ 
+ 
+ if test -z "$PYTHON"; 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 +21893,7 @@
+ 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 +21941,7 @@
+ 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.
+@@ -22450,7 +22450,7 @@
+ 
+ 
+ 
+-if test "x$with_gir" == "xyes" && test "x$with_gtk" != "xno"; then :
++if test "x$with_gir" = "xyes" && test "x$with_gtk" != "xno"; then :
+ 
+ 
+ 
+@@ -23110,7 +23110,7 @@
+ done
+ test -n "$JAR" || JAR=":"
+ 
+-if test "x$JAR" == "x:"; then :
++if test "x$JAR" = "x:"; then :
+   have_java="no"
+ fi
+ 
+@@ -23163,7 +23163,7 @@
+ 
+ 
+ 
+-if test "x$CLASSPATH" == "x"; then :
++if test "x$CLASSPATH" = "x"; then :
+   CLASSPATH="."
+ fi
+ 
+@@ -26983,7 +26983,7 @@
+ 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 :
+@@ -27014,7 +27014,7 @@
+ 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 :
+@@ -27023,7 +27023,7 @@
+ 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 :
+@@ -27035,6 +27035,6 @@
+ #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-include_zbar_Exception.h b/zbar/patches/patch-include_zbar_Exception.h
deleted file mode 100644
index cbd9df2788..0000000000
--- a/zbar/patches/patch-include_zbar_Exception.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-include_zbar_Exception.h,v 1.1 2015/07/07 17:16:35 leot1990 Exp $
-
-Add <cstddef> (needed for NULL).
-
---- include/zbar/Exception.h.orig	2009-10-23 18:16:44.000000000 +0000
-+++ include/zbar/Exception.h
-@@ -30,6 +30,7 @@
- # error "include zbar.h in your application, **not** zbar/Exception.h"
- #endif
- 
-+#include <cstddef>
- #include <exception>
- #include <new>
-