Fixing libquicktime compatibility issue, bug #142107

Package-Manager: portage-2.1.2_pre3-r6

5 files changed, 61 insertions, 19 deletions

diff --git a/media-video/dvgrab/ChangeLog b/media-video/dvgrab/ChangeLog
index a787dd89e514..d2800d851b0a 100644
--- a/media-video/dvgrab/ChangeLog
+++ b/media-video/dvgrab/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/dvgrab
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/ChangeLog,v 1.16 2006/09/06 12:04:18 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/ChangeLog,v 1.17 2006/10/21 22:59:50 aballier Exp $
+
+  21 Oct 2006; Alexis Ballier <aballier@gentoo.org>
+  +files/dvgrab-libquicktime-compat.patch, dvgrab-1.8.ebuild:
+  Fixing libquicktime compatibility issue, bug #142107
 
   06 Sep 2006; Matthias Schwarzott <zzam@gentoo.org>
   +files/dvgrab-1.8-configure.patch, dvgrab-1.8.ebuild:
diff --git a/media-video/dvgrab/Manifest b/media-video/dvgrab/Manifest
index c7c93842ca89..049b0edbd743 100644
--- a/media-video/dvgrab/Manifest
+++ b/media-video/dvgrab/Manifest
@@ -5,34 +5,38 @@ AUX dvgrab-1.8-configure.patch 2624 RMD160 848a9e7091a804fea8469e5aab9fb4e9b7358
 MD5 cd279c51e72b1507e90812d9ea453908 files/dvgrab-1.8-configure.patch 2624
 RMD160 848a9e7091a804fea8469e5aab9fb4e9b73581a6 files/dvgrab-1.8-configure.patch 2624
 SHA256 1ce0ef77765e18294b85b4f024f85e0a8eadce643c36b414ec06f72a4cff745f files/dvgrab-1.8-configure.patch 2624
-DIST dvgrab-1.7.tar.gz 163596
+AUX dvgrab-libquicktime-compat.patch 661 RMD160 5140ed6816e0ca172cf093b9e3f945b427c44b47 SHA1 2dee03a02cdde9ea52fd2a32187962cf92471ef3 SHA256 906aa54cd5e1eefa134a7c9032eba536e1215b646457de82e5fef099084ad4c8
+MD5 559e5116433065de4603319e39919db8 files/dvgrab-libquicktime-compat.patch 661
+RMD160 5140ed6816e0ca172cf093b9e3f945b427c44b47 files/dvgrab-libquicktime-compat.patch 661
+SHA256 906aa54cd5e1eefa134a7c9032eba536e1215b646457de82e5fef099084ad4c8 files/dvgrab-libquicktime-compat.patch 661
+DIST dvgrab-1.7.tar.gz 163596 RMD160 e3a7ba40ed878f8e79cb6e337295d943eb691497 SHA1 d2c2d608cfda11a397f2c6985172fbd18f789d43 SHA256 68ef6319cbd8bfcb4d148fdffc40e515fe2f9111f70126eafc944da25e6cfcd0
 DIST dvgrab-1.8.tar.gz 163695 RMD160 7db4fbd5341458d43f6d762a0c985a9beab923b8 SHA1 c73292c8f19a581883f1c0a536e06f646feb421f SHA256 b0a6d519307bacc95fb6a73f9ac359aa4c0b1fafd84a9c5fec57562b431aee4d
 EBUILD dvgrab-1.7.ebuild 737 RMD160 3d7f81ce19e292b5756da9f35ee70f6126043e08 SHA1 a9595da97250eecdb18e8e4838774d2941b20642 SHA256 fe38eea3246576aecb94f580bdb8b91ece84b085484e68043fad4392c4a7d73f
 MD5 10debb1def77296af7a434508702108d dvgrab-1.7.ebuild 737
 RMD160 3d7f81ce19e292b5756da9f35ee70f6126043e08 dvgrab-1.7.ebuild 737
 SHA256 fe38eea3246576aecb94f580bdb8b91ece84b085484e68043fad4392c4a7d73f dvgrab-1.7.ebuild 737
