From 8cd15da1fd33aa1c3806434a5636cdf647e08638ac2d8902d83e71e486e89954 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 15 Feb 2019 08:43:31 +0000 Subject: [PATCH] - Update to version 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 protoype 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 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/zbar?expand=0&rev=33 --- zbar-0.20.1.tar.bz2 | 3 --- zbar-0.21.tar.bz2 | 3 +++ zbar.changes | 36 +++++++++++++++++++++++++++++++++++ zbar.spec | 46 +++++++++++++++++++++------------------------ 4 files changed, 60 insertions(+), 28 deletions(-) delete mode 100644 zbar-0.20.1.tar.bz2 create mode 100644 zbar-0.21.tar.bz2 diff --git a/zbar-0.20.1.tar.bz2 b/zbar-0.20.1.tar.bz2 deleted file mode 100644 index 037731c..0000000 --- a/zbar-0.20.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a0081a9b473d9e44e029d948a8d7f22deb1bf128980f3fc4e185298066e62a6c -size 459018 diff --git a/zbar-0.21.tar.bz2 b/zbar-0.21.tar.bz2 new file mode 100644 index 0000000..02158ed --- /dev/null +++ b/zbar-0.21.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:333f39df453166b60d5a94d2e231bab6baec73183c11c3cf9f4515c214fa6c50 +size 1092315 diff --git a/zbar.changes b/zbar.changes index 8864a26..8a5ad4d 100644 --- a/zbar.changes +++ b/zbar.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Fri Feb 15 08:14:02 UTC 2019 - Martin Pluskal + +- Update to version 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 protoype 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 +- Remove accidentaly introduced build dependency on python2 +- We no longer need to generate configure + ------------------------------------------------------------------- Wed Jan 23 16:13:22 UTC 2019 - info@paolostivanin.com diff --git a/zbar.spec b/zbar.spec index 3792702..df5371a 100644 --- a/zbar.spec +++ b/zbar.spec @@ -13,36 +13,36 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define libname libzbar0 +%define sover 0 +%define libname lib%{name}%{sover} Name: zbar -Version: 0.20.1 +Version: 0.21 Release: 0 Summary: Bar code reader License: LGPL-2.0-or-later Group: Productivity/Other - URL: http://zbar.sourceforge.net/ Source0: https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2 Source98: baselibs.conf - -BuildRequires: ImageMagick-devel -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool -BuildRequires: pkgconfig BuildRequires: libjpeg-devel -BuildRequires: libv4l-devel -BuildRequires: libXv-devel +BuildRequires: pkgconfig >= 0.9.0 BuildRequires: xmlto -BuildRequires: python2-devel +BuildRequires: pkgconfig(ImageMagick) BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(libv4l2) +BuildRequires: pkgconfig(python3) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xv) %description ZBar reads bar codes from various sources, such as video streams, @@ -85,7 +85,8 @@ This package provides ZBar Qt bindings. %package -n lib%{name}qt-devel Summary: Development environment for the ZBar Qt bindings library Group: Development/Libraries/C and C++ -Requires: lib%{name}qt0 = %{version}, lib%{name}-devel = %{version} +Requires: lib%{name}-devel = %{version} +Requires: lib%{name}qt0 = %{version} %description -n lib%{name}qt-devel This package contains all necessary include files, libraries, @@ -96,15 +97,13 @@ applications using the zbar-qt library. %setup -q %build -# for the Mercurial-based archive we need to get proper autoconf files -autoreconf -fiv - %configure \ --docdir=%{_docdir}/%{name} \ --disable-static \ --without-java \ --without-python \ - --without-gtk + --without-gtk \ + --without-xshm # rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -113,11 +112,10 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} %install -rm -rf %{buildroot} %make_install find %{buildroot} -name "*.la" -or -name "*.a" | xargs rm -f -rm -rf %{buildroot}/usr/share/doc/zbar-%{version}/ -rm -f %{buildroot}/usr/share/doc/packages/zbar/{COPYING,LICENSE,INSTALL} +rm -rf %{buildroot}%{_datadir}/doc/zbar-%{version}/ +rm -f %{buildroot}%{_docdir}/zbar/{COPYING,LICENSE,INSTALL} %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig @@ -134,9 +132,7 @@ rm -f %{buildroot}/usr/share/doc/packages/zbar/{COPYING,LICENSE,INSTALL} %{_mandir}/man1/* %files -n %{libname} -%{_libdir}/libzbar.so.* -%exclude %{python2_sitearch}/zbar.so -%exclude %{_includedir}/zbar/zbargtk.h +%{_libdir}/libzbar.so.%{sover}* %files -n lib%{name}-devel %doc HACKING TODO @@ -155,7 +151,7 @@ rm -f %{buildroot}/usr/share/doc/packages/zbar/{COPYING,LICENSE,INSTALL} %{_libdir}/pkgconfig/zbar.pc %files -n lib%{name}qt0 -%{_libdir}/libzbarqt.so.* +%{_libdir}/libzbarqt.so.%{sover}* %files -n lib%{name}qt-devel %{_includedir}/%{name}/QZBar*.h