version bump -- watch for an API change since pre7

Package-Manager: portage-2.1.1_rc1-r1

5 files changed, 80 insertions, 5 deletions

diff --git a/media-libs/libdc1394/ChangeLog b/media-libs/libdc1394/ChangeLog
index 5181d3fb26c4..5d83882ed277 100644
--- a/media-libs/libdc1394/ChangeLog
+++ b/media-libs/libdc1394/ChangeLog
@@ -1,6 +1,13 @@
 # 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.23 2006/06/19 17:31:04 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.24 2006/08/29 15:16:34 seemant Exp $
+
+*libdc1394-2.0.0_rc3 (29 Aug 2006)
+
+  29 Aug 2006; Seemant Kulleen <seemant@gentoo.org>
+  +files/libdc1394-2.0.0_rc3-update-iso_channel.patch,
+  +libdc1394-2.0.0_rc3.ebuild:
+  version bump -- watch for an API change since pre7
 
 *libdc1394-2.0.0_pre7-r1 (19 Jun 2006)
 
diff --git a/media-libs/libdc1394/Manifest b/media-libs/libdc1394/Manifest
index 30ae25fa192f..f293f01257ca 100644
--- a/media-libs/libdc1394/Manifest
+++ b/media-libs/libdc1394/Manifest
@@ -18,6 +18,10 @@ AUX libdc1394-2.0.0_pre7-config.h-include-fix.patch 998 RMD160 c15875b3e9aa17608
 MD5 c0bb98e690b0f0d8764a84a8167a28d4 files/libdc1394-2.0.0_pre7-config.h-include-fix.patch 998
 RMD160 c15875b3e9aa17608775947eee850cb4e4d43ff1 files/libdc1394-2.0.0_pre7-config.h-include-fix.patch 998
 SHA256 2fc75f0aca3c3ca23d6729cc57de4c1e37d56551a8d41bfe584e786bf6c75217 files/libdc1394-2.0.0_pre7-config.h-include-fix.patch 998
+AUX libdc1394-2.0.0_rc3-update-iso_channel.patch 403 RMD160 f2a3061f74f918ca05d7e13119a481c4f4dc5930 SHA1 cabdad2d47ac5d3d5dd896b83634a218966444f4 SHA256 ba47f1266114500c9ad98a3da111ee4a2e6b16b330a40e43d9a8e3f5782fed0d
+MD5 a52999e1811677c31441092df95a9e88 files/libdc1394-2.0.0_rc3-update-iso_channel.patch 403
+RMD160 f2a3061f74f918ca05d7e13119a481c4f4dc5930 files/libdc1394-2.0.0_rc3-update-iso_channel.patch 403
+SHA256 ba47f1266114500c9ad98a3da111ee4a2e6b16b330a40e43d9a8e3f5782fed0d files/libdc1394-2.0.0_rc3-update-iso_channel.patch 403
 AUX nox11-2.patch 3221 RMD160 dcca897e8f8417f6b063b52a7e2b9f8c5907790c SHA1 b82e35a875e2f1897931a407fbb4bae89ed08277 SHA256 a4b901e465cbd4aa900419b4364780dfa2ec736401dd3aec73a52ea5b1272d89
 MD5 878ff31cebe2ccca989bb8e60ef5e0b6 files/nox11-2.patch 3221
 RMD160 dcca897e8f8417f6b063b52a7e2b9f8c5907790c files/nox11-2.patch 3221
@@ -31,6 +35,7 @@ DIST libdc1394-1.2.1.tar.gz 389075 RMD160 d44b07f218772a8fdd9d409b1e2dcf5152aa5f
 DIST libdc1394-2.0.0-pre4.tar.gz 364349 RMD160 f330538a2b2e11d852abd275ceef3d0082e6f727 SHA256 64a4266f7b60fb13a1c4a193438ab8f9f3b58571d5155d983c0a35113196f450
 DIST libdc1394-2.0.0-pre6.tar.gz 412057 RMD160 86417b142aca35ee799278ba57b0335313dbbf48 SHA1 e790da951b962bfe0c3286d9e2721c268154421b SHA256 4721407b2365f9ce697cfe5f0267a6fc4774206d1b34945dff63f5bb4dd91117
 DIST libdc1394-2.0.0-pre7.tar.gz 410416 RMD160 529527ba2c91d4567477d8e32b5975d0c9f49c77 SHA1 a50ea1dc1a2c653e0e138083c9917da27b1f7b5b SHA256 a737f0cdc2e0d77e829cac61b12bbea2ad00f65a637c09ec9c2189fb2938fe41
