version bump to latest release from upstream, with many fixes. API continues to stabilise -- please check apps that you've compiled against pre5 and before, they will need porting

(Portage version: 2.1_pre6-r4)

7 files changed, 62 insertions, 21 deletions

diff --git a/media-libs/libdc1394/ChangeLog b/media-libs/libdc1394/ChangeLog
index 77c1fe215711..a0fc7b2b1adc 100644
--- a/media-libs/libdc1394/ChangeLog
+++ b/media-libs/libdc1394/ChangeLog
@@ -1,6 +1,16 @@
 # 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.15 2006/02/07 20:42:51 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.16 2006/03/20 18:28:01 seemant Exp $
+
+*libdc1394-2.0.0_pre6 (20 Mar 2006)
+
+  20 Mar 2006; Seemant Kulleen <seemant@gentoo.org>
+  +files/libdc1394-2.0.0_pre6-grab_partial_image.diff,
+  +files/libdc1394-2.0.0_pre6-vendor_avt.diff, -libdc1394-2.0.0_pre5.ebuild,
+  +libdc1394-2.0.0_pre6.ebuild:
+  version bump to latest release from upstream, with many fixes. API continues
+  to stabilise -- please check apps that you've compiled against pre5 and
+  before, they will need porting
 
 *libdc1394-2.0.0_pre5-r1 (07 Feb 2006)
 
diff --git a/media-libs/libdc1394/Manifest b/media-libs/libdc1394/Manifest
index d9116808ada5..8aebd25d2cfa 100644
--- a/media-libs/libdc1394/Manifest
+++ b/media-libs/libdc1394/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 5c70fa9823a9708e5d87f8f045494ca2 ChangeLog 4170
 RMD160 d96eaddeb32316e8e0661116909d400e50d0c520 ChangeLog 4170
 SHA256 cb5bb486346c83703a048cd537b97c626135bd880d71ec90eb40860fd9a248fe ChangeLog 4170
@@ -10,15 +7,21 @@ SHA256 df91ff7ccd095fdde4f05b4dd04565966d8b9aa91d1e34cdad5f59368c97952e files/di
 MD5 d24f1e449aa173fce2d9f93ae627131d files/digest-libdc1394-2.0.0_pre4 155
 RMD160 80dfe71517faeebc6c669c617ec7459051ab5140 files/digest-libdc1394-2.0.0_pre4 155
 SHA256 c598e05c6890dbf15010731d7da40f7e24be26227305fd0ce7be63b8dcc53971 files/digest-libdc1394-2.0.0_pre4 155
-MD5 cd66fb3acf276ebb4ea4d625dc1b1548 files/digest-libdc1394-2.0.0_pre5 262
-RMD160 068a75726baef6f610461c0939596b2cba0a94c0 files/digest-libdc1394-2.0.0_pre5 262
-SHA256 c28f14a853cdaa2306f57e033df5e288a6dacab5e09d2208eb41cebab6320072 files/digest-libdc1394-2.0.0_pre5 262
 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 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 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
+MD5 a3b3daa742617bb4204283e1cd338b05 files/libdc1394-2.0.0_pre6-vendor_avt.diff 680
+RMD160 a35870ffd232a0662d98fa2d05cb17a753305454 files/libdc1394-2.0.0_pre6-vendor_avt.diff 680
+SHA256 4a6e13e1012484c702bb4ebd283e28a19e0749aa7cd54b05afdeeb908b434c96 files/libdc1394-2.0.0_pre6-vendor_avt.diff 680
 MD5 878ff31cebe2ccca989bb8e60ef5e0b6 files/nox11-2.patch 3221
 RMD160 dcca897e8f8417f6b063b52a7e2b9f8c5907790c files/nox11-2.patch 3221
 SHA256 a4b901e465cbd4aa900419b4364780dfa2ec736401dd3aec73a52ea5b1272d89 files/nox11-2.patch 3221
