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

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

diff --git a/media-libs/libdc1394/ChangeLog b/media-libs/libdc1394/ChangeLog
index 35bd9093dd0981bb0d27f49b86775cb4347b01e4..04a3ac9ae06cfacd883dc6dc6605a44a4081584d 100644 (file)
--- 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/Manifest b/media-libs/libdc1394/Manifest
index b7dcc87993255436b5f9c6ffe8c9835030c67bb5..b991759f640623a17c6152e51a7966c69f1142f1 100644 (file)
--- a/media-libs/libdc1394/Manifest
+++ b/media-libs/libdc1394/Manifest
@@ -1,10 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX libdc1394-disable-raw-capture.patch 905 RMD160 20f28c99080975d0fa5f038e7dde7b8ae28e781b SHA1 ea6cd821fd2ac4ccfcf5d17ae11c533924556736 SHA256 78c1b341ec5b19aea90e42ff74594d72f166bc29f5fd33cef8f4816849534aed
+AUX libdc1394-usbinit.patch 1149 RMD160 fd363313e2fd5d8ac0fa6e2ae444b0a3fa0aacd6 SHA1 cd0f177cc632f9f690ee44cc99660fff5994f9c1 SHA256 bb14627071cceca9a3fb5174ac26fc4f4d4ef77049caa96aa68d5c82ee799a32
 AUX libdc1394-videodev.h.patch 1964 RMD160 884799d96512d17623210b20fe6049e29c53e858 SHA1 f92fc7112b8a030cbce3c78a9b205245e4452848 SHA256 bb20fa4b0ec243b5c45f6e011f328b13b4647133332968e03dec8847ea970338
 DIST libdc1394-1.2.2.tar.gz 394782 RMD160 8c316c41d9a68f9dbc5c4bf18d9892c698f524e3 SHA1 eb781c0a23e674c335fde7b2d3b79c8e6c84f200 SHA256 0b75bd397e50dc409b15eee612ec599624d256806842306ad3248584595c87ed
 DIST libdc1394-2.1.2.tar.gz 585911 RMD160 20b7470cfb1990a9c8b4798b0362e91038d054a4 SHA1 d9ad4834f23b555d04f255945117a4420ae40977 SHA256 70a9f97a091165051bce7a5a5f198e01760432bbd20aa352e31562a73b229229
 DIST libdc1394-2.1.3.tar.gz 596778 RMD160 298ad9c92187bea0f127f0a0f9960483d50201aa SHA1 cab77199f2e434ece3cf31c798d00d79326679b4 SHA256 6690e8f97abadd41aa6a5f6e0365e17287847bb267d251ea308641a6dd7aa0e9
 EBUILD libdc1394-1.2.2.ebuild 966 RMD160 c8b8298841aec5676071f86fdfe2b91218a3e532 SHA1 d5b142c6a894443f0934c69efe686f98f4fdf5b3 SHA256 ab4f9b5b09fa9e5e4532a1f38b38987545514c787f797c436e550b95c7fbee2b
 EBUILD libdc1394-2.1.2.ebuild 1048 RMD160 4162e95ba1012c0ce1bc383023e7cac5fc95768c SHA1 208916937cff0b981313b4ca981bebd1c4b804e1 SHA256 1736fd72b578da1b124cb25d27232412b6cc46478068280ae0042e8be9a581ab
+EBUILD libdc1394-2.1.3-r1.ebuild 1041 RMD160 29a94d5eb796020f6fabdb3b0e7aff745b895581 SHA1 063caa61df952db5de93f45d59fa397285448a7b SHA256 a73e2cf184b867a0c6f016a30880d74bdc2e2866455372945410d31a5c8259dd
 EBUILD libdc1394-2.1.3.ebuild 996 RMD160 c2f106b2214b25967721c7305bb76f9653024f26 SHA1 86316594916857b74a0365d080b5eb2074c9d9e4 SHA256 6d1655b3889ce7ec097b6f92cd7b62542711646602532a19b929a5f685043ebe
-MISC ChangeLog 12066 RMD160 468df245b61bbd336930af6dae2bc81146da15c2 SHA1 5bbabbf579b42260b44330ec7a74f87e50c40b18 SHA256 133371c4b323e4300c26125550209f5e7310aea2f59478ef9d807aa1fa6f35cd
+MISC ChangeLog 12310 RMD160 feb885108ba95a01a3f9040808c4db830e235e62 SHA1 bb531c7e268a3c36754c37207680b57fbb3d0ba1 SHA256 62f94884f315439462a5164fbff8cef67add68d8b882895093795927131c7fd4
 MISC metadata.xml 265 RMD160 970f5f1ffd4c5652129991f704b9a53088ee3828 SHA1 705eaa46d73963dc22127305779275f787a3778a SHA256 1e6dd2b97263b8f143a2d2c0cd05cc1b917c9fcab50b2fae5e60f11d39c9c014
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOZofmAAoJENwGBM22xffeOewP/1PZft58OlNchJwioan3RXQ/
+jP7PUgcCDsE3H3TzBWIDdB67ovH9ogoXYk9nE2f79ikP3v1GMK094B7yhX4m0lmZ
+bdlYhsYjorG4LfiVvE3x1oeXoBx73J2eWSMQTF3MWv7Ko1ssHHlSkSU5o3YUbqqE
+JKN3h/uMPdTFo77Fclifk8bmsno0aER8fo1lsMRxWLVU5CbTcC9i9Md/W3AgrE0Z
+V7VGNQWyXq3XKuHXalX4BqZNx0AkjE2pjB7Bfs6OEaIXkEjFOAwTHfaYOnwWDy9P
+eVhlBkUYw5vCM7Ztx8bMBzCz10j3xCWD9BHsa+e03XHCg/jp8akCFkkEFvgyRr5J
+bwPpAf6kPG5R6qbra4uq86cKbYDy738f3WSHGinHGnGeEzG5xrwjGfNi8eTHMNQg
+EWcpNGQKR6uL+nyO/5ZBfy7d2xFy6cF7k7CShuv8GtJAIVzAbAQ7w7dcY9gUkRK2
+sw18TC00F6NeJuXtFv80zJq96U3dWiLwsQT3Qy9uiRWTBsE2vCVYGHfmlEduYgVm
+ZcbvuTVyBCkDKJURgpu1cLh/+F5z4q+uIfxvscafpKGJ1isCzHOgi76yYnkhHGcv
+DbML19tFs3noWUzQ3u+E8SuKZpHFKTC7DMQGF4WFglwNe0mtIBa87itCVh/ioogR
+ubydsxl2J+Aeq/xOgzQz
+=1F5u
+-----END PGP SIGNATURE-----

diff --git a/media-libs/libdc1394/files/libdc1394-usbinit.patch b/media-libs/libdc1394/files/libdc1394-usbinit.patch
new file mode 100644 (file)
index 0000000..e94d253
--- /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 (file)
index 0000000..6a93ce8
--- /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/*
+}