commit: a660f40c63bfba4fd9eb24134dac99fb25387e3f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu May 10 10:05:27 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu May 10 10:08:18 2018 +0000 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 e3379bb915d52912e9d64b4166c60e0625b1c3aae06492040b958b822e14cb9d5974e1e6b1dc69ef3cc4db11115aae76c98359198f1d0fad81312da3e6226e16 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..00000000000 --- 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 <sys/mman.h> - #endif - #include <linux/videodev2.h> -+#include <sys/stat.h> -+#include <unistd.h> -+#include <fcntl.h> - - #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..00000000000 --- 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 ) - 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 ) - )" -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - 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 - - sed -i -e '/AM_INIT_AUTOMAKE/s:-Werror ::' configure.ac || die #423581 - eautoreconf -} - -src_configure() { - append-cppflags -DNDEBUG - econf \ - $(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 - rm -r "${ED}"/usr/share/doc/${PN} - prune_libtool_files --all -} diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild deleted file mode 100644 index d07b29d8905..00000000000 --- a/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild +++ /dev/null @@ -1,100 +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 java-pkg-opt-2 multilib 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() { - epatch "${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 - epatch "${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 - rm -r "${ED}"/usr/share/doc/${PN} - prune_libtool_files --all -} - -pkg_preinst() { - java-pkg-opt-2_pkg_preinst -}
