Non-maintainer fix: add upstream patch to avoid usb_init symbol conflict, bug 380287

(Portage version: 2.1.10.13/cvs/Linux x86_64)

3 files changed, 94 insertions, 1 deletions

diff --git a/media-libs/libdc1394/ChangeLog b/media-libs/libdc1394/ChangeLog
index 35bd9093dd09..04a3ac9ae06c 100644
--- a/media-libs/libdc1394/ChangeLog
+++ b/media-libs/libdc1394/ChangeLog
@@ -1,6 +1,13 @@
 # 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.56 2011/06/07 23:21:16 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.57 2011/09/06 20:51:31 dilfridge Exp $
+
+*libdc1394-2.1.3-r1 (06 Sep 2011)
+
+  06 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +files/libdc1394-usbinit.patch, +libdc1394-2.1.3-r1.ebuild:
+  Non-maintainer fix: add upstream patch to avoid usb_init symbol conflict, bug
+  380287
 
   07 Jun 2011; Theo Chatzimichos <tampakrap@gentoo.org> libdc1394-2.1.3.ebuild:
   Non maintainer fix, there were two src_compile() instead of a src_configure
diff --git a/media-libs/libdc1394/files/libdc1394-usbinit.patch b/media-libs/libdc1394/files/libdc1394-usbinit.patch
new file mode 100644
index 000000000000..e94d25355ad8
--- /dev/null
+++ b/media-libs/libdc1394/files/libdc1394-usbinit.patch
@@ -0,0 +1,39 @@
+diff --git a/libdc1394/dc1394/control.c b/libdc1394/dc1394/control.c
+index c62e0e2..f250f6a 100644
+--- a/libdc1394/dc1394/control.c
++++ b/libdc1394/dc1394/control.c
+@@ -1955,7 +1955,7 @@ dc1394_new (void)
+     windows_init (d);
+ #endif
+ #ifdef HAVE_LIBUSB
+-    usb_init (d);
++    dc1394_usb_init (d);
+ #endif
+ 
+     int i;
+diff --git a/libdc1394/dc1394/internal.h b/libdc1394/dc1394/internal.h
+index b4d295a..c59e5d3 100644
+--- a/libdc1394/dc1394/internal.h
++++ b/libdc1394/dc1394/internal.h
+@@ -74,7 +74,7 @@ void juju_init(dc1394_t *d);
+ void linux_init(dc1394_t *d);
+ void macosx_init(dc1394_t *d);
+ void windows_init(dc1394_t *d);
+-void usb_init(dc1394_t *d);
++void dc1394_usb_init(dc1394_t *d);
+ 
+ void register_platform (dc1394_t * d, const platform_dispatch_t * dispatch,
+         const char * name);
+diff --git a/libdc1394/dc1394/usb/control.c b/libdc1394/dc1394/usb/control.c
+index 6509452..19a21a6 100644
+--- a/libdc1394/dc1394/usb/control.c
++++ b/libdc1394/dc1394/usb/control.c
+@@ -378,7 +378,7 @@ usb_dispatch = {
+ };
+ 
+ void
+-usb_init(dc1394_t * d)
++dc1394_usb_init(dc1394_t * d)
+ {
+     register_platform (d, &usb_dispatch, "usb");
+ }
diff --git a/media-libs/libdc1394/libdc1394-2.1.3-r1.ebuild b/media-libs/libdc1394/libdc1394-2.1.3-r1.ebuild
new file mode 100644
index 000000000000..6a93ce87b7c2
--- /dev/null
+++ b/media-libs/libdc1394/libdc1394-2.1.3-r1.ebuild
@@ -0,0 +1,47 @@
+# 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-r1.ebuild,v 1.1 2011/09/06 20:51:31 dilfridge 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
+	epatch "${FILESDIR}"/${PN}-usbinit.patch
+	eautoreconf
+}
+
+src_configure() {
+	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/*
+}