[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 235c87a514ce6b92326ae084c749dbc9c86b726c
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Fri Sep 29 11:10:39 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Sep 29 13:04:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=235c87a5
media-gfx/zbar: drop 0.23.90
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/33120
Signed-off-by: Arthur Zamarin gentoo.org>
media-gfx/zbar/Manifest| 1 -
media-gfx/zbar/zbar-0.23.90.ebuild | 229 -
2 files changed, 230 deletions(-)
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 3cac58789899..bad02d9095d4 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,2 +1 @@
-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/zbar-0.23.90.ebuild
b/media-gfx/zbar/zbar-0.23.90.ebuild
deleted file mode 100644
index 68bd3dce3e8e..
--- a/media-gfx/zbar/zbar-0.23.90.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-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? ( 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
- 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}/${P}-fix-gtk-default.patch"
- # TODO: upstream?
- "${FILESDIR}/${PN}-0.23_fix_python_detect.patch"
- "${FILESDIR}/${P}-fix-unittest.patch"
- "${FILESDIR}/${P}-fix-qt5x11extras-detect.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
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 97fc4383a8e3cc625b7209b7043a1a302b69289a
Author: Sam James gentoo org>
AuthorDate: Wed Apr 12 01:49:52 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Apr 12 01:49:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97fc4383
media-gfx/zbar: Stabilize 0.23.92 x86, #904188
Signed-off-by: Sam James gentoo.org>
media-gfx/zbar/zbar-0.23.92.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/zbar/zbar-0.23.92.ebuild
b/media-gfx/zbar/zbar-0.23.92.ebuild
index 47c378392f9c..5b8d7360950c 100644
--- a/media-gfx/zbar/zbar-0.23.92.ebuild
+++ b/media-gfx/zbar/zbar-0.23.92.ebuild
@@ -12,7 +12,7 @@ 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"
+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="
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 74d16a5b1ff8e680bd85cca58369ca98d075c988
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Apr 11 19:05:41 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Apr 11 19:05:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74d16a5b
media-gfx/zbar: Stabilize 0.23.92 amd64, #904188
Signed-off-by: Arthur Zamarin gentoo.org>
media-gfx/zbar/zbar-0.23.92.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/zbar/zbar-0.23.92.ebuild
b/media-gfx/zbar/zbar-0.23.92.ebuild
index f2233c1e697c..47c378392f9c 100644
--- a/media-gfx/zbar/zbar-0.23.92.ebuild
+++ b/media-gfx/zbar/zbar-0.23.92.ebuild
@@ -12,7 +12,7 @@ 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"
+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="
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/, media-gfx/zbar/
commit: 035ef8e2450a78522ce571217caf407694059f4f
Author: Petr Vaněk atlas cz>
AuthorDate: Wed Mar 8 08:38:08 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Mar 9 08:53:18 2023 +
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 atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/29990
Signed-off-by: Sam James 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 ..a51193af
--- /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(>val, Py_SIZE(longval));
++#else
+ Py_SIZE(>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(>val, Py_SIZE(longval));
++#else
+ Py_SIZE(>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 ..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? (
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 48c9cdacf049a7af3a8ead57312188e813b47108
Author: Joonas Niilola gentoo org>
AuthorDate: Tue Aug 2 10:12:21 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Tue Aug 2 10:13:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48c9cdac
media-gfx/zbar: fix configure logic for imagemagick<->graphicsmagick
- tested on stable amd64.
Closes: https://bugs.gentoo.org/784362
Signed-off-by: Joonas Niilola gentoo.org>
media-gfx/zbar/zbar-0.23.90.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/media-gfx/zbar/zbar-0.23.90.ebuild
b/media-gfx/zbar/zbar-0.23.90.ebuild
index 46b85c382176..3389a83eaacd 100644
--- a/media-gfx/zbar/zbar-0.23.90.ebuild
+++ b/media-gfx/zbar/zbar-0.23.90.ebuild
@@ -72,6 +72,7 @@ DEPEND="${COMMON_DEPEND}
BDEPEND="
app-text/xmlto
+ sys-devel/gettext
virtual/pkgconfig
gtk? ( dev-util/glib-utils )
nls? (
@@ -146,12 +147,12 @@ multilib_src_configure() {
if multilib_is_native_abi; then
# both must be enabled to use GraphicsMagick
- if use graphicsmagick; then
+ if use imagemagick && use graphicsmagick; then
myeconfargs+=(
--with-graphicsmagick
--without-imagemagick
)
- elif use imagemagick; then
+ elif ! use graphicsmagick && use imagemagick; then
myeconfargs+=(
--with-imagemagick
--without-graphicsmagick
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/, media-gfx/zbar/
commit: 82144645ee6f94af35d580e1dafd3134bf7120da Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun May 8 23:16:28 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun May 8 23:29:28 2022 + 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 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 - .../files/zbar-0.23_fix_Qt5X11Extras_detect.patch | 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.. --- 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 -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.. --- 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 -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.. --- 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.0 +0300 -+++ b/configure.ac
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 30436f2c8043874307488ce0b4de7de0020171ea
Author: Jakov Smolić gentoo org>
AuthorDate: Mon Apr 11 06:34:31 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Mon Apr 11 06:34:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30436f2c
media-gfx/zbar: Stabilize 0.23.90 x86, #836843
Signed-off-by: Jakov Smolić gentoo.org>
media-gfx/zbar/zbar-0.23.90.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/zbar/zbar-0.23.90.ebuild
b/media-gfx/zbar/zbar-0.23.90.ebuild
index e2cea8bdc500..46b85c382176 100644
--- a/media-gfx/zbar/zbar-0.23.90.ebuild
+++ b/media-gfx/zbar/zbar-0.23.90.ebuild
@@ -12,7 +12,7 @@ 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"
+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="
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: cc4675328d686969e8c7a9a8dacfc7b39880e81c
Author: Jakov Smolić gentoo org>
AuthorDate: Mon Apr 11 06:34:05 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Mon Apr 11 06:34:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc467532
media-gfx/zbar: Stabilize 0.23.90 amd64, #836843
Signed-off-by: Jakov Smolić gentoo.org>
media-gfx/zbar/zbar-0.23.90.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/zbar/zbar-0.23.90.ebuild
b/media-gfx/zbar/zbar-0.23.90.ebuild
index 91cdcabb9f33..e2cea8bdc500 100644
--- a/media-gfx/zbar/zbar-0.23.90.ebuild
+++ b/media-gfx/zbar/zbar-0.23.90.ebuild
@@ -12,7 +12,7 @@ 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"
+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="
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/, media-gfx/zbar/files/
commit: f108b95e0cc1025f4c6d8119b14e779ff843230e Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Apr 5 15:30:03 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 5 16:33:48 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f108b95e media-gfx/zbar: 0.23.90 version bump, EAPI-8 bump Fix build without dev-qt/qtchooser's unversioned Qt5 binaries in PATH. Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/zbar/Manifest| 1 + .../zbar/files/zbar-0.23.90-fix-gtk-default.patch | 35 .../zbar-0.23.90-fix-qt5x11extras-detect.patch | 18 ++ .../zbar/files/zbar-0.23.90-fix-unittest.patch | 78 +++ media-gfx/zbar/zbar-0.23.90.ebuild | 228 + 5 files changed, 360 insertions(+) diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest index a72b685b4bf3..60c7d029a61a 100644 --- a/media-gfx/zbar/Manifest +++ b/media-gfx/zbar/Manifest @@ -1 +1,2 @@ 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.90-fix-gtk-default.patch b/media-gfx/zbar/files/zbar-0.23.90-fix-gtk-default.patch new file mode 100644 index ..b1316243dd24 --- /dev/null +++ b/media-gfx/zbar/files/zbar-0.23.90-fix-gtk-default.patch @@ -0,0 +1,35 @@ +From 468f6bda627d683b3f40dbaf242c158409666f7e Mon Sep 17 00:00:00 2001 +From: Mauro Carvalho Chehab +Date: Sat, 13 Mar 2021 18:04:57 +0100 +Subject: [PATCH] configure.ac: fix some issues with gtk parameter + +By default, it uses Gtk3. Also, the with_gtk set to "no" +is wrong. + +Signed-off-by: Mauro Carvalho Chehab +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b6f87531..30a59f72 100644 +--- a/configure.ac b/configure.ac +@@ -492,7 +492,7 @@ AS_IF([test "x$with_npapi" != "xno"], + AM_CONDITIONAL([HAVE_NPAPI], [test "x$with_npapi" = "xyes"]) + + dnl GTK +-dnl For now, defaults to GTK version 2 ++dnl For now, defaults to GTK version 3 + + AC_ARG_WITH([gtk], + [AS_HELP_STRING([--with-gtk], +@@ -500,7 +500,7 @@ AC_ARG_WITH([gtk], + [AS_IF([test "x$with_gtk" != "xno" && test "x$with_gtk" != "xauto" && + test "x$with_gtk" != "xgtk2" && test "x$with_gtk" != "xgtk3"], + [echo "Invalid value for --with-gtk. Falling back to 'no'" +- with_gtk="xno"])], ++ with_gtk="no"])], + [with_gtk="auto"]) + + AC_ARG_VAR([GLIB_GENMARSHAL], [full path to glib-genmarshal]) diff --git a/media-gfx/zbar/files/zbar-0.23.90-fix-qt5x11extras-detect.patch b/media-gfx/zbar/files/zbar-0.23.90-fix-qt5x11extras-detect.patch new file mode 100644 index ..e8f6357eb486 --- /dev/null +++ b/media-gfx/zbar/files/zbar-0.23.90-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.0 +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.90-fix-unittest.patch b/media-gfx/zbar/files/zbar-0.23.90-fix-unittest.patch new file mode 100644 index ..589ebd4e287c --- /dev/null +++ b/media-gfx/zbar/files/zbar-0.23.90-fix-unittest.patch @@ -0,0 +1,78 @@ +diff -ur a/configure.ac b/configure.ac +--- a/configure.ac 2020-04-21 00:09:21.0 +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], +
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/, media-gfx/zbar/
commit: 8b42c8ee68fc3b3de5b4eb401f8432e936843b01
Author: Marek Szuba gentoo org>
AuthorDate: Fri Jun 4 11:20:55 2021 +
Commit: Marek Szuba gentoo org>
CommitDate: Fri Jun 4 11:23:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b42c8ee
media-gfx/zbar: drop 0.23-r1
Signed-off-by: Marek Szuba 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..000
--- 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
- #include
-+#include
-
- 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..000
--- 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
-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],
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/, media-gfx/zbar/
commit: 7efabb81f9bbfc7ea149285949a27400ea6db736
Author: Marek Szuba gentoo org>
AuthorDate: Fri Jun 4 11:21:30 2021 +
Commit: Marek Szuba gentoo org>
CommitDate: Fri Jun 4 11:23:44 2021 +
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 fastmail.fm>
Closes: https://bugs.gentoo.org/788703
Signed-off-by: Marek Szuba 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 000..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
+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
+---
+ 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 )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: de0de64dcbef3f6751c06f1ca33dca9761d6566f Author: Sam James gentoo org> AuthorDate: Tue Apr 6 21:15:05 2021 + Commit: Sam James gentoo org> CommitDate: Tue Apr 6 21:15:05 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de0de64d media-gfx/zbar: retire proxied maintainer Signed-off-by: Sam James gentoo.org> media-gfx/zbar/metadata.xml | 9 + 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/media-gfx/zbar/metadata.xml b/media-gfx/zbar/metadata.xml index 14483e82c58..21d625e4e4c 100644 --- a/media-gfx/zbar/metadata.xml +++ b/media-gfx/zbar/metadata.xml @@ -1,14 +1,7 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - em...@linxon.ru - Yury Martynov - - - proxy-ma...@gentoo.org - Proxy Maintainers - + zbar mchehab/zbar
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/, media-gfx/zbar/files/
commit: a9dfcd0754e2988c0cc78b996238c2d7d429d8a1
Author: Sam James gentoo org>
AuthorDate: Tue Mar 16 15:06:32 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Mar 16 15:06:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9dfcd07
media-gfx/zbar: add autoconf 2.70 patch
Closes: https://bugs.gentoo.org/775656
Signed-off-by: Sam James gentoo.org>
.../zbar/files/zbar-0.23.1-autoconf-2.70.patch | 38 ++
media-gfx/zbar/zbar-0.23.1.ebuild | 5 +--
2 files changed, 41 insertions(+), 2 deletions(-)
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
new file mode 100644
index 000..be9547ead11
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.23.1-autoconf-2.70.patch
@@ -0,0 +1,38 @@
+https://github.com/mchehab/zbar/commit/89e7900d85dd54ef351a7ed582aec6a5a5d7fa37
+https://bugs.gentoo.org/775656
+
+From 89e7900d85dd54ef351a7ed582aec6a5a5d7fa37 Mon Sep 17 00:00:00 2001
+From: Boyuan Yang
+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/zbar-0.23.1.ebuild
b/media-gfx/zbar/zbar-0.23.1.ebuild
index 2f529efbe04..d74a878a969 100644
--- a/media-gfx/zbar/zbar-0.23.1.ebuild
+++ b/media-gfx/zbar/zbar-0.23.1.ebuild
@@ -84,8 +84,9 @@ PATCHES=(
"${FILESDIR}/${P}_fix_leftover_on_shell_compatibility.patch"
"${FILESDIR}/${P}_fix_unittest.patch"
"${FILESDIR}/${P}_musl_include_locale_h.patch"
- "${FILESDIR}/zbar-0.23_fix_Qt5X11Extras_detect.patch"
- "${FILESDIR}/zbar-0.23_fix_python_detect.patch"
+ "${FILESDIR}/${PN}-0.23_fix_Qt5X11Extras_detect.patch"
+ "${FILESDIR}/${PN}-0.23_fix_python_detect.patch"
+ "${FILESDIR}/${P}-autoconf-2.70.patch"
)
DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/, media-gfx/zbar/files/
commit: 91ca0c194e16f0a710264f0c6e09b9210160e845
Author: Petr Vaněk atlas cz>
AuthorDate: Sat Feb 27 16:05:01 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Feb 27 16:28:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91ca0c19
media-gfx/zbar: fix musl build
The patch is taken from upstream
https://github.com/mchehab/zbar/pull/115
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/19688
Signed-off-by: Sam James gentoo.org>
.../files/zbar-0.23.1_musl_include_locale_h.patch | 26 ++
media-gfx/zbar/zbar-0.23.1.ebuild | 1 +
2 files changed, 27 insertions(+)
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
new file mode 100644
index 000..3262dd1abcb
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch
@@ -0,0 +1,26 @@
+diff --git a/zbarcam/zbarcam.c b/zbarcam/zbarcam.c
+index f7ea281..2452613 100644
+--- a/zbarcam/zbarcam.c
b/zbarcam/zbarcam.c
+@@ -37,6 +37,7 @@
+ #ifdef ENABLE_NLS
+ #include "../zbar/gettext.h"
+ # include
++# include
+ # define _(string) gettext(string)
+ #else
+ # define _(string) string
+diff --git a/zbarimg/zbarimg.c b/zbarimg/zbarimg.c
+index 0796fd8..3192ec1 100644
+--- a/zbarimg/zbarimg.c
b/zbarimg/zbarimg.c
+@@ -42,6 +42,7 @@
+ #ifdef ENABLE_NLS
+ #include "../zbar/gettext.h"
+ # include
++# include
+ # define _(string) gettext(string)
+ #else
+ # define _(string) string
+--
+2.26.2
diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild
b/media-gfx/zbar/zbar-0.23.1.ebuild
index d5805ede1de..2f529efbe04 100644
--- a/media-gfx/zbar/zbar-0.23.1.ebuild
+++ b/media-gfx/zbar/zbar-0.23.1.ebuild
@@ -83,6 +83,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${P}_fix_leftover_on_shell_compatibility.patch"
"${FILESDIR}/${P}_fix_unittest.patch"
+ "${FILESDIR}/${P}_musl_include_locale_h.patch"
"${FILESDIR}/zbar-0.23_fix_Qt5X11Extras_detect.patch"
"${FILESDIR}/zbar-0.23_fix_python_detect.patch"
)
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/
commit: 39a498488dcbed644cdf0cfa10c8ca9d70e7066a Author: Sam James gentoo org> AuthorDate: Sat Feb 27 16:29:11 2021 + Commit: Sam James gentoo org> CommitDate: Sat Feb 27 16:29:11 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39a49848 media-gfx/zbar: add musl patch metadata Signed-off-by: Sam James gentoo.org> media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) 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 index 3262dd1abcb..916dee61d43 100644 --- 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 @@ -1,5 +1,4 @@ -diff --git a/zbarcam/zbarcam.c b/zbarcam/zbarcam.c -index f7ea281..2452613 100644 +https://github.com/mchehab/zbar/pull/115 --- a/zbarcam/zbarcam.c +++ b/zbarcam/zbarcam.c @@ -37,6 +37,7 @@ @@ -10,8 +9,6 @@ index f7ea281..2452613 100644 # define _(string) gettext(string) #else # define _(string) string -diff --git a/zbarimg/zbarimg.c b/zbarimg/zbarimg.c -index 0796fd8..3192ec1 100644 --- a/zbarimg/zbarimg.c +++ b/zbarimg/zbarimg.c @@ -42,6 +42,7 @@
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/, media-gfx/zbar/files/
commit: 21481b475595cb9affd1c6b87b648321378c9547
Author: Sam James gentoo org>
AuthorDate: Sat Feb 27 16:33:03 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Feb 27 16:33:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21481b47
media-gfx/zbar: add nonbash patch to 0.23-r1
Thanks-to: Klaus Ethgen Ethgen.de>
Closes: https://bugs.gentoo.org/769716
Signed-off-by: Sam James gentoo.org>
media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch | 120
media-gfx/zbar/zbar-0.23-r1.ebuild | 1 +
2 files changed, 121 insertions(+)
diff --git a/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch
b/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch
new file mode 100644
index 000..1206a209d45
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch
@@ -0,0 +1,120 @@
+https://bugs.gentoo.org/769716
+
+From 4bd586181dde6196cb60602f228c4deb07818989 Mon Sep 17 00:00:00 2001
+From: Klaus Ethgen
+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_qtQt${QT_VERSION}"
+ echo "Java --with-java=$with_java"
+-AS_IF([test "x$win32" == "xno"],
++AS_IF([test "x$win32" = "xno"],
+ [echo "Dbus
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 816fd834f458b369039c1cf360033e461aca51a0
Author: Sam James gentoo org>
AuthorDate: Sun Feb 21 20:23:50 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 21 20:23:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=816fd834
media-gfx/zbar: Stabilize 0.23.1 amd64, #771903
Signed-off-by: Sam James gentoo.org>
media-gfx/zbar/zbar-0.23.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild
b/media-gfx/zbar/zbar-0.23.1.ebuild
index 62ce06989f7..d5805ede1de 100644
--- a/media-gfx/zbar/zbar-0.23.1.ebuild
+++ b/media-gfx/zbar/zbar-0.23.1.ebuild
@@ -13,7 +13,7 @@ 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"
+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="
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: ca57dc6d99bcb3cd0e1f3883143641f177bf6593
Author: Sam James gentoo org>
AuthorDate: Sun Feb 21 20:23:25 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 21 20:23:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca57dc6d
media-gfx/zbar: Stabilize 0.23.1 x86, #771903
Signed-off-by: Sam James gentoo.org>
media-gfx/zbar/zbar-0.23.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild
b/media-gfx/zbar/zbar-0.23.1.ebuild
index bb80d1bc91b..62ce06989f7 100644
--- a/media-gfx/zbar/zbar-0.23.1.ebuild
+++ b/media-gfx/zbar/zbar-0.23.1.ebuild
@@ -13,7 +13,7 @@ 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"
+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="
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 7b77f9a1a893dc1b2e15c708201cf76c645f88dc
Author: David Seifert gentoo org>
AuthorDate: Sun Feb 21 12:13:53 2021 +
Commit: David Seifert gentoo org>
CommitDate: Sun Feb 21 12:13:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b77f9a1
media-gfx/zbar: Add python 3.9
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: David Seifert gentoo.org>
media-gfx/zbar/zbar-0.23.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild
b/media-gfx/zbar/zbar-0.23.1.ebuild
index 6c1c8269865..bb80d1bc91b 100644
--- a/media-gfx/zbar/zbar-0.23.1.ebuild
+++ b/media-gfx/zbar/zbar-0.23.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal
python-single-r1 virtualx
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: fddfe3a1fe7007115f15b198e3bf61b90e42afcf
Author: Sam James gentoo org>
AuthorDate: Sun Dec 13 10:34:46 2020 +
Commit: Sam James gentoo org>
CommitDate: Sun Dec 13 10:34:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fddfe3a1
media-gfx/zbar: arm64 keyworded (bug #759160)
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
media-gfx/zbar/zbar-0.23.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild
b/media-gfx/zbar/zbar-0.23.1.ebuild
index 79c9d2c02b8..23cc7fc6254 100644
--- a/media-gfx/zbar/zbar-0.23.1.ebuild
+++ b/media-gfx/zbar/zbar-0.23.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mchehab/zbar/archive/${PV}.tar.gz
-> ${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+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="
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 7da97a920351fe66ee3fad7264817341342334e6
Author: Yury Martynov linxon ru>
AuthorDate: Sun May 10 05:47:41 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sun May 17 16:41:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7da97a92
media-gfx/zbar: 0.23.1 configure fails with /bin/sh != bash
Closes: https://bugs.gentoo.org/721370
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Yury Martynov linxon.ru>
Closes: https://github.com/gentoo/gentoo/pull/15735
Signed-off-by: Joonas Niilola gentoo.org>
media-gfx/zbar/zbar-0.23.1.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild
b/media-gfx/zbar/zbar-0.23.1.ebuild
index c284e6b7e98..79c9d2c02b8 100644
--- a/media-gfx/zbar/zbar-0.23.1.ebuild
+++ b/media-gfx/zbar/zbar-0.23.1.ebuild
@@ -193,6 +193,8 @@ multilib_src_configure() {
use test && myeconfargs+=( --without-zbarimg-tests )
fi
+ # use bash (bug 721370)
+ CONFIG_SHELL='/bin/bash' \
ECONF_SOURCE="${S}" \
econf "${myeconfargs[@]}"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/
commit: c4b3f3e8d1f7bc7bdc1f1d98b1361ebd1314c66f Author: Michael Mair-Keimberger gmail com> AuthorDate: Sun Apr 26 10:28:55 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Sun Apr 26 13:36:51 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4b3f3e8 media-gfx/zbar: remove unused patch Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/15525 Signed-off-by: Joonas Niilola gentoo.org> .../files/zbar-0.10_p20121015-ImageMagick-7.patch | 27 -- 1 file changed, 27 deletions(-) diff --git a/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch b/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch deleted file mode 100644 index f58c3e4d9c4..000 --- a/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 -@@ -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.0 +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 -+# include - - /* ImageMagick frequently changes API names - just use the original - * (more stable?) names to match GraphicsMagick
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 25ce6daf5d2bc9c97993d9cb4b6a3bd16ede1ffb
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Feb 24 18:07:08 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Feb 24 18:07:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25ce6daf
media-gfx/zbar: Drop 0.20.1-r2
Bug: https://bugs.gentoo.org/689406
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/zbar/Manifest | 1 -
media-gfx/zbar/zbar-0.20.1-r2.ebuild | 168 ---
2 files changed, 169 deletions(-)
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 8d5d753531a..3da8925c591 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,2 +1 @@
-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/zbar-0.20.1-r2.ebuild
b/media-gfx/zbar/zbar-0.20.1-r2.ebuild
deleted file mode 100644
index 5aba21e790d..000
--- a/media-gfx/zbar/zbar-0.20.1-r2.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-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="graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test
+threads v4l X xv"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- test? ( X ${PYTHON_REQUIRED_USE} )
-"
-
-COMMON_DEPEND="
- gtk? (
- dev-libs/glib:2[${MULTILIB_USEDEP}]
- x11-libs/gtk+:2[${MULTILIB_USEDEP}]
- )
- imagemagick? (
- !graphicsmagick? ( media-gfx/imagemagick:= )
- graphicsmagick? ( media-gfx/graphicsmagick:= )
- )
- jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
- python? (
- ${PYTHON_DEPS}
- gtk? (
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2[${PYTHON_MULTI_USEDEP}]
- ')
- )
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- )
- v4l? ( media-libs/libv4l:0= )
- 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}
- sys-devel/gettext
- virtual/pkgconfig
- gtk? ( dev-util/glib-utils )
- java? (
- >=virtual/jdk-1.8
- test? (
- dev-java/junit:4
- dev-java/hamcrest-core:1.3
- )
- )
- test? ( ${PYTHON_DEPS} )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.10-errors.patch )
-
-pkg_setup() {
- if use python || use test; then
- python-single-r1_pkg_setup
- fi
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- default
-
- if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
- eapply "${FILESDIR}/${PN}-0.10_p20121015-ImageMagick-7.patch"
- fi
-
- use python && python_fix_shebang examples/upcrpc.py test/*.py
- java-pkg-opt-2_src_prepare
-
- sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \
- -e '/^AM_CFLAGS=/s: -Werror::' \
- -i configure.ac || die
- sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
- -i java/Makefile.am || die
- eautoreconf
-}
-
-multilib_src_configure() {
- append-cppflags -DNDEBUG
-
- local myeconfargs=(
- $(use_with gtk)
- $(multilib_native_use_with graphicsmagick graphicsmagick)
- $(multilib_native_use_with imagemagick)
- $(multilib_native_use_with java)
- $(use_with jpeg)
- $(multilib_native_use_with python python2)
- $(use_enable static-libs static)
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 43346056916f99b312d6966be8c580263d260bb9
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Feb 24 16:25:00 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Feb 24 16:25:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43346056
media-gfx/zbar: x86 stable wrt bug #710178
Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-gfx/zbar/zbar-0.23-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/zbar/zbar-0.23-r1.ebuild
b/media-gfx/zbar/zbar-0.23-r1.ebuild
index 5bdccba179a..015ed0d88df 100644
--- a/media-gfx/zbar/zbar-0.23-r1.ebuild
+++ b/media-gfx/zbar/zbar-0.23-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz;
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg python qt5
static-libs test +threads v4l X xv"
REQUIRED_USE="
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: bb8c1ca931cc56c7c68054d10d0bb35a063b3888
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Feb 21 09:36:58 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Feb 21 09:36:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb8c1ca9
media-gfx/zbar: amd64 stable wrt bug #710178
Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-gfx/zbar/zbar-0.23-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/zbar/zbar-0.23-r1.ebuild
b/media-gfx/zbar/zbar-0.23-r1.ebuild
index 87656810dce..5bdccba179a 100644
--- a/media-gfx/zbar/zbar-0.23-r1.ebuild
+++ b/media-gfx/zbar/zbar-0.23-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz;
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg python qt5
static-libs test +threads v4l X xv"
REQUIRED_USE="
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 1c98fe8bc128858fa999409a779a1a72812bd524
Author: Michał Górny gentoo org>
AuthorDate: Fri Feb 7 15:06:53 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Feb 9 16:26:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c98fe8b
media-gfx/zbar: Switch to PYTHON_MULTI_USEDEP API
Signed-off-by: Michał Górny gentoo.org>
media-gfx/zbar/{zbar-0.20.1-r1.ebuild => zbar-0.20.1-r2.ebuild} | 8 ++--
media-gfx/zbar/{zbar-0.23.ebuild => zbar-0.23-r1.ebuild}| 4 +++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/media-gfx/zbar/zbar-0.20.1-r1.ebuild
b/media-gfx/zbar/zbar-0.20.1-r2.ebuild
similarity index 96%
rename from media-gfx/zbar/zbar-0.20.1-r1.ebuild
rename to media-gfx/zbar/zbar-0.20.1-r2.ebuild
index 9a6382e3b61..5aba21e790d 100644
--- a/media-gfx/zbar/zbar-0.20.1-r1.ebuild
+++ b/media-gfx/zbar/zbar-0.20.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -33,7 +33,11 @@ COMMON_DEPEND="
jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
python? (
${PYTHON_DEPS}
- gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )
+ gtk? (
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
)
qt5? (
dev-qt/qtcore:5
diff --git a/media-gfx/zbar/zbar-0.23.ebuild
b/media-gfx/zbar/zbar-0.23-r1.ebuild
similarity index 98%
rename from media-gfx/zbar/zbar-0.23.ebuild
rename to media-gfx/zbar/zbar-0.23-r1.ebuild
index 495dc423d47..87656810dce 100644
--- a/media-gfx/zbar/zbar-0.23.ebuild
+++ b/media-gfx/zbar/zbar-0.23-r1.ebuild
@@ -66,7 +66,9 @@ DEPEND="${COMMON_DEPEND}
)
test? (
${PYTHON_DEPS}
- dev-python/pillow[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+ ')
)"
BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: f289e9966587b984f21aaeb095955e23bf52ccdf
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Feb 3 14:29:34 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Feb 3 17:35:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f289e996
media-gfx/zbar: Minor nitpicks
Unify sed style, add minimum jre version, move einstalldocs
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/zbar/zbar-0.23.ebuild | 14 ++
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/media-gfx/zbar/zbar-0.23.ebuild b/media-gfx/zbar/zbar-0.23.ebuild
index 34eb41b923a..495dc423d47 100644
--- a/media-gfx/zbar/zbar-0.23.ebuild
+++ b/media-gfx/zbar/zbar-0.23.ebuild
@@ -54,7 +54,7 @@ COMMON_DEPEND="
)"
RDEPEND="${COMMON_DEPEND}
- java? ( virtual/jre )"
+ java? ( >=virtual/jre-1.8 )"
DEPEND="${COMMON_DEPEND}
java? (
@@ -99,9 +99,8 @@ src_prepare() {
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
+ sed -e
"s|PYTHONPATH=@abs_top_srcdir@|PYTHONPATH=@builddir@|g" \
+ -i test/Makefile.am.inc || die
fi
python_fix_shebang \
@@ -111,13 +110,12 @@ src_prepare() {
if use java; then
java-pkg-opt-2_src_prepare
- sed "s|javadir = \$(pkgdatadir)|javadir =
/usr/$(get_libdir)/zbar|" \
+ 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 -i \
- -e "s|^dist_doc_DATA =\(.*\)|dist_doc_DATA =|" Makefile.am ||
die
+ sed -e "s|^dist_doc_DATA =\(.*\)|dist_doc_DATA =|" -i Makefile.am || die
eautoreconf
}
@@ -204,10 +202,10 @@ src_install() {
)
fi
multilib-minimal_src_install
- einstalldocs
}
multilib_src_install_all() {
+ einstalldocs
find "${D}" -name '*.la' -delete || die
}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/, media-gfx/zbar/
commit: 5042a61cbb5a94deec529e6b24ae564b214ff2fa
Author: Yury Martynov linxon ru>
AuthorDate: Mon Jan 6 15:35:20 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Feb 3 17:35:38 2020 +
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 linxon.ru>
Closes: https://github.com/gentoo/gentoo/pull/14266
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/zbar/Manifest| 1 +
...create_correct_pkconfig_file_for_zbar-qt5.patch | 71 +++
.../files/zbar-0.23_fix_Qt5X11Extras_detect.patch | 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 000..3be9c77
--- /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?=
+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 000..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_Qt5X11Extras_detect.patch
b/media-gfx/zbar/files/zbar-0.23_fix_Qt5X11Extras_detect.patch
new file mode 100644
index 000..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.0 +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"],
+-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: e5c7baa4ff267423669f3dcb849fee691212516c
Author: Mikle Kolyada gentoo org>
AuthorDate: Tue Feb 12 09:35:53 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Tue Feb 12 09:35:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5c7baa4
media-gfx/zbar: x86 stable wrt bug #676570
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
media-gfx/zbar/zbar-0.20.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/zbar/zbar-0.20.1-r1.ebuild
b/media-gfx/zbar/zbar-0.20.1-r1.ebuild
index a3f82f05236..1a03d35fa4d 100644
--- a/media-gfx/zbar/zbar-0.20.1-r1.ebuild
+++ b/media-gfx/zbar/zbar-0.20.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz;
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test
+threads v4l X xv"
REQUIRED_USE="
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: e0c71c983390c16e6f0030cd4077a396769d634c
Author: Mikle Kolyada gentoo org>
AuthorDate: Tue Feb 12 09:34:30 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Tue Feb 12 09:34:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0c71c98
media-gfx/zbar: amd64 stable wrt bug #676570
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
media-gfx/zbar/zbar-0.20.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/zbar/zbar-0.20.1-r1.ebuild
b/media-gfx/zbar/zbar-0.20.1-r1.ebuild
index a374101200a..a3f82f05236 100644
--- a/media-gfx/zbar/zbar-0.20.1-r1.ebuild
+++ b/media-gfx/zbar/zbar-0.20.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz;
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
IUSE="graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test
+threads v4l X xv"
REQUIRED_USE="
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 084749933c76a97668607c9385f2951ee443112a
Author: Mikle Kolyada gentoo org>
AuthorDate: Tue Feb 12 09:39:14 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Tue Feb 12 09:39:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08474993
media-gfx/zbar: Drop old
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
media-gfx/zbar/zbar-0.20.1.ebuild | 161 --
1 file changed, 161 deletions(-)
diff --git a/media-gfx/zbar/zbar-0.20.1.ebuild
b/media-gfx/zbar/zbar-0.20.1.ebuild
deleted file mode 100644
index 700328f7538..000
--- a/media-gfx/zbar/zbar-0.20.1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-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="graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test
+threads v4l X xv"
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- test? ( X ${PYTHON_REQUIRED_USE} )
-"
-
-COMMON_DEPEND="
- gtk? (
- dev-libs/glib:2[${MULTILIB_USEDEP}]
- x11-libs/gtk+:2[${MULTILIB_USEDEP}]
- )
- imagemagick? (
- !graphicsmagick? ( media-gfx/imagemagick:= )
- graphicsmagick? ( media-gfx/graphicsmagick:= )
- )
- jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
- python? (
- ${PYTHON_DEPS}
- gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- )
- 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}
- sys-devel/gettext
- virtual/pkgconfig
- gtk? ( dev-util/glib-utils )
- java? (
- >=virtual/jdk-1.8
- test? (
- dev-java/junit:4
- dev-java/hamcrest-core:1.3
- )
- )
- test? ( ${PYTHON_DEPS} )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.10-errors.patch )
-
-pkg_setup() {
- if use python || use test; then
- python-single-r1_pkg_setup
- fi
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- default
-
- if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
- eapply "${FILESDIR}/${PN}-0.10_p20121015-ImageMagick-7.patch"
- fi
-
- use python && python_fix_shebang examples/upcrpc.py test/*.py
- java-pkg-opt-2_src_prepare
-
- sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \
- -e '/^AM_CFLAGS=/s: -Werror::' \
- -i configure.ac || die
- sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
- -i java/Makefile.am || die
- eautoreconf
-}
-
-multilib_src_configure() {
- append-cppflags -DNDEBUG
-
- local myeconfargs=(
- $(use_with gtk)
- $(multilib_native_use_with graphicsmagick graphicsmagick)
- $(multilib_native_use_with imagemagick)
- $(multilib_native_use_with java)
- $(use_with jpeg)
- $(multilib_native_use_with python python2)
- $(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
- if use java; then
- export JAVACFLAGS="$(java-pkg_javac-args)"
- export JAVA_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+=(
- $(use_with qt5 qt)
- $(use_with qt5)
- )
- else
- myeconfargs+=( --without-qt )
- fi
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/
commit: 216425aa738a3aa0c4eace62446cc98605bf6f4b
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Fri Jan 11 17:59:09 2019 +
Commit: Aaron Bauman gentoo org>
CommitDate: Sat Feb 9 20:12:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=216425aa
media-gfx/zbar: remove unused patches
Signed-off-by: Michael Mair-Keimberger gmail.com>
Signed-off-by: Aaron Bauman gentoo.org>
media-gfx/zbar/files/zbar-0.10-python-crash.patch | 19 -
media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch | 49 --
2 files changed, 68 deletions(-)
diff --git a/media-gfx/zbar/files/zbar-0.10-python-crash.patch
b/media-gfx/zbar/files/zbar-0.10-python-crash.patch
deleted file mode 100644
index a6f7a96e34d..000
--- a/media-gfx/zbar/files/zbar-0.10-python-crash.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://sourceforge.net/p/zbar/patches/37/
-
-fix from Debian for crashes when importing the python module.
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=702499
-
-this doesn't happen on some arches as the data naturally ends up with zero
-data after the structure, but on some (like arm), it isn't so we crash when
-python walks the list.
-
a/python/imagescanner.c
-+++ b/python/imagescanner.c
-@@ -68,6 +68,7 @@ imagescanner_get_results (zbarImageScanner *self,
-
- static PyGetSetDef imagescanner_getset[] = {
- { "results", (getter)imagescanner_get_results, },
-+{ NULL },
- };
-
- static PyObject*
diff --git a/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch
b/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch
deleted file mode 100644
index 4fde95e2b56..000
--- a/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch
+++ /dev/null
@@ -1,49 +0,0 @@
zbar-0.10/zbar/video/v4l2.c2009-10-23 18:16:44.0 +
-+++ zbar-0.10/zbar/video/v4l2.c2015-03-07 05:46:36.0 +
-@@ -241,6 +241,21 @@
- return(0);
- }
-
-+static int v4l2_request_buffers (zbar_video_t *vdo)
-+{
-+struct v4l2_requestbuffers rb;
-+memset(, 0, sizeof(rb));
-+rb.count = vdo->num_images;
-+rb.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+rb.memory = V4L2_MEMORY_USERPTR;
-+if(ioctl(vdo->fd, VIDIOC_REQBUFS, ) < 0)
-+return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-+ "requesting video frame buffers
(VIDIOC_REQBUFS)"));
-+if(rb.count)
-+vdo->num_images = rb.count;
-+return(0);
-+}
-+
- static int v4l2_set_format (zbar_video_t *vdo,
- uint32_t fmt)
- {
-@@ -308,6 +323,8 @@
- return(-1);
- if(vdo->iomode == VIDEO_MMAP)
- return(v4l2_mmap_buffers(vdo));
-+if(vdo->iomode == VIDEO_USERPTR)
-+return(v4l2_request_buffers(vdo));
- return(0);
- }
-
-@@ -337,8 +354,13 @@
- else {
- if(!vdo->iomode)
- vdo->iomode = VIDEO_USERPTR;
--if(rb.count)
--vdo->num_images = rb.count;
-+/* releasing buffers
-+ * lest the driver may later refuse to change format
-+ */
-+rb.count = 0;
-+if (ioctl(vdo->fd, VIDIOC_REQBUFS, ) < 0)
-+zprintf(0, "WARNING: releasing video buffers failed: error %d\n",
-+errno);
- }
- return(0);
- }
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 5270ac15b862fb09380ac93cbb5c9b37b4e33f15
Author: Pacho Ramos gentoo org>
AuthorDate: Sat Jan 12 10:39:26 2019 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sat Jan 12 10:39:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5270ac15
media-gfx/zbar: Fix deps for v4l
Closes: https://bugs.gentoo.org/673994
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Pacho Ramos gentoo.org>
media-gfx/zbar/zbar-0.20.1-r1.ebuild | 163 +++
1 file changed, 163 insertions(+)
diff --git a/media-gfx/zbar/zbar-0.20.1-r1.ebuild
b/media-gfx/zbar/zbar-0.20.1-r1.ebuild
new file mode 100644
index 000..a374101200a
--- /dev/null
+++ b/media-gfx/zbar/zbar-0.20.1-r1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+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="graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test
+threads v4l X xv"
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+ test? ( X ${PYTHON_REQUIRED_USE} )
+"
+
+COMMON_DEPEND="
+ gtk? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+ )
+ imagemagick? (
+ !graphicsmagick? ( media-gfx/imagemagick:= )
+ graphicsmagick? ( media-gfx/graphicsmagick:= )
+ )
+ jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+ python? (
+ ${PYTHON_DEPS}
+ gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ )
+ v4l? ( media-libs/libv4l:0= )
+ 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}
+ sys-devel/gettext
+ virtual/pkgconfig
+ gtk? ( dev-util/glib-utils )
+ java? (
+ >=virtual/jdk-1.8
+ test? (
+ dev-java/junit:4
+ dev-java/hamcrest-core:1.3
+ )
+ )
+ test? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.10-errors.patch )
+
+pkg_setup() {
+ if use python || use test; then
+ python-single-r1_pkg_setup
+ fi
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
+ eapply "${FILESDIR}/${PN}-0.10_p20121015-ImageMagick-7.patch"
+ fi
+
+ use python && python_fix_shebang examples/upcrpc.py test/*.py
+ java-pkg-opt-2_src_prepare
+
+ sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \
+ -e '/^AM_CFLAGS=/s: -Werror::' \
+ -i configure.ac || die
+ sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
+ -i java/Makefile.am || die
+ eautoreconf
+}
+
+multilib_src_configure() {
+ append-cppflags -DNDEBUG
+
+ local myeconfargs=(
+ $(use_with gtk)
+ $(multilib_native_use_with graphicsmagick graphicsmagick)
+ $(multilib_native_use_with imagemagick)
+ $(multilib_native_use_with java)
+ $(use_with jpeg)
+ $(multilib_native_use_with python python2)
+ $(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
+ if use java; then
+ export JAVACFLAGS="$(java-pkg_javac-args)"
+ export JAVA_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+=(
+ $(use_with qt5 qt)
+ $(use_with qt5)
+ )
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 171f77b5e336fc38e73948f801cb5e2672675f7f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Dec 29 13:36:28 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 29 13:36:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=171f77b5
media-gfx/zbar: Drop 0.10_p20121015-r3
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/zbar/Manifest | 1 -
media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild | 130 ---
2 files changed, 131 deletions(-)
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index b5bf4950fae..00a21a631d2 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,2 +1 @@
-DIST zbar-0.10_p20121015.zip 991578 BLAKE2B
021dfa3920a838fd7bab12b09600ac6949c1495045691c4cc547bfb6ec647658c60984da248b882eabfc0bb123b90401dd3a32adcd66726b1e7072662e303d18
SHA512
7bb74ea5b096093b283c44787547ad0b886281628d012aa7b03ddb477732feb1e12d4d5a661191d34b53b7b272a237f67840e219b0ac5e2803da478a1ddba7a1
DIST zbar-0.20.1.tar.gz 555199 BLAKE2B
f224a2207fa0603da4cc3a0e1d05bc73f3cf0cc9d13c26b3b801d3418f4f6a001b52e468b721552af61f4c8d7357934abd0560c24d3b233107785c69cfe14753
SHA512
21ad9d8fcdecb41bd4b8979366ab8ec6e8eac815f52270b0dc72ce6a126ccef933d048ce8bbe28f46ada5defadf85ba8c97c5c1870c9560a9dab28c585dfaf42
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
b/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
deleted file mode 100644
index 6990df2d2b3..000
--- a/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-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://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip;
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk imagemagick java jpeg python static-libs test +threads v4l X xv"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- test? ( X ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="gtk? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
- x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
- imagemagick? ( virtual/imagemagick-tools )
- jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
- python? (
- ${PYTHON_DEPS}
- gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )
- )
- X? (
- x11-libs/libXext[${MULTILIB_USEDEP}]
- xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
- )"
-RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.4 )"
-DEPEND="${CDEPEND}
- java? ( >=virtual/jdk-1.4
- test? ( dev-java/junit:4
- dev-java/hamcrest-core:1.3 ) )
- test? ( ${PYTHON_DEPS} )
- app-arch/unzip
- sys-devel/gettext
- virtual/pkgconfig"
-
-pkg_setup() {
- if use python || use test; then
- python-single-r1_pkg_setup
- fi
- java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
- #vcs-snapshot doesn't work on .zip
- default
- mv * ${P} || die
-}
-
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-0.10-errors.patch \
- "${FILESDIR}"/${PN}-0.10-python-crash.patch \
- "${FILESDIR}"/${PN}-0.10-v4l2-uvcvideo.patch
-
- # fix use of deprecated qt4 function, bug 572488
- sed -e 's:numBytes:byteCount:g' \
- -i "${S}"/include/zbar/QZBarImage.h || die
-
- if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
- eapply "${FILESDIR}/${P}-ImageMagick-7.patch"
- fi
-
- use python && python_fix_shebang examples/upcrpc.py test/*.py
- java-pkg-opt-2_src_prepare
-
- sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \
- -e '/^AM_CFLAGS=/s: -Werror::' \
- -i configure.ac || die
- sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
- -i java/Makefile.am
- eautoreconf
-}
-
-multilib_src_configure() {
- if multilib_is_native_abi && use java; then
- export JAVACFLAGS="$(java-pkg_javac-args)"
- export JAVA_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
-
- append-cppflags -DNDEBUG
-
- # different flags for image/graphics magick (bug 552350)
- myimagemagick="--without-imagemagick"
- has_version media-gfx/imagemagick &&
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 8487d4215c53e191bf3b88e821c1ecc4dc7324e2
Author: Mikle Kolyada gentoo org>
AuthorDate: Sat Dec 29 09:16:00 2018 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sat Dec 29 09:16:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8487d421
media-gfx/zbar: amd64 stable wrt bug #673020
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
media-gfx/zbar/zbar-0.20.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/zbar/zbar-0.20.1.ebuild
b/media-gfx/zbar/zbar-0.20.1.ebuild
index 1299e249e15..700328f7538 100644
--- a/media-gfx/zbar/zbar-0.20.1.ebuild
+++ b/media-gfx/zbar/zbar-0.20.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz;
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test
+threads v4l X xv"
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: c495832a6336cbf8c0d153c20072faff0f77f3ba
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sat Dec 22 22:22:38 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sat Dec 22 22:22:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c495832a
media-gfx/zbar: x86 stable (bug #673020)
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann gentoo.org>
media-gfx/zbar/zbar-0.20.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/zbar/zbar-0.20.1.ebuild
b/media-gfx/zbar/zbar-0.20.1.ebuild
index b62121e32e5..1299e249e15 100644
--- a/media-gfx/zbar/zbar-0.20.1.ebuild
+++ b/media-gfx/zbar/zbar-0.20.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz;
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
IUSE="graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test
+threads v4l X xv"
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: ca3a5c1bc65bfb8b8456a8ab16a83efeec973e82
Author: Louis Sautier gentoo org>
AuthorDate: Wed Dec 5 12:28:13 2018 +
Commit: Louis Sautier gentoo org>
CommitDate: Wed Dec 5 12:43:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca3a5c1b
media-gfx/zbar: fix multilib build with USE="v4l qt5"
Closes: https://bugs.gentoo.org/672184
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Louis Sautier gentoo.org>
media-gfx/zbar/zbar-0.20.1.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/media-gfx/zbar/zbar-0.20.1.ebuild
b/media-gfx/zbar/zbar-0.20.1.ebuild
index 643a3a60ea9..b62121e32e5 100644
--- a/media-gfx/zbar/zbar-0.20.1.ebuild
+++ b/media-gfx/zbar/zbar-0.20.1.ebuild
@@ -132,8 +132,9 @@ multilib_src_configure() {
ECONF_SOURCE=${S} \
econf "${myeconfargs[@]}"
- # work-around out-of-source build issue
- mkdir gtk pygtk qt test || die
+ # work around out-of-source build issues for multilib systems
+ # https://bugs.gentoo.org/672184
+ mkdir gtk pygtk qt test zbarcam || die
}
src_test() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 91433e5fca89bb5281548d29e3c13278ad295425
Author: Louis Sautier gentoo org>
AuthorDate: Wed Dec 5 09:49:01 2018 +
Commit: Louis Sautier gentoo org>
CommitDate: Wed Dec 5 09:52:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91433e5f
media-gfx/zbar: fix build failures on multilib systems
* Explicitly disable QT on non-native ABIs, otherwise it is implicitly
enabled by upstream's build system.
* Wrap QT-related headers that are only included for native ABI builds.
Closes: https://bugs.gentoo.org/672500
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Louis Sautier gentoo.org>
media-gfx/zbar/zbar-0.20.1.ebuild | 12
1 file changed, 12 insertions(+)
diff --git a/media-gfx/zbar/zbar-0.20.1.ebuild
b/media-gfx/zbar/zbar-0.20.1.ebuild
index 8d21ca2a30a..643a3a60ea9 100644
--- a/media-gfx/zbar/zbar-0.20.1.ebuild
+++ b/media-gfx/zbar/zbar-0.20.1.ebuild
@@ -125,6 +125,8 @@ multilib_src_configure() {
else
myeconfargs+=( --without-qt )
fi
+ else
+ myeconfargs+=( --without-qt )
fi
ECONF_SOURCE=${S} \
@@ -138,6 +140,16 @@ 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
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: cb1a5fb3fdd4f957378e09f02b0dfeda30121329
Author: Louis Sautier gentoo org>
AuthorDate: Wed Dec 5 08:15:50 2018 +
Commit: Louis Sautier gentoo org>
CommitDate: Wed Dec 5 08:18:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb1a5fb3
media-gfx/zbar: update HOMEPAGE and upstream metadata
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Louis Sautier gentoo.org>
media-gfx/zbar/metadata.xml | 2 ++
media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild | 4 ++--
media-gfx/zbar/zbar-0.20.1.ebuild| 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/media-gfx/zbar/metadata.xml b/media-gfx/zbar/metadata.xml
index 20edbb2faec..fd5ad454e03 100644
--- a/media-gfx/zbar/metadata.xml
+++ b/media-gfx/zbar/metadata.xml
@@ -4,5 +4,7 @@
zbar
+ mchehab/zbar
+ https://github.com/mchehab/zbar/issues
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
b/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
index 719be7784d5..6990df2d2b3 100644
--- a/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
+++ b/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
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="http://zbar.sourceforge.net/;
+HOMEPAGE="https://github.com/mchehab/zbar;
SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip;
LICENSE="LGPL-2.1"
diff --git a/media-gfx/zbar/zbar-0.20.1.ebuild
b/media-gfx/zbar/zbar-0.20.1.ebuild
index a24c1daade0..8d21ca2a30a 100644
--- a/media-gfx/zbar/zbar-0.20.1.ebuild
+++ b/media-gfx/zbar/zbar-0.20.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
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/procxx/zbar;
+HOMEPAGE="https://github.com/mchehab/zbar;
SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz;
LICENSE="LGPL-2.1"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/, media-gfx/zbar/files/
commit: c8cae200f832c7d05452540a32a925d1e6f16112
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Nov 25 17:59:41 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Nov 25 18:00:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8cae200
media-gfx/zbar: Can't drop 0.10_p20121015-r3 yet
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/zbar/Manifest| 1 +
media-gfx/zbar/files/zbar-0.10-python-crash.patch | 19 +++
media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch | 49
media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild | 130 +
4 files changed, 199 insertions(+)
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 00a21a631d2..b5bf4950fae 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1 +1,2 @@
+DIST zbar-0.10_p20121015.zip 991578 BLAKE2B
021dfa3920a838fd7bab12b09600ac6949c1495045691c4cc547bfb6ec647658c60984da248b882eabfc0bb123b90401dd3a32adcd66726b1e7072662e303d18
SHA512
7bb74ea5b096093b283c44787547ad0b886281628d012aa7b03ddb477732feb1e12d4d5a661191d34b53b7b272a237f67840e219b0ac5e2803da478a1ddba7a1
DIST zbar-0.20.1.tar.gz 555199 BLAKE2B
f224a2207fa0603da4cc3a0e1d05bc73f3cf0cc9d13c26b3b801d3418f4f6a001b52e468b721552af61f4c8d7357934abd0560c24d3b233107785c69cfe14753
SHA512
21ad9d8fcdecb41bd4b8979366ab8ec6e8eac815f52270b0dc72ce6a126ccef933d048ce8bbe28f46ada5defadf85ba8c97c5c1870c9560a9dab28c585dfaf42
diff --git a/media-gfx/zbar/files/zbar-0.10-python-crash.patch
b/media-gfx/zbar/files/zbar-0.10-python-crash.patch
new file mode 100644
index 000..a6f7a96e34d
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.10-python-crash.patch
@@ -0,0 +1,19 @@
+https://sourceforge.net/p/zbar/patches/37/
+
+fix from Debian for crashes when importing the python module.
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=702499
+
+this doesn't happen on some arches as the data naturally ends up with zero
+data after the structure, but on some (like arm), it isn't so we crash when
+python walks the list.
+
+--- a/python/imagescanner.c
b/python/imagescanner.c
+@@ -68,6 +68,7 @@ imagescanner_get_results (zbarImageScanner *self,
+
+ static PyGetSetDef imagescanner_getset[] = {
+ { "results", (getter)imagescanner_get_results, },
++{ NULL },
+ };
+
+ static PyObject*
diff --git a/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch
b/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch
new file mode 100644
index 000..4fde95e2b56
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch
@@ -0,0 +1,49 @@
+--- zbar-0.10/zbar/video/v4l2.c2009-10-23 18:16:44.0 +
zbar-0.10/zbar/video/v4l2.c2015-03-07 05:46:36.0 +
+@@ -241,6 +241,21 @@
+ return(0);
+ }
+
++static int v4l2_request_buffers (zbar_video_t *vdo)
++{
++struct v4l2_requestbuffers rb;
++memset(, 0, sizeof(rb));
++rb.count = vdo->num_images;
++rb.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
++rb.memory = V4L2_MEMORY_USERPTR;
++if(ioctl(vdo->fd, VIDIOC_REQBUFS, ) < 0)
++return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
++ "requesting video frame buffers
(VIDIOC_REQBUFS)"));
++if(rb.count)
++vdo->num_images = rb.count;
++return(0);
++}
++
+ static int v4l2_set_format (zbar_video_t *vdo,
+ uint32_t fmt)
+ {
+@@ -308,6 +323,8 @@
+ return(-1);
+ if(vdo->iomode == VIDEO_MMAP)
+ return(v4l2_mmap_buffers(vdo));
++if(vdo->iomode == VIDEO_USERPTR)
++return(v4l2_request_buffers(vdo));
+ return(0);
+ }
+
+@@ -337,8 +354,13 @@
+ else {
+ if(!vdo->iomode)
+ vdo->iomode = VIDEO_USERPTR;
+-if(rb.count)
+-vdo->num_images = rb.count;
++/* releasing buffers
++ * lest the driver may later refuse to change format
++ */
++rb.count = 0;
++if (ioctl(vdo->fd, VIDIOC_REQBUFS, ) < 0)
++zprintf(0, "WARNING: releasing video buffers failed: error %d\n",
++errno);
+ }
+ return(0);
+ }
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
b/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
new file mode 100644
index 000..719be7784d5
--- /dev/null
+++ b/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+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="http://zbar.sourceforge.net/;
+SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip;
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="gtk imagemagick java jpeg python static-libs test +threads v4l X xv"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/, media-gfx/zbar/files/
commit: 1f2f3092a6bb667be97b3d8dd35a76ab251d72e0
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Nov 25 17:28:48 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Nov 25 17:35:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f2f3092
media-gfx/zbar: Drop 0.10_p20121015-r3
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/zbar/Manifest| 1 -
media-gfx/zbar/files/zbar-0.10-python-crash.patch | 19 ---
media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch | 49
media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild | 132 -
4 files changed, 201 deletions(-)
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index b5bf4950fae..00a21a631d2 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,2 +1 @@
-DIST zbar-0.10_p20121015.zip 991578 BLAKE2B
021dfa3920a838fd7bab12b09600ac6949c1495045691c4cc547bfb6ec647658c60984da248b882eabfc0bb123b90401dd3a32adcd66726b1e7072662e303d18
SHA512
7bb74ea5b096093b283c44787547ad0b886281628d012aa7b03ddb477732feb1e12d4d5a661191d34b53b7b272a237f67840e219b0ac5e2803da478a1ddba7a1
DIST zbar-0.20.1.tar.gz 555199 BLAKE2B
f224a2207fa0603da4cc3a0e1d05bc73f3cf0cc9d13c26b3b801d3418f4f6a001b52e468b721552af61f4c8d7357934abd0560c24d3b233107785c69cfe14753
SHA512
21ad9d8fcdecb41bd4b8979366ab8ec6e8eac815f52270b0dc72ce6a126ccef933d048ce8bbe28f46ada5defadf85ba8c97c5c1870c9560a9dab28c585dfaf42
diff --git a/media-gfx/zbar/files/zbar-0.10-python-crash.patch
b/media-gfx/zbar/files/zbar-0.10-python-crash.patch
deleted file mode 100644
index a6f7a96e34d..000
--- a/media-gfx/zbar/files/zbar-0.10-python-crash.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://sourceforge.net/p/zbar/patches/37/
-
-fix from Debian for crashes when importing the python module.
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=702499
-
-this doesn't happen on some arches as the data naturally ends up with zero
-data after the structure, but on some (like arm), it isn't so we crash when
-python walks the list.
-
a/python/imagescanner.c
-+++ b/python/imagescanner.c
-@@ -68,6 +68,7 @@ imagescanner_get_results (zbarImageScanner *self,
-
- static PyGetSetDef imagescanner_getset[] = {
- { "results", (getter)imagescanner_get_results, },
-+{ NULL },
- };
-
- static PyObject*
diff --git a/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch
b/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch
deleted file mode 100644
index 4fde95e2b56..000
--- a/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch
+++ /dev/null
@@ -1,49 +0,0 @@
zbar-0.10/zbar/video/v4l2.c2009-10-23 18:16:44.0 +
-+++ zbar-0.10/zbar/video/v4l2.c2015-03-07 05:46:36.0 +
-@@ -241,6 +241,21 @@
- return(0);
- }
-
-+static int v4l2_request_buffers (zbar_video_t *vdo)
-+{
-+struct v4l2_requestbuffers rb;
-+memset(, 0, sizeof(rb));
-+rb.count = vdo->num_images;
-+rb.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+rb.memory = V4L2_MEMORY_USERPTR;
-+if(ioctl(vdo->fd, VIDIOC_REQBUFS, ) < 0)
-+return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-+ "requesting video frame buffers
(VIDIOC_REQBUFS)"));
-+if(rb.count)
-+vdo->num_images = rb.count;
-+return(0);
-+}
-+
- static int v4l2_set_format (zbar_video_t *vdo,
- uint32_t fmt)
- {
-@@ -308,6 +323,8 @@
- return(-1);
- if(vdo->iomode == VIDEO_MMAP)
- return(v4l2_mmap_buffers(vdo));
-+if(vdo->iomode == VIDEO_USERPTR)
-+return(v4l2_request_buffers(vdo));
- return(0);
- }
-
-@@ -337,8 +354,13 @@
- else {
- if(!vdo->iomode)
- vdo->iomode = VIDEO_USERPTR;
--if(rb.count)
--vdo->num_images = rb.count;
-+/* releasing buffers
-+ * lest the driver may later refuse to change format
-+ */
-+rb.count = 0;
-+if (ioctl(vdo->fd, VIDIOC_REQBUFS, ) < 0)
-+zprintf(0, "WARNING: releasing video buffers failed: error %d\n",
-+errno);
- }
- return(0);
- }
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
b/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
deleted file mode 100644
index ecdd0ad2dbf..000
--- a/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-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="http://zbar.sourceforge.net/;
-SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip;
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk imagemagick
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/, media-gfx/zbar/
commit: 78b1fa1e72173409b92d3232486c6a366fe829c3
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Nov 25 17:30:36 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Nov 25 17:35:18 2018 +
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 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
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 396ae5098d33469763456222de5638ff7e983475
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Nov 25 11:48:30 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Nov 25 17:34:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=396ae509
media-gfx/zbar: 0.20.1 version bump, add USE qt5, graphicsmagick
Add missing || die
Closes: https://bugs.gentoo.org/667990
Closes: https://bugs.gentoo.org/641920
Closes: https://bugs.gentoo.org/629016
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/zbar/Manifest | 1 +
media-gfx/zbar/zbar-0.20.1.ebuild | 148 ++
2 files changed, 149 insertions(+)
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index eae44cfe62f..b5bf4950fae 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1 +1,2 @@
DIST zbar-0.10_p20121015.zip 991578 BLAKE2B
021dfa3920a838fd7bab12b09600ac6949c1495045691c4cc547bfb6ec647658c60984da248b882eabfc0bb123b90401dd3a32adcd66726b1e7072662e303d18
SHA512
7bb74ea5b096093b283c44787547ad0b886281628d012aa7b03ddb477732feb1e12d4d5a661191d34b53b7b272a237f67840e219b0ac5e2803da478a1ddba7a1
+DIST zbar-0.20.1.tar.gz 555199 BLAKE2B
f224a2207fa0603da4cc3a0e1d05bc73f3cf0cc9d13c26b3b801d3418f4f6a001b52e468b721552af61f4c8d7357934abd0560c24d3b233107785c69cfe14753
SHA512
21ad9d8fcdecb41bd4b8979366ab8ec6e8eac815f52270b0dc72ce6a126ccef933d048ce8bbe28f46ada5defadf85ba8c97c5c1870c9560a9dab28c585dfaf42
diff --git a/media-gfx/zbar/zbar-0.20.1.ebuild
b/media-gfx/zbar/zbar-0.20.1.ebuild
new file mode 100644
index 000..045ba2301cb
--- /dev/null
+++ b/media-gfx/zbar/zbar-0.20.1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+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/procxx/zbar;
+SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz;
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test
+threads v4l X xv"
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+ test? ( X ${PYTHON_REQUIRED_USE} )
+"
+
+COMMON_DEPEND="
+ gtk? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+ )
+ imagemagick? (
+ !graphicsmagick? ( media-gfx/imagemagick:= )
+ graphicsmagick? ( media-gfx/graphicsmagick:= )
+ )
+ jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+ python? (
+ ${PYTHON_DEPS}
+ gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ )
+ 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}
+ sys-devel/gettext
+ virtual/pkgconfig
+ gtk? ( dev-util/glib-utils )
+ java? (
+ >=virtual/jdk-1.8
+ test? (
+ dev-java/junit:4
+ dev-java/hamcrest-core:1.3
+ )
+ )
+ test? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.10-errors.patch )
+
+pkg_setup() {
+ if use python || use test; then
+ python-single-r1_pkg_setup
+ fi
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
+ eapply "${FILESDIR}/${PN}-0.10_p20121015-ImageMagick-7.diff"
+ fi
+
+ use python && python_fix_shebang examples/upcrpc.py test/*.py
+ java-pkg-opt-2_src_prepare
+
+ sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \
+ -e '/^AM_CFLAGS=/s: -Werror::' \
+ -i configure.ac || die
+ sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
+ -i java/Makefile.am || die
+ eautoreconf
+}
+
+multilib_src_configure() {
+ append-cppflags -DNDEBUG
+
+ local myeconfargs=(
+ $(use_with gtk)
+ $(multilib_native_use_with graphicsmagick graphicsmagick)
+ $(multilib_native_use_with imagemagick)
+ $(multilib_native_use_with java)
+ $(use_with jpeg)
+ $(multilib_native_use_with python python2)
+ $(use_enable static-libs static)
+ $(use_enable threads pthread)
+ $(use_enable
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/, media-gfx/zbar/files/
commit: a660f40c63bfba4fd9eb24134dac99fb25387e3f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu May 10 10:05:27 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu May 10 10:08:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a660f40c
media-gfx/zbar: Drop old
Bug: https://bugs.gentoo.org/641920
Package-Manager: Portage-2.3.36, Repoman-2.3.9
media-gfx/zbar/Manifest| 1 -
media-gfx/zbar/files/zbar-0.10-no-v4l1-check.patch | 74 ---
media-gfx/zbar/zbar-0.10-r6.ebuild | 72 ---
media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild | 100 -
4 files changed, 247 deletions(-)
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 88e2bb7fdc2..eae44cfe62f 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,2 +1 @@
-DIST zbar-0.10.tar.bz2 592602 BLAKE2B
e3379bb915d52912e9d64b4166c60e0625b1c3aae06492040b958b822e14cb9d5974e1e6b1dc69ef3cc4db5aae76c98359198f1d0fad81312da3e6226e16
SHA512
76cb8a469e3ac9ea7932a95c500cf933501249cdb8dce4df558bf5681bd44c62111327b494e6e887079a5fd30b32154887dcc12962e6d27b1453f55457483db4
DIST zbar-0.10_p20121015.zip 991578 BLAKE2B
021dfa3920a838fd7bab12b09600ac6949c1495045691c4cc547bfb6ec647658c60984da248b882eabfc0bb123b90401dd3a32adcd66726b1e7072662e303d18
SHA512
7bb74ea5b096093b283c44787547ad0b886281628d012aa7b03ddb477732feb1e12d4d5a661191d34b53b7b272a237f67840e219b0ac5e2803da478a1ddba7a1
diff --git a/media-gfx/zbar/files/zbar-0.10-no-v4l1-check.patch
b/media-gfx/zbar/files/zbar-0.10-no-v4l1-check.patch
deleted file mode 100644
index b25827a0b99..000
--- a/media-gfx/zbar/files/zbar-0.10-no-v4l1-check.patch
+++ /dev/null
@@ -1,74 +0,0 @@
zbar-0.10/configure.ac
-+++ zbar-0.10/configure.ac
-@@ -147,19 +147,13 @@
- with_video="no"
- AS_IF([test "x$enable_video" != "xno"],
- [AS_IF([test "x$win32" = "xno"],
--[AC_CHECK_HEADERS([linux/videodev.h], [with_video="v4l1"],
-- [AC_MSG_FAILURE([test for video support failed!
--rebuild your kernel to include video4linux support or
--configure --disable-video to skip building video support.])])
-- AC_CHECK_HEADERS([linux/videodev2.h], [with_video="v4l2"],
-+[AC_CHECK_HEADERS([linux/videodev2.h], [with_video="v4l2"],
- [AC_MSG_WARN([v4l2 API not detected, upgrade your kernel!])])],
- [AC_CHECK_HEADERS([vfw.h], [with_video="vfw"],
- [AC_MSG_FAILURE([test for VfW video support failed!
- configure --disable-video to skip building vidoe support.])])])
- ])
- AM_CONDITIONAL([HAVE_VIDEO], [test "x$enable_video" != "xno"])
--AM_CONDITIONAL([HAVE_V4L1],
-- [test "x$with_video" = "xv4l1" || test "x$with_video" = "xv4l2"])
- AM_CONDITIONAL([HAVE_V4L2], [test "x$with_video" = "xv4l2"])
-
- dnl X
zbar-0.10/zbar/Makefile.am.inc
-+++ zbar-0.10/zbar/Makefile.am.inc
-@@ -53,12 +53,9 @@
- zbar_libzbar_la_SOURCES += zbar/processor/posix.h zbar/processor/posix.c
- endif
-
--if HAVE_V4L1
--zbar_libzbar_la_SOURCES += zbar/video/v4l1.c
- if HAVE_V4L2
- zbar_libzbar_la_SOURCES += zbar/video/v4l2.c
- endif
--endif
- if WIN32
- if HAVE_VIDEO
- zbar_libzbar_la_SOURCES += zbar/video/vfw.c
zbar-0.10/zbar/video/v4l2.c
-+++ zbar-0.10/zbar/video/v4l2.c
-@@ -39,6 +39,9 @@
- # include
- #endif
- #include
-+#include
-+#include
-+#include
-
- #include "video.h"
- #include "image.h"
-@@ -507,3 +507,23 @@
- vdo->dq = v4l2_dq;
- return(0);
- }
-+
-+int _zbar_video_open (zbar_video_t *vdo,
-+ const char *dev)
-+{
-+vdo->fd = open(dev, O_RDWR);
-+if(vdo->fd < 0)
-+return(err_capture_str(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-+ "opening video device '%s'", dev));
-+zprintf(1, "opened camera device %s (fd=%d)\n", dev, vdo->fd);
-+
-+int rc = -1;
-+if(vdo->intf != VIDEO_V4L1)
-+rc = _zbar_v4l2_probe(vdo);
-+
-+if(rc && vdo->fd >= 0) {
-+close(vdo->fd);
-+vdo->fd = -1;
-+}
-+return(rc);
-+}
diff --git a/media-gfx/zbar/zbar-0.10-r6.ebuild
b/media-gfx/zbar/zbar-0.10-r6.ebuild
deleted file mode 100644
index 618e4f0f1ff..000
--- a/media-gfx/zbar/zbar-0.10-r6.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic python-single-r1
-
-DESCRIPTION="Library and tools for reading barcodes from images or video"
-HOMEPAGE="http://zbar.sourceforge.net/;
-SRC_URI="mirror://sourceforge/zbar/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
- imagemagick? ( virtual/imagemagick-tools )
- jpeg? ( virtual/jpeg:0 )
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: a58e50c4bddb838a269abf71deeff789e17c2fd4
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu May 10 10:07:19 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu May 10 10:08:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a58e50c4
media-gfx/zbar: Drop USE=qt4
Closes: https://bugs.gentoo.org/641920
Package-Manager: Portage-2.3.36, Repoman-2.3.9
media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild | 132 +++
1 file changed, 132 insertions(+)
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
b/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
new file mode 100644
index 000..ecdd0ad2dbf
--- /dev/null
+++ b/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+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="http://zbar.sourceforge.net/;
+SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip;
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="gtk imagemagick java jpeg python static-libs test +threads v4l X xv"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+ test? ( X ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="gtk? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
+ imagemagick? ( virtual/imagemagick-tools )
+ jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+ python? (
+ ${PYTHON_DEPS}
+ gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )
+ )
+ X? (
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
+ )"
+RDEPEND="${CDEPEND}
+ java? ( >=virtual/jre-1.4 )"
+DEPEND="${CDEPEND}
+ java? ( >=virtual/jdk-1.4
+ test? ( dev-java/junit:4
+ dev-java/hamcrest-core:1.3 ) )
+ test? ( ${PYTHON_DEPS} )
+ app-arch/unzip
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ if use python || use test; then
+ python-single-r1_pkg_setup
+ fi
+ java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+ #vcs-snapshot doesn't work on .zip
+ default
+ mv * ${P} || die
+}
+
+src_prepare() {
+ eapply "${FILESDIR}"/${PN}-0.10-errors.patch \
+ "${FILESDIR}"/${PN}-0.10-python-crash.patch \
+ "${FILESDIR}"/${PN}-0.10-v4l2-uvcvideo.patch
+
+ # fix use of deprecated qt4 function, bug 572488
+ sed -e 's:numBytes:byteCount:g' \
+ -i "${S}"/include/zbar/QZBarImage.h || die
+
+ if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
+ eapply "${FILESDIR}/${P}-ImageMagick-7.diff"
+ fi
+
+ use python && python_fix_shebang examples/upcrpc.py test/*.py
+ java-pkg-opt-2_src_prepare
+
+ sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \
+ -e '/^AM_CFLAGS=/s: -Werror::' \
+ -i configure.ac || die
+ sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
+ -i java/Makefile.am
+ eautoreconf
+}
+
+multilib_src_configure() {
+ if multilib_is_native_abi && use java; then
+ export JAVACFLAGS="$(java-pkg_javac-args)"
+ export JAVA_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
+
+ append-cppflags -DNDEBUG
+
+ # different flags for image/graphics magick (bug 552350)
+ myimagemagick="--without-imagemagick"
+ has_version media-gfx/imagemagick &&
+ myimagemagick="$(multilib_native_use_with imagemagick)"
+ mygraphicsmagick="--without-graphicsmagick"
+ has_version media-gfx/graphicsmagick &&
+ mygraphicsmagick="$(multilib_native_use_with imagemagick
graphicsmagick)"
+ ECONF_SOURCE=${S} \
+ econf \
+ $(multilib_native_use_with java) \
+ $(use_with jpeg) \
+ $(use_with gtk) \
+ ${myimagemagick} \
+ ${mygraphicsmagick} \
+ $(multilib_native_use_with python) \
+ --without-qt \
+ $(use_enable static-libs static) \
+ $(use_enable threads pthread) \
+ $(use_with X x) \
+ $(use_with xv xv) \
+ $(use_enable v4l video)
+
+ # work-around out-of-source build issue
+ mkdir gtk pygtk qt test || die
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 2cc5bd6c0709933e3c1f619910e169a73943fec6
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu May 10 10:07:36 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu May 10 10:08:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cc5bd6c
media-gfx/zbar: Drop old
Package-Manager: Portage-2.3.36, Repoman-2.3.9
media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild | 134 ---
1 file changed, 134 deletions(-)
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
deleted file mode 100644
index 6c764241f4d..000
--- a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-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="http://zbar.sourceforge.net/;
-SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip;
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk imagemagick java jpeg python qt4 static-libs test +threads v4l X xv"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- test? ( X ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="gtk? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
- x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
- imagemagick? ( virtual/imagemagick-tools )
- jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
- python? (
- ${PYTHON_DEPS}
- gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )
- )
- qt4? ( dev-qt/qtcore:4[${MULTILIB_USEDEP}]
- dev-qt/qtgui:4[${MULTILIB_USEDEP}] )
- X? (
- x11-libs/libXext[${MULTILIB_USEDEP}]
- xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
- )"
-RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.4 )"
-DEPEND="${CDEPEND}
- java? ( >=virtual/jdk-1.4
- test? ( dev-java/junit:4
- dev-java/hamcrest-core:1.3 ) )
- test? ( ${PYTHON_DEPS} )
- app-arch/unzip
- sys-devel/gettext
- virtual/pkgconfig"
-
-pkg_setup() {
- if use python || use test; then
- python-single-r1_pkg_setup
- fi
- java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
- #vcs-snapshot doesn't work on .zip
- default
- mv * ${P} || die
-}
-
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-0.10-errors.patch \
- "${FILESDIR}"/${PN}-0.10-python-crash.patch \
- "${FILESDIR}"/${PN}-0.10-v4l2-uvcvideo.patch
-
- # fix use of deprecated qt4 function, bug 572488
- sed -e 's:numBytes:byteCount:g' \
- -i "${S}"/include/zbar/QZBarImage.h || die
-
- if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
- eapply "${FILESDIR}/${P}-ImageMagick-7.diff"
- fi
-
- use python && python_fix_shebang examples/upcrpc.py test/*.py
- java-pkg-opt-2_src_prepare
-
- sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \
- -e '/^AM_CFLAGS=/s: -Werror::' \
- -i configure.ac || die
- sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
- -i java/Makefile.am
- eautoreconf
-}
-
-multilib_src_configure() {
- if multilib_is_native_abi && use java; then
- export JAVACFLAGS="$(java-pkg_javac-args)"
- export JAVA_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
-
- append-cppflags -DNDEBUG
-
- # different flags for image/graphics magick (bug 552350)
- myimagemagick="--without-imagemagick"
- has_version media-gfx/imagemagick &&
- myimagemagick="$(multilib_native_use_with imagemagick)"
- mygraphicsmagick="--without-graphicsmagick"
- has_version media-gfx/graphicsmagick &&
- mygraphicsmagick="$(multilib_native_use_with imagemagick
graphicsmagick)"
- ECONF_SOURCE=${S} \
- econf \
- $(multilib_native_use_with java) \
- $(use_with jpeg) \
- $(use_with gtk) \
- ${myimagemagick} \
- ${mygraphicsmagick} \
- $(multilib_native_use_with python) \
- $(use_with qt4 qt) \
- $(use_enable static-libs static) \
- $(use_enable threads pthread) \
- $(use_with X x) \
- $(use_with xv xv) \
- $(use_enable v4l video)
-
- #
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 59fe46ef604a3d7e2eff53531978322477d276a1
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Feb 6 16:20:59 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Tue Feb 6 16:24:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59fe46ef
media-gfx/zbar: x86 stable (bug #641190)
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
index 3e5f42adf8a..6c764241f4d 100644
--- a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
+++ b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip;
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="gtk imagemagick java jpeg python qt4 static-libs test +threads v4l X xv"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
test? ( X ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: f63d299ed201dd0f82f043425a92026e32ec8705
Author: Jason Zaman gentoo org>
AuthorDate: Tue Dec 19 10:34:06 2017 +
Commit: Jason Zaman gentoo org>
CommitDate: Tue Dec 19 10:38:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f63d299e
media-gfx/zbar: amd64 stable
Gentoo-bug: 641190
Package-Manager: Portage-2.3.13, Repoman-2.3.3
media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
index 186a80e32cc..3e5f42adf8a 100644
--- a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
+++ b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip;
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
IUSE="gtk imagemagick java jpeg python qt4 static-libs test +threads v4l X xv"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
test? ( X ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: ceed09475c17126515be605f700f9bb3c540bd1f
Author: Michael Weber gentoo org>
AuthorDate: Mon Dec 18 10:37:16 2017 +
Commit: Michael Weber gentoo org>
CommitDate: Mon Dec 18 10:37:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceed0947
media-gfx/zbar: Fix USE=java tests.
Closes: https://bugs.gentoo.org/629078
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
index b31650273b5..186a80e32cc 100644
--- a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
+++ b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
@@ -36,7 +36,9 @@ CDEPEND="gtk? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
RDEPEND="${CDEPEND}
java? ( >=virtual/jre-1.4 )"
DEPEND="${CDEPEND}
- java? ( >=virtual/jdk-1.4 )
+ java? ( >=virtual/jdk-1.4
+ test? ( dev-java/junit:4
+ dev-java/hamcrest-core:1.3 ) )
test? ( ${PYTHON_DEPS} )
app-arch/unzip
sys-devel/gettext
@@ -83,6 +85,11 @@ multilib_src_configure() {
if multilib_is_native_abi && use java; then
export JAVACFLAGS="$(java-pkg_javac-args)"
export JAVA_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
append-cppflags -DNDEBUG
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 941ba5d5bd2504193c493f18c013a47e72a09237
Author: Michael Weber gentoo org>
AuthorDate: Mon Dec 18 09:52:04 2017 +
Commit: Michael Weber gentoo org>
CommitDate: Mon Dec 18 09:52:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=941ba5d5
media-gfx/zbar: USE=imagemagick requires different configure switches, thanks
ta2002.
Closes: https://bugs.gentoo.org/552350
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
index 6aa664bfb14..b31650273b5 100644
--- a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
+++ b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
@@ -86,12 +86,21 @@ multilib_src_configure() {
fi
append-cppflags -DNDEBUG
+
+ # different flags for image/graphics magick (bug 552350)
+ myimagemagick="--without-imagemagick"
+ has_version media-gfx/imagemagick &&
+ myimagemagick="$(multilib_native_use_with imagemagick)"
+ mygraphicsmagick="--without-graphicsmagick"
+ has_version media-gfx/graphicsmagick &&
+ mygraphicsmagick="$(multilib_native_use_with imagemagick
graphicsmagick)"
ECONF_SOURCE=${S} \
econf \
$(multilib_native_use_with java) \
$(use_with jpeg) \
$(use_with gtk) \
- $(multilib_native_use_with imagemagick) \
+ ${myimagemagick} \
+ ${mygraphicsmagick} \
$(multilib_native_use_with python) \
$(use_with qt4 qt) \
$(use_enable static-libs static) \
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 1c15f97c3cfb23fccd1f63ddd8016ae95d9f4193
Author: Michael Weber gentoo org>
AuthorDate: Mon Dec 18 09:19:28 2017 +
Commit: Michael Weber gentoo org>
CommitDate: Mon Dec 18 09:19:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c15f97c
media-gfx/zbar: Switch deprecated qt4 function (thanks Sam Jorna).
Closes: https://bugs.gentoo.org/572488
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild | 4
1 file changed, 4 insertions(+)
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
index 3a552305df6..6aa664bfb14 100644
--- a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
+++ b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
@@ -60,6 +60,10 @@ src_prepare() {
"${FILESDIR}"/${PN}-0.10-python-crash.patch \
"${FILESDIR}"/${PN}-0.10-v4l2-uvcvideo.patch
+ # fix use of deprecated qt4 function, bug 572488
+ sed -e 's:numBytes:byteCount:g' \
+ -i "${S}"/include/zbar/QZBarImage.h || die
+
if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
eapply "${FILESDIR}/${P}-ImageMagick-7.diff"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 75539e8e845df3d64c0ef32c01cc1d31ab84850a
Author: Michał Górny gentoo org>
AuthorDate: Sun Aug 27 17:14:26 2017 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Sep 7 20:31:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75539e8e
media-gfx/zbar: Enable multilib support
Bug: https://bugs.gentoo.org/628306
Closes: https://github.com/gentoo/gentoo/pull/5543
media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild | 34
1 file changed, 20 insertions(+), 14 deletions(-)
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
index e7e5d80d924..3a552305df6 100644
--- a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
+++ b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
@@ -5,7 +5,8 @@ EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 virtualx
+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="http://zbar.sourceforge.net/;
@@ -18,17 +19,19 @@ IUSE="gtk imagemagick java jpeg python qt4 static-libs test
+threads v4l X xv"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
test? ( X ${PYTHON_REQUIRED_USE} )"
-CDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
+CDEPEND="gtk? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
imagemagick? ( virtual/imagemagick-tools )
- jpeg? ( virtual/jpeg:0 )
+ jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
python? (
${PYTHON_DEPS}
gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )
)
- qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
+ qt4? ( dev-qt/qtcore:4[${MULTILIB_USEDEP}]
+ dev-qt/qtgui:4[${MULTILIB_USEDEP}] )
X? (
- x11-libs/libXext
- xv? ( x11-libs/libXv )
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
)"
RDEPEND="${CDEPEND}
java? ( >=virtual/jre-1.4 )"
@@ -72,33 +75,36 @@ src_prepare() {
eautoreconf
}
-src_configure() {
- if use java; then
+multilib_src_configure() {
+ if multilib_is_native_abi && use java; then
export JAVACFLAGS="$(java-pkg_javac-args)"
export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)"
fi
append-cppflags -DNDEBUG
+ ECONF_SOURCE=${S} \
econf \
- $(use_with java) \
+ $(multilib_native_use_with java) \
$(use_with jpeg) \
$(use_with gtk) \
- $(use_with imagemagick) \
- $(use_with python) \
+ $(multilib_native_use_with imagemagick) \
+ $(multilib_native_use_with python) \
$(use_with qt4 qt) \
$(use_enable static-libs static) \
$(use_enable threads pthread) \
$(use_with X x) \
$(use_with xv xv) \
$(use_enable v4l video)
+
+ # work-around out-of-source build issue
+ mkdir gtk pygtk qt test || die
}
src_test() {
- virtx default
+ virtx multilib-minimal_src_test
}
-src_install() {
- emake DESTDIR="${D}" install
+multilib_src_install_all() {
dodoc HACKING NEWS README TODO
find "${D}" -name '*.la' -delete || die
}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: a8f6e8e8579c2078fbbfa6e1d566f4d698b6bc93
Author: Michał Górny gentoo org>
AuthorDate: Sun Aug 27 15:06:00 2017 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Sep 7 20:31:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8f6e8e8
media-gfx/zbar: Add missing unzip dep
media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
index af638ab9c78..a6c0fc5a179 100644
--- a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
+++ b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
@@ -33,6 +33,7 @@ RDEPEND="${CDEPEND}
java? ( >=virtual/jre-1.4 )"
DEPEND="${CDEPEND}
java? ( >=virtual/jdk-1.4 )
+ app-arch/unzip
sys-devel/gettext
virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 2afbd628378643f8aeaa5779fa35533f4cf6d425
Author: Michał Górny gentoo org>
AuthorDate: Sun Aug 27 15:16:28 2017 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Sep 7 20:31:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2afbd628
media-gfx/zbar: Tests need Python too
media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
index a6c0fc5a179..48f2b35f178 100644
--- a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
+++ b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
@@ -14,8 +14,9 @@ SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip;
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gtk imagemagick java jpeg python qt4 static-libs +threads v4l X xv"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="gtk imagemagick java jpeg python qt4 static-libs test +threads v4l X xv"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+ test? ( ${PYTHON_REQUIRED_USE} )"
CDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
imagemagick? ( virtual/imagemagick-tools )
@@ -33,12 +34,15 @@ RDEPEND="${CDEPEND}
java? ( >=virtual/jre-1.4 )"
DEPEND="${CDEPEND}
java? ( >=virtual/jdk-1.4 )
+ test? ( ${PYTHON_DEPS} )
app-arch/unzip
sys-devel/gettext
virtual/pkgconfig"
pkg_setup() {
- use python && python-single-r1_pkg_setup
+ if use python || use test; then
+ python-single-r1_pkg_setup
+ fi
java-pkg-opt-2_pkg_setup
}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 9269e6bb7e59f6686507d78c7662acce54eefc80
Author: Michał Górny gentoo org>
AuthorDate: Sun Aug 27 15:02:51 2017 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Sep 7 20:31:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9269e6bb
media-gfx/zbar: Bump to EAPI=6
media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild | 99
1 file changed, 99 insertions(+)
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
new file mode 100644
index 000..af638ab9c78
--- /dev/null
+++ b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1
+
+DESCRIPTION="Library and tools for reading barcodes from images or video"
+HOMEPAGE="http://zbar.sourceforge.net/;
+SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip;
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gtk imagemagick java jpeg python qt4 static-libs +threads v4l X xv"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
+ imagemagick? ( virtual/imagemagick-tools )
+ jpeg? ( virtual/jpeg:0 )
+ python? (
+ ${PYTHON_DEPS}
+ gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )
+ )
+ qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
+ X? (
+ x11-libs/libXext
+ xv? ( x11-libs/libXv )
+ )"
+RDEPEND="${CDEPEND}
+ java? ( >=virtual/jre-1.4 )"
+DEPEND="${CDEPEND}
+ java? ( >=virtual/jdk-1.4 )
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+ #vcs-snapshot doesn't work on .zip
+ default
+ mv * ${P} || die
+}
+
+src_prepare() {
+ eapply "${FILESDIR}"/${PN}-0.10-errors.patch \
+ "${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
+ eapply "${FILESDIR}/${P}-ImageMagick-7.diff"
+ fi
+
+ use python && python_fix_shebang examples/upcrpc.py test/*.py
+ java-pkg-opt-2_src_prepare
+
+ sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \
+ -e '/^AM_CFLAGS=/s: -Werror::' \
+ -i configure.ac || die
+ sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
+ -i java/Makefile.am
+ eautoreconf
+}
+
+src_configure() {
+ if use java; then
+ export JAVACFLAGS="$(java-pkg_javac-args)"
+ export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)"
+ fi
+
+ append-cppflags -DNDEBUG
+ econf \
+ $(use_with java) \
+ $(use_with jpeg) \
+ $(use_with gtk) \
+ $(use_with imagemagick) \
+ $(use_with python) \
+ $(use_with qt4 qt) \
+ $(use_enable static-libs static) \
+ $(use_enable threads pthread) \
+ $(use_with X x) \
+ $(use_with xv xv) \
+ $(use_enable v4l video)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc HACKING NEWS README TODO
+ find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+ java-pkg-opt-2_pkg_preinst
+}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: e5a0d32d7743b1e6752698cb1ba71eb767b5b48b
Author: Michał Górny gentoo org>
AuthorDate: Sun Aug 27 15:27:29 2017 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Sep 7 20:31:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5a0d32d
media-gfx/zbar: Tests require USE=X enabled
media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
index f5177673bfb..e7e5d80d924 100644
--- a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
+++ b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="gtk imagemagick java jpeg python qt4 static-libs test +threads v4l X xv"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- test? ( ${PYTHON_REQUIRED_USE} )"
+ test? ( X ${PYTHON_REQUIRED_USE} )"
CDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
imagemagick? ( virtual/imagemagick-tools )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: d87458a9863130f047b27e593fd7e611dcf05303
Author: Michał Górny gentoo org>
AuthorDate: Sun Aug 27 15:21:13 2017 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Sep 7 20:31:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d87458a9
media-gfx/zbar: Use virtualx to fix running tests
media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
index 48f2b35f178..f5177673bfb 100644
--- a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
+++ b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1
+inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 virtualx
DESCRIPTION="Library and tools for reading barcodes from images or video"
HOMEPAGE="http://zbar.sourceforge.net/;
@@ -93,6 +93,10 @@ src_configure() {
$(use_enable v4l video)
}
+src_test() {
+ virtx default
+}
+
src_install() {
emake DESTDIR="${D}" install
dodoc HACKING NEWS README TODO
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/, media-gfx/zbar/
commit: 4be507464c01c3531105a43b470cb3c1df795906
Author: Lars Wendler gentoo org>
AuthorDate: Tue May 23 09:20:07 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue May 23 09:20:25 2017 +
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 000..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.0
+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
++# include
+
+ /* 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
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 6a2f51bbe5ad97c868f2811743dfba5d6a4fabca
Author: Andrew Savchenko gentoo org>
AuthorDate: Wed Sep 7 06:35:39 2016 +
Commit: Andrew Savchenko gentoo org>
CommitDate: Wed Sep 7 06:35:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a2f51bb
media-gfx/zbar: fix bug 589834
Add USE="java" support to fix automagic dependency.
Package-Manager: portage-2.3.0
Signed-off-by: Andrew Savchenko gentoo.org>
media-gfx/zbar/zbar-0.10_p20121015.ebuild | 27 ++-
1 file changed, 22 insertions(+), 5 deletions(-)
diff --git a/media-gfx/zbar/zbar-0.10_p20121015.ebuild
b/media-gfx/zbar/zbar-0.10_p20121015.ebuild
index 5799d94..8a10c4b 100644
--- a/media-gfx/zbar/zbar-0.10_p20121015.ebuild
+++ b/media-gfx/zbar/zbar-0.10_p20121015.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -6,7 +6,7 @@ EAPI=5
PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils flag-o-matic python-single-r1
+inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1
DESCRIPTION="Library and tools for reading barcodes from images or video"
HOMEPAGE="http://zbar.sourceforge.net/;
@@ -15,9 +15,9 @@ SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip;
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv"
+IUSE="gtk imagemagick java jpeg python qt4 static-libs +threads v4l X xv"
-RDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
+CDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
imagemagick? (
|| ( media-gfx/imagemagick
media-gfx/graphicsmagick[imagemagick] ) )
@@ -27,7 +27,10 @@ RDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
X? ( x11-libs/libXext
xv? ( x11-libs/libXv ) )"
-DEPEND="${RDEPEND}
+REPEND="${CDEPEND}
+ java? ( >=virtual/jre-1.4 ) "
+DEPEND="${CDEPEND}
+ java? ( >=virtual/jdk-1.4 )
sys-devel/gettext
virtual/pkgconfig"
@@ -35,6 +38,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
pkg_setup() {
use python && python-single-r1_pkg_setup
+ java-pkg-opt-2_pkg_setup
}
src_unpack() {
@@ -49,16 +53,25 @@ src_prepare() {
"${FILESDIR}"/${PN}-0.10-v4l2-uvcvideo.patch
use python && python_fix_shebang examples/upcrpc.py test/*.py
+ java-pkg-opt-2_src_prepare
sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \
-e '/^AM_CFLAGS=/s: -Werror::' \
-i configure.ac || die
+ sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
+ -i java/Makefile.am
eautoreconf
}
src_configure() {
+ if use java; then
+ export JAVACFLAGS="$(java-pkg_javac-args)"
+ export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)"
+ fi
+
append-cppflags -DNDEBUG
econf \
+ $(use_with java) \
$(use_with jpeg) \
$(use_with gtk) \
$(use_with imagemagick) \
@@ -77,3 +90,7 @@ src_install() {
rm -r "${ED}"/usr/share/doc/${PN}
prune_libtool_files --all
}
+
+pkg_preinst() {
+ java-pkg-opt-2_pkg_preinst
+}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/, media-gfx/zbar/files/
commit: 6bb3d1e8458fc0872b4d01349fcb8e74e02f3566
Author: Michael Weber xmw AT gentoo DOT org
AuthorDate: Mon Aug 10 23:05:44 2015 +
Commit: Michael Weber xmw AT gentoo DOT org
CommitDate: Mon Aug 10 23:05:57 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bb3d1e8
media-gfx/zbar: fix UVC webcam compatibility (bug 548034, thanks Scott Alfter).
Package-Manager: portage-2.2.20
media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch | 49 ++
media-gfx/zbar/zbar-0.10-r5.ebuild | 7 ++--
media-gfx/zbar/zbar-0.10_p20121015.ebuild | 6 +--
3 files changed, 56 insertions(+), 6 deletions(-)
diff --git a/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch
b/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch
new file mode 100644
index 000..4fde95e
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch
@@ -0,0 +1,49 @@
+--- zbar-0.10/zbar/video/v4l2.c2009-10-23 18:16:44.0 +
zbar-0.10/zbar/video/v4l2.c2015-03-07 05:46:36.0 +
+@@ -241,6 +241,21 @@
+ return(0);
+ }
+
++static int v4l2_request_buffers (zbar_video_t *vdo)
++{
++struct v4l2_requestbuffers rb;
++memset(rb, 0, sizeof(rb));
++rb.count = vdo-num_images;
++rb.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
++rb.memory = V4L2_MEMORY_USERPTR;
++if(ioctl(vdo-fd, VIDIOC_REQBUFS, rb) 0)
++return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
++ requesting video frame buffers
(VIDIOC_REQBUFS)));
++if(rb.count)
++vdo-num_images = rb.count;
++return(0);
++}
++
+ static int v4l2_set_format (zbar_video_t *vdo,
+ uint32_t fmt)
+ {
+@@ -308,6 +323,8 @@
+ return(-1);
+ if(vdo-iomode == VIDEO_MMAP)
+ return(v4l2_mmap_buffers(vdo));
++if(vdo-iomode == VIDEO_USERPTR)
++return(v4l2_request_buffers(vdo));
+ return(0);
+ }
+
+@@ -337,8 +354,13 @@
+ else {
+ if(!vdo-iomode)
+ vdo-iomode = VIDEO_USERPTR;
+-if(rb.count)
+-vdo-num_images = rb.count;
++/* releasing buffers
++ * lest the driver may later refuse to change format
++ */
++rb.count = 0;
++if (ioctl(vdo-fd, VIDIOC_REQBUFS, rb) 0)
++zprintf(0, WARNING: releasing video buffers failed: error %d\n,
++errno);
+ }
+ return(0);
+ }
diff --git a/media-gfx/zbar/zbar-0.10-r5.ebuild
b/media-gfx/zbar/zbar-0.10-r5.ebuild
index 96d5787..c9873c2 100644
--- a/media-gfx/zbar/zbar-0.10-r5.ebuild
+++ b/media-gfx/zbar/zbar-0.10-r5.ebuild
@@ -38,9 +38,10 @@ pkg_setup() {
}
src_prepare() {
- epatch ${FILESDIR}/${P}-no-v4l1-check.patch
- epatch ${FILESDIR}/${P}-errors.patch
- epatch ${FILESDIR}/${P}-python-crash.patch
+ epatch ${FILESDIR}/${P}-no-v4l1-check.patch \
+ ${FILESDIR}/${P}-errors.patch \
+ ${FILESDIR}/${P}-python-crash.patch \
+ ${FILESDIR}/${P}-v4l2-uvcvideo.patch
use python python_fix_shebang examples/upcrpc.py test/*.py
diff --git a/media-gfx/zbar/zbar-0.10_p20121015.ebuild
b/media-gfx/zbar/zbar-0.10_p20121015.ebuild
index 7beedc9..c6f6de1 100644
--- a/media-gfx/zbar/zbar-0.10_p20121015.ebuild
+++ b/media-gfx/zbar/zbar-0.10_p20121015.ebuild
@@ -44,9 +44,9 @@ src_unpack() {
}
src_prepare() {
- #epatch ${FILESDIR}/${P}-no-v4l1-check.patch
- epatch ${FILESDIR}/${PN}-0.10-errors.patch
- epatch ${FILESDIR}/${PN}-0.10-python-crash.patch
+ epatch ${FILESDIR}/${PN}-0.10-errors.patch \
+ ${FILESDIR}/${PN}-0.10-python-crash.patch \
+ ${FILESDIR}/${PN}-0.10-v4l2-uvcvideo.patch
use python python_fix_shebang examples/upcrpc.py test/*.py
[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
commit: 314801d42413fb6991f1ffc144d88964a44f0ac2
Author: Michael Weber xmw AT gentoo DOT org
AuthorDate: Mon Aug 10 23:16:20 2015 +
Commit: Michael Weber xmw AT gentoo DOT org
CommitDate: Mon Aug 10 23:16:20 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=314801d4
media-gfx/zbar: move sys-devel/gettext from RDEPEND to DEPEND (bug 531546,
thanks Nikoli).
Package-Manager: portage-2.2.20
media-gfx/zbar/zbar-0.10-r5.ebuild| 4 ++--
media-gfx/zbar/zbar-0.10_p20121015.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-gfx/zbar/zbar-0.10-r5.ebuild
b/media-gfx/zbar/zbar-0.10-r5.ebuild
index c9873c2..34c5530 100644
--- a/media-gfx/zbar/zbar-0.10-r5.ebuild
+++ b/media-gfx/zbar/zbar-0.10-r5.ebuild
@@ -17,8 +17,7 @@ SLOT=0
KEYWORDS=amd64 ~arm x86
IUSE=gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv
-RDEPEND=sys-devel/gettext
- gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
+RDEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
imagemagick? (
|| ( media-gfx/imagemagick
media-gfx/graphicsmagick[imagemagick] ) )
@@ -29,6 +28,7 @@ RDEPEND=sys-devel/gettext
X? ( x11-libs/libXext
xv? ( x11-libs/libXv ) )
DEPEND=${RDEPEND}
+ sys-devel/gettext
virtual/pkgconfig
REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/media-gfx/zbar/zbar-0.10_p20121015.ebuild
b/media-gfx/zbar/zbar-0.10_p20121015.ebuild
index c6f6de1..e501a96 100644
--- a/media-gfx/zbar/zbar-0.10_p20121015.ebuild
+++ b/media-gfx/zbar/zbar-0.10_p20121015.ebuild
@@ -17,8 +17,7 @@ SLOT=0
KEYWORDS=~amd64 ~arm ~x86
IUSE=gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv
-RDEPEND=sys-devel/gettext
- gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
+RDEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
imagemagick? (
|| ( media-gfx/imagemagick
media-gfx/graphicsmagick[imagemagick] ) )
@@ -29,6 +28,7 @@ RDEPEND=sys-devel/gettext
X? ( x11-libs/libXext
xv? ( x11-libs/libXv ) )
DEPEND=${RDEPEND}
+ sys-devel/gettext
virtual/pkgconfig
REQUIRED_USE=${PYTHON_REQUIRED_USE}