@@ -34,16 +37,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 852e6c3269ca14543223a0246755e067 libdc1394-2.0.0_pre5.ebuild 906
-RMD160 163f8c26dbf8c37353fdb3f11992543e040fa77b libdc1394-2.0.0_pre5.ebuild 906
-SHA256 5f0f3741906a95aab64a062a424361f8fc530f9be7ba2fe260a96aaf1452c121 libdc1394-2.0.0_pre5.ebuild 906
+MD5 cead65f3d0832509d7750cad2bbe485d libdc1394-2.0.0_pre6.ebuild 1059
+RMD160 d9eddc676ddf96afd07a6960ce92991cc438e2c2 libdc1394-2.0.0_pre6.ebuild 1059
+SHA256 da3f10f14828358d641627a42613ebeb3aa187cbc50366a7c34e477afd2cd55e libdc1394-2.0.0_pre6.ebuild 1059
 MD5 8c508b7fe8782ef51c759979f02e6110 metadata.xml 254
 RMD160 e443fb2011869d9fa797e4d71e336cac9b91a57c metadata.xml 254
 SHA256 10f669506638ebd14d588da05f936dd27b3ffcc7a69e6063cbd77f6439edea0c metadata.xml 254
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD6QckTOXg++0VvJQRAl40AKDGsmwZhzvLIUpiFPjYPv3pgdn+/wCgs396
-4Yxd0T29r+ba6dcHslOR/VI=
-=nSg4
------END PGP SIGNATURE-----
diff --git a/media-libs/libdc1394/files/digest-libdc1394-2.0.0_pre5 b/media-libs/libdc1394/files/digest-libdc1394-2.0.0_pre5
deleted file mode 100644
index 57abc46a6194..000000000000
--- a/media-libs/libdc1394/files/digest-libdc1394-2.0.0_pre5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 078cbe32c77dbf7d3943d09e7516816d libdc1394-2.0.0-pre5.tar.gz 368917
-RMD160 1b692acbc1fe402c2d07b5e132c35e0a9ea3653a libdc1394-2.0.0-pre5.tar.gz 368917
-SHA256 02bb1ed4e299a1a7a32487e8c7285f0e91fafb2acb700905a96ca57b7751af0a libdc1394-2.0.0-pre5.tar.gz 368917
diff --git a/media-libs/libdc1394/files/digest-libdc1394-2.0.0_pre6 b/media-libs/libdc1394/files/digest-libdc1394-2.0.0_pre6
new file mode 100644
index 000000000000..772a9b57c883
--- /dev/null
+++ b/media-libs/libdc1394/files/digest-libdc1394-2.0.0_pre6
@@ -0,0 +1,3 @@
+MD5 a2bafbc41fd46e0c0fb1fa14fcece9d6 libdc1394-2.0.0-pre6.tar.gz 412057
+RMD160 86417b142aca35ee799278ba57b0335313dbbf48 libdc1394-2.0.0-pre6.tar.gz 412057
+SHA256 4721407b2365f9ce697cfe5f0267a6fc4774206d1b34945dff63f5bb4dd91117 libdc1394-2.0.0-pre6.tar.gz 412057
diff --git a/media-libs/libdc1394/files/libdc1394-2.0.0_pre6-grab_partial_image.diff b/media-libs/libdc1394/files/libdc1394-2.0.0_pre6-grab_partial_image.diff
new file mode 100644
index 000000000000..bbc4b01798f7
--- /dev/null
+++ b/media-libs/libdc1394/files/libdc1394-2.0.0_pre6-grab_partial_image.diff
@@ -0,0 +1,11 @@
+--- examples/grab_partial_image.c.orig	2006-03-20 10:07:00.000000000 -0500
++++ examples/grab_partial_image.c	2006-03-20 10:07:37.000000000 -0500
+@@ -158,7 +158,7 @@
+     /*---------------------------------------------------------------------
+      *  output elapsed time
+      *---------------------------------------------------------------------*/
+-    elapsed_time = (float)(times(&tms_buf) - start_time) / CLK_TCK;
++    elapsed_time = (float)(times(&tms_buf) - start_time) / CLOCKS_PER_SEC;
+     printf( "got frame %d. elapsed time: %g sec ==> %g frames/second\n",
+             i, elapsed_time, (float)i / elapsed_time);
+   }
diff --git a/media-libs/libdc1394/files/libdc1394-2.0.0_pre6-vendor_avt.diff b/media-libs/libdc1394/files/libdc1394-2.0.0_pre6-vendor_avt.diff
new file mode 100644
index 000000000000..ea5029952221
--- /dev/null
+++ b/media-libs/libdc1394/files/libdc1394-2.0.0_pre6-vendor_avt.diff
@@ -0,0 +1,20 @@
+--- libdc1394/dc1394_vendor_avt.c.orig	2006-03-20 10:09:07.000000000 -0500
++++ libdc1394/dc1394_vendor_avt.c	2006-03-20 10:09:25.000000000 -0500
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "dc1394_vendor_avt.h"
++#include "config.h"
+ 
+ /********************************************************/
+ /* Configuration Register Offsets for Advances features */
+--- libdc1394/dc1394_vendor_avt.h.orig	2006-03-20 10:09:11.000000000 -0500
++++ libdc1394/dc1394_vendor_avt.h	2006-03-20 10:09:31.000000000 -0500
+@@ -26,7 +26,6 @@
+ #include <libraw1394/raw1394.h>
+ #include "dc1394_control.h"
+ #include "dc1394_register.h"
+-#include "config.h"
+ 
+ typedef struct __dc1394_avt_adv_feature_info_struct 
+ {
diff --git a/media-libs/libdc1394/libdc1394-2.0.0_pre5.ebuild b/media-libs/libdc1394/libdc1394-2.0.0_pre6.ebuild
index 3ee57463a610..1fc52944b6ee 100644
--- a/media-libs/libdc1394/libdc1394-2.0.0_pre5.ebuild
+++ b/media-libs/libdc1394/libdc1394-2.0.0_pre6.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_pre5.ebuild,v 1.3 2006/01/29 08:02:28 robbat2 Exp $
+# $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 $
 
 inherit eutils
 
@@ -26,6 +26,10 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	# 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
+
 	if ! use X; then
 		epatch ${FILESDIR}/nox11-2.patch
 	fi