* [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/, media-gfx/zbar/
@ 2017-05-23 9:20 Lars Wendler
0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2017-05-23 9:20 UTC (permalink / raw
To: gentoo-commits
commit: 4be507464c01c3531105a43b470cb3c1df795906
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue May 23 09:20:07 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue May 23 09:20:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4be50746
media-gfx/zbar: Fixed build with imagemagick-7 (bug #592324).
Thanks to Jürgen Rose for providing a patch.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
.../files/zbar-0.10_p20121015-ImageMagick-7.diff | 24 ++++++++++++++++++++++
media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild | 4 ++++
2 files changed, 28 insertions(+)
diff --git a/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.diff b/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.diff
new file mode 100644
index 00000000000..a56ab7d913b
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.diff
@@ -0,0 +1,24 @@
+diff -r -U3 zbar-0.10_p20121015_orig/configure.ac zbar-0.10_p20121015/configure.ac
+--- zbar-0.10_p20121015_orig/configure.ac 2016-08-28 16:59:23.969753652 +0200
++++ zbar-0.10_p20121015/configure.ac 2016-08-28 17:17:15.384494517 +0200
+@@ -324,7 +324,7 @@
+ dnl double check ImageMagick install (bug #2582232)
+ CPPFLAGS_save="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $MAGICK_CFLAGS"
+- AC_CHECK_HEADER([wand/MagickWand.h],
++ AC_CHECK_HEADER([MagickWand/MagickWand.h],
+ [have_IM="yes"],
+ [have_IM="broken"])
+ CPPFLAGS="$CPPFLAGS_save"])])
+diff -r -U3 zbar-0.10_p20121015_orig/zbarimg/zbarimg.c zbar-0.10_p20121015/zbarimg/zbarimg.c
+--- zbar-0.10_p20121015_orig/zbarimg/zbarimg.c 2015-08-05 11:10:32.000000000 +0200
++++ zbar-0.10_p20121015/zbarimg/zbarimg.c 2016-08-28 17:10:39.532787196 +0200
+@@ -44,7 +44,7 @@
+ #endif
+
+ #ifdef HAVE_IMAGEMAGICK
+-# include <wand/MagickWand.h>
++# include <MagickWand/MagickWand.h>
+
+ /* ImageMagick frequently changes API names - just use the original
+ * (more stable?) names to match GraphicsMagick
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild
index ba683f81e1b..d07b29d8905 100644
--- a/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild
+++ b/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild
@@ -52,6 +52,10 @@ src_prepare() {
"${FILESDIR}"/${PN}-0.10-python-crash.patch \
"${FILESDIR}"/${PN}-0.10-v4l2-uvcvideo.patch
+ if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
+ epatch "${FILESDIR}/${P}-ImageMagick-7.diff"
+ fi
+
use python && python_fix_shebang examples/upcrpc.py test/*.py
java-pkg-opt-2_src_prepare
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/, media-gfx/zbar/
@ 2018-11-25 17:36 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2018-11-25 17:36 UTC (permalink / raw
To: gentoo-commits
commit: 78b1fa1e72173409b92d3232486c6a366fe829c3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 25 17:30:36 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 25 17:35:18 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78b1fa1e
media-gfx/zbar: mv diff -> patch, add basic patch header
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...1015-ImageMagick-7.diff => zbar-0.10_p20121015-ImageMagick-7.patch} | 3 +++
media-gfx/zbar/zbar-0.20.1.ebuild | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.diff b/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch
similarity index 93%
rename from media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.diff
rename to media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch
index a56ab7d913b..f58c3e4d9c4 100644
--- a/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.diff
+++ b/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch
@@ -1,3 +1,6 @@
+Fixed build with imagemagick-7 (bug #592324).
+Thanks-to: Jürgen Rose
+
diff -r -U3 zbar-0.10_p20121015_orig/configure.ac zbar-0.10_p20121015/configure.ac
--- zbar-0.10_p20121015_orig/configure.ac 2016-08-28 16:59:23.969753652 +0200
+++ zbar-0.10_p20121015/configure.ac 2016-08-28 17:17:15.384494517 +0200
diff --git a/media-gfx/zbar/zbar-0.20.1.ebuild b/media-gfx/zbar/zbar-0.20.1.ebuild
index 045ba2301cb..a24c1daade0 100644
--- a/media-gfx/zbar/zbar-0.20.1.ebuild
+++ b/media-gfx/zbar/zbar-0.20.1.ebuild
@@ -75,7 +75,7 @@ src_prepare() {
default
if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
- eapply "${FILESDIR}/${PN}-0.10_p20121015-ImageMagick-7.diff"
+ eapply "${FILESDIR}/${PN}-0.10_p20121015-ImageMagick-7.patch"
fi
use python && python_fix_shebang examples/upcrpc.py test/*.py
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/, media-gfx/zbar/
@ 2020-02-03 17:37 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2020-02-03 17:37 UTC (permalink / raw
To: gentoo-commits
commit: 5042a61cbb5a94deec529e6b24ae564b214ff2fa
Author: Yury Martynov <email <AT> linxon <DOT> ru>
AuthorDate: Mon Jan 6 15:35:20 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 3 17:35:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5042a61c
media-gfx/zbar: version bump to 0.23
Closes: https://bugs.gentoo.org/689406
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Yury Martynov <email <AT> linxon.ru>
Closes: https://github.com/gentoo/gentoo/pull/14266
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/zbar/Manifest | 1 +
...create_correct_pkconfig_file_for_zbar-qt5.patch | 71 +++++++
| 18 ++
...3_fix_detection_of_errors_in_the_v4l_read.patch | 29 +++
.../zbar/files/zbar-0.23_fix_python_detect.patch | 13 ++
...3_reset_conversion_descriptor_after_close.patch | 25 +++
media-gfx/zbar/metadata.xml | 16 +-
media-gfx/zbar/zbar-0.23.ebuild | 216 +++++++++++++++++++++
8 files changed, 388 insertions(+), 1 deletion(-)
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 00a21a631d2..8d5d753531a 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1 +1,2 @@
DIST zbar-0.20.1.tar.gz 555199 BLAKE2B f224a2207fa0603da4cc3a0e1d05bc73f3cf0cc9d13c26b3b801d3418f4f6a001b52e468b721552af61f4c8d7357934abd0560c24d3b233107785c69cfe14753 SHA512 21ad9d8fcdecb41bd4b8979366ab8ec6e8eac815f52270b0dc72ce6a126ccef933d048ce8bbe28f46ada5defadf85ba8c97c5c1870c9560a9dab28c585dfaf42
+DIST zbar-0.23.tar.gz 1301948 BLAKE2B dd74ce44bcb10f8a7cf180b982e5bd82f1f5674540931377d207ab730bb2d080fe222bfc42d4a3d70895ad53b78638e73c2294018b80d30dc28f7e6ecc14c761 SHA512 9737f9dca42c29f92aa1eca5c0808da34f1d16c88c65241c9e3984c487e502f398437e7a707a1edd2c440f784db537ba33ea4008a2d1c1caaf5eea6431b1400b
diff --git a/media-gfx/zbar/files/zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch b/media-gfx/zbar/files/zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch
new file mode 100644
index 00000000000..3be9c222277
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch
@@ -0,0 +1,71 @@
+From cac1fffce80f0835e4d8d234023a775b4243b916 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Sun, 20 Oct 2019 01:44:02 +0200
+Subject: [PATCH] Create correct pkconfig file for zbar-qt5
+
+Although zbar supports Qt5, the created pkgconfig file always requested
+the Qt(4) components.
+
+Fixes issue #62.
+---
+ configure.ac | 13 ++++++++++---
+ zbar-qt5.pc.in | 12 ++++++++++++
+ 2 files changed, 22 insertions(+), 3 deletions(-)
+ create mode 100644 zbar-qt5.pc.in
+
+diff --git a/configure.ac b/configure.ac
+index 935110a..49ef6a8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -659,15 +659,23 @@ AS_IF([test "x$with_qt" != "xno"],
+ CPPFLAGS="$CPPFLAGS $QT_CPPFLAGS"
+ dnl -fPIC has no effect on Windows and breaks windres
+ AS_IF([test "x$win32" = "xno"], [CPPFLAGS="$CPPFLAGS -fPIC"])
+- AC_MSG_NOTICE([using Qt version $QT_VERSION])],
++ AC_MSG_NOTICE([using Qt version $QT_VERSION])
++ qt_pkgconfig_file="zbar-qt5.pc"
++ ],
+
+ [MOC=`$PKG_CONFIG QtGui --variable=moc_location`
+ AC_MSG_NOTICE([using moc from $MOC])
+ QT_VERSION=`$PKG_CONFIG QtGui --modversion`
+- AC_MSG_NOTICE([using Qt version $QT_VERSION])]))
++ AC_MSG_NOTICE([using Qt version $QT_VERSION])
++ qt_pkgconfig_file="zbar-qt.pc"
++ ]))
+
+ AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"])
+
++AM_COND_IF([HAVE_QT],
++ [AC_CONFIG_FILES([zbar-qt.pc:"${qt_pkgconfig_file}.in"])]
++)
++
+ dnl Java
+ have_java="maybe"
+
+@@ -820,7 +828,6 @@ java/Makefile
+ zbar/Makefile
+ zbar.pc
+ zbar-gtk.pc
+-zbar-qt.pc
+ doc/doxygen.conf])
+
+ AC_CONFIG_FILES([test/test_examples.sh],[chmod 755 test/test_examples.sh])
+diff --git a/zbar-qt5.pc.in b/zbar-qt5.pc.in
+new file mode 100644
+index 0000000..3378993
+--- /dev/null
++++ b/zbar-qt5.pc.in
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: zbar-qt
++Description: bar code scanning and decoding Qt5 widget
++URL: http://zbar.sourceforge.net
++Version: @VERSION@
++Requires: zbar, Qt5Core >= 5, Qt5Gui >= 5
++Libs: -L${libdir} -lzbarqt
++Cflags: -I${includedir}
--git a/media-gfx/zbar/files/zbar-0.23_fix_Qt5X11Extras_detect.patch b/media-gfx/zbar/files/zbar-0.23_fix_Qt5X11Extras_detect.patch
new file mode 100644
index 00000000000..7692db41e0d
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.23_fix_Qt5X11Extras_detect.patch
@@ -0,0 +1,18 @@
+diff -ur a/configure.ac b/configure.ac
+--- a/configure.ac 2019-05-23 23:37:12.000000000 +0300
++++ b/configure.ac 2020-01-22 12:27:14.190755156 +0300
+@@ -638,13 +638,9 @@
+
+ AC_ARG_VAR([MOC], [full path to Qt moc program])
+
+-AS_IF([test "x$have_x" = "xyes"],
+- [qt_extra="Qt5X11Extras >= 5.0"],
+- [qt_extra=""])
+-
+ AS_IF([test "x$with_qt" != "xno"],
+ [PKG_CHECK_MODULES([QT],
+- [Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 $qt_extra],,
++ [Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 Qt5X11Extras >= 5.0],,
+ [with_qt5 = "no"
+ PKG_CHECK_MODULES([QT],
+ [QtCore >= 4 QtGui >= 4],,
diff --git a/media-gfx/zbar/files/zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch b/media-gfx/zbar/files/zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch
new file mode 100644
index 00000000000..8484e31b737
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch
@@ -0,0 +1,29 @@
+From 52a4fa5242af5da770b3cab1713f87e8d899e7ed Mon Sep 17 00:00:00 2001
+From: Dan Fandrich <dan@coneharvesters.com>
+Date: Fri, 27 Dec 2019 18:33:17 +0100
+Subject: [PATCH] Fix detection of errors in the v4l read.
+
+The return type must be signed in order to detect a read failure. Also,
+display an error message after such a failure.
+---
+ zbar/video/v4l2.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
+index daed38b..c0398ea 100644
+--- a/zbar/video/v4l2.c
++++ b/zbar/video/v4l2.c
+@@ -133,9 +133,11 @@ static zbar_image_t *v4l2_dq (zbar_video_t *vdo)
+ return(NULL);
+
+ /* FIXME should read entire image */
+- unsigned long datalen = read(fd, (void*)img->data, img->datalen);
+- if(datalen < 0)
++ ssize_t datalen = read(fd, (void*)img->data, img->datalen);
++ if(datalen < 0) {
++ perror("v4l2_dq read");
+ return(NULL);
++ }
+ else if(datalen != img->datalen)
+ zprintf(0, "WARNING: read() size mismatch: 0x%lx != 0x%lx\n",
+ datalen, img->datalen);
diff --git a/media-gfx/zbar/files/zbar-0.23_fix_python_detect.patch b/media-gfx/zbar/files/zbar-0.23_fix_python_detect.patch
new file mode 100644
index 00000000000..54e10184217
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.23_fix_python_detect.patch
@@ -0,0 +1,13 @@
+diff -ur a/configure.ac b/configure.ac
+--- a/configure.ac 2019-05-23 23:37:12.000000000 +0300
++++ b/configure.ac 2020-01-06 12:30:41.621264633 +0300
+@@ -559,8 +559,7 @@
+ [with_python="no"])
+ ])
+ ]
+- )],
+- [with_python="auto"]
++ )]
+ )
+
+ AS_IF([test "x$with_python" != "xno"],
diff --git a/media-gfx/zbar/files/zbar-0.23_reset_conversion_descriptor_after_close.patch b/media-gfx/zbar/files/zbar-0.23_reset_conversion_descriptor_after_close.patch
new file mode 100644
index 00000000000..75d02cb996a
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.23_reset_conversion_descriptor_after_close.patch
@@ -0,0 +1,25 @@
+From ba0bcb39c4fa57634c05597464352d4e630f1ea2 Mon Sep 17 00:00:00 2001
+From: hz-mk <51707958+hz-mk@users.noreply.github.com>
+Date: Tue, 11 Jun 2019 16:32:18 +0200
+Subject: [PATCH] Reset conversion descriptor after close (prevent double free)
+
+---
+ zbar/qrcode/qrdectxt.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/zbar/qrcode/qrdectxt.c b/zbar/qrcode/qrdectxt.c
+index 2ab7b9b..4be7635 100644
+--- a/zbar/qrcode/qrdectxt.c
++++ b/zbar/qrcode/qrdectxt.c
+@@ -409,7 +409,10 @@ int qr_code_data_list_extract_text(const qr_code_data_list *_qrlist,
+ /*If eci should be reset between codes, do so.*/
+ if(eci<=QR_ECI_GLI1){
+ eci=-1;
+- if(eci_cd!=(iconv_t)-1)iconv_close(eci_cd);
++ if(eci_cd!=(iconv_t)-1){
++ iconv_close(eci_cd);
++ eci_cd=(iconv_t)-1;
++ }
+ }
+
+ }
diff --git a/media-gfx/zbar/metadata.xml b/media-gfx/zbar/metadata.xml
index fd5ad454e03..064f2be7587 100644
--- a/media-gfx/zbar/metadata.xml
+++ b/media-gfx/zbar/metadata.xml
@@ -1,10 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>email@linxon.ru</email>
+ <name>Yury Martynov</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">zbar</remote-id>
<remote-id type="github">mchehab/zbar</remote-id>
<bugs-to>https://github.com/mchehab/zbar/issues</bugs-to>
</upstream>
+ <longdescription>
+ The ZBar Bar Code Reader 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, UPC, Code 128, Code 93, Code 39
+ and Interleaved 2 of 5. The flexible, layered architecture features a
+ fast, streaming interface with a minimal memory footprint.
+ </longdescription>
</pkgmetadata>
diff --git a/media-gfx/zbar/zbar-0.23.ebuild b/media-gfx/zbar/zbar-0.23.ebuild
new file mode 100644
index 00000000000..34eb41b923a
--- /dev/null
+++ b/media-gfx/zbar/zbar-0.23.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx
+
+DESCRIPTION="Library and tools for reading barcodes from images or video"
+HOMEPAGE="https://github.com/mchehab/zbar"
+SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg python qt5 static-libs test +threads v4l X xv"
+REQUIRED_USE="
+ introspection? ( gtk )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ test? (
+ ${PYTHON_REQUIRED_USE}
+ X? ( imagemagick )
+ )
+ xv? ( X )"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+ gtk? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ introspection? ( dev-libs/gobject-introspection )
+ )
+ imagemagick? (
+ !graphicsmagick? ( media-gfx/imagemagick:=[png,jpeg?] )
+ graphicsmagick? ( media-gfx/graphicsmagick:=[png,jpeg?] )
+ )
+ jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+ python? ( ${PYTHON_DEPS} )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ )
+ v4l? ( media-libs/libv4l:0=[${MULTILIB_USEDEP}] )
+ X? (
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
+ )"
+
+RDEPEND="${COMMON_DEPEND}
+ java? ( virtual/jre )"
+
+DEPEND="${COMMON_DEPEND}
+ java? (
+ >=virtual/jdk-1.8
+ test? (
+ dev-java/hamcrest-core:1.3
+ dev-java/junit:4
+ )
+ )
+ test? (
+ ${PYTHON_DEPS}
+ dev-python/pillow[${PYTHON_USEDEP}]
+ )"
+
+BDEPEND="
+ sys-devel/gettext
+ virtual/pkgconfig
+ gtk? ( dev-util/glib-utils )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.10-errors.patch"
+ "${FILESDIR}/${P}_create_correct_pkconfig_file_for_zbar-qt5.patch"
+ "${FILESDIR}/${P}_fix_detection_of_errors_in_the_v4l_read.patch"
+ "${FILESDIR}/${P}_fix_python_detect.patch"
+ "${FILESDIR}/${P}_fix_Qt5X11Extras_detect.patch"
+ "${FILESDIR}/${P}_reset_conversion_descriptor_after_close.patch"
+)
+
+DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog )
+
+pkg_setup() {
+ if use python || use test; then
+ python-single-r1_pkg_setup
+ fi
+ use java && java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ if use python || use test; then
+ if use test; then
+ # make tests happy
+ # because one of the test requires loadable py module from the current ${BUILD_DIR}
+ sed -i \
+ -e "s|PYTHONPATH=@abs_top_srcdir@|PYTHONPATH=@builddir@|g" \
+ test/Makefile.am.inc || die
+ fi
+
+ python_fix_shebang \
+ examples/*.py \
+ test/{test_python,barcodetest}.py # test_pygtk.py — py2 only
+ fi
+
+ if use java; then
+ java-pkg-opt-2_src_prepare
+ sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
+ -i java/Makefile.am || die
+ fi
+
+ # do not install {LICENSE,INSTALL,etc}.md doc files with 'make install' (use DOCS=() instead)
+ sed -i \
+ -e "s|^dist_doc_DATA =\(.*\)|dist_doc_DATA =|" Makefile.am || die
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ append-cppflags -DNDEBUG
+
+ local myeconfargs=(
+ $(use_with dbus)
+ $(use_with gtk gtk gtk3) # default is gtk2
+ $(use_with jpeg)
+ $(multilib_native_use_with introspection gir)
+ $(multilib_native_use_with java)
+ $(multilib_native_use_with python python auto)
+ $(use_enable static-libs static)
+ $(use_enable threads pthread)
+ $(use_enable v4l video)
+ $(use_with X x)
+ $(use_with X xshm)
+ $(use_with xv xv)
+ )
+
+ if multilib_is_native_abi; then
+ # both must be enabled to use GraphicsMagick
+ if use graphicsmagick; then
+ myeconfargs+=(
+ --with-graphicsmagick
+ --without-imagemagick
+ )
+ elif use imagemagick; then
+ myeconfargs+=(
+ --with-imagemagick
+ --without-graphicsmagick
+ )
+ else
+ myeconfargs+=(
+ --without-imagemagick
+ --without-graphicsmagick
+ )
+ fi
+
+ if use java; then
+ export JAVACFLAGS="$(java-pkg_javac-args)"
+ append-cflags "$(java-pkg_get-jni-cflags)"
+ if use test; then # bug 629078
+ java-pkg_append_ CLASSPATH .
+ java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar)
+ java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)
+ fi
+ fi
+
+ if use qt5; then
+ myeconfargs+=(
+ --with-qt
+ --with-qt5
+ )
+ else
+ myeconfargs+=( --without-qt )
+ fi
+ else
+ myeconfargs+=(
+ --without-qt
+ --without-imagemagick
+ --without-graphicsmagick
+ )
+ fi
+
+ ECONF_SOURCE="${S}" \
+ econf "${myeconfargs[@]}"
+
+ # work around out-of-source build issues for multilib systems (bug 672184)
+ mkdir qt zbarcam || die
+}
+
+src_test() {
+ virtx multilib-minimal_src_test
+}
+
+src_install() {
+ if use qt5; then
+ local MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/zbar/QZBar.h
+ /usr/include/zbar/QZBarImage.h
+ )
+ fi
+ multilib-minimal_src_install
+ einstalldocs
+}
+
+multilib_src_install_all() {
+ find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+ use java && java-pkg-opt-2_pkg_preinst
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/, media-gfx/zbar/
@ 2021-06-04 11:23 Marek Szuba
0 siblings, 0 replies; 7+ messages in thread
From: Marek Szuba @ 2021-06-04 11:23 UTC (permalink / raw
To: gentoo-commits
commit: 7efabb81f9bbfc7ea149285949a27400ea6db736
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 4 11:21:30 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Jun 4 11:23:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7efabb81
media-gfx/zbar: fix python3_9 compilation failure
Backported upstream fix. Tested against python3_8 and python3_9,
compiles fine against both.
Reported-by: PhobosK <phobosk <AT> fastmail.fm>
Closes: https://bugs.gentoo.org/788703
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../zbar/files/zbar-0.23.1_python_tp_print.patch | 55 ++++++++++++++++++++++
media-gfx/zbar/zbar-0.23.1.ebuild | 1 +
2 files changed, 56 insertions(+)
diff --git a/media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch b/media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch
new file mode 100644
index 00000000000..8d4d821426d
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch
@@ -0,0 +1,55 @@
+From 938d39716488b545b92c28f48acc94a7b8fc9138 Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+Date: Tue, 28 Jul 2020 10:27:30 +0200
+Subject: [PATCH] python: enum: make it compatible with Python 3.9
+
+As reported by:
+ https://github.com/mchehab/zbar/issues/92
+
+python bindings don't build with Python 3.9, because it is
+using tp_print, which has been silently ignored since Python
+3.0, according with[1]:
+
+ "The tp_print slot of PyTypeObject has been removed.
+ It was used for printing objects to files in Python 2.7
+ and before.
+ Since Python 3.0, it has been ignored and unused."
+
+[1] https://docs.python.org/3.9/whatsnew/3.9.html#id3
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+---
+ python/enum.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/python/enum.c b/python/enum.c
+index a1135531..dfe1b1ef 100644
+--- a/python/enum.c
++++ b/python/enum.c
+@@ -76,6 +76,8 @@ enumitem_str (zbarEnumItem *self)
+ return(self->name);
+ }
+
++#if PY_MAJOR_VERSION < 3
++/* tp_print was dropped on Python 3.9 */
+ static int
+ enumitem_print (zbarEnumItem *self,
+ FILE *fp,
+@@ -83,6 +85,7 @@ enumitem_print (zbarEnumItem *self,
+ {
+ return(self->name->ob_type->tp_print(self->name, fp, flags));
+ }
++#endif
+
+ static PyObject*
+ enumitem_repr (zbarEnumItem *self)
+@@ -115,7 +118,9 @@ PyTypeObject zbarEnumItem_Type = {
+ .tp_new = (newfunc)enumitem_new,
+ .tp_dealloc = (destructor)enumitem_dealloc,
+ .tp_str = (reprfunc)enumitem_str,
++#if PY_MAJOR_VERSION < 3
+ .tp_print = (printfunc)enumitem_print,
++#endif
+ .tp_repr = (reprfunc)enumitem_repr,
+ };
+
diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild b/media-gfx/zbar/zbar-0.23.1.ebuild
index d74a878a969..7b07b269b68 100644
--- a/media-gfx/zbar/zbar-0.23.1.ebuild
+++ b/media-gfx/zbar/zbar-0.23.1.ebuild
@@ -87,6 +87,7 @@ PATCHES=(
"${FILESDIR}/${PN}-0.23_fix_Qt5X11Extras_detect.patch"
"${FILESDIR}/${PN}-0.23_fix_python_detect.patch"
"${FILESDIR}/${P}-autoconf-2.70.patch"
+ "${FILESDIR}/${PN}-0.23.1_python_tp_print.patch"
)
DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog )
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/, media-gfx/zbar/
@ 2021-06-04 11:23 Marek Szuba
0 siblings, 0 replies; 7+ messages in thread
From: Marek Szuba @ 2021-06-04 11:23 UTC (permalink / raw
To: gentoo-commits
commit: 8b42c8ee68fc3b3de5b4eb401f8432e936843b01
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 4 11:20:55 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Jun 4 11:23:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b42c8ee
media-gfx/zbar: drop 0.23-r1
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
media-gfx/zbar/Manifest | 1 -
media-gfx/zbar/files/zbar-0.10-errors.patch | 10 -
media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch | 120 ------------
...create_correct_pkconfig_file_for_zbar-qt5.patch | 71 -------
...3_fix_detection_of_errors_in_the_v4l_read.patch | 29 ---
...3_reset_conversion_descriptor_after_close.patch | 25 ---
media-gfx/zbar/zbar-0.23-r1.ebuild | 217 ---------------------
7 files changed, 473 deletions(-)
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 73e9e49982d..a72b685b4bf 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,2 +1 @@
DIST zbar-0.23.1.tar.gz 1019268 BLAKE2B 5aa8725a0945b6f50eb78bb7b8a61e5b46356b18f07e8af778a63d46b94c894d9e827ed71bd89060898ecbdaebc5b4bb6e638939d7bc0dede390f7137770049f SHA512 ae7741cf750a10cf53dc11abcd482c3885507153ee37f6e3364ed5ed72184ebb009560b8c40d8090603a551fb681700a962838a59ce77d005d080ee49fbfa54b
-DIST zbar-0.23.tar.gz 1301948 BLAKE2B dd74ce44bcb10f8a7cf180b982e5bd82f1f5674540931377d207ab730bb2d080fe222bfc42d4a3d70895ad53b78638e73c2294018b80d30dc28f7e6ecc14c761 SHA512 9737f9dca42c29f92aa1eca5c0808da34f1d16c88c65241c9e3984c487e502f398437e7a707a1edd2c440f784db537ba33ea4008a2d1c1caaf5eea6431b1400b
diff --git a/media-gfx/zbar/files/zbar-0.10-errors.patch b/media-gfx/zbar/files/zbar-0.10-errors.patch
deleted file mode 100644
index 63328ce664b..00000000000
--- a/media-gfx/zbar/files/zbar-0.10-errors.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- zbar-0.10/include/zbar/Exception.h
-+++ zbar-0.10/include/zbar/Exception.h
-@@ -32,6 +32,7 @@
-
- #include <exception>
- #include <new>
-+#include <cstddef>
-
- namespace zbar {
-
diff --git a/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch b/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch
deleted file mode 100644
index 1206a209d45..00000000000
--- a/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-https://bugs.gentoo.org/769716
-
-From 4bd586181dde6196cb60602f228c4deb07818989 Mon Sep 17 00:00:00 2001
-From: Klaus Ethgen <Klaus@Ethgen.de>
-Date: Sun, 7 Feb 2021 14:22:52 +0100
-Subject: [PATCH] =?iso8859-1?q?Configure-Patch=20f=FCr=20nicht-bash?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=iso8859-1
-Content-Transfer-Encoding: 8bit
-
----
- configure.ac | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c2b7819..f6224a1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -489,7 +489,7 @@ AC_ARG_WITH([gtk],
- AC_ARG_VAR([GLIB_GENMARSHAL], [full path to glib-genmarshal])
- AC_ARG_VAR([GTK_VERSION_MAJOR])
-
--AS_IF([test "x$with_gtk" == "xgtk3" || test "x$with_gtk" == "xauto"],
-+AS_IF([test "x$with_gtk" = "xgtk3" || test "x$with_gtk" = "xauto"],
- [PKG_CHECK_MODULES([GTK3], [gtk+-3.0],
- [GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
- GTK_VERSION=`$PKG_CONFIG gtk+-3.0 --modversion`
-@@ -501,7 +501,7 @@ AS_IF([test "x$with_gtk" == "xgtk3" || test "x$with_gtk" == "xauto"],
- ])
- ])
-
--AS_IF([test "x$with_gtk" == "xgtk2" || test "x$with_gtk" == "xauto"],
-+AS_IF([test "x$with_gtk" = "xgtk2" || test "x$with_gtk" = "xauto"],
- [PKG_CHECK_MODULES([GTK2], [gtk+-2.0],
- [GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
- GTK_VERSION=`$PKG_CONFIG gtk+-2.0 --modversion`
-@@ -550,11 +550,11 @@ AC_ARG_VAR([PYGTK_CODEGEN], [full path to pygtk-codegen program (python2 only)])
- AC_ARG_VAR([PYGTK_DEFS], [directory where PyGTK definitions may be found (python2 only)])
-
- AS_IF([test -z "$PYTHON"],
-- [AS_IF([test "x$with_python" == "xauto"],
-+ [AS_IF([test "x$with_python" = "xauto"],
- [AC_PATH_PROGS([PYTHON], [python3 python2 python], [:], [$PATH])],
-- [AS_IF([test "x$with_python" == "xpython3"],
-+ [AS_IF([test "x$with_python" = "xpython3"],
- [AC_PATH_PROGS([PYTHON], [python3 python], [:], [$PATH])],
-- [AS_IF([test "x$with_python" == "xpython2"],
-+ [AS_IF([test "x$with_python" = "xpython2"],
- [AC_PATH_PROGS([PYTHON], [python2 python], [:], [$PATH])],
- [with_python="no"])
- ])
-@@ -608,7 +608,7 @@ AM_CONDITIONAL([HAVE_PYGTK2], [test "x$with_pygtk2" != "xno"])
-
- dnl GObject Introspection (GIR)
-
--AS_IF([test "x$with_gir" == "xyes" && test "x$with_gtk" != "xno"],
-+AS_IF([test "x$with_gir" = "xyes" && test "x$with_gtk" != "xno"],
- [m4_ifdef([GOBJECT_INTROSPECTION_CHECK],
- [GOBJECT_INTROSPECTION_CHECK([0.6.7])
- AS_IF([test "x$found_introspection" = "xyes"],
-@@ -696,7 +696,7 @@ AC_ARG_WITH([java],
- [],
- [with_java="check"])
-
--JAVAC=${JAVAC/ecj/ecj -1.5}
-+JAVAC="$(echo $JAVAC | sed 's/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
-@@ -707,13 +707,13 @@ AM_CONDITIONAL([HAVE_JAVAH], [test "x$JAVAH" != "x"])
-
- AC_ARG_VAR([JAR], [location of Java archive tool])
- AC_PATH_PROGS([JAR], [jar], [:], [$JAVA_PATH])
--AS_IF([test "x$JAR" == "x:"], [have_java="no"])
-+AS_IF([test "x$JAR" = "x:"], [have_java="no"])
-
- AC_ARG_VAR([JAVA], [location of Java application launcher])
- AC_PATH_PROGS([JAVA], [java], [/bin/false], [$JAVA_PATH])
-
- AC_ARG_VAR([CLASSPATH], [Java class path (include JUnit to run java tests)])
--AS_IF([test "x$CLASSPATH" == "x"], [CLASSPATH="."])
-+AS_IF([test "x$CLASSPATH" = "x"], [CLASSPATH="."])
-
- dnl Search for Java unit test library
- AS_IF([test -z "$JUNIT_HOME"],
-@@ -850,7 +850,7 @@ echo "GTK --with-gtk=$with_gtk Gtk${GTK_VERSION}"
- echo "GObject introspection --with-gir=$with_gir"
- echo "Qt --with-qt=$with_qt Qt${QT_VERSION}"
- echo "Java --with-java=$with_java"
--AS_IF([test "x$win32" == "xno"],
-+AS_IF([test "x$win32" = "xno"],
- [echo "Dbus --with-dbus=$with_dbus"])
- AS_IF([test "x$have_GM" = "xyes"],
- [echo "GraphicsMagick --with-graphicsmagick=yes"],
-@@ -873,13 +873,13 @@ AS_IF([test "x$have_IM" != "xyes" && test "x$have_GM" != "xyes"],
- [echo " => the zbarimg file scanner will *NOT* be built"])
- AS_IF([test "x$have_GM" = "xyes"],
- [echo " => ImageMagick is preferred, as GraphicsMagick doesn't support https"])
--AS_IF([test "x$with_gtk" == "xno"],
-+AS_IF([test "x$with_gtk" = "xno"],
- [echo " => GTK support will *NOT* be built"])
- AS_IF([test "x$with_pygtk2" != "xyes" && test "xPYTHON_VERSION_MAJOR" = "x2"],
- [echo " => the Python 2 GTK widget wrapper will *NOT* be built"])
- AS_IF([test "x$with_qt" != "xyes"],
- [echo " => the Qt widget will *NOT* be built"])
--AS_IF([test "x$with_qt" == "xyes" && test "x$enable_static_qt" == "xyes" ],
-+AS_IF([test "x$with_qt" = "xyes" && test "x$enable_static_qt" = "xyes" ],
- [echo " => Building a static Qt library"])
- AS_IF([test "x$with_java" != "xyes"],
- [echo " => the Java interface will *NOT* be built"])
-@@ -888,5 +888,5 @@ AS_IF([test "x$with_java_unit" != "xyes"],
- #echo "NPAPI Plugin --with-npapi=$with_npapi"
- #AS_IF([test "x$with_mozilla" != "xyes"],
- # [echo " => the Mozilla/Firefox/OpenOffice plugin will *NOT* be built"])
--AS_IF([test "x$enable_pdf417" == "xyes"],
-+AS_IF([test "x$enable_pdf417" = "xyes"],
- [echo " => the pdf417 code support is incomplete!"])
---
-2.30.0
-
diff --git a/media-gfx/zbar/files/zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch b/media-gfx/zbar/files/zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch
deleted file mode 100644
index 3be9c222277..00000000000
--- a/media-gfx/zbar/files/zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From cac1fffce80f0835e4d8d234023a775b4243b916 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-Date: Sun, 20 Oct 2019 01:44:02 +0200
-Subject: [PATCH] Create correct pkconfig file for zbar-qt5
-
-Although zbar supports Qt5, the created pkgconfig file always requested
-the Qt(4) components.
-
-Fixes issue #62.
----
- configure.ac | 13 ++++++++++---
- zbar-qt5.pc.in | 12 ++++++++++++
- 2 files changed, 22 insertions(+), 3 deletions(-)
- create mode 100644 zbar-qt5.pc.in
-
-diff --git a/configure.ac b/configure.ac
-index 935110a..49ef6a8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -659,15 +659,23 @@ AS_IF([test "x$with_qt" != "xno"],
- CPPFLAGS="$CPPFLAGS $QT_CPPFLAGS"
- dnl -fPIC has no effect on Windows and breaks windres
- AS_IF([test "x$win32" = "xno"], [CPPFLAGS="$CPPFLAGS -fPIC"])
-- AC_MSG_NOTICE([using Qt version $QT_VERSION])],
-+ AC_MSG_NOTICE([using Qt version $QT_VERSION])
-+ qt_pkgconfig_file="zbar-qt5.pc"
-+ ],
-
- [MOC=`$PKG_CONFIG QtGui --variable=moc_location`
- AC_MSG_NOTICE([using moc from $MOC])
- QT_VERSION=`$PKG_CONFIG QtGui --modversion`
-- AC_MSG_NOTICE([using Qt version $QT_VERSION])]))
-+ AC_MSG_NOTICE([using Qt version $QT_VERSION])
-+ qt_pkgconfig_file="zbar-qt.pc"
-+ ]))
-
- AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"])
-
-+AM_COND_IF([HAVE_QT],
-+ [AC_CONFIG_FILES([zbar-qt.pc:"${qt_pkgconfig_file}.in"])]
-+)
-+
- dnl Java
- have_java="maybe"
-
-@@ -820,7 +828,6 @@ java/Makefile
- zbar/Makefile
- zbar.pc
- zbar-gtk.pc
--zbar-qt.pc
- doc/doxygen.conf])
-
- AC_CONFIG_FILES([test/test_examples.sh],[chmod 755 test/test_examples.sh])
-diff --git a/zbar-qt5.pc.in b/zbar-qt5.pc.in
-new file mode 100644
-index 0000000..3378993
---- /dev/null
-+++ b/zbar-qt5.pc.in
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: zbar-qt
-+Description: bar code scanning and decoding Qt5 widget
-+URL: http://zbar.sourceforge.net
-+Version: @VERSION@
-+Requires: zbar, Qt5Core >= 5, Qt5Gui >= 5
-+Libs: -L${libdir} -lzbarqt
-+Cflags: -I${includedir}
diff --git a/media-gfx/zbar/files/zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch b/media-gfx/zbar/files/zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch
deleted file mode 100644
index 8484e31b737..00000000000
--- a/media-gfx/zbar/files/zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 52a4fa5242af5da770b3cab1713f87e8d899e7ed Mon Sep 17 00:00:00 2001
-From: Dan Fandrich <dan@coneharvesters.com>
-Date: Fri, 27 Dec 2019 18:33:17 +0100
-Subject: [PATCH] Fix detection of errors in the v4l read.
-
-The return type must be signed in order to detect a read failure. Also,
-display an error message after such a failure.
----
- zbar/video/v4l2.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
-index daed38b..c0398ea 100644
---- a/zbar/video/v4l2.c
-+++ b/zbar/video/v4l2.c
-@@ -133,9 +133,11 @@ static zbar_image_t *v4l2_dq (zbar_video_t *vdo)
- return(NULL);
-
- /* FIXME should read entire image */
-- unsigned long datalen = read(fd, (void*)img->data, img->datalen);
-- if(datalen < 0)
-+ ssize_t datalen = read(fd, (void*)img->data, img->datalen);
-+ if(datalen < 0) {
-+ perror("v4l2_dq read");
- return(NULL);
-+ }
- else if(datalen != img->datalen)
- zprintf(0, "WARNING: read() size mismatch: 0x%lx != 0x%lx\n",
- datalen, img->datalen);
diff --git a/media-gfx/zbar/files/zbar-0.23_reset_conversion_descriptor_after_close.patch b/media-gfx/zbar/files/zbar-0.23_reset_conversion_descriptor_after_close.patch
deleted file mode 100644
index 75d02cb996a..00000000000
--- a/media-gfx/zbar/files/zbar-0.23_reset_conversion_descriptor_after_close.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ba0bcb39c4fa57634c05597464352d4e630f1ea2 Mon Sep 17 00:00:00 2001
-From: hz-mk <51707958+hz-mk@users.noreply.github.com>
-Date: Tue, 11 Jun 2019 16:32:18 +0200
-Subject: [PATCH] Reset conversion descriptor after close (prevent double free)
-
----
- zbar/qrcode/qrdectxt.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/zbar/qrcode/qrdectxt.c b/zbar/qrcode/qrdectxt.c
-index 2ab7b9b..4be7635 100644
---- a/zbar/qrcode/qrdectxt.c
-+++ b/zbar/qrcode/qrdectxt.c
-@@ -409,7 +409,10 @@ int qr_code_data_list_extract_text(const qr_code_data_list *_qrlist,
- /*If eci should be reset between codes, do so.*/
- if(eci<=QR_ECI_GLI1){
- eci=-1;
-- if(eci_cd!=(iconv_t)-1)iconv_close(eci_cd);
-+ if(eci_cd!=(iconv_t)-1){
-+ iconv_close(eci_cd);
-+ eci_cd=(iconv_t)-1;
-+ }
- }
-
- }
diff --git a/media-gfx/zbar/zbar-0.23-r1.ebuild b/media-gfx/zbar/zbar-0.23-r1.ebuild
deleted file mode 100644
index d51457a9e1d..00000000000
--- a/media-gfx/zbar/zbar-0.23-r1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx
-
-DESCRIPTION="Library and tools for reading barcodes from images or video"
-HOMEPAGE="https://github.com/mchehab/zbar"
-SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg python qt5 static-libs test +threads v4l X xv"
-REQUIRED_USE="
- introspection? ( gtk )
- python? ( ${PYTHON_REQUIRED_USE} )
- test? (
- ${PYTHON_REQUIRED_USE}
- X? ( imagemagick )
- )
- xv? ( X )"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
- gtk? (
- dev-libs/glib:2[${MULTILIB_USEDEP}]
- x11-libs/gtk+:3[${MULTILIB_USEDEP}]
- introspection? ( dev-libs/gobject-introspection )
- )
- imagemagick? (
- !graphicsmagick? ( media-gfx/imagemagick:=[png,jpeg?] )
- graphicsmagick? ( media-gfx/graphicsmagick:=[png,jpeg?] )
- )
- jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
- python? ( ${PYTHON_DEPS} )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- )
- v4l? ( media-libs/libv4l:0=[${MULTILIB_USEDEP}] )
- X? (
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
- )"
-
-RDEPEND="${COMMON_DEPEND}
- java? ( >=virtual/jre-1.8 )"
-
-DEPEND="${COMMON_DEPEND}
- java? (
- >=virtual/jdk-1.8
- test? (
- dev-java/hamcrest-core:1.3
- dev-java/junit:4
- )
- )
- test? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pillow[${PYTHON_MULTI_USEDEP}]
- ')
- )"
-
-BDEPEND="
- sys-devel/gettext
- virtual/pkgconfig
- gtk? ( dev-util/glib-utils )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.10-errors.patch"
- "${FILESDIR}/${PN}-0.23-r1-nonbash.patch"
- "${FILESDIR}/${P}_create_correct_pkconfig_file_for_zbar-qt5.patch"
- "${FILESDIR}/${P}_fix_detection_of_errors_in_the_v4l_read.patch"
- "${FILESDIR}/${P}_fix_python_detect.patch"
- "${FILESDIR}/${P}_fix_Qt5X11Extras_detect.patch"
- "${FILESDIR}/${P}_reset_conversion_descriptor_after_close.patch"
-)
-
-DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog )
-
-pkg_setup() {
- if use python || use test; then
- python-single-r1_pkg_setup
- fi
- use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- default
-
- if use python || use test; then
- if use test; then
- # make tests happy
- # because one of the test requires loadable py module from the current ${BUILD_DIR}
- sed -e "s|PYTHONPATH=@abs_top_srcdir@|PYTHONPATH=@builddir@|g" \
- -i test/Makefile.am.inc || die
- fi
-
- python_fix_shebang \
- examples/*.py \
- test/{test_python,barcodetest}.py # test_pygtk.py — py2 only
- fi
-
- if use java; then
- java-pkg-opt-2_src_prepare
- sed -e "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
- -i java/Makefile.am || die
- fi
-
- # do not install {LICENSE,INSTALL,etc}.md doc files with 'make install' (use DOCS=() instead)
- sed -e "s|^dist_doc_DATA =\(.*\)|dist_doc_DATA =|" -i Makefile.am || die
-
- eautoreconf
-}
-
-multilib_src_configure() {
- append-cppflags -DNDEBUG
-
- local myeconfargs=(
- $(use_with dbus)
- $(use_with gtk gtk gtk3) # default is gtk2
- $(use_with jpeg)
- $(multilib_native_use_with introspection gir)
- $(multilib_native_use_with java)
- $(multilib_native_use_with python python auto)
- $(use_enable static-libs static)
- $(use_enable threads pthread)
- $(use_enable v4l video)
- $(use_with X x)
- $(use_with X xshm)
- $(use_with xv xv)
- )
-
- if multilib_is_native_abi; then
- # both must be enabled to use GraphicsMagick
- if use graphicsmagick; then
- myeconfargs+=(
- --with-graphicsmagick
- --without-imagemagick
- )
- elif use imagemagick; then
- myeconfargs+=(
- --with-imagemagick
- --without-graphicsmagick
- )
- else
- myeconfargs+=(
- --without-imagemagick
- --without-graphicsmagick
- )
- fi
-
- if use java; then
- export JAVACFLAGS="$(java-pkg_javac-args)"
- append-cflags "$(java-pkg_get-jni-cflags)"
- if use test; then # bug 629078
- java-pkg_append_ CLASSPATH .
- java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar)
- java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)
- fi
- fi
-
- if use qt5; then
- myeconfargs+=(
- --with-qt
- --with-qt5
- )
- else
- myeconfargs+=( --without-qt )
- fi
- else
- myeconfargs+=(
- --without-qt
- --without-imagemagick
- --without-graphicsmagick
- )
- fi
-
- ECONF_SOURCE="${S}" \
- econf "${myeconfargs[@]}"
-
- # work around out-of-source build issues for multilib systems (bug 672184)
- mkdir qt zbarcam || die
-}
-
-src_test() {
- virtx multilib-minimal_src_test
-}
-
-src_install() {
- if use qt5; then
- local MULTILIB_WRAPPED_HEADERS=(
- /usr/include/zbar/QZBar.h
- /usr/include/zbar/QZBarImage.h
- )
- fi
- multilib-minimal_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${D}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
- use java && java-pkg-opt-2_pkg_preinst
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/, media-gfx/zbar/
@ 2022-05-08 23:29 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2022-05-08 23:29 UTC (permalink / raw
To: gentoo-commits
commit: 82144645ee6f94af35d580e1dafd3134bf7120da
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 8 23:16:28 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 8 23:29:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82144645
media-gfx/zbar: Drop 0.23.1
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/zbar/Manifest | 1 -
.../zbar/files/zbar-0.23.1-autoconf-2.70.patch | 38 ----
....23.1_fix_leftover_on_shell_compatibility.patch | 24 ---
.../zbar/files/zbar-0.23.1_fix_unittest.patch | 78 -------
.../files/zbar-0.23.1_musl_include_locale_h.patch | 23 ---
.../zbar/files/zbar-0.23.1_python_tp_print.patch | 55 -----
| 18 --
media-gfx/zbar/zbar-0.23.1.ebuild | 229 ---------------------
8 files changed, 466 deletions(-)
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 60c7d029a61a..3343fb13b810 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,2 +1 @@
-DIST zbar-0.23.1.tar.gz 1019268 BLAKE2B 5aa8725a0945b6f50eb78bb7b8a61e5b46356b18f07e8af778a63d46b94c894d9e827ed71bd89060898ecbdaebc5b4bb6e638939d7bc0dede390f7137770049f SHA512 ae7741cf750a10cf53dc11abcd482c3885507153ee37f6e3364ed5ed72184ebb009560b8c40d8090603a551fb681700a962838a59ce77d005d080ee49fbfa54b
DIST zbar-0.23.90.tar.gz 1005314 BLAKE2B 5d0c193509602dfb55741b421e1d28f1424ecec50aa3be584912544a587922c053284c41cf14ff0b4824095d0d376381ed055e7faf9ff394bd8d44fd9ed2971d SHA512 d73d71873bec68ee021997512a9edbd223f5f5fe43c66c4dd3502224ba6009be2e5e1714766cb8e1056244673e87e0939ed0319116f61d7371b5ab79fb5e04eb
diff --git a/media-gfx/zbar/files/zbar-0.23.1-autoconf-2.70.patch b/media-gfx/zbar/files/zbar-0.23.1-autoconf-2.70.patch
deleted file mode 100644
index be9547ead111..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.1-autoconf-2.70.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://github.com/mchehab/zbar/commit/89e7900d85dd54ef351a7ed582aec6a5a5d7fa37
-https://bugs.gentoo.org/775656
-
-From 89e7900d85dd54ef351a7ed582aec6a5a5d7fa37 Mon Sep 17 00:00:00 2001
-From: Boyuan Yang <byang@debian.org>
-Date: Thu, 31 Dec 2020 12:56:26 -0500
-Subject: [PATCH] configure.ac: Fix quote issue (autoconf 2.70 compat)
-
-One of the AS_IF() macro was not properly quoted. This commit
-fixes that issue.
-
-This patch closes: #132 (fixes this bug report).
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index df0220a8..db4bc902 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -656,7 +656,7 @@ AS_IF([test "x$with_qt" != "xno"],
- [with_qt="no"])])])
-
- AS_IF([test "x$with_qt" != "xno"],
-- AS_IF([test "x$with_qt5" != "xno"],
-+ [AS_IF([test "x$with_qt5" != "xno"],
- [AC_CHECK_PROGS(MOC, [moc-qt5 moc])
- AC_MSG_NOTICE([using moc from $MOC])
- QT_VERSION=`$PKG_CONFIG Qt5Gui --modversion`
-@@ -672,7 +672,7 @@ dnl -fPIC has no effect on Windows and breaks windres
- QT_VERSION=`$PKG_CONFIG QtGui --modversion`
- AC_MSG_NOTICE([using Qt version $QT_VERSION])
- qt_pkgconfig_file="zbar-qt.pc"
-- ]))
-+ ])])
-
- AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"])
-
diff --git a/media-gfx/zbar/files/zbar-0.23.1_fix_leftover_on_shell_compatibility.patch b/media-gfx/zbar/files/zbar-0.23.1_fix_leftover_on_shell_compatibility.patch
deleted file mode 100644
index 62993a8b2b25..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.1_fix_leftover_on_shell_compatibility.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 8e74a2e223bd40e8cf95ac2580df56ac8500a859 Mon Sep 17 00:00:00 2001
-From: Boyuan Yang <byang@debian.org>
-Date: Wed, 22 Apr 2020 10:29:39 -0400
-Subject: [PATCH] configure.ac: Fix leftover on shell compatibility
-
-Uses "=" instead of "==" in string comparision for POSIX
-compatibility. This is a leftover of previous similar fix.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 105da09..df0220a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -845,7 +845,7 @@ dnl summary log
- echo ""
- echo "please verify that the detected configuration matches your expectations:"
- echo "------------------------------------------------------------------------"
--AS_IF([test "x$USE_NLS" == "xyes"],
-+AS_IF([test "x$USE_NLS" = "xyes"],
- [echo "gettext $USE_NLS"]
- )
- AS_IF([test "x$win32" != "xno"],
diff --git a/media-gfx/zbar/files/zbar-0.23.1_fix_unittest.patch b/media-gfx/zbar/files/zbar-0.23.1_fix_unittest.patch
deleted file mode 100644
index 3f538c81138f..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.1_fix_unittest.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -ur a/configure.ac b/configure.ac
---- a/configure.ac 2020-04-21 00:09:21.000000000 +0300
-+++ b/configure.ac 2020-04-23 16:53:06.654339488 +0300
-@@ -336,6 +336,14 @@
- AC_SUBST(DBUS_CONFDIR)
- ])
-
-+dnl zbarimg tests
-+AC_ARG_WITH([zbarimg_tests],
-+ [AS_HELP_STRING([--without-zbarimg-tests],
-+ [disable tests for zbarimg])],
-+ [],
-+ [with_zbarimg_tests="yes"])
-+AM_CONDITIONAL([HAVE_ZBARIMG_TESTS], [test "x$with_zbarimg_tests" = "xyes"])
-+
- dnl libjpeg
- AC_ARG_WITH([jpeg],
- [AS_HELP_STRING([--without-jpeg],
-@@ -724,25 +732,12 @@
-
- AC_ARG_VAR([CLASSPATH], [Java class path (include JUnit to run java tests)])
- AS_IF([test "x$CLASSPATH" = "x"], [CLASSPATH="."])
-+AC_SUBST(CLASSPATH)
-
--dnl Search for Java unit test library
--AS_IF([test -z "$JUNIT_HOME"],
-- [JUNIT_HOME="/usr/share/java"])
--
--AS_IF([test -f "$JUNIT_HOME/junit4.jar"],
-- [JUNIT="$JUNIT_HOME/junit4.jar"],
-- [AS_IF([test -f "$JUNIT_HOME/junit.jar"],
-- [JUNIT="$JUNIT_HOME/junit.jar"])])
--
--AS_IF([test "x$JUNIT" != "x"],
-- [AS_IF([test -f "/usr/share/java/hamcrest/all.jar"],
-- [CLASSPATH="$JUNIT:/usr/share/java/hamcrest/all.jar:$CLASSPATH"
-- AC_SUBST(CLASSPATH)
-- with_java_unit="yes"])],
-- [AS_IF([test -f "/usr/share/java/hamcrest-all.jar"],
-- [CLASSPATH="$JUNIT:/usr/share/java/hamcrest-all.jar:$CLASSPATH"
-- AC_SUBST(CLASSPATH)
-- with_java_unit="yes"])])
-+AC_ARG_WITH([java_unit],
-+ [AS_HELP_STRING([--without-java-unit],
-+ [Enable java unittest])],
-+ [with_java_unit="yes"])
-
- AM_CONDITIONAL([HAVE_JAVA_UNIT], [test "x$with_java_unit" = "xyes"])
-
-@@ -905,6 +900,8 @@
- [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"])
-+AS_IF([test "x$with_zbarimg_tests" != "xyes"],
-+ [echo " => zbarimg tests 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"])
-diff -ur a/test/Makefile.am.inc b/test/Makefile.am.inc
---- a/test/Makefile.am.inc 2020-04-21 00:09:21.000000000 +0300
-+++ b/test/Makefile.am.inc 2020-04-23 17:03:07.819999370 +0300
-@@ -91,11 +91,16 @@
- regress-decoder: test/test_decode
- @abs_top_builddir@/test/test_decode -q -n 100000
-
-+if HAVE_ZBARIMG_TESTS
- check-images-py: zbarimg/zbarimg
- @PYTHON@ @abs_top_srcdir@/test/barcodetest.py
-
- check-images: zbarimg/zbarimg
- @abs_top_builddir@/test/test_examples.sh
-+else
-+check-images-py:
-+check-images:
-+endif
-
- check-convert: test/test_convert
- @abs_top_srcdir@/test/test_convert
diff --git a/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch b/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch
deleted file mode 100644
index 916dee61d431..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://github.com/mchehab/zbar/pull/115
---- a/zbarcam/zbarcam.c
-+++ b/zbarcam/zbarcam.c
-@@ -37,6 +37,7 @@
- #ifdef ENABLE_NLS
- #include "../zbar/gettext.h"
- # include <libintl.h>
-+# include <locale.h>
- # define _(string) gettext(string)
- #else
- # define _(string) string
---- a/zbarimg/zbarimg.c
-+++ b/zbarimg/zbarimg.c
-@@ -42,6 +42,7 @@
- #ifdef ENABLE_NLS
- #include "../zbar/gettext.h"
- # include <libintl.h>
-+# include <locale.h>
- # define _(string) gettext(string)
- #else
- # define _(string) string
---
-2.26.2
diff --git a/media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch b/media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch
deleted file mode 100644
index 8d4d821426d2..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 938d39716488b545b92c28f48acc94a7b8fc9138 Mon Sep 17 00:00:00 2001
-From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
-Date: Tue, 28 Jul 2020 10:27:30 +0200
-Subject: [PATCH] python: enum: make it compatible with Python 3.9
-
-As reported by:
- https://github.com/mchehab/zbar/issues/92
-
-python bindings don't build with Python 3.9, because it is
-using tp_print, which has been silently ignored since Python
-3.0, according with[1]:
-
- "The tp_print slot of PyTypeObject has been removed.
- It was used for printing objects to files in Python 2.7
- and before.
- Since Python 3.0, it has been ignored and unused."
-
-[1] https://docs.python.org/3.9/whatsnew/3.9.html#id3
-
-Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
----
- python/enum.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/python/enum.c b/python/enum.c
-index a1135531..dfe1b1ef 100644
---- a/python/enum.c
-+++ b/python/enum.c
-@@ -76,6 +76,8 @@ enumitem_str (zbarEnumItem *self)
- return(self->name);
- }
-
-+#if PY_MAJOR_VERSION < 3
-+/* tp_print was dropped on Python 3.9 */
- static int
- enumitem_print (zbarEnumItem *self,
- FILE *fp,
-@@ -83,6 +85,7 @@ enumitem_print (zbarEnumItem *self,
- {
- return(self->name->ob_type->tp_print(self->name, fp, flags));
- }
-+#endif
-
- static PyObject*
- enumitem_repr (zbarEnumItem *self)
-@@ -115,7 +118,9 @@ PyTypeObject zbarEnumItem_Type = {
- .tp_new = (newfunc)enumitem_new,
- .tp_dealloc = (destructor)enumitem_dealloc,
- .tp_str = (reprfunc)enumitem_str,
-+#if PY_MAJOR_VERSION < 3
- .tp_print = (printfunc)enumitem_print,
-+#endif
- .tp_repr = (reprfunc)enumitem_repr,
- };
-
diff --git a/media-gfx/zbar/files/zbar-0.23_fix_Qt5X11Extras_detect.patch b/media-gfx/zbar/files/zbar-0.23_fix_Qt5X11Extras_detect.patch
deleted file mode 100644
index 7692db41e0da..000000000000
--- a/media-gfx/zbar/files/zbar-0.23_fix_Qt5X11Extras_detect.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur a/configure.ac b/configure.ac
---- a/configure.ac 2019-05-23 23:37:12.000000000 +0300
-+++ b/configure.ac 2020-01-22 12:27:14.190755156 +0300
-@@ -638,13 +638,9 @@
-
- AC_ARG_VAR([MOC], [full path to Qt moc program])
-
--AS_IF([test "x$have_x" = "xyes"],
-- [qt_extra="Qt5X11Extras >= 5.0"],
-- [qt_extra=""])
--
- AS_IF([test "x$with_qt" != "xno"],
- [PKG_CHECK_MODULES([QT],
-- [Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 $qt_extra],,
-+ [Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 Qt5X11Extras >= 5.0],,
- [with_qt5 = "no"
- PKG_CHECK_MODULES([QT],
- [QtCore >= 4 QtGui >= 4],,
diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild b/media-gfx/zbar/zbar-0.23.1.ebuild
deleted file mode 100644
index 56e14bbc04eb..000000000000
--- a/media-gfx/zbar/zbar-0.23.1.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx
-
-DESCRIPTION="Library and tools for reading barcodes from images or video"
-HOMEPAGE="https://github.com/mchehab/zbar"
-SRC_URI="https://github.com/mchehab/zbar/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg nls python qt5 static-libs test +threads v4l X xv"
-REQUIRED_USE="
- introspection? ( gtk )
- python? ( ${PYTHON_REQUIRED_USE} )
- test? (
- ${PYTHON_REQUIRED_USE}
- X? ( imagemagick )
- )
- xv? ( X )"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
- gtk? (
- dev-libs/glib:2[${MULTILIB_USEDEP}]
- x11-libs/gtk+:3[${MULTILIB_USEDEP}]
- introspection? ( dev-libs/gobject-introspection )
- )
- imagemagick? (
- !graphicsmagick? ( media-gfx/imagemagick:=[png,jpeg?] )
- graphicsmagick? ( media-gfx/graphicsmagick:=[png,jpeg?] )
- )
- jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
- python? ( ${PYTHON_DEPS} )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- )
- v4l? ( media-libs/libv4l:0=[${MULTILIB_USEDEP}] )
- X? (
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
- )"
-
-RDEPEND="${COMMON_DEPEND}
- java? ( >=virtual/jre-1.8 )"
-
-DEPEND="${COMMON_DEPEND}
- java? (
- >=virtual/jdk-1.8
- test? (
- dev-java/hamcrest-core:1.3
- dev-java/junit:4
- )
- )
- test? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pillow[${PYTHON_USEDEP}]
- ')
- )"
-
-BDEPEND="
- app-text/xmlto
- virtual/pkgconfig
- gtk? ( dev-util/glib-utils )
- nls? (
- sys-devel/gettext
- virtual/libiconv
- )"
-
-PATCHES=(
- "${FILESDIR}/${P}_fix_leftover_on_shell_compatibility.patch"
- "${FILESDIR}/${P}_fix_unittest.patch"
- "${FILESDIR}/${P}_musl_include_locale_h.patch"
- "${FILESDIR}/${PN}-0.23_fix_Qt5X11Extras_detect.patch"
- "${FILESDIR}/${PN}-0.23_fix_python_detect.patch"
- "${FILESDIR}/${P}-autoconf-2.70.patch"
- "${FILESDIR}/${PN}-0.23.1_python_tp_print.patch"
-)
-
-DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog )
-
-pkg_setup() {
- if use python || use test; then
- python-single-r1_pkg_setup
- fi
- use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- default
-
- if use python || use test; then
- if use test; then
- # make tests happy
- # because one of the test requires loadable py module from the current ${BUILD_DIR}
- sed -e "s|PYTHONPATH=@abs_top_srcdir@|PYTHONPATH=@builddir@|g" \
- -i test/Makefile.am.inc || die
- fi
-
- python_fix_shebang \
- examples/*.py \
- test/{test_python,barcodetest}.py # test_pygtk.py — py2 only
- fi
-
- if use java; then
- java-pkg-opt-2_src_prepare
- sed -e "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
- -i java/Makefile.am || die
- fi
-
- # do not install {LICENSE,INSTALL,etc} doc files with 'make install' (use DOCS=() instead)
- sed -e "s|^dist_doc_DATA =\(.*\)|dist_doc_DATA =|" -i Makefile.am || die
-
- eautoreconf
-}
-
-multilib_src_configure() {
- append-cppflags -DNDEBUG
-
- local myeconfargs=(
- $(use_with dbus)
- $(use_with gtk gtk gtk3) # default is gtk2
- $(use_with jpeg)
- $(multilib_native_use_with introspection gir)
- $(multilib_native_use_with java)
- $(multilib_native_use_with python python auto)
- $(use_enable nls)
- $(use_enable static-libs static)
- $(use_enable threads pthread)
- $(use_enable v4l video)
- $(use_with X x)
- $(use_with X xshm)
- $(use_with xv xv)
- )
-
- if multilib_is_native_abi; then
- # both must be enabled to use GraphicsMagick
- if use graphicsmagick; then
- myeconfargs+=(
- --with-graphicsmagick
- --without-imagemagick
- )
- elif use imagemagick; then
- myeconfargs+=(
- --with-imagemagick
- --without-graphicsmagick
- )
- else
- myeconfargs+=(
- --without-imagemagick
- --without-graphicsmagick
- )
- fi
-
- if use java; then
- export JAVACFLAGS="$(java-pkg_javac-args)"
- append-cflags "$(java-pkg_get-jni-cflags)"
- if use test; then # bug 629078
- myeconfargs+=( --with-java-unit )
- java-pkg_append_ CLASSPATH .
- java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar)
- java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)
- fi
- fi
-
- if use qt5; then
- myeconfargs+=(
- --with-qt
- --with-qt5
- )
- else
- myeconfargs+=( --without-qt )
- fi
- else
- myeconfargs+=(
- --without-graphicsmagick
- --without-imagemagick
- --without-qt
- )
-
- # zbarimg tests with native abi only
- # (this option from the patch above, stay up to date)
- use test && myeconfargs+=( --without-zbarimg-tests )
- fi
-
- # use bash (bug 721370)
- CONFIG_SHELL='/bin/bash' \
- ECONF_SOURCE="${S}" \
- econf "${myeconfargs[@]}"
-
- # work around out-of-source build issues for multilib systems (bug 672184)
- mkdir qt zbarcam || die
-}
-
-src_test() {
- virtx multilib-minimal_src_test
-}
-
-src_install() {
- if use qt5; then
- local MULTILIB_WRAPPED_HEADERS=(
- /usr/include/zbar/QZBar.h
- /usr/include/zbar/QZBarImage.h
- )
- fi
- multilib-minimal_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${D}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
- use java && java-pkg-opt-2_pkg_preinst
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/, media-gfx/zbar/
@ 2023-03-09 8:53 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-03-09 8:53 UTC (permalink / raw
To: gentoo-commits
commit: 035ef8e2450a78522ce571217caf407694059f4f
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Wed Mar 8 08:38:08 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 9 08:53:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=035ef8e2
media-gfx/zbar: add 0.23.92
- Backport patch for py3.11 from upstraem
- Fix test build issue with musl libc. Test needs to be linked with
sys-libs/argp-standalone.
- switch dependency to media-libs/libjpeg-turbo instead of deprecated
virtual/jpeg
- directly append test jars to CLASSPATH variable in order to avoid
internal usage of java-pkg_append_ function from java-utils-2 eclass,
however, it is not necessary to append "." because test does that
automatically, see [1].
[1] https://github.com/mchehab/zbar/blob/9f0cbc70aba627afe02cb0afdb8fbc39eb4f229d/java/Makefile.am#L58-L59
Closes: https://bugs.gentoo.org/836256
Closes: https://bugs.gentoo.org/896994
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/29990
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/zbar/Manifest | 1 +
.../zbar/files/zbar-0.23.92-py311-set-size.patch | 30 +++
media-gfx/zbar/zbar-0.23.92.ebuild | 235 +++++++++++++++++++++
3 files changed, 266 insertions(+)
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 3343fb13b810..3cac58789899 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1 +1,2 @@
DIST zbar-0.23.90.tar.gz 1005314 BLAKE2B 5d0c193509602dfb55741b421e1d28f1424ecec50aa3be584912544a587922c053284c41cf14ff0b4824095d0d376381ed055e7faf9ff394bd8d44fd9ed2971d SHA512 d73d71873bec68ee021997512a9edbd223f5f5fe43c66c4dd3502224ba6009be2e5e1714766cb8e1056244673e87e0939ed0319116f61d7371b5ab79fb5e04eb
+DIST zbar-0.23.92.tar.gz 1005358 BLAKE2B 97af3c399333abfcd64e45e6c4f38e5da6ed1540447f35f0efe9bc0fb8d296d80c964452afa29d26d22bddd8de31bc3ca6582db38afe8416e9480f11b939e040 SHA512 cae47fb199173fc1c052984865ca0e6aeab330bd6d77506a0937994d459deb4419a3e54e2dcd2e9830ffb8acf14f29e22e0a6becc9e4cfe19b07dad1babe9513
diff --git a/media-gfx/zbar/files/zbar-0.23.92-py311-set-size.patch b/media-gfx/zbar/files/zbar-0.23.92-py311-set-size.patch
new file mode 100644
index 000000000000..a51193af7777
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.23.92-py311-set-size.patch
@@ -0,0 +1,30 @@
+Upstream-PR: https://github.com/mchehab/zbar/pull/231
+
+diff --git a/python/enum.c b/python/enum.c
+index ba22ba63..4644509e 100644
+--- a/python/enum.c
++++ b/python/enum.c
+@@ -50,7 +50,11 @@ static zbarEnumItem *enumitem_new(PyTypeObject *type, PyObject *args,
+
+ /* we assume the "fast path" for a single-digit ints (see longobject.c) */
+ /* this also holds if we get a small_int preallocated long */
++#if PY_VERSION_HEX >= 0x030900A4
++ Py_SET_SIZE(&self->val, Py_SIZE(longval));
++#else
+ Py_SIZE(&self->val) = Py_SIZE(longval);
++#endif
+ self->val.ob_digit[0] = longval->ob_digit[0];
+ Py_DECREF(longval);
+ #else
+@@ -129,7 +133,11 @@ zbarEnumItem *zbarEnumItem_New(PyObject *byname, PyObject *byvalue, int val,
+
+ /* we assume the "fast path" for a single-digit ints (see longobject.c) */
+ /* this also holds if we get a small_int preallocated long */
++#if PY_VERSION_HEX >= 0x030900A4
++ Py_SET_SIZE(&self->val, Py_SIZE(longval));
++#else
+ Py_SIZE(&self->val) = Py_SIZE(longval);
++#endif
+ self->val.ob_digit[0] = longval->ob_digit[0];
+ Py_DECREF(longval);
+
diff --git a/media-gfx/zbar/zbar-0.23.92.ebuild b/media-gfx/zbar/zbar-0.23.92.ebuild
new file mode 100644
index 000000000000..f2233c1e697c
--- /dev/null
+++ b/media-gfx/zbar/zbar-0.23.92.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 qmake-utils virtualx
+
+DESCRIPTION="Library and tools for reading barcodes from images or video"
+HOMEPAGE="https://github.com/mchehab/zbar"
+SRC_URI="https://github.com/mchehab/zbar/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg nls python qt5 static-libs test +threads v4l X xv"
+
+REQUIRED_USE="
+ introspection? ( gtk )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ test? (
+ ${PYTHON_REQUIRED_USE}
+ X? ( imagemagick )
+ )
+ xv? ( X )"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+ gtk? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ introspection? ( dev-libs/gobject-introspection )
+ )
+ imagemagick? (
+ !graphicsmagick? ( media-gfx/imagemagick:=[png,jpeg?] )
+ graphicsmagick? ( media-gfx/graphicsmagick:=[png,jpeg?] )
+ )
+ jpeg? ( media-libs/libjpeg-turbo:0[${MULTILIB_USEDEP}] )
+ python? ( ${PYTHON_DEPS} )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ )
+ v4l? ( media-libs/libv4l:0=[${MULTILIB_USEDEP}] )
+ X? (
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
+ )"
+
+RDEPEND="${COMMON_DEPEND}
+ java? ( >=virtual/jre-1.8 )"
+
+DEPEND="${COMMON_DEPEND}
+ java? (
+ >=virtual/jdk-1.8
+ test? (
+ dev-java/hamcrest-core:1.3
+ dev-java/junit:4
+ )
+ )
+ test? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/pillow[${PYTHON_USEDEP}]
+ ')
+ elibc_musl? ( sys-libs/argp-standalone )
+ )"
+
+BDEPEND="
+ app-text/xmlto
+ sys-devel/gettext
+ virtual/pkgconfig
+ gtk? ( dev-util/glib-utils )
+ nls? (
+ sys-devel/gettext
+ virtual/libiconv
+ )"
+
+DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog )
+
+PATCHES=(
+ # git master
+ "${FILESDIR}/${PN}-0.23.90-fix-gtk-default.patch"
+ # TODO: upstream?
+ "${FILESDIR}/${PN}-0.23_fix_python_detect.patch"
+ "${FILESDIR}/${PN}-0.23.90-fix-unittest.patch"
+ "${FILESDIR}/${PN}-0.23.90-fix-qt5x11extras-detect.patch"
+ "${FILESDIR}/${P}-py311-set-size.patch"
+)
+
+pkg_setup() {
+ if use python || use test; then
+ python-single-r1_pkg_setup
+ fi
+ use java && java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ if use python || use test; then
+ if use test; then
+ # make tests happy
+ # because one of the test requires loadable py module from the current ${BUILD_DIR}
+ sed -e "s|PYTHONPATH=@abs_top_srcdir@|PYTHONPATH=@builddir@|g" \
+ -i test/Makefile.am.inc || die
+ fi
+
+ python_fix_shebang \
+ examples/*.py \
+ test/{test_python,barcodetest}.py # test_pygtk.py — py2 only
+ fi
+
+ if use java; then
+ java-pkg-opt-2_src_prepare
+ sed -e "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
+ -i java/Makefile.am || die
+ fi
+
+ # do not install {LICENSE,INSTALL,etc} doc files with 'make install' (use DOCS=() instead)
+ sed -e "s|^dist_doc_DATA =\(.*\)|dist_doc_DATA =|" -i Makefile.am || die
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ append-cppflags -DNDEBUG
+
+ local myeconfargs=(
+ $(use_with dbus)
+ $(use_with gtk gtk gtk3) # avoid 'auto'
+ $(use_with jpeg)
+ $(multilib_native_use_with introspection gir)
+ $(multilib_native_use_with java)
+ $(multilib_native_use_with python python auto)
+ $(use_enable nls)
+ $(use_enable static-libs static)
+ $(use_enable threads pthread)
+ $(use_enable v4l video)
+ $(use_with X x)
+ $(use_with X xshm)
+ $(use_with xv xv)
+ )
+
+ if multilib_is_native_abi; then
+ # both must be enabled to use GraphicsMagick
+ if use imagemagick && use graphicsmagick; then
+ myeconfargs+=(
+ --with-graphicsmagick
+ --without-imagemagick
+ )
+ elif ! use graphicsmagick && use imagemagick; then
+ myeconfargs+=(
+ --with-imagemagick
+ --without-graphicsmagick
+ )
+ else
+ myeconfargs+=(
+ --without-imagemagick
+ --without-graphicsmagick
+ )
+ fi
+
+ if use java; then
+ export JAVACFLAGS="$(java-pkg_javac-args)"
+ append-cflags "$(java-pkg_get-jni-cflags)"
+ if use test; then # bug 629078
+ myeconfargs+=( --with-java-unit )
+ CLASSPATH+=":$(java-pkg_getjar --build-only junit-4 junit.jar)"
+ CLASSPATH+=":$(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)"
+ fi
+ fi
+
+ if use qt5; then
+ myeconfargs+=(
+ --with-qt
+ --with-qt5
+ )
+ else
+ myeconfargs+=( --without-qt )
+ fi
+
+ if use test && use elibc_musl; then
+ append-ldflags -largp
+ fi
+
+ else
+ myeconfargs+=(
+ --without-graphicsmagick
+ --without-imagemagick
+ --without-qt
+ )
+
+ # zbarimg tests with native abi only
+ # (this option from the patch above, stay up to date)
+ use test && myeconfargs+=( --without-zbarimg-tests )
+ fi
+
+ # use bash (bug 721370)
+ CONFIG_SHELL='/bin/bash' \
+ ECONF_SOURCE="${S}" \
+ MOC="$(qt5_get_bindir)"/moc \
+ econf "${myeconfargs[@]}"
+
+ # work around out-of-source build issues for multilib systems (bug 672184)
+ mkdir qt zbarcam || die
+}
+
+src_test() {
+ virtx multilib-minimal_src_test
+}
+
+src_install() {
+ if use qt5; then
+ local MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/zbar/QZBar.h
+ /usr/include/zbar/QZBarImage.h
+ )
+ fi
+ multilib-minimal_src_install
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+ use java && java-pkg-opt-2_pkg_preinst
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-03-09 8:53 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-08 23:29 [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/, media-gfx/zbar/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-03-09 8:53 Sam James
2021-06-04 11:23 Marek Szuba
2021-06-04 11:23 Marek Szuba
2020-02-03 17:37 Andreas Sturmlechner
2018-11-25 17:36 Andreas Sturmlechner
2017-05-23 9:20 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox