diff options
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libdc1394/ChangeLog | 10 | ||||
| -rw-r--r-- | media-libs/libdc1394/Manifest | 21 | ||||
| -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.diff | 10 | ||||
| -rw-r--r-- | media-libs/libdc1394/libdc1394-2.0.0_pre6-r1.ebuild (renamed from media-libs/libdc1394/libdc1394-2.0.0_pre6.ebuild) | 3 |
5 files changed, 33 insertions, 11 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..d2adc658f588 100644 --- a/media-libs/libdc1394/Manifest +++ b/media-libs/libdc1394/Manifest @@ -1,6 +1,6 @@ -MD5 aeeb7979f9ca74da240fb60492589b01 ChangeLog 4614 -RMD160 9a169f31301a26b703e01c18db1401d255e30632 ChangeLog 4614 -SHA256 7ec983b111b21abd1bcc278f5e48d5bc6cfd8ff44eece73a139d0b83890edfb7 ChangeLog 4614 +MD5 4395ed783e3b9aec00e0b5846b80be46 ChangeLog 4962 +RMD160 4c82adef0409c634ea6f2ce24865c07934f061ef ChangeLog 4962 +SHA256 64935c1dce705029c044108f5b681967da6b0161e53b4d5115b7ca9900eb7826 ChangeLog 4962 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,12 +10,15 @@ SHA256 c598e05c6890dbf15010731d7da40f7e24be26227305fd0ce7be63b8dcc53971 files/di 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 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 +MD5 c7b5c11e4b7692209b32dbccba4d188d files/libdc1394-2.0.0_pre6-extra-failure-removal.diff 456 +RMD160 745a1bc3ecb5eaf56fd603e1efde00a841fd198f files/libdc1394-2.0.0_pre6-extra-failure-removal.diff 456 +SHA256 7b5374ccf21e3d5f255bc5468959abe37c4313192519ff32c0d3df847d51162d files/libdc1394-2.0.0_pre6-extra-failure-removal.diff 456 MD5 db738e79160ae03ef02e80a85a3d8f20 files/libdc1394-2.0.0_pre6-grab_partial_image.diff 630 RMD160 ef6f5259b90a6ab16c4cdfaaae79eea3328555c5 files/libdc1394-2.0.0_pre6-grab_partial_image.diff 630 SHA256 a210ba1f32a7aa2abdb3fbc0664f63d2a8db06519be1f48bfaa88a33e0868ca3 files/libdc1394-2.0.0_pre6-grab_partial_image.diff 630 @@ -37,9 +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.ebuild 1060 -RMD160 cea4d00cc50d925ca27159b41b284da358e5a201 libdc1394-2.0.0_pre6.ebuild 1060 -SHA256 bcd145dbfc444a8d67f937802ecdc59e35dac2411e7ce7e9ea76f4a15f060b21 libdc1394-2.0.0_pre6.ebuild 1060 +MD5 8c45bc8cb3c86cf37a719a7cd6323522 libdc1394-2.0.0_pre6-r1.ebuild 1115 +RMD160 34d4d0ebf58daeeea61223ed45ba8e16743f5fe7 libdc1394-2.0.0_pre6-r1.ebuild 1115 +SHA256 a30ea366a26e39325b5ea27619f82bf86f98a16435f01a28083a93fb98f37d64 libdc1394-2.0.0_pre6-r1.ebuild 1115 MD5 8c508b7fe8782ef51c759979f02e6110 metadata.xml 254 RMD160 e443fb2011869d9fa797e4d71e336cac9b91a57c metadata.xml 254 SHA256 10f669506638ebd14d588da05f936dd27b3ffcc7a69e6063cbd77f6439edea0c metadata.xml 254 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 |