Version bump, + new patch to disable obsolete raw capture (required for bug #231908)

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 84 insertions, 2 deletions

diff --git a/media-libs/libdc1394/ChangeLog b/media-libs/libdc1394/ChangeLog
index 2c4fe3b015b5..8d7826376b2b 100644
--- a/media-libs/libdc1394/ChangeLog
+++ b/media-libs/libdc1394/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libdc1394
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.37 2009/01/31 10:26:52 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.38 2009/01/31 10:36:45 stefaan Exp $
+
+*libdc1394-1.2.2 (31 Jan 2009)
+
+  31 Jan 2009; Stefaan De Roeck <stefaan@gentoo.org>
+  +files/libdc1394-disable-raw-capture.patch, +libdc1394-1.2.2.ebuild:
+  Version bump, + new patch to disable obsolete raw capture (required for
+  bug #231908)
 
   31 Jan 2009; Stefaan De Roeck <stefaan@gentoo.org>
   -libdc1394-2.0.0_pre4.ebuild, -libdc1394-2.0.0-r1.ebuild:
diff --git a/media-libs/libdc1394/Manifest b/media-libs/libdc1394/Manifest
index a3469dff45a6..b1f3330bf47d 100644
--- a/media-libs/libdc1394/Manifest
+++ b/media-libs/libdc1394/Manifest
@@ -1,8 +1,11 @@
 AUX libdc1394-1.2.1-nox11.patch 2818 RMD160 00b65a5080b12cfe80fb875aa9d5f652e2e27582 SHA1 711fe0dccacedaafdf0533a65ae0a7fea4dbbe0e SHA256 94198adc2d2b4b1229737a5ee6e456dddfbfb2a7ef0e9ab7156ba9de80dc8747
+AUX libdc1394-disable-raw-capture.patch 905 RMD160 20f28c99080975d0fa5f038e7dde7b8ae28e781b SHA1 ea6cd821fd2ac4ccfcf5d17ae11c533924556736 SHA256 78c1b341ec5b19aea90e42ff74594d72f166bc29f5fd33cef8f4816849534aed
 AUX nox11-2.patch 3221 RMD160 dcca897e8f8417f6b063b52a7e2b9f8c5907790c SHA1 b82e35a875e2f1897931a407fbb4bae89ed08277 SHA256 a4b901e465cbd4aa900419b4364780dfa2ec736401dd3aec73a52ea5b1272d89
 DIST libdc1394-1.2.1.tar.gz 389075 RMD160 d44b07f218772a8fdd9d409b1e2dcf5152aa5f9f SHA1 99578d00a984bd9407facf5d95a3870b69a8b1d7 SHA256 5019d040ee4a803db5a4e9ce2857487f69d41d3bdec027f1eeef320e80fa227f
+DIST libdc1394-1.2.2.tar.gz 394782 RMD160 8c316c41d9a68f9dbc5c4bf18d9892c698f524e3 SHA1 eb781c0a23e674c335fde7b2d3b79c8e6c84f200 SHA256 0b75bd397e50dc409b15eee612ec599624d256806842306ad3248584595c87ed
 DIST libdc1394-2.0.2.tar.gz 554095 RMD160 04fe0d258372d30e307e679ffe0735af751cc15b SHA1 254f8f2039e9fc12dfcdbffdd4dac5bdee00ec7f SHA256 4660fa37bb4ec8fd8438d3de30efe47239476e433ef7c157de02a68bc5d7178b
 EBUILD libdc1394-1.2.1.ebuild 1186 RMD160 e1203a8052a2cfb432f031e7fae86903feaafc35 SHA1 c55238cee94b499bef13109e479f7ac703b98709 SHA256 c53e21a9489cfd95f5d5fa092d929418655bf256f5bab9754cd33771d3b2b5b6
+EBUILD libdc1394-1.2.2.ebuild 1043 RMD160 607782bcf06b4938cee7a22bdd671bf6f77437c8 SHA1 5c0240ba6143e0f604447af0fa69c49f27150586 SHA256 aa169d0b5e122a57df53ce4a66be1a615ac38ab4f872baa652238d056afe82f0
 EBUILD libdc1394-2.0.2.ebuild 969 RMD160 4b8320ed1a134f6411f7eb66268bad8b2456f6fb SHA1 9f727fb847e5e9c15fbebe039bae414caafa60ab SHA256 8382e86dfe797fbebd0f1b23181ea24764590c95e358b5224d8bcccdc19ee4c7
-MISC ChangeLog 9573 RMD160 64476e9b980ad0c5124ad3322b4812e1c8d7e5dc SHA1 14694d870bacf7efc7098308255e2828854d2192 SHA256 92fb5c9dde92680766b6d7162b745cda43300c24f6115706d217fa41ad0bc681
+MISC ChangeLog 9819 RMD160 9f8ca5fe50a795e71c8b7c348af12aff7974f17b SHA1 9f40572182d7d7ff8607d0ae1aacc888b98d68fe SHA256 344f8e8e6b0137c3a565ece82da2542f280ad1ca13d579c453fa11cb450d97cd
 MISC metadata.xml 363 RMD160 c116dbd71788168bf2b4a1bfeaf103048eb9b5f5 SHA1 553eb25a4f69fb39282b5d9c7e37dea23cc7602a SHA256 3516e958bb13de282f2933a833ae8dd9126280a2191cea733fc00aeba4c337fc
diff --git a/media-libs/libdc1394/files/libdc1394-disable-raw-capture.patch b/media-libs/libdc1394/files/libdc1394-disable-raw-capture.patch
new file mode 100644
index 000000000000..6e246e54bbdc
--- /dev/null
+++ b/media-libs/libdc1394/files/libdc1394-disable-raw-capture.patch
@@ -0,0 +1,31 @@
+--- /tmp/libdc1394-1.2.2/libdc1394/dc1394_capture.c	2007-08-03 08:47:33.000000000 +0200
++++ libdc1394-1.2.2/libdc1394/dc1394_capture.c	2008-12-09 12:16:28.000000000 +0100
+@@ -27,6 +27,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+ #include <errno.h>
++#include <stdio.h>
+ 
+ #include "config.h"
+ #include "dc1394_control.h"
+@@ -424,6 +425,12 @@
+ dc1394_multi_capture(raw1394handle_t handle, dc1394_cameracapture *cams,
+                      int num) 
+ {
++    // this functionality is not supported anymore in libraw1394-2.0.0,
++    // nor in recent linux kernels, and is superseded by the dma capture
++    // functions below
++    fprintf(stderr, "libdc1394: error, raw capture mode is not supported anymore");
++    return DC1394_FAILURE;
++#if 0
+     int i, j;
+     _dc1394_all_captured= num;
+ 
+@@ -493,6 +500,7 @@
+     }
+ 
+     return DC1394_SUCCESS;
++#endif
+ }
+ 
+ /**********************************
diff --git a/media-libs/libdc1394/libdc1394-1.2.2.ebuild b/media-libs/libdc1394/libdc1394-1.2.2.ebuild
new file mode 100644
index 000000000000..7f68ea86d091
--- /dev/null
+++ b/media-libs/libdc1394/libdc1394-1.2.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-1.2.2.ebuild,v 1.1 2009/01/31 10:36:45 stefaan Exp $
+
+inherit eutils flag-o-matic
+
+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="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X"
+
+RDEPEND="sys-libs/libraw1394
+		X? ( x11-libs/libSM x11-libs/libXv )"
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+src_unpack() {
+	unpack ${A}; cd "${S}"
+	if ! use X; then
+		epatch "${FILESDIR}"/${P}-nox11.patch
+	fi
+	epatch "${FILESDIR}"/${PN}-disable-raw-capture.patch
+}
+
+src_compile() {
+	if has_version '>=sys-libs/glibc-2.4' ; then
+		append-flags "-DCLK_TCK=CLOCKS_PER_SEC"
+	fi
+
+	econf || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc NEWS README AUTHORS
+}