-EBUILD dvgrab-1.8.ebuild 980 RMD160 6cddd2ace1e56537976ae02d3c589e7ffdc73386 SHA1 0abc40bbbad66f47a9d4df627eba53762de83158 SHA256 a277599d52c7a9da8381e48084032c541bc1fe5791ff3ef16d110cf5525d9bfe
-MD5 6e5acd9f4bdb4f3de6605334b5446d0d dvgrab-1.8.ebuild 980
-RMD160 6cddd2ace1e56537976ae02d3c589e7ffdc73386 dvgrab-1.8.ebuild 980
-SHA256 a277599d52c7a9da8381e48084032c541bc1fe5791ff3ef16d110cf5525d9bfe dvgrab-1.8.ebuild 980
-MISC ChangeLog 2446 RMD160 3a4b31638f86538139c0e6d5499ab49bbe5793c2 SHA1 70deeae3371dc670d24f9cd038d91897e52955e8 SHA256 ea4e649ea827ef5fab54677d916368bfaa8261afad7eadb6cf4f706a5bb01298
-MD5 5864f6ea93e0c1fa2c40593dd199aaaf ChangeLog 2446
-RMD160 3a4b31638f86538139c0e6d5499ab49bbe5793c2 ChangeLog 2446
-SHA256 ea4e649ea827ef5fab54677d916368bfaa8261afad7eadb6cf4f706a5bb01298 ChangeLog 2446
+EBUILD dvgrab-1.8.ebuild 1042 RMD160 dfc5f526dba756b73f43a70956e21d74a8d322f4 SHA1 0c8ff6799d7de88fe532fd1d21e467e5ab4a476e SHA256 4301323663848647dcf25247d86916e3c029ca719bd16c13d4031aeca741cb9a
+MD5 07f541ac64da84dcb116223ea490c7f6 dvgrab-1.8.ebuild 1042
+RMD160 dfc5f526dba756b73f43a70956e21d74a8d322f4 dvgrab-1.8.ebuild 1042
+SHA256 4301323663848647dcf25247d86916e3c029ca719bd16c13d4031aeca741cb9a dvgrab-1.8.ebuild 1042
+MISC ChangeLog 2620 RMD160 7f0fa197025c3a8f08f5d36bde90f2abadb7e82c SHA1 0c61d238659d58d4ebde350655079c36e4b93c1a SHA256 a2a732cd59b371bf30355aca6bcbb9a285b066422b5a37af55ee41c488c2ab2a
+MD5 a77dee038f6520fa2f969ee4fa801bbd ChangeLog 2620
+RMD160 7f0fa197025c3a8f08f5d36bde90f2abadb7e82c ChangeLog 2620
+SHA256 a2a732cd59b371bf30355aca6bcbb9a285b066422b5a37af55ee41c488c2ab2a ChangeLog 2620
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 metadata.xml 225
-MD5 db7e9be0f32a0c3572d08c1576fa69ad files/digest-dvgrab-1.7 62
-RMD160 eb67df9d190914a9056c35ef09e2e5667ca837af files/digest-dvgrab-1.7 62
-SHA256 06c4c9f8a97b837515820452267d251de1569a4e816f67253445c5472d60fdbf files/digest-dvgrab-1.7 62
+MD5 73aa7d2d86615c2c835528905d688bff files/digest-dvgrab-1.7 232
+RMD160 417795369b665266959b3621ff9f9787878480c5 files/digest-dvgrab-1.7 232
+SHA256 30fdda631f9670c8c6c7a6dfe610f5c869fe6f1e4837089a9e7e41c7aeebb22f files/digest-dvgrab-1.7 232
 MD5 6d7d9ab902b625057aa20ba33e394bad files/digest-dvgrab-1.8 232
 RMD160 3a932674c29658ba53c23f32073b871d918706ef files/digest-dvgrab-1.8 232
 SHA256 327fa62ec75524980cc5a965bd6b8f8d9b64f7faeb764b37128c02d7bed1b6be files/digest-dvgrab-1.8 232
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE/rlPt2vP6XvVdOcRAm+PAKCOR+iYa1WZMAOMrQIjrm49e3ICAACfc7g0
-4AApAzGjPQcDhyLXbwGb4Fg=
-=G9v8
+iD8DBQFFOqZjvFcC4BYPU0oRAmyiAKCgYJ9TmwFr3zoN3rxLHOON3lReMACgn0FB
+6FsLvy67QEwhb+cAKNbbhjA=
+=xA3Q
 -----END PGP SIGNATURE-----