+DIST libdc1394-2.0.0-rc3.tar.gz 432242 RMD160 4f9663a092590d7a9205e49b52f26cc5a564c6eb SHA1 d1458d5e508a5d107e33e159b7e0945c4e85328a SHA256 7f129fab0b7764c2ec728c8dcf0a8eae681e385c600e12f91d9a2b588cd3e133
 DIST libdc1394-2.0.0_pre4-svn-fixes.patch.bz2 5234 RMD160 47dbf75e02ba2779a0e09f526fba5c63995b4c95 SHA256 57d779ec113aeed6658f5ac70f24ace4d64430005d387f54e3cda44f2f9c2d58
 EBUILD libdc1394-1.0.0-r1.ebuild 1194 RMD160 84a943d3ea4a49bb461a7465df74b64460247df5 SHA1 431416b11e621c544b594b0d96aad4519b975a84 SHA256 989509f1a9655974181e12a64f42d14980cc729ff6fcb4e86d106890dd6a43d6
 MD5 3ba305a068235562cdf478aa894b3803 libdc1394-1.0.0-r1.ebuild 1194
@@ -52,10 +57,14 @@ EBUILD libdc1394-2.0.0_pre7-r1.ebuild 1029 RMD160 c978279011e82c5f480eb31409f594
 MD5 6ad63fc5f76ca00d98514972e9d6be76 libdc1394-2.0.0_pre7-r1.ebuild 1029
 RMD160 c978279011e82c5f480eb31409f594d538357927 libdc1394-2.0.0_pre7-r1.ebuild 1029
 SHA256 1b1b42248ca5150a7df9962423a17a09e8f07958d1ca15ac0d66f8c0da7a8190 libdc1394-2.0.0_pre7-r1.ebuild 1029
-MISC ChangeLog 6991 RMD160 79f94a88ec751ab80f7abc8c49bbda417a82346a SHA1 b2299f06ade9d2043273049e38d29eb84a2a022b SHA256 4a7c9f0b2afd89378edf743dc6f1e2bcd8668573f92d0b0d7f4115032cb98109
-MD5 c78b2cc6e559c52c5c73a13a69f9510a ChangeLog 6991
-RMD160 79f94a88ec751ab80f7abc8c49bbda417a82346a ChangeLog 6991
-SHA256 4a7c9f0b2afd89378edf743dc6f1e2bcd8668573f92d0b0d7f4115032cb98109 ChangeLog 6991
+EBUILD libdc1394-2.0.0_rc3.ebuild 1023 RMD160 586f792bd38f65c04594c4f11f37cce5a20475c9 SHA1 f65e0482d62c1751b19e829f5bfc3b26eec629a6 SHA256 dd093658aaaaf13b8206b077c479e65d6668dedc682e09ad111c0c5f68022249
+MD5 fc973a365c3fe5d05f7193b09f272d06 libdc1394-2.0.0_rc3.ebuild 1023
+RMD160 586f792bd38f65c04594c4f11f37cce5a20475c9 libdc1394-2.0.0_rc3.ebuild 1023
+SHA256 dd093658aaaaf13b8206b077c479e65d6668dedc682e09ad111c0c5f68022249 libdc1394-2.0.0_rc3.ebuild 1023
+MISC ChangeLog 7219 RMD160 a3f7c8fe7f884fe3d6caab13937e859d409c0e58 SHA1 ccf315564cf3e8c61042c6b157a782a8cd041643 SHA256 9ee707550a50d5fd5614c4c80d8cde23685cead4a160caf4d882cce545a113bf
+MD5 f0408d71899d3d07cbeb703384f79c0b ChangeLog 7219
+RMD160 a3f7c8fe7f884fe3d6caab13937e859d409c0e58 ChangeLog 7219
+SHA256 9ee707550a50d5fd5614c4c80d8cde23685cead4a160caf4d882cce545a113bf ChangeLog 7219
 MISC metadata.xml 254 RMD160 e443fb2011869d9fa797e4d71e336cac9b91a57c SHA1 3a978a742ce76f4f08724d0956e0e20586063e8e SHA256 10f669506638ebd14d588da05f936dd27b3ffcc7a69e6063cbd77f6439edea0c
 MD5 8c508b7fe8782ef51c759979f02e6110 metadata.xml 254
 RMD160 e443fb2011869d9fa797e4d71e336cac9b91a57c metadata.xml 254
