Non Maintainer version bump, Build without V4L1 support, #359735 & #363303

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

3 files changed, 106 insertions, 1 deletions

diff --git a/media-libs/libdc1394/ChangeLog b/media-libs/libdc1394/ChangeLog
index cfa946a71db8..63599e7713ed 100644
--- a/media-libs/libdc1394/ChangeLog
+++ b/media-libs/libdc1394/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libdc1394
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.54 2011/03/21 14:23:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.55 2011/04/30 17:22:47 jlec Exp $
+
+*libdc1394-2.1.3 (30 Apr 2011)
+
+  30 Apr 2011; Justin Lecher <jlec@gentoo.org>
+  +files/libdc1394-videodev.h.patch, +libdc1394-2.1.3.ebuild:
+  Non Maintainer version bump, Build without V4L1 support, #359735 & #363303
 
   21 Mar 2011; Diego E. Pettenò <flameeyes@gentoo.org>
   -files/libdc1394-1.2.1-nox11.patch, libdc1394-1.2.2.ebuild:
diff --git a/media-libs/libdc1394/files/libdc1394-videodev.h.patch b/media-libs/libdc1394/files/libdc1394-videodev.h.patch
new file mode 100644
index 000000000000..dba42c46f0bd
--- /dev/null
+++ b/media-libs/libdc1394/files/libdc1394-videodev.h.patch
@@ -0,0 +1,53 @@
+From 2ee7e7f98dd6225b40d5cd570c240504be7bc86a Mon Sep 17 00:00:00 2001
+From: David Moore <david.moore@gmail.com>
+Date: Sun, 27 Mar 2011 22:48:15 -0700
+Subject: [PATCH 1/1] Conditionally compile dc1394_vloopback only when linux/videodev.h exists
+
+---
+ libdc1394/ChangeLog            |    3 +++
+ libdc1394/configure.in         |    3 +++
+ libdc1394/examples/Makefile.am |    2 ++
+ 3 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/libdc1394/ChangeLog b/libdc1394/ChangeLog
+index e1355de..536ccae 100644
+--- a/libdc1394/ChangeLog
++++ b/libdc1394/ChangeLog
+@@ -1,3 +1,6 @@
++2011-03-27  David Moore  <david.moore@gmail.com>
++	* Conditionally compile dc1394_vloopback only when linux/video.h exists
++
+ 2011-01-02  David Moore  <david.moore@gmail.com>
+ 	* dc1394/conversions.h: Fix typo in DC1394_STEREO_METHOD_MIN
+ 	* Update NEWS, README, AUTHORS and version for release 2.1.3.
+diff --git a/libdc1394/configure.in b/libdc1394/configure.in
+index 69babab..bdddc9b 100644
+--- a/libdc1394/configure.in
++++ b/libdc1394/configure.in
+@@ -75,6 +75,9 @@ AM_CONDITIONAL(HAVE_WINDOWS, test x$have_windows = xtrue)
+ AM_CONDITIONAL(HAVE_LIBRAW1394, test x$libraw1394 = xtrue)
+ AM_CONDITIONAL(HAVE_LIBUSB, test "x$LIBUSB_LIBS" != "x")
+ 
++AC_CHECK_HEADER([linux/videodev.h], [have_videodev=true])
++AM_CONDITIONAL(HAVE_VIDEODEV, test x$have_videodev = xtrue)
++
+ AC_ARG_ENABLE([examples], [AS_HELP_STRING([--disable-examples], [don't build example programs])], [build_examples=$enableval], [build_examples=true])
+ 
+ AM_CONDITIONAL(MAKE_EXAMPLES, test x$build_examples = xtrue)
+diff --git a/libdc1394/examples/Makefile.am b/libdc1394/examples/Makefile.am
+index fcebf18..035612e 100644
+--- a/libdc1394/examples/Makefile.am
++++ b/libdc1394/examples/Makefile.am
+@@ -8,7 +8,9 @@ A = grab_gray_image grab_partial_image grab_color_image \
+ B = dc1394_reset_bus
+ 
+ if HAVE_LINUX
++if HAVE_VIDEODEV
+ B += dc1394_vloopback
++endif
+ if HAVE_XV
+ A += dc1394_multiview
+ endif
+-- 
+1.7.0.1
+
diff --git a/media-libs/libdc1394/libdc1394-2.1.3.ebuild b/media-libs/libdc1394/libdc1394-2.1.3.ebuild
new file mode 100644
index 000000000000..ccf1fc4f265a
--- /dev/null
+++ b/media-libs/libdc1394/libdc1394-2.1.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-2.1.3.ebuild,v 1.1 2011/04/30 17:22:48 jlec Exp $
+
+EAPI="4"
+
+inherit autotools eutils
+
+DESCRIPTION="Library to interface with IEEE 1394 cameras following the IIDC specification"
+HOMEPAGE="http://sourceforge.net/projects/libdc1394/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X doc"
+
+RDEPEND="
+	>=sys-libs/libraw1394-1.2.0
+	X? ( x11-libs/libSM x11-libs/libXv )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-videodev.h.patch
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		--program-suffix=2 \
+		$(use_with X x) \
+		$(use_enable doc doxygen-html)
+}
+
+src_compile() {
+	default
+	if use doc ; then
+		emake doc
+	fi
+}
+
+src_install() {
+	default
+	use doc && dohtml doc/html/*
+}