version bump -- watch for an API change since pre7

(Portage version: 2.1.1_rc1-r1)

4 files changed, 64 insertions, 1 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/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
+}