diff --git a/media-video/dvgrab/dvgrab-1.8.ebuild b/media-video/dvgrab/dvgrab-1.8.ebuild
index ad07edaaafa1..cf069cc6c51c 100644
--- a/media-video/dvgrab/dvgrab-1.8.ebuild
+++ b/media-video/dvgrab/dvgrab-1.8.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-video/dvgrab/dvgrab-1.8.ebuild,v 1.8 2006/09/06 12:04:18 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/dvgrab-1.8.ebuild,v 1.9 2006/10/21 22:59:50 aballier Exp $
 
 inherit eutils autotools
 
@@ -20,9 +20,10 @@ DEPEND="sys-libs/libavc1394
 RDEPEND="${DEPEND}"
 
 src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-configure.patch
+	unpack "${A}"
+	epatch "${FILESDIR}/${P}-configure.patch"
 	cd ${S}
+	epatch "${FILESDIR}/${PN}-libquicktime-compat.patch"
 	eautoreconf
 }
 
diff --git a/media-video/dvgrab/files/digest-dvgrab-1.7 b/media-video/dvgrab/files/digest-dvgrab-1.7
index aad63fd83707..b1b8eaf784af 100644
--- a/media-video/dvgrab/files/digest-dvgrab-1.7
+++ b/media-video/dvgrab/files/digest-dvgrab-1.7
@@ -1 +1,3 @@
 MD5 42d14bcc6375774c2623c05530c5a5dd dvgrab-1.7.tar.gz 163596
+RMD160 e3a7ba40ed878f8e79cb6e337295d943eb691497 dvgrab-1.7.tar.gz 163596
+SHA256 68ef6319cbd8bfcb4d148fdffc40e515fe2f9111f70126eafc944da25e6cfcd0 dvgrab-1.7.tar.gz 163596
diff --git a/media-video/dvgrab/files/dvgrab-libquicktime-compat.patch b/media-video/dvgrab/files/dvgrab-libquicktime-compat.patch
new file mode 100644
index 000000000000..3f5c56b2d1e0
--- /dev/null
+++ b/media-video/dvgrab/files/dvgrab-libquicktime-compat.patch
@@ -0,0 +1,31 @@
+--- filehandler.cc	2005/04/18 16:36:07	1.13
++++ filehandler.cc	2006/03/04 05:29:38	1.14
+@@ -788,10 +788,9 @@
+ bool QtHandler::Create( const string& filename )
+ {
+ 	Init();
+-
+ 	fd = quicktime_open( const_cast<char*>( filename.c_str() ), 0, 1 );
++	this->filename = filename;
+ 
+-	//if (fd != NULL) FileTracker::GetInstance().Add(filename.c_str());
+ 	return ( fd != NULL );
+ }
+ 
+@@ -907,7 +906,7 @@
+ 	if ( fd )
+ 	{
+ 		struct stat file_status;
+-		fstat( fileno( fd->stream ), &file_status );
++		stat( filename.c_str(), &file_status );
+ 		return file_status.st_size;
+ 	}
+ 	else
+@@ -945,6 +944,7 @@
+ 		Close();
+ 		return false;
+ 	}
++	filename = s;
+ 
+ 	return true;
+ }