add a patch that gets rid of the unconditional failure return in dc1394_avt_get_mirror function. Patch thanks to Phil Lamoreaux

(Portage version: 2.1_pre7-r4)

5 files changed, 27 insertions, 2 deletions

diff --git a/media-libs/libdc1394/ChangeLog b/media-libs/libdc1394/ChangeLog
index a0fc7b2b1adc..9383dde6b58c 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.16 2006/03/20 18:28:01 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.17 2006/04/06 18:09:07 seemant Exp $
+
+*libdc1394-2.0.0_pre6-r1 (06 Apr 2006)
+
+  06 Apr 2006; Seemant Kulleen <seemant@gentoo.org>
+  +files/libdc1394-2.0.0_pre6-extra-failure-removal.diff,
+  -libdc1394-2.0.0_pre6.ebuild, +libdc1394-2.0.0_pre6-r1.ebuild:
+  add a patch that gets rid of the unconditional failure return in
+  dc1394_avt_get_mirror function. Patch thanks to Phil Lamoreaux
 
 *libdc1394-2.0.0_pre6 (20 Mar 2006)
 
diff --git a/media-libs/libdc1394/Manifest b/media-libs/libdc1394/Manifest
index 1f1ade99a79c..01806931bdc6 100644
--- a/media-libs/libdc1394/Manifest
+++ b/media-libs/libdc1394/Manifest
@@ -13,6 +13,9 @@ SHA256 c28f14a853cdaa2306f57e033df5e288a6dacab5e09d2208eb41cebab6320072 files/di
 MD5 73fbb7efabe64fef5c21ae70611aafe8 files/digest-libdc1394-2.0.0_pre6 262
 RMD160 8466a448ed539bd425b2517d8ca72961160387a9 files/digest-libdc1394-2.0.0_pre6 262
 SHA256 873374eb027e671ff4f57dd2090cc82f3395eb8d85ac864cda9a7cac11bcb43f files/digest-libdc1394-2.0.0_pre6 262
+MD5 73fbb7efabe64fef5c21ae70611aafe8 files/digest-libdc1394-2.0.0_pre6-r1 262
+RMD160 8466a448ed539bd425b2517d8ca72961160387a9 files/digest-libdc1394-2.0.0_pre6-r1 262
+SHA256 873374eb027e671ff4f57dd2090cc82f3395eb8d85ac864cda9a7cac11bcb43f files/digest-libdc1394-2.0.0_pre6-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
@@ -37,6 +40,9 @@ SHA256 ed1d07cb5f2b0e22068e3ef1d14ca895de5d7c964d93969bc13038ce5ddafd54 libdc139
 MD5 28bb89aed262c6707dd00289ce6a3adb libdc1394-2.0.0_pre5-r1.ebuild 1019
 RMD160 75b91e05ebdb1d071552114f755190d36a9a0153 libdc1394-2.0.0_pre5-r1.ebuild 1019
 SHA256 ff89089412abb749c49d6f21c4eabce97953ed84e3c91bc2fd6f1a1cedf8b510 libdc1394-2.0.0_pre5-r1.ebuild 1019
+MD5 306288ecf7069f0d7c144edd4eb7f395 libdc1394-2.0.0_pre6-r1.ebuild 1060
+RMD160 cea4d00cc50d925ca27159b41b284da358e5a201 libdc1394-2.0.0_pre6-r1.ebuild 1060
+SHA256 bcd145dbfc444a8d67f937802ecdc59e35dac2411e7ce7e9ea76f4a15f060b21 libdc1394-2.0.0_pre6-r1.ebuild 1060
 MD5 306288ecf7069f0d7c144edd4eb7f395 libdc1394-2.0.0_pre6.ebuild 1060
 RMD160 cea4d00cc50d925ca27159b41b284da358e5a201 libdc1394-2.0.0_pre6.ebuild 1060
 SHA256 bcd145dbfc444a8d67f937802ecdc59e35dac2411e7ce7e9ea76f4a15f060b21 libdc1394-2.0.0_pre6.ebuild 1060
diff --git a/media-libs/libdc1394/files/digest-libdc1394-2.0.0_pre6 b/media-libs/libdc1394/files/digest-libdc1394-2.0.0_pre6-r1
index 772a9b57c883..772a9b57c883 100644
--- a/media-libs/libdc1394/files/digest-libdc1394-2.0.0_pre6
+++ b/media-libs/libdc1394/files/digest-libdc1394-2.0.0_pre6-r1
diff --git a/media-libs/libdc1394/files/libdc1394-2.0.0_pre6-extra-failure-removal.diff b/media-libs/libdc1394/files/libdc1394-2.0.0_pre6-extra-failure-removal.diff
new file mode 100644
index 000000000000..f38b584330a0
--- /dev/null
+++ b/media-libs/libdc1394/files/libdc1394-2.0.0_pre6-extra-failure-removal.diff
@@ -0,0 +1,10 @@
+--- libdc1394/dc1394_vendor_avt.c.orig	2006-04-06 13:55:38.000000000 -0400
++++ libdc1394/dc1394_vendor_avt.c	2006-04-06 13:55:52.000000000 -0400
+@@ -650,7 +650,6 @@
+   /* Retrieve Mirror mode */
+   err=GetCameraAdvControlRegister(camera,REG_CAMERA_AVT_MIRROR_IMAGE, &value);
+   DC1394_ERR_CHK(err,"Could not get AVT mirror image");
+-    return DC1394_FAILURE;
+   
+   /* mirror ON / OFF : Bit 6 */
+   *on_off = (unsigned int)((value & 0x2000000UL) >> 25); 
diff --git a/media-libs/libdc1394/libdc1394-2.0.0_pre6.ebuild b/media-libs/libdc1394/libdc1394-2.0.0_pre6-r1.ebuild
index 1fc52944b6ee..3f814ee62dd3 100644
--- a/media-libs/libdc1394/libdc1394-2.0.0_pre6.ebuild
+++ b/media-libs/libdc1394/libdc1394-2.0.0_pre6-r1.ebuild
@@ -1,6 +1,6 @@
 # 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_pre6.ebuild,v 1.1 2006/03/20 18:28:01 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-2.0.0_pre6-r1.ebuild,v 1.1 2006/04/06 18:09:07 seemant Exp $
 
 inherit eutils
 
@@ -29,6 +29,7 @@ src_unpack() {
 	# Fix a bug where iso_channel property is not kept up-to-date
 	epatch ${FILESDIR}/${P}-grab_partial_image.diff
 	epatch ${FILESDIR}/${P}-vendor_avt.diff
+	epatch ${FILESDIR}/${P}-extra-failure-removal.diff
 
 	if ! use X; then
 		epatch ${FILESDIR}/nox11-2.patch