Remove v4l1 from headers

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

4 files changed, 143 insertions, 11 deletions

diff --git a/media-gfx/zbar/ChangeLog b/media-gfx/zbar/ChangeLog
index d6e5196f110a..29566c53d3eb 100644
--- a/media-gfx/zbar/ChangeLog
+++ b/media-gfx/zbar/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/zbar
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.2 2011/10/30 15:53:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.3 2011/11/10 08:50:44 xmw Exp $
+
+*zbar-0.10-r1 (10 Nov 2011)
+
+  10 Nov 2011; Michael Weber <xmw@gentoo.org> +zbar-0.10-r1.ebuild,
+  +files/zbar-0.10-no-v4l1-check.patch:
+  Remove v4l1 from headers, thanks to Andrew Savchenko for the patch (bug
+  389683)
 
   30 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> zbar-0.10.ebuild:
   Remove usage of obsolete USE="v4l2" wrt #385241
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 11b23492558a..35fbfe62b7f3 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX zbar-0.10-no-v4l1-check.patch 2270 RMD160 028f01f0f4e0b25feddc67b139fbba69eb5fe386 SHA1 1c2f3ca24247304bf59a77aef3104e4f80c01df8 SHA256 fe41b3855be44d0f61e6e21dfd3fd90fc56b6f01b1e6633e3d2ab9ed9617f5c8
 DIST zbar-0.10.tar.bz2 592602 RMD160 a68db3e81d596a506e50e797c3540a05b8b84a9f SHA1 273b47c26788faba4325baecc34063e27a012963 SHA256 234efb39dbbe5cef4189cc76f37afbe3cfcfb45ae52493bfe8e191318bdbadc6
+EBUILD zbar-0.10-r1.ebuild 1351 RMD160 a889d3c51eb65bdbbdd8ee255d1a93fbe685cb43 SHA1 d9ecd04845e4cc105d95fe83f5e5f54b2027c583 SHA256 61223ddc00496792676eb1c829fe82afb778a918abd0c420bff611c282ef6445
 EBUILD zbar-0.10.ebuild 1287 RMD160 75e51e811db9ba3e734568e93e763014f8b57fd8 SHA1 1b361ef635054c2892435eb95ab23f49a3c166d0 SHA256 8b110af173f32f6cbc9bb29e500fcd39f9f3143adf13a13035cdc3309b40c66e
-MISC ChangeLog 519 RMD160 39964d8af9a03dbace1528840b45f6ef928013da SHA1 ac4db8989db97c7a924ffe006103fc7d30b343e3 SHA256 6b2c45194e60e8ec7b06116203f00ff5c06aca942cc1e6bcd5fc3f4d1d178e8e
+MISC ChangeLog 735 RMD160 6cf78b2615c4ff06eb635532e67be539e29388b9 SHA1 e97a136a6fb7aa89d32d075edfc2b89bf8b6d2ac SHA256 90bf00c1455111e165daa80f9f6c4af840b6bc38d27a47b8da4b814a7a549742
 MISC metadata.xml 245 RMD160 6b03982a4d5f32d9fa6b9259ae36f9fcb07c8404 SHA1 fb16c7b4c5ab071dd979f761b8bb075f5396b737 SHA256 375a1da02cd2c393ce2378a73c1ce08134bc030b3bb378c6a4d6ca9cd5be1f8d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOrXMUAAoJEEdUh39IaPFN1AAH/1LAv8WXvfTmrjtJ/TzBUCzv
-5gd5bL7GsRmIJqfm7odoL3cKiaDY2jdNb+ol+q0YcwfGpWcgA20O6VZHW7EL7nck
-Ap9VjY/zBIdTC+N3smjdp3cNuRAnNRPwN+WyWEPdWZASY/pV5FJNhEgH7cBmUJzv
-uCSmtDzP2teoB1/bL5KD58DugAqiex3g5PfDnqhqMv+d3K7mL+E1D3VS+hVY7FAF
-FlMbiWkMiIiAtFtbMgiWWfSLhZRKLp7w3AjsIJv47Z14xT4Jr3S8D9LlhA7rHPeB
-UM8JvFQxnjO5TkTYGUEtJsCG/n8a6RuTXBzcPCO21wQsMdDBUyR3WC0SgETT9rQ=
-=j8pr
+iF4EAREIAAYFAk67kGwACgkQknrdDGLu8JCSzQEAhRBI0soPV59gwQWASLCjMXCb
+kGEhoQFe4dk4GMRGyaUA/0u94HqMc/YkYwQ3MB7DHsynoUD+HpuT1Yg3t4dBvaAr
+=2d4m
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..b25827a0b998
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.10-no-v4l1-check.patch
@@ -0,0 +1,74 @@
+--- 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-r1.ebuild b/media-gfx/zbar/zbar-0.10-r1.ebuild
new file mode 100644
index 000000000000..cd5dcbf0c5ec
--- /dev/null
+++ b/media-gfx/zbar/zbar-0.10-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r1.ebuild,v 1.1 2011/11/10 08:50:44 xmw Exp $
+
+EAPI="4"
+
+PYTHON_DEPEND="2"
+inherit autotools eutils python
+
+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 ~x86"
+IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv"
+
+RDEPEND="gtk? ( =dev-libs/glib-2* =x11-libs/gtk+-2* )
+	imagemagick? ( >=media-gfx/imagemagick-6.2.6 )
+	jpeg? ( virtual/jpeg )
+	python? ( gtk? ( dev-python/pygtk )	)
+	qt4? ( x11-libs/qt-core x11-libs/qt-gui )
+	X? ( x11-libs/libXext
+		xv? ( x11-libs/libXv ) )"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-no-v4l1-check.patch"
+	eautoreconf
+}
+
+src_configure() {
+	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 "${D}"/usr/share/doc/${PN}
+	find "${D}" -nam "*.la" -delete
+}