@@ -75,3 +84,6 @@ SHA256 873374eb027e671ff4f57dd2090cc82f3395eb8d85ac864cda9a7cac11bcb43f files/di
 MD5 1e5db04185e062b5fcee91f22ceb73c1 files/digest-libdc1394-2.0.0_pre7-r1 262
 RMD160 edd229012fa72eeaba757551ee5daf90c2df3a89 files/digest-libdc1394-2.0.0_pre7-r1 262
 SHA256 c3797e75b6905f0e703fd566c7d6080c878c754e78412275bbe03d77395369c1 files/digest-libdc1394-2.0.0_pre7-r1 262
+MD5 72f4abd2f8707901078ddcb9abcf37ad files/digest-libdc1394-2.0.0_rc3 259
+RMD160 3c9590cfc8f28566ade821e59123be65102b775b files/digest-libdc1394-2.0.0_rc3 259
+SHA256 089718d47f53a1f1c47357d4fcf76925d1597d337b91e4b23825028a66b6d36d files/digest-libdc1394-2.0.0_rc3 259
diff --git a/media-libs/libdc1394/files/digest-libdc1394-2.0.0_rc3 b/media-libs/libdc1394/files/digest-libdc1394-2.0.0_rc3
new file mode 100644
index 000000000000..489a2d3c3c54
--- /dev/null
+++ b/media-libs/libdc1394/files/digest-libdc1394-2.0.0_rc3
@@ -0,0 +1,3 @@
+MD5 b5c130db255c14027fd7759744d1b9c1 libdc1394-2.0.0-rc3.tar.gz 432242
+RMD160 4f9663a092590d7a9205e49b52f26cc5a564c6eb libdc1394-2.0.0-rc3.tar.gz 432242
+SHA256 7f129fab0b7764c2ec728c8dcf0a8eae681e385c600e12f91d9a2b588cd3e133 libdc1394-2.0.0-rc3.tar.gz 432242
diff --git a/media-libs/libdc1394/files/libdc1394-2.0.0_rc3-update-iso_channel.patch b/media-libs/libdc1394/files/libdc1394-2.0.0_rc3-update-iso_channel.patch
new file mode 100644
index 000000000000..0650acbb9a0d
--- /dev/null
+++ b/media-libs/libdc1394/files/libdc1394-2.0.0_rc3-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_rc3.ebuild b/media-libs/libdc1394/libdc1394-2.0.0_rc3.ebuild
new file mode 100644
index 000000000000..e730bd95c238
--- /dev/null
+++ b/media-libs/libdc1394/libdc1394-2.0.0_rc3.ebuild
@@ -0,0 +1,42 @@
+# 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_rc3.ebuild,v 1.1 2006/08/29 15:16:34 seemant 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="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X"
+
+RDEPEND=">=sys-libs/libraw1394-1.2.0
+		X? ( || ( ( x11-libs/libSM x11-libs/libXv )
+				  virtual/x11 ) )"
+DEPEND="!=sys-libs/libdc1394-2*
+	${RDEPEND}
+	sys-devel/libtool"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-update-iso_channel.patch
+}
+
+src_compile() {
+	econf \
+		--program-suffix=2 \
+		$(use_with X x) || die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc NEWS README AUTHORS ChangeLog
+}