From 8a030167e48320482d3f1e2d9db5d64d1ec56738 Mon Sep 17 00:00:00 2001 From: ssrlive <30760636+ssrlive@users.noreply.github.com> Date: Sun, 15 Aug 2021 12:14:00 +0800 Subject: [PATCH] following upstream changes. --- .travis.yml | 139 --------- ChangeLog | 18 ++ Makefile.am | 4 +- README.md | 28 +- configure.ac | 76 +++-- debian/TODO | 1 - debian/changelog | 444 --------------------------- debian/clean | 4 - debian/control | 199 ------------ debian/copyright | 59 ---- debian/docs | 2 - debian/gbp.conf | 25 -- debian/libbarcode-zbar-perl.examples | 1 - debian/libbarcode-zbar-perl.install | 2 - debian/libzbar-dev.install | 13 - debian/libzbar0.install | 1 - debian/libzbar0.symbols | 145 --------- debian/libzbargtk-dev.install | 4 - debian/libzbargtk0.install | 2 - debian/libzbargtk0.symbols | 14 - debian/libzbarqt-dev.install | 4 - debian/libzbarqt0.install | 2 - debian/libzbarqt0.shlibs | 1 - debian/not-installed | 1 - debian/python3-zbar.install | 1 - debian/rules | 59 ---- debian/source/format | 1 - debian/watch | 3 - debian/zbar-tools.install | 6 - debian/zbar-tools.manpages | 1 - debian/zbarcam-gtk.install | 1 - debian/zbarcam-qt.install | 1 - examples/scan_image.c | 3 +- examples/scan_image.cpp | 2 +- pygtk/Makefile.am.inc | 4 +- python/Makefile.am.inc | 4 +- python/zbarmodule.c | 6 +- qt/Makefile.am.inc | 1 + test/test_decode.c | 2 +- test/test_video.c | 4 +- travis/linux.debian-sid.install | 7 - travis/linux.debian-sid.script | 41 --- travis/linux.mingw-w64.install | 13 - travis/linux.mingw-w64.script | 19 -- travis/linux.ubuntu-gtk2.install | 20 -- travis/linux.ubuntu-gtk2.script | 13 - travis/linux.ubuntu-gtk3.install | 23 -- travis/linux.ubuntu-gtk3.script | 13 - travis/osx.mac.install | 6 - travis/osx.mac.script | 15 - travis/windows.pc.install | 3 - travis/windows.pc.script | 30 -- zbar/convert.c | 27 +- zbar/decoder/ean.c | 6 +- zbar/image.c | 7 +- zbar/img_scanner.c | 5 +- zbar/qrcode/qrdectxt.c | 12 +- zbar/sqcode.c | 1 + zbar/symbol.c | 100 ++++-- zbar/video/dshow.c | 10 +- zbar/video/v4l1.c | 8 +- zbar/window/win.c | 11 +- zbarcam/Makefile.am.inc | 1 + zbarcam/scan_video.c | 7 +- 64 files changed, 223 insertions(+), 1463 deletions(-) delete mode 100644 .travis.yml delete mode 100644 debian/TODO delete mode 100644 debian/changelog delete mode 100644 debian/clean delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100644 debian/docs delete mode 100644 debian/gbp.conf delete mode 100644 debian/libbarcode-zbar-perl.examples delete mode 100644 debian/libbarcode-zbar-perl.install delete mode 100644 debian/libzbar-dev.install delete mode 100644 debian/libzbar0.install delete mode 100644 debian/libzbar0.symbols delete mode 100644 debian/libzbargtk-dev.install delete mode 100644 debian/libzbargtk0.install delete mode 100644 debian/libzbargtk0.symbols delete mode 100644 debian/libzbarqt-dev.install delete mode 100644 debian/libzbarqt0.install delete mode 100644 debian/libzbarqt0.shlibs delete mode 100644 debian/not-installed delete mode 100644 debian/python3-zbar.install delete mode 100755 debian/rules delete mode 100644 debian/source/format delete mode 100644 debian/watch delete mode 100755 debian/zbar-tools.install delete mode 100644 debian/zbar-tools.manpages delete mode 100644 debian/zbarcam-gtk.install delete mode 100644 debian/zbarcam-qt.install delete mode 100755 travis/linux.debian-sid.install delete mode 100755 travis/linux.debian-sid.script delete mode 100755 travis/linux.mingw-w64.install delete mode 100755 travis/linux.mingw-w64.script delete mode 100755 travis/linux.ubuntu-gtk2.install delete mode 100755 travis/linux.ubuntu-gtk2.script delete mode 100755 travis/linux.ubuntu-gtk3.install delete mode 100755 travis/linux.ubuntu-gtk3.script delete mode 100755 travis/osx.mac.install delete mode 100755 travis/osx.mac.script delete mode 100755 travis/windows.pc.install delete mode 100755 travis/windows.pc.script diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 346a1bd..0000000 --- a/.travis.yml +++ /dev/null @@ -1,139 +0,0 @@ -language: cpp -compiler: gcc -dist: bionic -osx_image: xcode10.3 -sudo: required - -notifications: - email: - recipients: - - mchehab@kernel.org - on_success: change - on_failure: always - -cache: - directories: - - $HOME/.ccache - - $HOME/pbuilder-bases - - $HOME/Library/Caches/Homebrew - - $HOME/AppData/Local/Temp/chocolatey - - /C/tools/msys64 - timeout: 1000 - -matrix: - fast_finish: true - include: - - os: linux - env: TARGET_OS=ubuntu-gtk2 - dist: bionic - - os: linux - env: TARGET_OS=ubuntu-gtk3 - dist: bionic - - os: linux - env: TARGET_OS=mingw-w64 - dist: bionic - - os: linux - env: TARGET_OS=debian-sid - dist: bionic - - os: linux - compiler: clang - env: TARGET_OS=debian-sid - dist: bionic - - - os: windows - env: TARGET_OS=pc DIRECT_SHOW="--with-directshow" - - os: windows - env: TARGET_OS=pc DIRECT_SHOW="" - - - os: osx - env: TARGET_OS=mac - # power jobs added. - - os: linux - env: TARGET_OS=ubuntu-gtk2 - dist: bionic - arch: ppc64le - - os: linux - env: TARGET_OS=ubuntu-gtk3 - dist: bionic - arch: ppc64le - - os: linux - env: TARGET_OS=mingw-w64 - dist: bionic - arch: -ppc64le - - os: linux - env: TARGET_OS=debian-sid - dist: bionic - arch: -ppc64le - - os: linux - compiler: clang - env: TARGET_OS=debian-sid - dist: bionic - arch: -ppc64le - - - os: windows - env: TARGET_OS=pc DIRECT_SHOW="--with-directshow" - arch: ppc64le - - os: windows - env: TARGET_OS=pc DIRECT_SHOW="" - arch: ppc64le - - - os: osx - env: TARGET_OS=mac - arch: ppc64le -before_cache: -- rm -f $HOME/.cache/pip/log/debug.log -- >- - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then - $msys2 pacman --sync --clean --noconfirm; - echo "--tcp-nodelay" >> ${APPDATA}/.curlrc; - else - ccache -s - fi -# https://stackoverflow.com/a/53331571/1433768 -- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew cleanup; fi - -before_install: -- >- - case "$TRAVIS_OS_NAME" in - "osx") - brew update - ;; - "windows") - [[ ! -f C:/tools/msys64/msys2_shell.cmd ]] && rm -rf C:/tools/msys64; - choco uninstall -y mingw; - choco upgrade -y msys2; - export msys2='cmd //C RefreshEnv.cmd '; - export msys2+='& set MSYS=winsymlinks:nativestrict '; - export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start'; - export shell="$msys2 -mingw64 -full-path -here -c \$\* --"; - export msys2+=" -msys2 -c \$\* --"; - $msys2 pacman --sync --noconfirm --disable-download-timeout --needed \ - mingw-w64-x86_64-toolchain - $msys2 pacman -Syu --noconfirm --disable-download-timeout \ - autoconf libtool automake gettext make autoconf-archive pkg-config mingw-w64-x86_64-gnutls - export PATH=/C/tools/msys64/mingw64/bin:$PATH - export MAKE=mingw32-make; - ;; - *) # Linux - sudo apt-get update -qq - ;; - esac - -install: - - export MAKEFLAGS="-j `nproc`" - - "${TRAVIS_BUILD_DIR}/travis/${TRAVIS_OS_NAME}.${TARGET_OS}.install" - -script: - - "${TRAVIS_BUILD_DIR}/travis/${TRAVIS_OS_NAME}.${TARGET_OS}.script" - -after_failure: -# http://jsteemann.github.io/blog/2014/10/30/getting-core-dumps-of-failed-travisci-builds/ -- coreFile=$(find . -maxdepth 1 -name "*core*" | head -n 1) -- >- - if [[ -f "$coreFile" ]]; - then - gdb -c "$coreFile" test \ - -ex "thread apply all bt" \ - -ex "set pagination 0" \ - -batch; - fi diff --git a/ChangeLog b/ChangeLog index 2410d6f..79e0abf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +0.23.92: + + * Added a --enable-static option to make easier to distribute + Windows binaries + +0.23.90: + * Started using github actions for CI and binary releases + * Fixed several issues with configure.ac, making it auto-detect + most things, when possible + * README.md now shows the absolute minimum requirement for + building ZBar on Ubuntu + * Fixed some build issues + * Make it compatible with Python 3.9 + * Fixed some Python 3.9 and Qt5 warnings + * Typo fixes + * Several fixes at zbarcam + * zbarimg: fix stderr output when symbols are found + 0.23.1: * Add i18n translation support and add a pt_BR translation diff --git a/Makefile.am b/Makefile.am index fe332b6..ff7d405 100644 --- a/Makefile.am +++ b/Makefile.am @@ -90,10 +90,10 @@ endif if HAVE_DBUS dbusconfdir = @DBUS_CONFDIR@ dbusconf_DATA = $(srcdir)/dbus/org.linuxtv.Zbar.conf -EXTRA_DIST += $(dbusconf_DATA) endif -EXTRA_DIST += zbar.ico zbar.nsi zbar-qt5.pc.in zbar-qt.pc.in +EXTRA_DIST += zbar.ico zbar.nsi zbar-qt5.pc.in zbar-qt.pc.in \ + dbus/org.linuxtv.Zbar.conf EXTRA_DIST += examples/*.png examples/sha1sum \ examples/upcrpc.py examples/upcrpc.pl \ diff --git a/README.md b/README.md index c7c50a6..9f05a93 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,19 @@ Tarballs with ZBar can be obtained from: - +Since ZBar version 0.23.90, binaries auto-generated from Github's +Actions workflows are auto-generated for each release: + +- + +They contain binaries for: + +- Ubuntu SID, generated via pbuilder; +- Mac OS; +- Windows, for 4 different configurations: + - 32 bits/64 bits; + - Video for Windows (VfW) or DirectShow (DShow). + License information can be found in `COPYING`. You may find some outdated documentation at the original ZBar's @@ -33,17 +46,14 @@ updated for ages: BUILDING ======== -Ubuntu -``` -apt install autopoint pkg-config -y - -autoreconf -vfi -./configure --without-imagemagick --without-python --without-gtk -make -``` - See `INSTALL.md` for generic configuration and build instructions. +Please notice that at least autotools related packages and a +C compiler are needed, in order to generate the configure script. + +So, on Debian, at least those packages are needed: + autoconf autopoint pkg-config libtool gcc make + If you have installed all needed dependencies, all you need to do is to run: ``` diff --git a/configure.ac b/configure.ac index db4bc90..4371813 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,7 @@ +changecom()dnl dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.68]) -AC_INIT([zbar], [0.23.1], [mchehab+samsung@kernel.org]) +AC_INIT([zbar], [0.23.92], [mchehab+huawei@kernel.org]) m4_ifndef([AC_LANG_DEFINES_PROVIDED], [m4_define([AC_LANG_DEFINES_PROVIDED])]) AC_CONFIG_AUX_DIR(config) @@ -88,11 +89,6 @@ AC_PROG_CC_STDC PKG_PROG_PKG_CONFIG -AC_ARG_VAR([XMLTO], [location of xmlto, used for optional \ -documentation generation]) -AC_ARG_VAR([XMLTOFLAGS], [additional arguments for xmlto]) -AC_CHECK_PROGS([XMLTO], [xmlto], [:]) - dnl symbologies AC_ARG_ENABLE([codes], @@ -188,6 +184,13 @@ AC_ARG_ENABLE([doc], [], [enable_doc="yes"]) +AS_IF([test "x$enable_doc" != "xno"], + [AC_ARG_VAR([XMLTO], [location of xmlto, used for optional documentation generation]) + AC_ARG_VAR([XMLTOFLAGS], [additional arguments for xmlto]) + AC_CHECK_PROGS([XMLTO], [xmlto])]) + +AS_IF([test "x$XMLTO" = "x"], enable_doc="no") + AM_CONDITIONAL([HAVE_DOC], [test "x$enable_doc" != "xno"]) dnl video @@ -345,8 +348,7 @@ AC_ARG_WITH([jpeg], have_jpeg="maybe" AS_IF([test "x$with_jpeg" != "xno"], - [AC_CHECK_HEADERS([jpeglib.h], [], [have_jpeg="no"]) - AC_CHECK_HEADER([jerror.h], [], [have_jpeg="no"]) + [AC_CHECK_HEADERS([jpeglib.h jerror.h], [], [have_jpeg="no"]) AC_CHECK_LIB([jpeg], [jpeg_read_header], [], [have_jpeg="no"]) AS_IF([test "x$have_jpeg" != "xno"], [with_jpeg="yes"], @@ -393,15 +395,19 @@ dnl but the latter doesn't exist in older versions (bug #2848437) dnl double check ImageMagick install (bug #2582232) CPPFLAGS_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $MAGICK_CFLAGS" - AC_CHECK_HEADER([wand/MagickWand.h], - [have_IM="yes"], + AC_CHECK_HEADERS([wand/MagickWand.h], + [ + have_IM="yes" + with_imagemagick="yes" + ], [have_IM="broken"]) dnl check for ImageMagick 7, see https://imagemagick.org/script/porting.php#headers AS_IF([test "x$have_IM" = "xbroken"], [ - AC_CHECK_HEADER([MagickWand/MagickWand.h], + AC_CHECK_HEADERS([MagickWand/MagickWand.h], [ have_IM="yes" have_IM7="yes" + with_imagemagick="yes" ], [have_IM="broken"]) ]) @@ -417,6 +423,7 @@ AS_IF([test "x$have_IM" = "xyes"], [], [looked_for="$looked_for or GraphicsMagick"]) PKG_CHECK_MODULES([GM], [GraphicsMagickWand], [have_GM="yes" + with_imagemagick="no" magick="GraphicsMagick" MAGICK_CFLAGS="$MAGICK_CFLAGS $GM_CFLAGS" MAGICK_LIBS="$MAGICK_LIBS $GM_LIBS" @@ -428,8 +435,10 @@ AS_IF([test "x$have_IM" = "xyes"], [], dnl now that we have collected all the info abt what Magick is available dnl let the user know what we will or can't do AS_IF([test "x$have_IM" = "xbroken" && test "x$have_GM" = "xyes"], - [AC_MSG_WARN([Your ImageMagick install is broken, using GraphicsMagick instead])]) - + [ + with_imagemagick="no" + AC_MSG_WARN([Your ImageMagick install is broken, using GraphicsMagick instead]) + ]) AS_IF([test "x$have_IM" = "xyes" || test "x$have_GM" = "xyes"], [AC_MSG_NOTICE([using $magick version $MAGICK_VERSION])], [test "x$with_imagemagick" = "xno" && \ @@ -439,6 +448,9 @@ AS_IF([test "x$have_IM" = "xyes" || test "x$have_GM" = "xyes"], [AC_MSG_FAILURE([$magick package found but wand/MagickWand.h not installed?! this is a problem with your $magick install, please try again after resolving the inconsistency or installing GraphicsMagick alternative...])], + [test "x$with_graphicsmagick" = "xcheck"], + [AC_MSG_NOTICE([ImageMagick/GraphicsMagick not detected. Several features will be disabled]) + with_imagemagick="no"], [AC_MSG_FAILURE([dnl Unable to find $looked_for: @@ -518,8 +530,8 @@ AS_IF([test "x$with_gtk" = "xgtk2" || test "x$with_gtk" = "xauto"], ],[libgtk2=false]) ]) -# GTK not found -AS_IF(test "x$with_gtk" = "xauto"],[with_gtk="no"]) +dnl GTK not found +AS_IF([test "x$with_gtk" = "xauto"], [with_gtk="no"]) AC_SUBST(GTK_LIBS) AC_SUBST(GTK_CFLAGS) @@ -548,7 +560,7 @@ Please notice that PYTHON var, if especified, takes precedence.])], AC_ARG_VAR([PYTHON_CONFIG], [full path to python-config program]) AC_ARG_VAR([PYTHON_CFLAGS], [compiler flags for building python extensions]) -AC_ARG_VAR([PYTHON_LIBS], [linker flags for building python extensions]) +AC_ARG_VAR([PYTHON_LDFLAGS], [linker flags for building python extensions]) AC_ARG_VAR([PYGTK_H2DEF], [full path to PyGTK h2def.py module (python2 only)]) AC_ARG_VAR([PYGTK_CODEGEN], [full path to pygtk-codegen program (python2 only)]) @@ -581,15 +593,25 @@ AS_IF([test "x$PYTHON_VERSION" != "x" && test "x$with_python" != "xno"], [test -x "$PYTHON-config"], [PYTHON_CFLAGS=`$PYTHON-config --cflags`], [PYTHON_CFLAGS=`$PYTHON -c 'import distutils.sysconfig as s, sys; sys.stdout.write(" ".join(s.get_config_vars("CFLAGS")) + " -I"+s.get_python_inc() + " -I"+s.get_python_inc(plat_specific=True))'`]) + AS_IF([test "x$PYTHON_LDFLAGS" != "x"], + [], + [test "x$PYTHON_CONFIG" != "x" && test -x "$PYTHON_CONFIG"], + [PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`], + [test -x "$PYTHON-config"], + [PYTHON_LDFLAGS=`$PYTHON-config --ldflags`], + [PYTHON_LDFLAGS=`$PYTHON -c 'import distutils.sysconfig as s, sys; sys.stdout.write(" ".join(s.get_config_vars("LDFLAGS")) + " -I"+s.get_python_inc() + " -I"+s.get_python_inc(plat_specific=True))'`]) dnl check that #include compiles (bug #3092663) CPPFLAGS_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS" - AC_CHECK_HEADER([Python.h], [], [AC_MSG_ERROR([dnl + AS_IF([test "x$win32" = "xyes"], PYTHON_LDFLAGS="$PYTHON_LDFLAGS -no-undefined") + AC_CHECK_HEADERS([Python.h], [], + [AS_IF([test "x$with_python" = "xauto"],with_python="no", + [AC_MSG_ERROR([dnl Python module enabled, but unable to compile Python.h. Install the development package for python-$am_cv_python_version, or configure --without-python to disable the python bindings.dnl -])]) +])])]) CPPFLAGS="$CPPFLAGS_save" dnl PyGTK @@ -650,7 +672,7 @@ AS_IF([test "x$have_x" = "xyes"], AS_IF([test "x$with_qt" != "xno"], [PKG_CHECK_MODULES([QT], [Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 $qt_extra],, - [with_qt5 = "no" + [with_qt5="no" PKG_CHECK_MODULES([QT], [QtCore >= 4 QtGui >= 4],, [with_qt="no"])])]) @@ -688,13 +710,13 @@ AC_ARG_VAR([JAVA_HOME], [root location of JDK]) AC_ARG_VAR([JAVAC], [location of Java language compiler]) AC_ARG_VAR([JAVAH], [location of Java header generator]) -# If $JAVA_HOME not defined, try to autodetect it +dnl If $JAVA_HOME not defined, try to autodetect it AS_IF([test -z "$JAVA_HOME"], [AC_PATH_PROGS([JAVAC], [javac jikes ecj gcj], [:], [$PATH]) AS_IF([test ! -z "$JAVAC"], [JAVA_HOME=$( readlink -f ${JAVAC} | rev | cut -d/ -f3- | rev )])]) -# If $JAVA_HOME is defined, set JAVA_PATH and JAVAC +dnl If $JAVA_HOME is defined, set JAVA_PATH and JAVAC AS_IF([test ! -z "$JAVA_HOME"], [JAVA_PATH="$JAVA_HOME/bin$PATH_SEPARATOR$PATH" AS_IF([test -z "$JAVAC"], @@ -708,8 +730,8 @@ AC_ARG_WITH([java], JAVAC=${JAVAC/ecj/ecj -1.5} -# 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 +dnl Javah was obsoleted on Java 8 and removed on Java 11. So, we need to +dnl look strictly at the $JAVA_HOME in order to avoid mixing different versions AS_IF([test -z "$JAVAH"], [AC_PATH_PROGS([JAVAH], [javah], [], [$JAVA_HOME/bin])]) @@ -756,7 +778,7 @@ AS_IF([test -d "$JAVA_HOME/include/linux"], AS_IF([test "x$with_java" != "xno"], [CPPFLAGS_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $JAVA_CFLAGS" - AC_CHECK_HEADER([jni.h], [], [have_java="no"]) + AC_CHECK_HEADERS([jni.h], [], [have_java="no"]) CPPFLAGS="$CPPFLAGS_save" AS_IF([test "x$have_java" != "xno"], [with_java="yes"], @@ -905,8 +927,8 @@ AS_IF([test "x$with_java" != "xyes"], [echo " => the Java interface will *NOT* be built"]) AS_IF([test "x$with_java_unit" != "xyes"], [echo " => the Java unit test will *NOT* be enabled"]) -#echo "NPAPI Plugin --with-npapi=$with_npapi" -#AS_IF([test "x$with_mozilla" != "xyes"], -# [echo " => the Mozilla/Firefox/OpenOffice plugin will *NOT* be built"]) +dnl echo "NPAPI Plugin --with-npapi=$with_npapi" +dnl AS_IF([test "x$with_mozilla" != "xyes"], +dnl [echo " => the Mozilla/Firefox/OpenOffice plugin will *NOT* be built"]) AS_IF([test "x$enable_pdf417" = "xyes"], [echo " => the pdf417 code support is incomplete!"]) diff --git a/debian/TODO b/debian/TODO deleted file mode 100644 index e573709..0000000 --- a/debian/TODO +++ /dev/null @@ -1 +0,0 @@ -* Java support is missing now diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 14f23cf..0000000 --- a/debian/changelog +++ /dev/null @@ -1,444 +0,0 @@ -zbar (0.23-1.3) unstable; urgency=medium - - * Non-maintainer upload. - * Upload to unstable. - * debian/control: Disable building python3 extension for all - python versions again. Upstream code does not support it yet. - - -- Boyuan Yang Sun, 02 Feb 2020 14:02:50 -0500 - -zbar (0.23-1.3~exp1) experimental; urgency=medium - - * Non-maintainer upload. - * debian/control: Add back Qt5 binding. New packages: - - libzbarqt0: Qt5 zbar binding - - libzbarqt-dev: Qt5 zbar binding (development file) - - zbarcam-qt: Qt5 zbar camera frontend tool - - zbarcam-gtk: Gtk zbar camera frontend tool - (Closes: #950398) - * debian/control: - + Bump Standards-Version to 4.5.0. - + Mention QR code in package short description. - (Closes: #946576) - * debian/rules: Build python3 extension for all supported - python versions. - * debian/patches: Cherry-pick patches of error fix and Qt5 - support. - - -- Boyuan Yang Fri, 31 Jan 2020 23:46:17 -0500 - -zbar (0.23-1.2) unstable; urgency=medium - - * Non-maintainer upload - * Drop unused Build-Depends on python-gtk2-dev (Closes: 885473) - * Clean up python3 Build-Depends - - -- Jeremy Bicha Tue, 22 Oct 2019 22:20:05 -0400 - -zbar (0.23-1.1) unstable; urgency=medium - - * Non-maintainer upload. - * Rebuild for a source-only upload. - * debian/control: Bump Standards-Version to 4.4.0. - * debian/patches: - + Refactor previous perl shabang patch to merge them together. - + Backport upstream patch to fix iconv-related unexpected abort. - * debian/libzbargtk0.symbols: Add new symbol. - - -- Boyuan Yang Thu, 25 Jul 2019 17:01:39 -0400 - -zbar (0.23-1) unstable; urgency=medium - - * New upstream version. - * New maintainer. (Closes: #898078) - * Drop pygtk, python2 support. (Closes: #885473) - * Add python3 support. (Closes: #888303) - * debian/clean: added. - - -- Gürkan Myczko Mon, 27 May 2019 09:22:12 +0200 - -zbar (0.22-1) unstable; urgency=medium - - * QA upload. - * New upstream release (2019-02-20). - * debian/patches: Drop all patches, merged upstream. - * debian/control: Also mark libzbar-dev and libzbargtk-dev as - Multi-Arch: same. - - -- Boyuan Yang Wed, 20 Feb 2019 10:18:30 -0500 - -zbar (0.21-3) unstable; urgency=medium - - * QA upload. - * debian/patches: - + Replace custom codespell typo fix patches with upstream - applied one. - + Cherry-pick upstream patches till 20190215 to fix grammar - error in configure.ac script. - * debian/control: - + Mark libbarcode-zbar-perl, python-zbar and python-zbarpygtk - as Multi-Arch: same. (Closes: #812954) - * New zbarcam is no longer crashing. (Closes: #762209) - - -- Boyuan Yang Fri, 15 Feb 2019 10:35:13 -0500 - -zbar (0.21-2) unstable; urgency=medium - - * QA upload. - * debian/zbar-tools.install: Use dh-exec again to selectively - install zbarcam for linux-any only. - - -- Boyuan Yang Thu, 14 Feb 2019 18:58:42 -0500 - -zbar (0.21-1) unstable; urgency=medium - - * QA upload. - * Upload onto unstable. - * debian/control: Update homepage with current GitHub project. - - -- Boyuan Yang Thu, 14 Feb 2019 18:32:38 -0500 - -zbar (0.21-1~exp1) experimental; urgency=medium - - * QA upload. - * New upstream release 0.21. - * debian/watch: Monitor new upstream on GitHub. - * debian/control: - - Drop build-dependency on dh-exec, no longer necessary. - * debian/gbp.conf: Disable gbp-import-orig postimport hook, - it is useless now. - * debian/rules: - + Completely rewrite and use the dh sequencer. - + use override_dh_strip to generate automatic debug packages. - * debian/patches: - - Drop all patches, merged or fixed upstream. - + Cherry-pick upstream fixes on stable-0.21 branch - till 20190214. - + Add a patch to fix typos found by codespell. - - -- Boyuan Yang Thu, 14 Feb 2019 15:51:03 -0500 - -zbar (0.10+doc-11) unstable; urgency=medium - - * QA upload. - * Orphan the package and set maintainer to Debian QA Group. - * debian/control: - + Build-depend on debhelper-compat (= 12) instead of using - debian/compat file. - + Bump Standards-Version to 4.3.0. - + Use Rules-Requires-Root: no. - + Replace obsoleted Priority: extra with optional. - - Do not build Qt4 library anymore. (Closes: #875246) - * debian/symbols: Add Build-Depends-Package field. (lintian) - * debian/rules: - + Enable full hardening. - + Minor adjust to debhelper sequences to suit debhelper compat - v12. - * debian/gbp.conf: Update instructions to fit current git repo - setup. - * debian/patches: - + Add a patch to rename custom dprintf macro to zbar_dprintf - to prevent naming conflict. - - -- Boyuan Yang Sun, 10 Feb 2019 14:26:34 -0500 - -zbar (0.10+doc-10.1) unstable; urgency=low - - * Non-maintainer upload with maintainer permission. - - [ Francois Gouget ] - * Add missing versioned Build-Depends for automake - * Convert most binary packages to Multi-Arch (Closes: #777202) - * Switch to 3.0 (quilt) format, in order to use dh-exec - - [ Thorsten Glaser ] - * Add missing versioned Build-Depends for autoconf - * Build-Depends: dh-python (as requested by dh_python) - * Make zbar-dbg M-A: same (as pointed out by lintian) - * Add missing required build-{arch,indep} targets (lintian) - * Mention Perl module name in long package description (lintian) - - -- Thorsten Glaser Mon, 02 Jan 2017 17:16:01 +0100 - -zbar (0.10+doc-10) unstable; urgency=medium - - * [d3eba6e2] Add support for Python GIL / asynchronous scanning. - Thanks to Jonathan McDowell (Closes: #766089) - * [fd5fd7f1] Fix typo in package description. - Thanks to Pascal De Vuyst (Closes: #697516, #715178) - - -- Bernd Zeimetz Mon, 20 Oct 2014 22:04:56 +0200 - -zbar (0.10+doc-9) unstable; urgency=low - - * [2c641cc9] Fix configure.ac to build with newer autotools. - Thanks to Lucas Nussbaum (Closes: #713332) - - -- Bernd Zeimetz Sun, 18 Aug 2013 12:26:59 +0200 - -zbar (0.10+doc-8) unstable; urgency=low - - * [5c38da40] Use [linux-any] instead of [!kfreebsd-*]. - Thanks to Robert Millan (Closes: #634774) - * [1f15f52e] Add sentinel to PyGetSetDef imagescanner_getset[]. - Ensure that the loop is terminated which reads the - imagescanner_getset[] array on import - otherwise we'll run into - a segfault, at least on arm. - Thanks to Anton Gladky and Peter Green (Closes: #702499) - - -- Bernd Zeimetz Sun, 17 Mar 2013 22:46:47 +0100 - -zbar (0.10+doc-7) unstable; urgency=low - - * [48425c37] Ack'ing NMU. - Thanks to Mehdi Dogguy (Closes: #625584) - * [ce18efe2] Don't install .la files. (Closes: #633271) - - -- Bernd Zeimetz Sun, 10 Jul 2011 14:17:11 +0200 - -zbar (0.10+doc-6.1) unstable; urgency=high - - * Non-maintainer upload. - * libzbar-dev depend on libmagick++-dev instead of libmagick++9-dev. - (Closes: #625584). - - -- Mehdi Dogguy Sun, 26 Jun 2011 15:04:36 +0200 - -zbar (0.10+doc-6) unstable; urgency=low - - * [3b98a217] Require v4l as build-dependency on linux only. - * [5f635649] Migrate to dh_python2 instead of python-support. - - -- Bernd Zeimetz Wed, 27 Apr 2011 22:34:12 +0200 - -zbar (0.10+doc-5) unstable; urgency=low - - * [2801e55f] Use the new dh_authtoolsdev-* helper to update config.* - * [906f5a10] Use dh-autoreconf to rebuild configure and friends. - Thanks to Peter Fritzsche (Closes: #558539) - * [a3042424] Use quilt to apply patches. - * [35182c3a] Description: Linux 2.6.38 and later do not support the v4l1 API. - Add patch to migrate to using the libv4l library to abstract the - access to Linux video devices, instead. - Patch taken from the upstream bug tracker. - Also add libv4l-dev as build-dependency. - Thanks to Steve Langasek (Closes: #620220) - * [425b9ce6] Fixing typo in the long description of python-zbar. - Thanks to Davide Prina (Closes: #617942) - - -- Bernd Zeimetz Fri, 01 Apr 2011 01:05:18 +0200 - -zbar (0.10+doc-4) unstable; urgency=low - - * [abdd6f9f] Use better dependencies for zbar-dbg. - * [5c639854] Remove conflicts of libzbar-dev. libzbar replaced zebra - in directory names by zbar, so clashes with quagga and libpacklib1- - dev are avoided. So there is no need to conflict against the - packages anymore. - * [75f615f2] Use Breaks instead of Conflicts as suggested by lintian. - - -- Bernd Zeimetz Sat, 28 Aug 2010 15:01:46 +0200 - -zbar (0.10+doc-3) unstable; urgency=low - - * [6b190c39] Enable VfL only on Linux instead of excluding kfreebsd - only. (Closes: #585082) - thanks to Samuel Thibault - * [da42c117] Update libzbarqt0 symbol files to newer dpkg-dev - features. As symbols seem to appear/disappear depending on the - version of QT and/or the compiler, I've relaxed the check for - changed symbols to stop complaining at all for libzbarqt0. I'll - update the symbols files manually when needed. (Closes: #584773) - - thanks to Loïc Minier - * [94ac49b6] Add missing dependency to the perl/Makefile target in - debian/rules. This should allow to build with -j again. (Closes: - #584758) - thanks to Loïc Minier - - -- Bernd Zeimetz Wed, 09 Jun 2010 17:08:07 +0200 - -zbar (0.10+doc-2build1) maverick; urgency=low - - * Release for Ubuntu. 0.10+doc-2 FTBFS there due to default LDFLAGS - which were passed on to Perl's MakeMaker. - * [b0066775] Fix spelling error in changelog. Thanks lintian. - * [6ddbfe0d] Ensure only -L options are passed as LIBS to Perl's - MakeMaker. - - -- Bernd Zeimetz Tue, 25 May 2010 22:25:18 +0200 - -zbar (0.10+doc-2) unstable; urgency=low - - * [1806e6cd] Copy libzbarqt0.symbols for each architecture. - * [8d172f95] Disable video support on kfreebsd. - * [63b87cf4] Don't list binaries for zbar-tools explicitly. zbarvideo - is not being built on kfreebsd, so we should not try to install it - there. - * [14e36c30] Don't rename debug extensions if they were renamed - already. - * [650fa88e] Fix libzbarqt0.symbols for various architectures - thanks - C++. - - -- Bernd Zeimetz Tue, 25 May 2010 17:37:52 +0200 - -zbar (0.10+doc-1) unstable; urgency=low - - * Import full upstream source including the doc folder and drop - the dfsg part in the version (using +doc now as we need a version - greater than 0.10+dfsg. See the changelog below and debian/copyright - for details - - * [1f9232b1] Add missing dependencies to libzbar-dev. - * [577bae53] Tidy .docs files - one debian/docs is enough. - * [b77a29e5] Python-related packages: Fix dependencies and build - python-zbar. - * [6a336b40] Adopt package (Closes: #543881) - * [d3e7838d] gbp.conf: Remove filter option for git-import-orig. - Upstream clarified the license for the doc folder, the documentation - is (and was) under the same license as the rest of the zbar project. - The former package maintainer just did not bother to ask. - (http://zbar.hg.sourceforge.net/hgweb/zbar/zbar/rev/a400dd46fb4a) - * [d9f0f3bd] Remove quilt - no patches necessary anymore. - * [8e9b2f81] Adding watch file. - * [ddfdb3db] Merge commit 'upstream/0.10+doc' - * [4c547f3a] Build zbar for all supported Python versions. Also build - debug extensions. - * [c6dbc26d] Ensure proper sonames while installing libraries. - * [74e55643] Update supported codes in descriptions. - * [54969382] Install README file into docs. - * [3d97e382] Updating copyright file. - * [71bfc1fe] Install manpages for zbar-tools. - * [9de7a34a] Remove --fail-missing from dh_install call. - * [39a37679] Add symbol files for libraries. - * [418ee09b] Be paranoid about symbol files - pass -c4 to dpkg- - gensymbols. - * [a1527ed7] Use -L to link against previously built libs. - * [c672ecc8] Don't include symbols, which are removed by strip, in - symbols file. - * [9b93453e] Build Perl bindings into libbarcode-zbar-perl. - * [76b32218] According to lintian zbar-dbg needs to Depend on all - packages. - * [2cb6d478] python-zbar needs to conflict/replace older versions of - python-zbarpygtk. - * [bca1a7dc] Better wording for short description. - * [4f6fdf16] Ensure perl bindings are built without rpath. - * [df98e89f] Add missing dh_perl call. - * [18539f50] Add comment about licenses of doc/* to debian/copyright. - * [2bb4fb29] zbar-dbg needs to depend on python-gtk2-dbg. - * [3da1a01e] Add VCS information. - - -- Bernd Zeimetz Tue, 25 May 2010 02:09:41 +0200 - -zbar (0.10+dfsg-1) unstable; urgency=low - - * QA Upload. - - I might adopt the package later, but for now an update to the - latest upstream version is more important. Also I do not want to - set myself as maintainer without bringing the packaging into - a good shape. - - * [154213cf] Adding git-buildpackage config. - * [c89b1ccb] Merge commit 'upstream/0.10+dfsg' - * [5565931e] Adding debian/source/format, format 1.0. - * [9080fcb7] Updating patch. - - -- Bernd Zeimetz Thu, 20 May 2010 01:58:52 +0200 - -zbar (0.8+dfsg-4) unstable; urgency=low - - * QA upload. - * Build-depend on python-support and call dh_pysupport in debian/rules - to allow byte-compilation (Closes: #571484). - * Bump Standards-Version to 3.8.4, no changes required. - * Add ${misc:Depends} dependency where needed. - * Remove duplicate section fields from some binary packages. - * Really remove Vcs-* fields. - - -- Luca Falavigna Sun, 28 Feb 2010 15:59:51 +0100 - -zbar (0.8+dfsg-3) unstable; urgency=low - - * Updating package to standards version 3.8.3. - * Removing vcs fields. - * Orphaning package. - - -- Daniel Baumann Thu, 27 Aug 2009 10:04:11 +0200 - -zbar (0.8+dfsg-2) unstable; urgency=low - - * Correcting spelling of Qt in package descriptions (Closes: #534426). - - -- Daniel Baumann Sun, 26 Jul 2009 21:03:26 +0200 - -zbar (0.8+dfsg-1) unstable; urgency=low - - * Merging upstream version 0.8+dfsg. - * Updating dfsg.patch. - * Updating package to standards version 3.8.2. - * Updating year in copyright file. - - -- Daniel Baumann Tue, 07 Jul 2009 16:17:32 +0200 - -zbar (0.7+dfsg-1) unstable; urgency=low - - * Merging upstream version 0.7+dfsg. - * Adding upstream target in rules file. - * Adding patch to ignore stripped out documentation during build. - * Renaming binary and source package from zebra to zbar to match - upstream. - * Removing manpages from zbar-tools debhelper install file, manpages - are stripped out in dfsg tarball. - * Updating section of the debug package. - * Using correct rfc-2822 date formats in changelog. - - -- Daniel Baumann Sun, 17 May 2009 12:50:49 +0200 - -zebra (0.7-1) unstable; urgency=low - - * Merging upstream version 0.7. - * Updating debhelper install files to cope with upstreams zebra to zbar - rename. - - -- Daniel Baumann Sun, 26 Apr 2009 16:43:00 +0200 - -zebra (0.6-1) unstable; urgency=low - - * Updating imagemagick build-depends. - * Updating standards to 3.8.1. - * Merging upstream version 0.6. - * Unsetting LDFLAGS (which are exported to the environment by newer dpkg), - otherwise python modules fail to build. - * Tidy rules file. - * Updating year in copyright file. - - -- Daniel Baumann Sun, 26 Apr 2009 16:30:00 +0200 - -zebra (0.5+debian-4) unstable; urgency=low - - * Sorting config.guess/config.sub handling in rules. - * Passing flags to configure as arguments. - * Removing unnecessary passing of sourcedir to dh_install. - - -- Daniel Baumann Wed, 17 Dec 2008 21:21:00 +0100 - -zebra (0.5+debian-3) unstable; urgency=low - - * Replacing obsolete dh_clean -k with dh_prep. - * Adding conflicts against quagga to avoid /usr/lib/libzebra.a clash - (Closes: #505268). - - -- Daniel Baumann Tue, 11 Nov 2008 12:07:00 +0100 - -zebra (0.5+debian-2) unstable; urgency=low - - * Adding conflicts against libpacklib1-dev to avoid - /usr/include/zebra.h clash, unlikely that there is another solution - possible (Closes: #504526). - - -- Daniel Baumann Tue, 04 Nov 2008 21:07:00 +0100 - -zebra (0.5+debian-1) unstable; urgency=low - - * Initial release (Closes: #502992). - * Rebuild upstream tarball without debian directory. - - -- Daniel Baumann Thu, 23 Oct 2008 12:29:00 +0200 diff --git a/debian/clean b/debian/clean deleted file mode 100644 index 959ae29..0000000 --- a/debian/clean +++ /dev/null @@ -1,4 +0,0 @@ -doc/man/zbarcam.1 -doc/man/zbarimg.1 -doc/reldate.xml -doc/version.xml diff --git a/debian/control b/debian/control deleted file mode 100644 index 4c986b0..0000000 --- a/debian/control +++ /dev/null @@ -1,199 +0,0 @@ -Source: zbar -Section: libs -Priority: optional -Maintainer: Gürkan Myczko -Build-Depends: - debhelper-compat (= 12), - dh-exec, - dh-sequence-python3, - libdbus-1-dev, - libgtk2.0-dev, - libjpeg-dev, - libmagick++-dev, - libqt5x11extras5-dev, - libv4l-dev [linux-any], - libx11-dev, - perl, - pkg-config, - python3-dev:any, - qtbase5-dev, - xmlto, - libgtk-3-dev, -Rules-Requires-Root: no -X-Python3-Version: >= 3.6 -Standards-Version: 4.5.0 -Homepage: https://github.com/mchehab/zbar -Vcs-Git: https://salsa.debian.org/debian/zbar.git -Vcs-Browser: https://salsa.debian.org/debian/zbar - -Package: libbarcode-zbar-perl -Section: perl -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, - ${perl:Depends}, - ${shlibs:Depends}, -Description: QR code / bar code scanner and decoder (Perl bindings) - ZBar is a library for scanning and decoding bar codes from various sources - such as video streams, image files or raw intensity sensors. It supports - EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR Code. - . - This package contains the Perl bindings and the Barcode::Zbar module. - -Package: libzbar-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - libmagick++-dev, - libx11-dev, - libzbar0 (= ${binary:Version}), - ${misc:Depends}, -Description: QR code / bar code scanner and decoder (development) - ZBar is a library for scanning and decoding bar codes from various sources - such as video streams, image files or raw intensity sensors. It supports - EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR Code. - . - This package contains the development files. - -Package: libzbar0 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, - ${shlibs:Depends}, -Description: QR code / bar code scanner and decoder (library) - ZBar is a library for scanning and decoding bar codes from various sources - such as video streams, image files or raw intensity sensors. It supports - EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR Code. - . - This package contains the library. - -Package: libzbargtk-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - libgtk2.0-dev, - libzbar-dev (= ${binary:Version}), - libzbargtk0 (= ${binary:Version}), - ${misc:Depends}, -Description: QR code / bar code scanner and decoder (GTK+ bindings development) - ZBar is a library for scanning and decoding bar codes from various sources - such as video streams, image files or raw intensity sensors. It supports - EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR Code. - . - This package contains the development files for the GTK+ bindings. - -Package: libzbargtk0 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - libzbar0 (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends}, -Description: QR code / bar code scanner and decoder (GTK+ bindings) - ZBar is a library for scanning and decoding bar codes from various sources - such as video streams, image files or raw intensity sensors. It supports - EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR Code. - . - This package contains the GTK+ bindings. - -Package: python3-zbar -Section: python -Architecture: any -Multi-Arch: same -Replaces: - python-zbarpygtk (<< 0.10+doc), -Breaks: - python-zbarpygtk (<< 0.10+doc), -Depends: - libzbar0 (= ${binary:Version}), - ${misc:Depends}, - ${python3:Depends}, - ${shlibs:Depends}, -Description: QR code / bar code scanner and decoder (Python bindings) - ZBar is a library for scanning and decoding bar codes from various sources - such as video streams, image files or raw intensity sensors. It supports - EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR Code. - . - This package contains the Python bindings. - -Package: zbar-tools -Section: graphics -Architecture: any -Depends: - libzbar0 (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends}, -Suggests: - zbarcam-qt, - zbarcam-gtk, -Description: QR code / bar code scanner and decoder (utilities) - ZBar is a library for scanning and decoding bar codes from various sources - such as video streams, image files or raw intensity sensors. It supports - EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR Code. - . - This package contains basic applications for decoding captured bar code images - and using a video4linux device (e.g. webcam) as a bar code scanner. - -Package: libzbarqt-dev -Section: libdevel -Architecture: any -Depends: - libqt5x11extras5-dev, - libzbar-dev (= ${binary:Version}), - libzbarqt0 (= ${binary:Version}), - qtbase5-dev, - ${misc:Depends}, -Description: QR code / bar code scanner and decoder (Qt binding development) - ZBar is a library for scanning and decoding bar codes from various sources - such as video streams, image files or raw intensity sensors. It supports - EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR Code. - . - This package contains the development files for the Qt binding. - -Package: libzbarqt0 -Architecture: any -Multi-Arch: same -Depends: - libzbar0 (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends}, -Description: QR code / bar code scanner and decoder (Qt binding) - ZBar is a library for scanning and decoding bar codes from various sources - such as video streams, image files or raw intensity sensors. It supports - EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR Code. - . - This package contains the library for Qt binding. - -Package: zbarcam-qt -Architecture: any -Depends: - libzbarqt0 (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends}, -Description: QR code / bar code scanner and decoder (Qt camera tool) - ZBar is a library for scanning and decoding bar codes from various sources - such as video streams, image files or raw intensity sensors. It supports - EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR Code. - . - This package contains the Qt-based camara frontend tool. - -Package: zbarcam-gtk -Architecture: any -Depends: - libzbargtk0 (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends}, -Description: QR code / bar code scanner and decoder (Gtk camera tool) - ZBar is a library for scanning and decoding bar codes from various sources - such as video streams, image files or raw intensity sensors. It supports - EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR Code. - . - This package contains the Gtk-based camara frontend tool. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index e07e6e5..0000000 --- a/debian/copyright +++ /dev/null @@ -1,59 +0,0 @@ -This work was originally packaged for Debian by Daniel Baumann - and is later maintained by Bernd Zeimetz . - -It was downloaded from: - http://zbar.sourceforge.net/ - -The current version of zbar is downloaded from: - https://github.com/mchehab/zbar - -Below follows the copyrigt and license information as -provided in the file COPYING - - The ZBar Bar Code Reader is Copyright (C) 2007-2009 Jeff Brown - - The QR Code reader is Copyright (C) 1999-2009 Timothy B. Terriberry - - - You can redistribute this library and/or modify it under the terms of the GNU - Lesser General Public License as published by the Free Software Foundation; - either version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. - See the GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License along - with this library; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - ISAAC is based on the public domain implementation by Robert J. Jenkins Jr., - and is itself public domain. - - Portions of the bit stream reader are copyright (C) The Xiph.Org Foundation - 1994-2008, and are licensed under a BSD-style license. - - The Reed-Solomon decoder is derived from an implementation (C) 1991-1995 Henry - Minsky (hqm@ua.com, hqm@ai.mit.edu), and is licensed under the LGPL with - permission. - - - -The debian packaging is - Copyright (C) 2008-2009 Daniel Baumann - Copyright (C) 2010 Bernd Zeimetz -and licensed under the same license as zbar; you can redistribute -it and/or modify it under the terms of the GNU Library General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -On Debian systems, the complete text of the GNU Library General Public License -can be found in /usr/share/common-licenses/LGPL-2.1 file. - - -The hints about GFDL and invariant documentations, which were forgotton in -the doc folder, were fixed by upstream, see the following URLs for details: -https://sourceforge.net/tracker/?func=detail&aid=3004411&group_id=189236&atid=928515 -http://zbar.hg.sourceforge.net/hgweb/zbar/zbar/rev/a400dd46fb4a -http://zbar.hg.sourceforge.net/hgweb/zbar/zbar/rev/41ea3fade9e1 diff --git a/debian/docs b/debian/docs deleted file mode 100644 index 4dd3757..0000000 --- a/debian/docs +++ /dev/null @@ -1,2 +0,0 @@ -README.md -TODO.md diff --git a/debian/gbp.conf b/debian/gbp.conf deleted file mode 100644 index fd93ad3..0000000 --- a/debian/gbp.conf +++ /dev/null @@ -1,25 +0,0 @@ -# Configuration file for git-buildpackage and friends - -[DEFAULT] -# the default branch for upstream sources: -upstream-branch = upstream -# the default branch for the debian patch: -debian-branch = master -# the default tag formats used: -upstream-tag = upstream/%(version)s -debian-tag = debian/%(version)s -# use pristine-tar: -pristine-tar = True - -# Options only affecting git-buildpackage -[buildpackage] -# uncomment this to automatically GPG sign tags -sign-tags = True -# push to a remote repository after a successful tag: -posttag = git push && git push --tags -#ignore-new = True - -# Options only affecting git-import-orig -[import-orig] -#postimport = git-dch -N%(version)s -S -a --debian-branch=$GBP_BRANCH -postimport = true diff --git a/debian/libbarcode-zbar-perl.examples b/debian/libbarcode-zbar-perl.examples deleted file mode 100644 index 6754fb8..0000000 --- a/debian/libbarcode-zbar-perl.examples +++ /dev/null @@ -1 +0,0 @@ -perl/examples/* diff --git a/debian/libbarcode-zbar-perl.install b/debian/libbarcode-zbar-perl.install deleted file mode 100644 index af4111b..0000000 --- a/debian/libbarcode-zbar-perl.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*/perl5/* -usr/share/man/man3/Barcode* diff --git a/debian/libzbar-dev.install b/debian/libzbar-dev.install deleted file mode 100644 index aa77fd6..0000000 --- a/debian/libzbar-dev.install +++ /dev/null @@ -1,13 +0,0 @@ -/usr/include/zbar.h -/usr/include/zbar/Decoder.h -/usr/include/zbar/Exception.h -/usr/include/zbar/Image.h -/usr/include/zbar/ImageScanner.h -/usr/include/zbar/Processor.h -/usr/include/zbar/Scanner.h -/usr/include/zbar/Symbol.h -/usr/include/zbar/Video.h -/usr/include/zbar/Window.h -/usr/lib/*/libzbar.a -/usr/lib/*/libzbar.so -/usr/lib/*/pkgconfig/zbar.pc diff --git a/debian/libzbar0.install b/debian/libzbar0.install deleted file mode 100644 index e6542db..0000000 --- a/debian/libzbar0.install +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/*/libzbar.so.* diff --git a/debian/libzbar0.symbols b/debian/libzbar0.symbols deleted file mode 100644 index fa46d3b..0000000 --- a/debian/libzbar0.symbols +++ /dev/null @@ -1,145 +0,0 @@ -libzbar.so.0 libzbar0 #MINVER# -* Build-Depends-Package: libzbar-dev - _zbar_error_spew@Base 0.10 - _zbar_error_string@Base 0.10 - _zbar_get_error_code@Base 0.10 - zbar_decode_width@Base 0.10 - zbar_decoder_create@Base 0.10 - zbar_decoder_destroy@Base 0.10 - zbar_decoder_get_color@Base 0.10 - zbar_decoder_get_config@Base 0.22 - zbar_decoder_get_configs@Base 0.21 - zbar_decoder_get_data@Base 0.10 - zbar_decoder_get_data_length@Base 0.10 - zbar_decoder_get_direction@Base 0.21 - zbar_decoder_get_modifiers@Base 0.21 - zbar_decoder_get_type@Base 0.10 - zbar_decoder_get_userdata@Base 0.10 - zbar_decoder_new_scan@Base 0.10 - zbar_decoder_reset@Base 0.10 - zbar_decoder_set_config@Base 0.10 - zbar_decoder_set_handler@Base 0.10 - zbar_decoder_set_userdata@Base 0.10 - zbar_get_addon_name@Base 0.10 - zbar_get_config_name@Base 0.21 - zbar_get_modifier_name@Base 0.21 - zbar_get_orientation_name@Base 0.21 - zbar_get_symbol_name@Base 0.10 - zbar_image_convert@Base 0.10 - zbar_image_convert_resize@Base 0.10 - zbar_image_copy@Base 0.10 - zbar_image_create@Base 0.10 - zbar_image_destroy@Base 0.10 - zbar_image_first_symbol@Base 0.10 - zbar_image_free_data@Base 0.10 - zbar_image_get_crop@Base 0.21 - zbar_image_get_data@Base 0.10 - zbar_image_get_data_length@Base 0.10 - zbar_image_get_format@Base 0.10 - zbar_image_get_height@Base 0.10 - zbar_image_get_sequence@Base 0.10 - zbar_image_get_size@Base 0.21 - zbar_image_get_symbols@Base 0.10 - zbar_image_get_userdata@Base 0.10 - zbar_image_get_width@Base 0.10 - zbar_image_ref@Base 0.10 - zbar_image_scanner_create@Base 0.10 - zbar_image_scanner_destroy@Base 0.10 - zbar_image_scanner_enable_cache@Base 0.10 - zbar_image_scanner_get_config@Base 0.22 - zbar_image_scanner_get_results@Base 0.10 - zbar_image_scanner_recycle_image@Base 0.10 - zbar_image_scanner_request_dbus@Base 0.21 - zbar_image_scanner_set_config@Base 0.10 - zbar_image_scanner_set_data_handler@Base 0.10 - zbar_image_set_crop@Base 0.21 - zbar_image_set_data@Base 0.10 - zbar_image_set_format@Base 0.10 - zbar_image_set_sequence@Base 0.10 - zbar_image_set_size@Base 0.10 - zbar_image_set_symbols@Base 0.10 - zbar_image_set_userdata@Base 0.10 - zbar_image_write@Base 0.10 - zbar_increase_verbosity@Base 0.10 - zbar_jpeg_error@Base 0.10 - zbar_negotiate_format@Base 0.10 - zbar_parse_config@Base 0.10 - zbar_process_image@Base 0.10 - zbar_process_one@Base 0.10 - zbar_processor_create@Base 0.10 - zbar_processor_destroy@Base 0.10 - zbar_processor_force_format@Base 0.10 - zbar_processor_get_control@Base 0.21 - zbar_processor_get_results@Base 0.10 - zbar_processor_get_userdata@Base 0.10 - zbar_processor_init@Base 0.10 - zbar_processor_is_visible@Base 0.10 - zbar_processor_request_dbus@Base 0.21 - zbar_processor_request_interface@Base 0.10 - zbar_processor_request_iomode@Base 0.10 - zbar_processor_request_size@Base 0.10 - zbar_processor_set_active@Base 0.10 - zbar_processor_set_config@Base 0.10 - zbar_processor_set_control@Base 0.21 - zbar_processor_set_data_handler@Base 0.10 - zbar_processor_set_userdata@Base 0.10 - zbar_processor_set_visible@Base 0.10 - zbar_processor_user_wait@Base 0.10 - zbar_scan_image@Base 0.10 - zbar_scan_y@Base 0.10 - zbar_scanner_create@Base 0.10 - zbar_scanner_destroy@Base 0.10 - zbar_scanner_flush@Base 0.10 - zbar_scanner_get_color@Base 0.10 - zbar_scanner_get_edge@Base 0.10 - zbar_scanner_get_state@Base 0.10 - zbar_scanner_get_width@Base 0.10 - zbar_scanner_new_scan@Base 0.10 - zbar_scanner_reset@Base 0.10 - zbar_set_verbosity@Base 0.10 - zbar_symbol_first_component@Base 0.10 - zbar_symbol_get_components@Base 0.10 - zbar_symbol_get_configs@Base 0.21 - zbar_symbol_get_count@Base 0.10 - zbar_symbol_get_data@Base 0.10 - zbar_symbol_get_data_length@Base 0.10 - zbar_symbol_get_loc_size@Base 0.10 - zbar_symbol_get_loc_x@Base 0.10 - zbar_symbol_get_loc_y@Base 0.10 - zbar_symbol_get_modifiers@Base 0.21 - zbar_symbol_get_orientation@Base 0.21 - zbar_symbol_get_quality@Base 0.10 - zbar_symbol_get_type@Base 0.10 - zbar_symbol_next@Base 0.10 - zbar_symbol_ref@Base 0.10 - zbar_symbol_set_first_symbol@Base 0.10 - zbar_symbol_set_first_unfiltered@Base 0.21 - zbar_symbol_set_get_size@Base 0.10 - zbar_symbol_set_ref@Base 0.10 - zbar_symbol_xml@Base 0.10 - zbar_version@Base 0.10 - zbar_video_create@Base 0.10 - zbar_video_destroy@Base 0.10 - zbar_video_enable@Base 0.10 - zbar_video_get_control@Base 0.21 - zbar_video_get_controls@Base 0.21 - zbar_video_get_fd@Base 0.10 - zbar_video_get_format@Base 0.10 - zbar_video_get_height@Base 0.10 - zbar_video_get_resolutions@Base 0.22 - zbar_video_get_width@Base 0.10 - zbar_video_init@Base 0.10 - zbar_video_next_image@Base 0.10 - zbar_video_open@Base 0.10 - zbar_video_request_interface@Base 0.10 - zbar_video_request_iomode@Base 0.10 - zbar_video_request_size@Base 0.10 - zbar_video_set_control@Base 0.21 - zbar_window_attach@Base 0.10 - zbar_window_create@Base 0.10 - zbar_window_destroy@Base 0.10 - zbar_window_draw@Base 0.10 - zbar_window_get_overlay@Base 0.10 - zbar_window_redraw@Base 0.10 - zbar_window_resize@Base 0.10 - zbar_window_set_overlay@Base 0.10 diff --git a/debian/libzbargtk-dev.install b/debian/libzbargtk-dev.install deleted file mode 100644 index c76508b..0000000 --- a/debian/libzbargtk-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/include/zbar/zbargtk.h -usr/lib/*/libzbargtk.a -usr/lib/*/libzbargtk.so -usr/lib/*/pkgconfig/zbar-gtk.pc diff --git a/debian/libzbargtk0.install b/debian/libzbargtk0.install deleted file mode 100644 index d1fe794..0000000 --- a/debian/libzbargtk0.install +++ /dev/null @@ -1,2 +0,0 @@ -/usr/lib/*/libzbargtk.so.0 -/usr/lib/*/libzbargtk.so.0.* diff --git a/debian/libzbargtk0.symbols b/debian/libzbargtk0.symbols deleted file mode 100644 index 1decf12..0000000 --- a/debian/libzbargtk0.symbols +++ /dev/null @@ -1,14 +0,0 @@ -libzbargtk.so.0 libzbargtk0 #MINVER# -* Build-Depends-Package: libzbargtk-dev - zbar_gtk_get_type@Base 0.10 - zbar_gtk_get_video_device@Base 0.10 - zbar_gtk_get_video_enabled@Base 0.10 - zbar_gtk_get_video_opened@Base 0.10 - zbar_gtk_image_from_pixbuf@Base 0.10 - zbar_gtk_new@Base 0.10 - zbar_gtk_release_pixbuf@Base 0.10 - zbar_gtk_request_video_size@Base 0.21 - zbar_gtk_scan_image@Base 0.10 - zbar_gtk_set_video_device@Base 0.10 - zbar_gtk_set_video_enabled@Base 0.10 - zbar_marshal_VOID__INT_STRING@Base 0.23 diff --git a/debian/libzbarqt-dev.install b/debian/libzbarqt-dev.install deleted file mode 100644 index f926ce6..0000000 --- a/debian/libzbarqt-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/include/zbar/QZBar*.h -usr/lib/*/libzbarqt.a -usr/lib/*/libzbarqt.so -usr/lib/*/pkgconfig/zbar-qt.pc diff --git a/debian/libzbarqt0.install b/debian/libzbarqt0.install deleted file mode 100644 index 376159c..0000000 --- a/debian/libzbarqt0.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*/libzbarqt.so.0 -usr/lib/*/libzbarqt.so.0.* diff --git a/debian/libzbarqt0.shlibs b/debian/libzbarqt0.shlibs deleted file mode 100644 index 09d99ba..0000000 --- a/debian/libzbarqt0.shlibs +++ /dev/null @@ -1 +0,0 @@ -libzbarqt 0 libzbarqt0 (>= 0.23) diff --git a/debian/not-installed b/debian/not-installed deleted file mode 100644 index f403946..0000000 --- a/debian/not-installed +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/*.la diff --git a/debian/python3-zbar.install b/debian/python3-zbar.install deleted file mode 100644 index 7fee746..0000000 --- a/debian/python3-zbar.install +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/python*/*-packages/zbar*.so diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 5479bc6..0000000 --- a/debian/rules +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/make -f -export DH_VERBOSE = 1 - -# see FEATURE AREAS in dpkg-buildflags(1) -export DEB_BUILD_MAINT_OPTIONS = hardening=+all - -# see ENVIRONMENT in dpkg-buildflags(1) -# package maintainers to append CFLAGS -export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# package maintainers to append LDFLAGS -export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - -# Introduce standard debhelper variables -DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/default.mk - -# Let pybuild know the python binary package name -export PYBUILD_NAME = zbar - -LDFLAGS_LIB_SEARCHPATH = $(strip $(shell find $(CURDIR)/zbar -name '*.so' -printf "-L%h ")) -LDFLAGS_BINDINGS = $(strip $(LDFLAGS) $(LDFLAGS_LIB_SEARCHPATH)) - -# Explicitly set supported Qt version -export QT_SELECT := 5 - -# Properly set configure flags -CONFIGURE_FLAGS = --without-java --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --with-gtk=gtk3 --with-python=python3 --with-qt5 - -# We enable libv4l support only on Linux platforms. -ifeq (,$(findstring linux,$(DEB_HOST_ARCH_OS))) - CONFIGURE_FLAGS += --disable-video -endif - -%: - dh $@ - -override_dh_auto_configure: - dh_auto_configure -- $(CONFIGURE_FLAGS) - -override_dh_missing: - dh_missing --list-missing - -override_dh_strip: - dh_strip --dbgsym-migration='zbar-dbg (<< 0.21~)' - -override_dh_clean: - dh_clean - # Also clean up perl-related files - [ ! -f $(CURDIR)/perl/Makefile ] || $(MAKE) -C perl realclean - -override_dh_auto_install: build-perl - dh_auto_install - -build-perl: - dh_auto_configure --sourcedirectory=perl -- INC="-I$(CURDIR)/include" LIBS="$(LDFLAGS_LIB_SEARCHPATH) -lzbar" - dh_auto_build --sourcedirectory=perl -- OTHERLDFLAGS="$(LDFLAGS_LIB_SEARCHPATH)" LD_RUN_PATH='' - dh_auto_install --sourcedirectory=perl - -.PHONY: build-perl diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8..0000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/debian/watch b/debian/watch deleted file mode 100644 index ee38722..0000000 --- a/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 - -http://sf.net/zbar/zbar-(.+)\.tar\.bz2 diff --git a/debian/zbar-tools.install b/debian/zbar-tools.install deleted file mode 100755 index ecf85bd..0000000 --- a/debian/zbar-tools.install +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/dh-exec -[linux-any] usr/bin/zbarcam -usr/bin/zbarimg -etc/dbus-1/system.d/org.linuxtv.Zbar.conf -#[linux-any] usr/bin/zbarcam-gtk -#[linux-any] usr/bin/zbarcam-qt diff --git a/debian/zbar-tools.manpages b/debian/zbar-tools.manpages deleted file mode 100644 index 5ea05fe..0000000 --- a/debian/zbar-tools.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/share/man/man1/* diff --git a/debian/zbarcam-gtk.install b/debian/zbarcam-gtk.install deleted file mode 100644 index 691ec0e..0000000 --- a/debian/zbarcam-gtk.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/zbarcam-gtk diff --git a/debian/zbarcam-qt.install b/debian/zbarcam-qt.install deleted file mode 100644 index 96984b1..0000000 --- a/debian/zbarcam-qt.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/zbarcam-qt diff --git a/examples/scan_image.c b/examples/scan_image.c index f403ea1..ed0a72e 100644 --- a/examples/scan_image.c +++ b/examples/scan_image.c @@ -35,8 +35,7 @@ static void get_data (const char *name, FILE *file = fopen(name, "rb"); if(!file) exit(2); - png = - png_create_read_struct(PNG_LIBPNG_VER_STRING, + png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); if(!png) exit(3); if(setjmp(png_jmpbuf(png))) exit(4); diff --git a/examples/scan_image.cpp b/examples/scan_image.cpp index 555fb25..6fea5a0 100644 --- a/examples/scan_image.cpp +++ b/examples/scan_image.cpp @@ -1,6 +1,6 @@ #include -#include #include +#include #define STR(s) #s using namespace std; diff --git a/pygtk/Makefile.am.inc b/pygtk/Makefile.am.inc index 9b34c3d..033d601 100644 --- a/pygtk/Makefile.am.inc +++ b/pygtk/Makefile.am.inc @@ -2,9 +2,9 @@ pyexec_LTLIBRARIES += pygtk/zbarpygtk.la pygtk_zbarpygtk_la_CPPFLAGS = \ $(GTK_CFLAGS) $(PYTHON_CFLAGS) $(PYGTK_CFLAGS) $(AM_CPPFLAGS) pygtk_zbarpygtk_la_LDFLAGS = -shared -module -avoid-version -export-dynamic \ - -export-symbols-regex initzbarpygtk + -export-symbols-regex initzbarpygtk $(PYTHON_LDFLAGS) pygtk_zbarpygtk_la_LIBADD = \ - $(PYTHON_LIBS) $(PYGTK_LIBS) gtk/libzbargtk.la $(AM_LIBADD) + $(PYGTK_LIBS) gtk/libzbargtk.la $(AM_LIBADD) pygtk_zbarpygtk_la_DEPENDENCIES = gtk/libzbargtk.la dist_pygtk_zbarpygtk_la_SOURCES = pygtk/zbarpygtkmodule.c diff --git a/python/Makefile.am.inc b/python/Makefile.am.inc index f61214f..f1f30a4 100644 --- a/python/Makefile.am.inc +++ b/python/Makefile.am.inc @@ -1,8 +1,8 @@ pyexec_LTLIBRARIES += python/zbar.la python_zbar_la_CPPFLAGS = $(PYTHON_CFLAGS) $(AM_CPPFLAGS) python_zbar_la_LDFLAGS = -shared -module -avoid-version -export-dynamic \ - -export-symbols-regex '(initzbar|PyInit_zbar)' -python_zbar_la_LIBADD = $(PYTHON_LIBS) zbar/libzbar.la $(AM_LIBADD) + -export-symbols-regex '(initzbar|PyInit_zbar)' $(PYTHON_LDFLAGS) +python_zbar_la_LIBADD = zbar/libzbar.la $(AM_LIBADD) python_zbar_la_SOURCES = python/zbarmodule.c python/zbarmodule.h \ python/enum.c python/exception.c python/symbol.c python/symbolset.c \ diff --git a/python/zbarmodule.c b/python/zbarmodule.c index 7451c29..da0a195 100644 --- a/python/zbarmodule.c +++ b/python/zbarmodule.c @@ -146,10 +146,10 @@ version (PyObject *self, if(!PyArg_ParseTuple(args, "")) return(NULL); - unsigned int major, minor; - zbar_version(&major, &minor, NULL); + unsigned int major, minor, patch; + zbar_version(&major, &minor, &patch); - return(Py_BuildValue("II", major, minor)); + return(Py_BuildValue("III", major, minor, patch)); } static PyObject* diff --git a/qt/Makefile.am.inc b/qt/Makefile.am.inc index b099c2b..fba4fdf 100644 --- a/qt/Makefile.am.inc +++ b/qt/Makefile.am.inc @@ -15,4 +15,5 @@ qt/moc_%.cpp: qt/%.h $(MOC) $(qt_libzbarqt_la_CPPFLAGS) $< -o $@ qt/moc_%.cpp: include/zbar/%.h + $(mkdir_p) qt $(MOC) $(qt_libzbarqt_la_CPPFLAGS) $< -o $@ diff --git a/test/test_decode.c b/test/test_decode.c index 1a67ae0..d67f627 100644 --- a/test/test_decode.c +++ b/test/test_decode.c @@ -1342,7 +1342,7 @@ int main (int argc, char *argv[]) encode_junk(rnd_size + 1); if (num_iter) { - for (iter == 0; iter < num_iter; iter++) { + for (iter = 0; iter < num_iter; iter++) { test1(); seed = (rand() << 8) ^ rand(); } diff --git a/test/test_video.c b/test/test_video.c index 53ddd0b..c349ddc 100644 --- a/test/test_video.c +++ b/test/test_video.c @@ -32,7 +32,9 @@ #include #include #include -#include +#ifdef HAVE_SYS_TIME_H +# include +#endif #include #include diff --git a/travis/linux.debian-sid.install b/travis/linux.debian-sid.install deleted file mode 100755 index 6fdc2ac..0000000 --- a/travis/linux.debian-sid.install +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -sudo apt-get install -y \ - autopoint \ - debian-archive-keyring \ - dpkg \ - gettext \ - pbuilder diff --git a/travis/linux.debian-sid.script b/travis/linux.debian-sid.script deleted file mode 100755 index 9cf49d5..0000000 --- a/travis/linux.debian-sid.script +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -set -e - -: ${TARGET_ARCH:=amd64} - -BASETGZ="$HOME/pbuilder-bases/debian-sid-$TARGET_ARCH.tgz" -MIRROR=http://cdn-fastly.deb.debian.org/debian -KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg - -if [ -z "$TRAVIS_TAG" ] -then - sudo \ - sh -c "echo CCACHEDIR=$HOME/.ccache >> /etc/pbuilderrc" -fi - -if [ "$CC" = clang ] -then - sudo sh -c \ - "echo EXTRAPACKAGES='\"clang libomp-dev\"' >> /etc/pbuilderrc" -fi - -if [ ! -e "$BASETGZ.stamp" ] -then - mkdir -p "$HOME/pbuilder-bases" - sudo pbuilder --create --basetgz "$BASETGZ" --mirror $MIRROR \ - --distribution sid --architecture $TARGET_ARCH \ - --debootstrapopts --variant=buildd \ - --debootstrapopts --keyring=$KEYRING \ - --debootstrapopts --include=perl - touch "$BASETGZ.stamp" -else - sudo pbuilder --update --basetgz "$BASETGZ" -fi - -git archive --format tgz -o ../zbar_$(more configure.ac |grep AC_INIT|perl -ne 'print $1 if /(\d+.\d+)/').orig.tar.gz HEAD - -DIR="$PWD" -cd .. -dpkg-source -b "$DIR" -env -i CC="$CC" CXX="$CXX" sudo pbuilder --build --debbuildopts --jobs=auto \ - --basetgz "$BASETGZ" *.dsc diff --git a/travis/linux.mingw-w64.install b/travis/linux.mingw-w64.install deleted file mode 100755 index 716bf1b..0000000 --- a/travis/linux.mingw-w64.install +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -sudo apt-get install -y \ - autoconf \ - automake \ - autopoint \ - autotools-dev \ - gettext \ - libdbus-1-dev \ - pkg-config \ - win-iconv-mingw-w64-dev \ - binutils-mingw-w64-i686 gcc-mingw-w64 mingw-w64-i686-dev \ - mingw-w64-common \ - xmlto diff --git a/travis/linux.mingw-w64.script b/travis/linux.mingw-w64.script deleted file mode 100755 index 5e4dcf0..0000000 --- a/travis/linux.mingw-w64.script +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -set -e - -export PKG_CONFIG_PATH=/usr/x86_64-w64-mingw32/lib/pkgconfig - -autoreconf -vfi - -CC=i686-w64-mingw32-gcc ./configure \ - --host=i686-w64-mingw32 \ - --prefix=/usr/local/win32 \ - --with-directshow \ - --without-gtk \ - --without-python \ - --without-qt --without-java \ - --without-imagemagick \ - --enable-pthread - -make -sudo make install diff --git a/travis/linux.ubuntu-gtk2.install b/travis/linux.ubuntu-gtk2.install deleted file mode 100755 index 4980fb5..0000000 --- a/travis/linux.ubuntu-gtk2.install +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -sudo apt-get install -y \ - autoconf \ - automake \ - autopoint \ - autotools-dev \ - gettext \ - libdbus-1-dev \ - libgtk2.0-dev \ - libmagick++-dev \ - libqt5x11extras5-dev \ - libv4l-dev \ - libx11-dev \ - openjdk-8-jdk-headless \ - perl \ - pkg-config \ - python-all-dev \ - python-all-dbg \ - python-gtk2-dev \ - xmlto diff --git a/travis/linux.ubuntu-gtk2.script b/travis/linux.ubuntu-gtk2.script deleted file mode 100755 index 8fc70bf..0000000 --- a/travis/linux.ubuntu-gtk2.script +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -set -e - -autoreconf -vfi - -# Travis CI sets wrong value -unset PYTHON_CFLAGS - -export QT_SELECT=5 -./configure -make -make check-local -sudo make install diff --git a/travis/linux.ubuntu-gtk3.install b/travis/linux.ubuntu-gtk3.install deleted file mode 100755 index 224fb47..0000000 --- a/travis/linux.ubuntu-gtk3.install +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -sudo apt-get install -y \ - autoconf \ - automake \ - autopoint \ - autotools-dev \ - gettext \ - libdbus-1-dev \ - gir1.2-gtk-3.0 \ - libgtk-3-dev \ - libgirepository1.0-dev \ - libmagick++-dev \ - libqt5x11extras5-dev \ - libv4l-dev \ - libx11-dev \ - openjdk-8-jdk-headless \ - perl \ - pkg-config \ - python3-minimal \ - python3-dev \ - python3 \ - python3-gi \ - xmlto diff --git a/travis/linux.ubuntu-gtk3.script b/travis/linux.ubuntu-gtk3.script deleted file mode 100755 index 0e4d20b..0000000 --- a/travis/linux.ubuntu-gtk3.script +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -set -e - -autoreconf -vfi - -# Let configure get this -unset PYTHON_CFLAGS PYTHON - -export QT_SELECT=5 -./configure --with-gtk=gtk3 --with-python=python3 -make -make check-local -sudo make install diff --git a/travis/osx.mac.install b/travis/osx.mac.install deleted file mode 100755 index e58509c..0000000 --- a/travis/osx.mac.install +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -brew install gettext autoconf automake libiconv libtool \ - gs graphicsmagick python xmlto pkg-config ccache - -brew unlink libtool && brew link libtool -brew unlink gettext && brew link gettext diff --git a/travis/osx.mac.script b/travis/osx.mac.script deleted file mode 100755 index fb098e6..0000000 --- a/travis/osx.mac.script +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -set -e - -export PATH="/usr/local/opt/libiconv/bin:$PATH" -export PATH="/usr/local/opt/ccache/libexec:$PATH" -export LDFLAGS="-L/usr/local/opt/libiconv/lib" -export CPPFLAGS="-I/usr/local/opt/libiconv/include" - -autoreconf -vfi - -./configure --disable-video --without-qt --without-gtk --disable-nls \ - --with-python=python3 --without-imagemagick --with-graphicsmagick - -make -sudo make install diff --git a/travis/windows.pc.install b/travis/windows.pc.install deleted file mode 100755 index bfc35f7..0000000 --- a/travis/windows.pc.install +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -# Everything was already installed by before_install at .travis.yml diff --git a/travis/windows.pc.script b/travis/windows.pc.script deleted file mode 100755 index 841a7aa..0000000 --- a/travis/windows.pc.script +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -set -e - -export CONFIG_SHELL=/C/tools/msys64/usr/bin/bash.exe -export CPPFLAGS=-D__USE_MINGW_ANSI_STDIO=1; -export AR=gcc-ar; -export RANLIB=gcc-ranlib; - -$shell autoreconf -vfi - -prefix=/C/tools/msys64/mingw64/ - -$shell ./configure \ - --prefix=$prefix \ - ${DIRECT_SHOW} \ - --without-gtk \ - --without-python \ - --without-qt --without-java \ - --without-imagemagick \ - --enable-pthread --disable-dependency-tracking - -echo "Building" -$shell $MAKE - -echo "Installing" - -# Ignore errors here, as it won't be able to create some dirs -$shell $MAKE install || true - -echo "Success!" diff --git a/zbar/convert.c b/zbar/convert.c index 7bee878..75a33e5 100644 --- a/zbar/convert.c +++ b/zbar/convert.c @@ -1105,7 +1105,6 @@ int _zbar_best_format (uint32_t src, int zbar_negotiate_format (zbar_video_t *vdo, zbar_window_t *win) { - static const uint32_t y800[2] = { fourcc('Y','8','0','0'), 0 }; errinfo_t *errdst; const uint32_t *srcs, *dsts; unsigned min_cost = -1; @@ -1115,26 +1114,23 @@ int zbar_negotiate_format (zbar_video_t *vdo, if(!vdo && !win) return(0); - if(win) - (void)window_lock(win); + (void)window_lock(win); - errdst = (vdo) ? &vdo->err : &win->err; + errdst = &vdo->err; if(verify_format_sort()) { - if(win) - (void)window_unlock(win); + (void)window_unlock(win); return(err_capture(errdst, SEV_FATAL, ZBAR_ERR_INTERNAL, __func__, "image format list is not sorted!?")); } - if((vdo && !vdo->formats) || (win && !win->formats)) { - if(win) - (void)window_unlock(win); + if(!vdo->format || !win->formats) { + (void)window_unlock(win); return(err_capture(errdst, SEV_ERROR, ZBAR_ERR_UNSUPPORTED, __func__, "no input or output formats available")); } - srcs = (vdo) ? vdo->formats : y800; - dsts = (win) ? win->formats : y800; + srcs = vdo->formats; + dsts = win->formats; for(fmt = _zbar_formats; *fmt; fmt++) { /* only consider formats supported by video device */ @@ -1163,8 +1159,8 @@ int zbar_negotiate_format (zbar_video_t *vdo, vdo->formats = vdo->emu_formats; vdo->emu_formats = NULL; - srcs = (vdo) ? vdo->formats : y800; - dsts = (win) ? win->formats : y800; + srcs = vdo->formats; + dsts = win->formats; /* * Use the same cost algorithm to select emulated formats. @@ -1196,14 +1192,11 @@ int zbar_negotiate_format (zbar_video_t *vdo, } } - if(win) - (void)window_unlock(win); + (void)window_unlock(win); if(!min_fmt) return(err_capture(errdst, SEV_ERROR, ZBAR_ERR_UNSUPPORTED, __func__, "no supported image formats available")); - if(!vdo) - return(0); zprintf(2, "setting best format %.4s(%08" PRIx32 ") (%d)\n", (char*)&min_fmt, min_fmt, min_cost); diff --git a/zbar/decoder/ean.c b/zbar/decoder/ean.c index 330f2be..d1c9c9d 100644 --- a/zbar/decoder/ean.c +++ b/zbar/decoder/ean.c @@ -266,11 +266,9 @@ static inline char ean_part_end2 (ean_decoder_t *ean, return(ZBAR_NONE); /* extract parity bits */ - par = ((pass->raw[1] & 0x10) >> 3 | - (pass->raw[2] & 0x10) >> 4); + par = ((pass->raw[1] & 0x10) >> 3 | (pass->raw[2] & 0x10) >> 4); /* calculate "checksum" */ - chk = ~((pass->raw[1] & 0xf) * 10 + - (pass->raw[2] & 0xf)) & 0x3; + chk = ~((pass->raw[1] & 0xf) * 10 + (pass->raw[2] & 0xf)) & 0x3; dbprintf(2, " par=%x chk=%x", par, chk); if(par != chk) return(ZBAR_NONE); diff --git a/zbar/image.c b/zbar/image.c index 7f2ada7..0add469 100644 --- a/zbar/image.c +++ b/zbar/image.c @@ -21,13 +21,14 @@ * http://sourceforge.net/projects/zbar *------------------------------------------------------------------------*/ -#include "error.h" -#include "image.h" -#include "refcnt.h" #include #include #include +#include "error.h" +#include "image.h" +#include "refcnt.h" + zbar_image_t *zbar_image_create () { zbar_image_t *img = calloc(1, sizeof(zbar_image_t)); diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c index f4cc14d..7dc78d4 100644 --- a/zbar/img_scanner.c +++ b/zbar/img_scanner.c @@ -891,7 +891,7 @@ static void *_zbar_scan_image(zbar_image_scanner_t *iscn, unsigned w, h, cx1, cy1; int density; char filter; - int nean = 0, naddon = 0; + int nean, naddon; /* timestamp image * FIXME prefer video timestamp @@ -1062,7 +1062,8 @@ static void *_zbar_scan_image(zbar_image_scanner_t *iscn, /* FIXME tmp hack to merge simple case EAN add-ons */ filter = (!iscn->enable_cache && (density == 1 || CFG(iscn, ZBAR_CFG_Y_DENSITY) == 1)); - nean = 0, naddon = 0; + nean = 0; + naddon = 0; if(syms->nsyms) { zbar_symbol_t **symp; for(symp = &syms->head; *symp; ) { diff --git a/zbar/qrcode/qrdectxt.c b/zbar/qrcode/qrdectxt.c index 71c55b0..78cb204 100644 --- a/zbar/qrcode/qrdectxt.c +++ b/zbar/qrcode/qrdectxt.c @@ -16,6 +16,8 @@ #include "error.h" #include "img_scanner.h" +#define ENC_LIST_SIZE 4 + static int text_is_ascii(const unsigned char *_text,int _len){ int i; for(i=0;i<_len;i++)if(_text[i]>=0x80)return 0; @@ -50,9 +52,9 @@ static int text_is_big5(const unsigned char *_text, int _len){ return 1; } -static void enc_list_mtf(iconv_t _enc_list[3],iconv_t _enc){ +static void enc_list_mtf(iconv_t _enc_list[ENC_LIST_SIZE],iconv_t _enc){ int i; - for(i=0;i<4;i++)if(_enc_list[i]==_enc){ + for(i=0;i0;)_enc_list[j+1]=_enc_list[j]; _enc_list[0]=_enc; @@ -90,7 +92,7 @@ int qr_code_data_list_extract_text(const qr_code_data_list *_qrlist, for(i=0;ix0 + dot->width - 1; x >= (int) dot->x0; x--) { for (y = dot->y0 + dot->height; y < (int) (dot->y0 + 3 * dot->height); y++) { diff --git a/zbar/symbol.c b/zbar/symbol.c index 33e2f90..3c9b9b0 100644 --- a/zbar/symbol.c +++ b/zbar/symbol.c @@ -98,38 +98,80 @@ const char *zbar_get_orientation_name (zbar_orientation_t orient) } } +#ifndef _MSC_VER +static const signed char _zbar_symbol_hash[ZBAR_CODE128 + 1] = { + [0 ... ZBAR_CODE128] = -1, + + /* [ZBAR_FOO] = 0, is empty */ + [ZBAR_SQCODE] = 1, + [ZBAR_CODE128] = 2, + [ZBAR_EAN13] = 3, + [ZBAR_UPCA] = 4, + [ZBAR_EAN8] = 5, + [ZBAR_UPCE] = 6, + [ZBAR_ISBN13] = 7, + [ZBAR_ISBN10] = 8, + [ZBAR_CODE39] = 9, + [ZBAR_I25] = 10, + [ZBAR_PDF417] = 11, + [ZBAR_QRCODE] = 12, + [ZBAR_DATABAR] = 13, + [ZBAR_DATABAR_EXP] = 14, + [ZBAR_CODE93] = 15, + [ZBAR_EAN2] = 16, + [ZBAR_EAN5] = 17, + [ZBAR_COMPOSITE] = 18, + [ZBAR_CODABAR] = 19, + + /* Please update NUM_SYMS accordingly */ +}; + +static const signed char *_init_hash() { return _zbar_symbol_hash; }; +#else +/* + * Needed By Microsoft C. Even on Visual Studio 2019, C99 designated + * identifiers aren't supported! So, we need this hack. + */ +static const signed char *_init_hash() { + static signed char hash[ZBAR_CODE128 + 1] = { -1 }; + static int was_initialized = 0; + + if (was_initialized) + return (const signed char *)hash; + + memset(hash, -1, sizeof(hash)); + + /* Keep in sync with the C99 implementation */ + hash[ZBAR_SQCODE] = 1, + hash[ZBAR_CODE128] = 2, + hash[ZBAR_EAN13] = 3, + hash[ZBAR_UPCA] = 4, + hash[ZBAR_EAN8] = 5, + hash[ZBAR_UPCE] = 6, + hash[ZBAR_ISBN13] = 7, + hash[ZBAR_ISBN10] = 8, + hash[ZBAR_CODE39] = 9, + hash[ZBAR_I25] = 10, + hash[ZBAR_PDF417] = 11, + hash[ZBAR_QRCODE] = 12, + hash[ZBAR_DATABAR] = 13, + hash[ZBAR_DATABAR_EXP] = 14, + hash[ZBAR_CODE93] = 15, + hash[ZBAR_EAN2] = 16, + hash[ZBAR_EAN5] = 17, + hash[ZBAR_COMPOSITE] = 18, + hash[ZBAR_CODABAR] = 19; + + was_initialized = 1; + + return (const signed char *)hash; +}; +#endif + int _zbar_get_symbol_hash (zbar_symbol_type_t sym) { int h; - signed char hash[ZBAR_CODE128 + 1] = { 0 }; - - { - //[0 ... ZBAR_CODE128] = -1, - memset(hash, -1, sizeof(hash)); - - /* [ZBAR_FOO] = 0, is empty */ - hash[ZBAR_SQCODE] = 1, - hash[ZBAR_CODE128] = 2, - hash[ZBAR_EAN13] = 3, - hash[ZBAR_UPCA] = 4, - hash[ZBAR_EAN8] = 5, - hash[ZBAR_UPCE] = 6, - hash[ZBAR_ISBN13] = 7, - hash[ZBAR_ISBN10] = 8, - hash[ZBAR_CODE39] = 9, - hash[ZBAR_I25] = 10, - hash[ZBAR_PDF417] = 11, - hash[ZBAR_QRCODE] = 12, - hash[ZBAR_DATABAR] = 13, - hash[ZBAR_DATABAR_EXP] = 14, - hash[ZBAR_CODE93] = 15, - hash[ZBAR_EAN2] = 16, - hash[ZBAR_EAN5] = 17, - hash[ZBAR_COMPOSITE] = 18, - hash[ZBAR_CODABAR] = 19; - - /* Please update NUM_SYMS accordingly */ - } + const signed char *hash = _init_hash(); assert (sym >= ZBAR_PARTIAL && sym <= ZBAR_CODE128); diff --git a/zbar/video/dshow.c b/zbar/video/dshow.c index 7e30cd1..f83a475 100644 --- a/zbar/video/dshow.c +++ b/zbar/video/dshow.c @@ -1015,8 +1015,10 @@ static int dshow_determine_formats(zbar_video_t* vdo) if (is_supported) { - // first search for existing fourcc format + resolution_t resolution; int j; + + // first search for existing fourcc format for (j = 0; j < n; ++j) { if (state->int_formats[i].fourcc == fmt) @@ -1031,11 +1033,11 @@ static int dshow_determine_formats(zbar_video_t* vdo) vdo->formats[n] = fmt; ++n; } - { - resolution_t resolution = { bih->biWidth, bih->biHeight }; + + resolution.cx = bih->biWidth; + resolution.cy = bih->biHeight; resolution_list_add(&state->int_formats[j].resolutions, &resolution); - } } } // note: other format types could be possible, e.g. VIDEOINFOHEADER2 ... diff --git a/zbar/video/v4l1.c b/zbar/video/v4l1.c index da5d608..999df4a 100644 --- a/zbar/video/v4l1.c +++ b/zbar/video/v4l1.c @@ -29,8 +29,12 @@ # include #endif #include -#include -#include +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif #include #include #include diff --git a/zbar/window/win.c b/zbar/window/win.c index c48492c..5376b96 100644 --- a/zbar/window/win.c +++ b/zbar/window/win.c @@ -167,13 +167,13 @@ int _zbar_window_end (zbar_window_t *w) int _zbar_window_clear (zbar_window_t *w) { + RECT r = { 0, 0, w->width, w->height }; HDC hdc = GetDC(w->display); if(!hdc) return(-1/*FIXME*/); - { - RECT r = { 0, 0, w->width, w->height }; + FillRect(hdc, &r, GetStockObject(BLACK_BRUSH)); - } + ReleaseDC(w->display, hdc); ValidateRect(w->display, NULL); return(0); @@ -273,15 +273,14 @@ int _zbar_window_fill_rect (zbar_window_t *w, point_t org, point_t size) { + RECT r = { org.x, org.y, org.x + size.x, org.y + size.y }; HDC hdc = w->state->hdc; SetDCBrushColor(hdc, RGB((rgb & 4) * 0x33, (rgb & 2) * 0x66, (rgb & 1) * 0xcc)); - { - RECT r = { org.x, org.y, org.x + size.x, org.y + size.y }; FillRect(hdc, &r, GetStockObject(DC_BRUSH)); - } + return(0); } diff --git a/zbarcam/Makefile.am.inc b/zbarcam/Makefile.am.inc index b6de82c..df6794d 100644 --- a/zbarcam/Makefile.am.inc +++ b/zbarcam/Makefile.am.inc @@ -28,6 +28,7 @@ DISTCLEANFILES += $(nodist_zbarcam_zbarcam_qt_SOURCES) zbarcam/moc_zbarcam_qt.h zbarcam/moc_zbarcam_qt.h: zbarcam/zbarcam-qt.cpp + $(mkdir_p) zbarcam $(MOC) -i $(zbarcam_zbarcam_qt_CPPFLAGS) $< -o $@ endif diff --git a/zbarcam/scan_video.c b/zbarcam/scan_video.c index 020e0d6..c5ec02a 100644 --- a/zbarcam/scan_video.c +++ b/zbarcam/scan_video.c @@ -21,6 +21,8 @@ * http://sourceforge.net/projects/zbar *------------------------------------------------------------------------*/ +#include + #include #include #include @@ -32,8 +34,9 @@ #include #include -#include - +#ifdef MAJOR_IN_SYSMACROS +# include +#endif typedef void (cb_t) (void *userdata, const char *device); struct devnodes {