summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeemant Kulleen <seemant@gentoo.org>2006-04-06 18:09:07 +0000
committerSeemant Kulleen <seemant@gentoo.org>2006-04-06 18:09:07 +0000
commit0b77e988d879face32cd6f98fc46d8d1c8cb9e5e (patch)
treea7147ec0db98734ba26ceaf4c5e1af8e734e1a8a /media-libs/libdc1394/files
parentVersion bump. (diff)
downloadgentoo-2-0b77e988d879face32cd6f98fc46d8d1c8cb9e5e.tar.gz
gentoo-2-0b77e988d879face32cd6f98fc46d8d1c8cb9e5e.tar.bz2
gentoo-2-0b77e988d879face32cd6f98fc46d8d1c8cb9e5e.zip
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)
Diffstat (limited to 'media-libs/libdc1394/files')
-rw-r--r--media-libs/libdc1394/files/digest-libdc1394-2.0.0_pre6-r1 (renamed from media-libs/libdc1394/files/digest-libdc1394-2.0.0_pre6)0
-rw-r--r--media-libs/libdc1394/files/libdc1394-2.0.0_pre6-extra-failure-removal.diff10
2 files changed, 10 insertions, 0 deletions
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);