From 3aad29f737d8207a1cd19d9acc10b6a6d5cd3922 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 20 Feb 2019 07:14:39 -0300 Subject: [PATCH 1/7] Update ZBar sources Signed-off-by: Mauro Carvalho Chehab --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f42fdfe..62dee54 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ zbar-0.10.tar.bz2 /zbar-0.20.tar.bz2 /zbar-0.20.1.tar.bz2 /zbar-0.21.tar.bz2 +/zbar-0.22.tar.bz2 diff --git a/sources b/sources index 24d03e4..cc952a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zbar-0.21.tar.bz2) = 8c1095ec234b04839229dd6345b0758f0a133c715f28031ab64c2c7809a0c0fc4cbd7226fba1a6e3c40efcb8b2a334a7e461cdc34a77c21b537dbf8faf38c14c +SHA512 (zbar-0.22.tar.bz2) = 8e40df37ebbedfc2e1cf4c82c3cfbfb44f2da24603874646b446cef9bd63d02ef40f2fd8af433254dd078513df4030ef60cb663bf10c86a9f29df57450a5a99a From c117ca9658778358684e5f9384038ab58859d554 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 20 Feb 2019 07:01:47 -0300 Subject: [PATCH 2/7] Bump to version 0.22 The main focus of this version is to make zbarcam-qt a full-featured application, allowing to use all ZBar library features with a GUI interface. It also comes with an optional new feature to allow inverting the colors when parsing images. That's specially useful for QR codes, as it seems that several such barcodes come inverted. There are also some bug fixes on it. Sumary of changes: * 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 Signed-off-by: Mauro Carvalho Chehab --- zbar.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zbar.spec b/zbar.spec index 8e73d8e..662070a 100644 --- a/zbar.spec +++ b/zbar.spec @@ -1,5 +1,5 @@ Name: zbar -Version: 0.21 +Version: 0.22 Release: 1%{?dist} Summary: Bar code reader @@ -137,7 +137,10 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/ %{_includedir}/zbar/QZBar*.h %changelog -* Tue Feb 12 2019 Mauro Carvalho Chehab - 0.20.1-4 +* Wed Feb 20 2019 Mauro Carvalho Chehab - 0.22-1 +- Bump to version 0.22: zbarcam-qt is now a full-featured application + +* Tue Feb 12 2019 Mauro Carvalho Chehab - 0.21-1 - Bump to version 0.21: d-bus and SQ code support, improved zbarcam-qt * Sun Feb 03 2019 Fedora Release Engineering - 0.20.1-5 From 9f2cd28e8f1a352c648a91a7977d339d3065faeb Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 10 May 2019 21:58:45 -0300 Subject: [PATCH 3/7] Update to 0.23 release candidate package (0.22.90) This Release Candidate brings support for Gtk3 and GIR. Add support for it and create an extra package for GIR. Signed-off-by: Mauro Carvalho Chehab --- .gitignore | 7 +------ sources | 2 +- zbar.spec | 41 ++++++++++++++++++++++++++++++++++++++--- 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 62dee54..ab41230 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ -zbar-0.10.tar.bz2 -/zbar-0.10.tar.bz2 -/zbar-0.20.tar.bz2 -/zbar-0.20.1.tar.bz2 -/zbar-0.21.tar.bz2 -/zbar-0.22.tar.bz2 +/zbar-0.22.90.tar.bz2 diff --git a/sources b/sources index cc952a4..509c708 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zbar-0.22.tar.bz2) = 8e40df37ebbedfc2e1cf4c82c3cfbfb44f2da24603874646b446cef9bd63d02ef40f2fd8af433254dd078513df4030ef60cb663bf10c86a9f29df57450a5a99a +SHA512 (zbar-0.22.90.tar.bz2) = fd21747dd7c40b2a3a0c958b18d0947905edb32424aa85efed7610aefb7167173b563656c4f201781f7f9b3bbb64d946a39b2089bac8aeccca823d4fb01e104d diff --git a/zbar.spec b/zbar.spec index 662070a..2d6f3f5 100644 --- a/zbar.spec +++ b/zbar.spec @@ -1,5 +1,5 @@ Name: zbar -Version: 0.22 +Version: 0.22.90 Release: 1%{?dist} Summary: Bar code reader @@ -9,8 +9,9 @@ Source0: https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2 BuildRequires: autoconf automake libtool gettext-devel BuildRequires: qt5-qtbase-devel qt5-qtx11extras-devel -BuildRequires: gtk2-devel GraphicsMagick-c++-devel +BuildRequires: gtk3-devel ImageMagick-devel pygobject3-devel BuildRequires: libv4l-devel libXv-devel xmlto dbus-devel +BuildRequires: java-11-openjdk-devel %description A layered bar code scanning and decoding library. Supports EAN, UPC, Code 128, @@ -34,6 +35,15 @@ Requires: %{name} = %{version}-%{release} This package contains a bar code scanning widget for use with GUI applications based on GTK+-2.0. +%package gi +Summary: Bar code reader GObject Introspection (GIR) Gtk bindings +Requires: %{name}-gtk = %{version}-%{release} + +%description gi +This package contains a bar code scanning GObject Introspection +(GIR) Gtk bindings, with allow the usage of ZBar with GUI +support on any application compatible with GIR, like python3. + %package gtk-devel Summary: Bar code reader GTK widget extra development files Requires: pkgconfig, %{name}-gtk = %{version}-%{release}, %{name}-devel = %{version}-%{release} @@ -60,12 +70,21 @@ This package contains header files and additional libraries used for developing GUI applications based on Qt4 that include a bar code scanning widget. +%package java +Summary: Bar code reader Java library +Requires: pkgconfig, %{name}-gtk = %{version}-%{release}, %{name}-devel = %{version}-%{release} + +%description java +This package contains header files and additional libraries used for +on Java Native Interface (JNI) applications using ZBar. + + %prep %setup -q %build autoreconf -vfi -%configure --without-java --with-graphicsmagick --without-python2 --docdir=%{_docdir}/%{name}-%{version} +%configure --without-python --with-gtk=auto --docdir=%{_docdir}/%{name}-%{version} # rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -76,6 +95,9 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +install -d %{buildroot}%{_jnidir} +mv %{buildroot}%{_datadir}/zbar/lib/zbar.jar %{buildroot}%{_jnidir} +mv %{buildroot}%{_datadir}/zbar/lib/libzbarjni.so* %{buildroot}%{_libdir} #Remove .la and .a files find ${RPM_BUILD_ROOT} -name '*.la' -or -name '*.a' | xargs rm -f @@ -122,6 +144,12 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/ %{_libdir}/libzbargtk.so.* %{_bindir}/zbarcam-gtk +%files gi +%dir %{_libdir}/girepository-1.0 +%dir %{_datadir}/gir-1.0 +%{_libdir}/girepository-1.0/ZBar-1.0.typelib +%{_datadir}/gir-1.0/ZBar-1.0.gir + %files gtk-devel %{_libdir}/libzbargtk.so %{_libdir}/pkgconfig/zbar-gtk.pc @@ -136,7 +164,14 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/ %{_libdir}/pkgconfig/zbar-qt.pc %{_includedir}/zbar/QZBar*.h +%files java +%{_jnidir}/zbar.jar +%{_libdir}/libzbarjni.so* + %changelog +* Fri May 10 2019 Mauro Carvalho Chehab - 0.22.90-1 +- Release candidate for 0.23. Support for Gtk3 and GObject Introspection (GIR) + * Wed Feb 20 2019 Mauro Carvalho Chehab - 0.22-1 - Bump to version 0.22: zbarcam-qt is now a full-featured application From 2cc4eaee4b41f2777110f7d3ecf81fd495533f67 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 11 May 2019 13:52:52 -0300 Subject: [PATCH 4/7] Bump to 0.22.91 Has some build fixes. While here, enable python3 bindings build. Signed-off-by: Mauro Carvalho Chehab --- .gitignore | 1 + sources | 2 +- zbar.spec | 21 +++++++++++++++++++-- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ab41230..141282d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /zbar-0.22.90.tar.bz2 +/zbar-0.22.91.tar.bz2 diff --git a/sources b/sources index 509c708..6d2849e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zbar-0.22.90.tar.bz2) = fd21747dd7c40b2a3a0c958b18d0947905edb32424aa85efed7610aefb7167173b563656c4f201781f7f9b3bbb64d946a39b2089bac8aeccca823d4fb01e104d +SHA512 (zbar-0.22.91.tar.bz2) = d9c70aeb110889fc1bd1960982e0db167b4bbc708ed6c30f4e13688e1211522eaf680aee7712d99639fcacc61f8faa5d936bed619de0240c19167807b7e74f8f diff --git a/zbar.spec b/zbar.spec index 2d6f3f5..56f146a 100644 --- a/zbar.spec +++ b/zbar.spec @@ -1,5 +1,5 @@ Name: zbar -Version: 0.22.90 +Version: 0.22.91 Release: 1%{?dist} Summary: Bar code reader @@ -12,6 +12,7 @@ BuildRequires: qt5-qtbase-devel qt5-qtx11extras-devel BuildRequires: gtk3-devel ImageMagick-devel pygobject3-devel BuildRequires: libv4l-devel libXv-devel xmlto dbus-devel BuildRequires: java-11-openjdk-devel +BuildRequires: python3-devel %description A layered bar code scanning and decoding library. Supports EAN, UPC, Code 128, @@ -70,6 +71,15 @@ This package contains header files and additional libraries used for developing GUI applications based on Qt4 that include a bar code scanning widget. +%package python3 +Group: Development/Libraries +Summary: Bar code reader PyGTK widget +Requires: python3-pillow, %{name} = %{version}-%{release} + +%description python3 +This package contains a bar code scanning widget for use on +python applications that work with images. + %package java Summary: Bar code reader Java library Requires: pkgconfig, %{name}-gtk = %{version}-%{release}, %{name}-devel = %{version}-%{release} @@ -84,7 +94,8 @@ on Java Native Interface (JNI) applications using ZBar. %build autoreconf -vfi -%configure --without-python --with-gtk=auto --docdir=%{_docdir}/%{name}-%{version} +%configure --with-python=python3 --with-gtk=auto --docdir=%{_docdir}/%{name}-%{version} +rm gtk/*.gir # rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -98,6 +109,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install -d %{buildroot}%{_jnidir} mv %{buildroot}%{_datadir}/zbar/lib/zbar.jar %{buildroot}%{_jnidir} mv %{buildroot}%{_datadir}/zbar/lib/libzbarjni.so* %{buildroot}%{_libdir} +cp %{buildroot}/%{_srcdir}/test/test_python.py %{buildroot}%{_docdir} #Remove .la and .a files find ${RPM_BUILD_ROOT} -name '*.la' -or -name '*.a' | xargs rm -f @@ -168,6 +180,11 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/ %{_jnidir}/zbar.jar %{_libdir}/libzbarjni.so* +%files python3 +%{python3_sitearch}/zbarpygtk.so +%{python3_sitearch}/zbar.so +%{buildroot}%{docdir}/test_python.py + %changelog * Fri May 10 2019 Mauro Carvalho Chehab - 0.22.90-1 - Release candidate for 0.23. Support for Gtk3 and GObject Introspection (GIR) From be2309ac3a544c8d15daa01731528f51c09eb500 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 11 May 2019 16:35:29 -0300 Subject: [PATCH 5/7] Some fixes for zbar-python build In order to be able to build a zbar-python, we need to address some small things. Among them, there's a requirement to use "python3" at python's test script. IMHO, that's a bad idea, at least upstream, as the same script also works with python2 when using pygtk (also supported by ZBar). Signed-off-by: Mauro Carvalho Chehab --- sources | 2 +- use_python3_on_python_script.patch | 10 ++++++++++ zbar.spec | 8 ++++---- 3 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 use_python3_on_python_script.patch diff --git a/sources b/sources index 6d2849e..2aefe91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zbar-0.22.91.tar.bz2) = d9c70aeb110889fc1bd1960982e0db167b4bbc708ed6c30f4e13688e1211522eaf680aee7712d99639fcacc61f8faa5d936bed619de0240c19167807b7e74f8f +SHA512 (zbar-0.22.91.tar.bz2) = c64a9d6b21e5da9dc583ed2f2098402093e6932ce2383e49ecb7a6db18418456f039381f9fda4e9276e59fea2b1e7cd1f01cf32977e4eb9c6a3391d36228c5ae diff --git a/use_python3_on_python_script.patch b/use_python3_on_python_script.patch new file mode 100644 index 0000000..7161f1d --- /dev/null +++ b/use_python3_on_python_script.patch @@ -0,0 +1,10 @@ +diff --git a/test/test_python.py b/test/test_python.py +index 252c51a97256..8388d9a5aa36 100755 +--- a/test/test_python.py ++++ b/test/test_python.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + #------------------------------------------------------------------------ + # Copyright 2019 (c) Mauro Carvalho Chehab + # diff --git a/zbar.spec b/zbar.spec index 56f146a..9b7b0bc 100644 --- a/zbar.spec +++ b/zbar.spec @@ -6,6 +6,7 @@ Summary: Bar code reader License: LGPLv2+ URL: http://zbar.sourceforge.net/ Source0: https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2 +Patch0: use_python3_on_python_script.patch BuildRequires: autoconf automake libtool gettext-devel BuildRequires: qt5-qtbase-devel qt5-qtx11extras-devel @@ -91,11 +92,11 @@ on Java Native Interface (JNI) applications using ZBar. %prep %setup -q +%patch0 -p1 %build autoreconf -vfi %configure --with-python=python3 --with-gtk=auto --docdir=%{_docdir}/%{name}-%{version} -rm gtk/*.gir # rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -109,7 +110,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install -d %{buildroot}%{_jnidir} mv %{buildroot}%{_datadir}/zbar/lib/zbar.jar %{buildroot}%{_jnidir} mv %{buildroot}%{_datadir}/zbar/lib/libzbarjni.so* %{buildroot}%{_libdir} -cp %{buildroot}/%{_srcdir}/test/test_python.py %{buildroot}%{_docdir} +cp test/test_python.py %{buildroot}%{_docdir} #Remove .la and .a files find ${RPM_BUILD_ROOT} -name '*.la' -or -name '*.a' | xargs rm -f @@ -181,9 +182,8 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/ %{_libdir}/libzbarjni.so* %files python3 -%{python3_sitearch}/zbarpygtk.so %{python3_sitearch}/zbar.so -%{buildroot}%{docdir}/test_python.py +%{_docdir}/test_python.py %changelog * Fri May 10 2019 Mauro Carvalho Chehab - 0.22.90-1 From ade3b6641b3f34813581700fc4c82d967857d3b7 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 14 May 2019 07:26:52 -0300 Subject: [PATCH 6/7] Bump to the third release candidate for 0.23 Signed-off-by: Mauro Carvalho Chehab --- .gitignore | 1 + sources | 2 +- zbar.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 141282d..1f25f40 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /zbar-0.22.90.tar.bz2 /zbar-0.22.91.tar.bz2 +/zbar-0.22.92.tar.bz2 diff --git a/sources b/sources index 2aefe91..7c09094 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zbar-0.22.91.tar.bz2) = c64a9d6b21e5da9dc583ed2f2098402093e6932ce2383e49ecb7a6db18418456f039381f9fda4e9276e59fea2b1e7cd1f01cf32977e4eb9c6a3391d36228c5ae +SHA512 (zbar-0.22.92.tar.bz2) = 242fb7dc9ad3b25d2acd1fdbf39039fd376c40167f3b88dd63e4bd63c112c18560f42f186f78430167ce5b7c0a53fc7c7185367efa2a4985c9abc68a27500375 diff --git a/zbar.spec b/zbar.spec index 9b7b0bc..8d8cd65 100644 --- a/zbar.spec +++ b/zbar.spec @@ -1,5 +1,5 @@ Name: zbar -Version: 0.22.91 +Version: 0.22.92 Release: 1%{?dist} Summary: Bar code reader @@ -127,8 +127,8 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/ %ldconfig_scriptlets qt %files -%doc NEWS README.md INSTALL.md -%license COPYING LICENSE +%doc NEWS.md README.md INSTALL.md +%license COPYING LICENSE.md %{_bindir}/zbarimg %{_bindir}/zbarcam @@ -137,7 +137,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/ %{_sysconfdir}/dbus-1/system.d/org.linuxtv.Zbar.conf %files devel -%doc HACKING TODO +%doc HACKING.md TODO.md %{_libdir}/libzbar.so %{_libdir}/pkgconfig/zbar.pc @@ -186,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/ %{_docdir}/test_python.py %changelog +* Tue May 14 2019 Mauro Carvalho Chehab - 0.22.92-1 +- Third release candidate for 0.23. + * Fri May 10 2019 Mauro Carvalho Chehab - 0.22.90-1 - Release candidate for 0.23. Support for Gtk3 and GObject Introspection (GIR) From 0d841f40e2f339ecdd228758925a9a0ea32b9e2d Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 23 May 2019 18:17:14 -0300 Subject: [PATCH 7/7] Bump to version 0.23 Signed-off-by: Mauro Carvalho Chehab --- .gitignore | 1 + sources | 2 +- zbar.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1f25f40..1618487 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /zbar-0.22.90.tar.bz2 /zbar-0.22.91.tar.bz2 /zbar-0.22.92.tar.bz2 +/zbar-0.23.tar.bz2 diff --git a/sources b/sources index 7c09094..6707fd8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zbar-0.22.92.tar.bz2) = 242fb7dc9ad3b25d2acd1fdbf39039fd376c40167f3b88dd63e4bd63c112c18560f42f186f78430167ce5b7c0a53fc7c7185367efa2a4985c9abc68a27500375 +SHA512 (zbar-0.23.tar.bz2) = 7eef2ee99760edd693ecc12a36e04b71a156b93b4c1977ca4f6da103a955284cf640b55adb185477e1d4cc65345bb01608ed9528f6518abb514ccbc58e5d350b diff --git a/zbar.spec b/zbar.spec index 8d8cd65..8d9abed 100644 --- a/zbar.spec +++ b/zbar.spec @@ -1,5 +1,5 @@ Name: zbar -Version: 0.22.92 +Version: 0.23 Release: 1%{?dist} Summary: Bar code reader @@ -186,6 +186,10 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/ %{_docdir}/test_python.py %changelog +* Thu May 23 2019 Mauro Carvalho Chehab - 0.23-1 +- Bump to release 0.23. + + * Tue May 14 2019 Mauro Carvalho Chehab - 0.22.92-1 - Third release candidate for 0.23.