Fix a bug where iso_channel attribute was not updated. Also fix pre4 for modular X.

(Portage version: 2.1_pre4-r1)

6 files changed, 80 insertions, 7 deletions

diff --git a/media-libs/libdc1394/ChangeLog b/media-libs/libdc1394/ChangeLog
index a65823bc1073..77c1fe215711 100644
--- a/media-libs/libdc1394/ChangeLog
+++ b/media-libs/libdc1394/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libdc1394
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.14 2006/01/29 08:10:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.15 2006/02/07 20:42:51 dsd Exp $
+
+*libdc1394-2.0.0_pre5-r1 (07 Feb 2006)
+
+  07 Feb 2006; Daniel Drake <dsd@gentoo.org>
+  +files/libdc1394-2.0.0_pre5-update-iso_channel.patch,
+  libdc1394-2.0.0_pre4.ebuild, +libdc1394-2.0.0_pre5-r1.ebuild:
+  Fix a bug where iso_channel attribute was not updated. Also fix pre4 for
+  modular X.
 
   29 Jan 2006; Robin H. Johnson <robbat2@gentoo.org> libdc1394-1.0.0.ebuild:
   Fix 1.0.0 for modular-x as well.
diff --git a/media-libs/libdc1394/Manifest b/media-libs/libdc1394/Manifest
index d41962d901a1..9c840dace948 100644
--- a/media-libs/libdc1394/Manifest
+++ b/media-libs/libdc1394/Manifest
@@ -1,6 +1,6 @@
-MD5 0099d45493e4cd1b37724221fafb754a ChangeLog 3880
-RMD160 c41ca4a8b7fb0b782d5a38ac8699582efeea3531 ChangeLog 3880
-SHA256 99791b6aa80c35e86c8eaee9b6f8364920be42b2e0d80f2951864a196b1f0e30 ChangeLog 3880
+MD5 295340570defe5f5c2b0c6f3c6c31907 ChangeLog 4114
+RMD160 77529d71d271556a68f32b988f9d8a73a344b6ab ChangeLog 4114
+SHA256 b79bc7b4eece41ff8ce424f6b5001cee999167358357f0bf24c002fee4e74970 ChangeLog 4114
 MD5 4dc3c8ed8159eaa65e146db1bafdd4e1 files/digest-libdc1394-1.0.0 247
 RMD160 c9d5003f5f9fd0e018a11670fbd43c07886e7bc5 files/digest-libdc1394-1.0.0 247
 SHA256 df91ff7ccd095fdde4f05b4dd04565966d8b9aa91d1e34cdad5f59368c97952e files/digest-libdc1394-1.0.0 247
@@ -10,6 +10,12 @@ SHA256 c598e05c6890dbf15010731d7da40f7e24be26227305fd0ce7be63b8dcc53971 files/di
 MD5 cd66fb3acf276ebb4ea4d625dc1b1548 files/digest-libdc1394-2.0.0_pre5 262
 RMD160 068a75726baef6f610461c0939596b2cba0a94c0 files/digest-libdc1394-2.0.0_pre5 262
 SHA256 c28f14a853cdaa2306f57e033df5e288a6dacab5e09d2208eb41cebab6320072 files/digest-libdc1394-2.0.0_pre5 262
+MD5 cd66fb3acf276ebb4ea4d625dc1b1548 files/digest-libdc1394-2.0.0_pre5-r1 262
+RMD160 068a75726baef6f610461c0939596b2cba0a94c0 files/digest-libdc1394-2.0.0_pre5-r1 262
+SHA256 c28f14a853cdaa2306f57e033df5e288a6dacab5e09d2208eb41cebab6320072 files/digest-libdc1394-2.0.0_pre5-r1 262
+MD5 a52999e1811677c31441092df95a9e88 files/libdc1394-2.0.0_pre5-update-iso_channel.patch 403
+RMD160 f2a3061f74f918ca05d7e13119a481c4f4dc5930 files/libdc1394-2.0.0_pre5-update-iso_channel.patch 403
+SHA256 ba47f1266114500c9ad98a3da111ee4a2e6b16b330a40e43d9a8e3f5782fed0d files/libdc1394-2.0.0_pre5-update-iso_channel.patch 403
 MD5 878ff31cebe2ccca989bb8e60ef5e0b6 files/nox11-2.patch 3221
 RMD160 dcca897e8f8417f6b063b52a7e2b9f8c5907790c files/nox11-2.patch 3221
 SHA256 a4b901e465cbd4aa900419b4364780dfa2ec736401dd3aec73a52ea5b1272d89 files/nox11-2.patch 3221
@@ -22,6 +28,9 @@ SHA256 26ddbb596a9c7a3ab53846bf16e32aa343961d37c6189c5c4a03c7f8bcd29362 libdc139
 MD5 fb2bb4bf3161139499760b7e2c98e2cc libdc1394-2.0.0_pre4.ebuild 1157
 RMD160 435b9cce55f64e025fda98007e72c3822c0efd94 libdc1394-2.0.0_pre4.ebuild 1157
 SHA256 db4f5ced59e2391500866e0664f7d1a10e6e10c4119fdac7bacfd0602b8ee259 libdc1394-2.0.0_pre4.ebuild 1157
+MD5 294ddb3c295625d9a863ea047ff11082 libdc1394-2.0.0_pre5-r1.ebuild 1020
+RMD160 82740b0678e8c9510a1bb264a4ffcc255c9f152c libdc1394-2.0.0_pre5-r1.ebuild 1020
+SHA256 c1e7c7ef48791043d4edd56c4ca6b4154c3e130cda6629c0a5051d3b553ea9e0 libdc1394-2.0.0_pre5-r1.ebuild 1020
 MD5 852e6c3269ca14543223a0246755e067 libdc1394-2.0.0_pre5.ebuild 906
 RMD160 163f8c26dbf8c37353fdb3f11992543e040fa77b libdc1394-2.0.0_pre5.ebuild 906
 SHA256 5f0f3741906a95aab64a062a424361f8fc530f9be7ba2fe260a96aaf1452c121 libdc1394-2.0.0_pre5.ebuild 906
diff --git a/media-libs/libdc1394/files/digest-libdc1394-2.0.0_pre5-r1 b/media-libs/libdc1394/files/digest-libdc1394-2.0.0_pre5-r1
new file mode 100644
index 000000000000..57abc46a6194
--- /dev/null
+++ b/media-libs/libdc1394/files/digest-libdc1394-2.0.0_pre5-r1
@@ -0,0 +1,3 @@
+MD5 078cbe32c77dbf7d3943d09e7516816d libdc1394-2.0.0-pre5.tar.gz 368917
+RMD160 1b692acbc1fe402c2d07b5e132c35e0a9ea3653a libdc1394-2.0.0-pre5.tar.gz 368917
+SHA256 02bb1ed4e299a1a7a32487e8c7285f0e91fafb2acb700905a96ca57b7751af0a libdc1394-2.0.0-pre5.tar.gz 368917
diff --git a/media-libs/libdc1394/files/libdc1394-2.0.0_pre5-update-iso_channel.patch b/media-libs/libdc1394/files/libdc1394-2.0.0_pre5-update-iso_channel.patch
new file mode 100644
index 000000000000..0650acbb9a0d
--- /dev/null
+++ b/media-libs/libdc1394/files/libdc1394-2.0.0_pre5-update-iso_channel.patch
@@ -0,0 +1,11 @@
+--- libdc1394-2.0.0-pre5/libdc1394/dc1394_control.c.orig	2006-02-07 15:08:02.000000000 -0500
++++ libdc1394-2.0.0-pre5/libdc1394/dc1394_control.c	2006-02-07 15:29:26.000000000 -0500
+@@ -1207,6 +1207,8 @@ dc1394_video_set_iso_channel_and_speed(d
+       DC1394_ERR_CHK(err, "Could not set ISO data register");
+   }
+   
++  if (err == DC1394_SUCCESS)
++    camera->iso_channel = channel;
+   return err;;
+ }
+ 
diff --git a/media-libs/libdc1394/libdc1394-2.0.0_pre4.ebuild b/media-libs/libdc1394/libdc1394-2.0.0_pre4.ebuild
index fcd05fff27c6..9c3c5bf0256a 100644
--- a/media-libs/libdc1394/libdc1394-2.0.0_pre4.ebuild
+++ b/media-libs/libdc1394/libdc1394-2.0.0_pre4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-2.0.0_pre4.ebuild,v 1.9 2005/10/19 18:38:02 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-2.0.0_pre4.ebuild,v 1.10 2006/02/07 20:42:51 dsd Exp $
 
 inherit eutils
 
@@ -20,7 +20,8 @@ IUSE="X"
 
 DEPEND=">=sys-libs/libraw1394-0.9.0
 	sys-devel/libtool
-	X? ( virtual/x11 )"
+	X? ( || ( ( x11-libs/libSM x11-libs/libXv )
+			  virtual/x11 ) )"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
diff --git a/media-libs/libdc1394/libdc1394-2.0.0_pre5-r1.ebuild b/media-libs/libdc1394/libdc1394-2.0.0_pre5-r1.ebuild
new file mode 100644
index 000000000000..9305464271b8
--- /dev/null
+++ b/media-libs/libdc1394/libdc1394-2.0.0_pre5-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-2.0.0_pre5-r1.ebuild,v 1.1 2006/02/07 20:42:51 dsd Exp $
+
+inherit eutils
+
+MY_P=${P/_/-}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="library for controling IEEE 1394 conforming based cameras"
+HOMEPAGE="http://sourceforge.net/projects/libdc1394/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X"
+
+RDEPEND=">=sys-libs/libraw1394-0.9.0
+		X? ( || ( ( x11-libs/libSM x11-libs/libXv )
+				  virtual/x11 ) )"
+DEPEND="${RDEPEND}
+		sys-devel/libtool"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix a bug where iso_channel property is not kept up-to-date
+	epatch ${FILESDIR}/${P}-update-iso_channel.patch
+
+	if ! use X; then
+		epatch ${FILESDIR}/nox11-2.patch
+	fi
+
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc NEWS README AUTHORS ChangeLog
+}