Adding a patch to compile against >=media-libs/libquicktime-0.9.9, bug #141429

Package-Manager: portage-2.1.2_pre3-r3

4 files changed, 46 insertions, 10 deletions

diff --git a/media-tv/xawtv/ChangeLog b/media-tv/xawtv/ChangeLog
index 836cc6c3bd62..d52312f47ddf 100644
--- a/media-tv/xawtv/ChangeLog
+++ b/media-tv/xawtv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/xawtv
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.50 2006/10/14 20:20:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.51 2006/10/17 18:35:30 aballier Exp $
+
+  17 Oct 2006; Alexis Ballier <aballier@gentoo.org>
+  +files/xawtv-3.95-libquicktime-compat.patch, xawtv-3.95-r1.ebuild:
+  Adding a patch to compile against >=media-libs/libquicktime-0.9.9, bug #141429
 
   14 Oct 2006; Aron Griffis <agriffis@gentoo.org> xawtv-3.95-r1.ebuild:
   Mark 3.95-r1 stable on ia64. #138606
diff --git a/media-tv/xawtv/Manifest b/media-tv/xawtv/Manifest
index eabc8073acd2..9e3a63eceebd 100644
--- a/media-tv/xawtv/Manifest
+++ b/media-tv/xawtv/Manifest
@@ -10,6 +10,10 @@ AUX xawtv-3.94-no-x11.patch 577 RMD160 03246cd3a593e169d2607250c5137fb7b368e6a5
 MD5 eeb0da894fddca794ffc60f0033ce58c files/xawtv-3.94-no-x11.patch 577
 RMD160 03246cd3a593e169d2607250c5137fb7b368e6a5 files/xawtv-3.94-no-x11.patch 577
 SHA256 f93d032e9d48db8b3e470c07b77de8520d7deb110ab4d86d5fff3253958cd01b files/xawtv-3.94-no-x11.patch 577
+AUX xawtv-3.95-libquicktime-compat.patch 1040 RMD160 07a6a212136dd6b1108a1fc1605506e9f94a8ceb SHA1 91d3c1824d7810389f56c89e33e2bc4340d52faf SHA256 e7c49e00e845d237478ba13b7afdfa4f8e59d49749a1f953464ae848b90454b3
+MD5 4797c31e903a3f5b4c092e4da8ba68f6 files/xawtv-3.95-libquicktime-compat.patch 1040
+RMD160 07a6a212136dd6b1108a1fc1605506e9f94a8ceb files/xawtv-3.95-libquicktime-compat.patch 1040
+SHA256 e7c49e00e845d237478ba13b7afdfa4f8e59d49749a1f953464ae848b90454b3 files/xawtv-3.95-libquicktime-compat.patch 1040
 DIST tv-fonts-1.0.tar.bz2 140781 RMD160 a4e9509ac934087aafd9168adb71bce02170f995 SHA1 de959bfe21c54458f4f37d4303a485ac40972043 SHA256 5f4a9a66e6cd7cb967ac1f31926bd5b04f5e551e684ad7a736072eeff1707693
 DIST tv-fonts-1.1.tar.bz2 80177 RMD160 0bf4aa9ebc8b08edfc3b6c306e0d9efad3656652 SHA1 e35d1ddf5cc0b68a5935e5cabd2fbb1c39c6f760 SHA256 0194dd03ac9b384951e7f5ed7d08c6fc5f6d94efcd08516732720a1a4704d9f6
 DIST xaw-deinterlace-3.76-0.1.1.diff.bz2 3858 RMD160 eec4b8a6f7b752dc0d582c6895d897a35775d0c8 SHA1 8201e11b41ae9aae8751d40a868e21cfa35deff5 SHA256 8d8a050607e25665da88e8f8c90d289123c0ebb0ca320d206a3dc026ec6a4c42
@@ -20,14 +24,14 @@ EBUILD xawtv-3.94-r1.ebuild 2354 RMD160 623e88b7504ed933aee7fd658ba6a2a5c31f6fa4
 MD5 7d4e59c9bfed0b53c79353a863abdced xawtv-3.94-r1.ebuild 2354
 RMD160 623e88b7504ed933aee7fd658ba6a2a5c31f6fa4 xawtv-3.94-r1.ebuild 2354
 SHA256 30d7bfbcb574b0f16faeab4c60137cf6b2a75329943f1ea132c40b4adec76b59 xawtv-3.94-r1.ebuild 2354
-EBUILD xawtv-3.95-r1.ebuild 3654 RMD160 b25950d5abc2443533f67e495a048ccef2d84b98 SHA1 6bbe871aa90c8c8be3e8643c9c36d7af34fcea2c SHA256 3146dcc5fbafe1d54a18239dd8ddb515d1d4c0ee7d18ef5a1a26d1cdbd74caba
-MD5 0d4f4dc7c21af8cd80cf4205f924129a xawtv-3.95-r1.ebuild 3654
-RMD160 b25950d5abc2443533f67e495a048ccef2d84b98 xawtv-3.95-r1.ebuild 3654
-SHA256 3146dcc5fbafe1d54a18239dd8ddb515d1d4c0ee7d18ef5a1a26d1cdbd74caba xawtv-3.95-r1.ebuild 3654
-MISC ChangeLog 13108 RMD160 1aa2093c3bda9a4d0a03ff302f36f906d84cc25e SHA1 54ee49e585b1e8b954b16b19f04d14a831962320 SHA256 05db29c870318ce09053633c80497aa17d868e4eadafbf26a520ae1b2d5cbb96
-MD5 6eff08cfe0e90506440f658616cd9a47 ChangeLog 13108
-RMD160 1aa2093c3bda9a4d0a03ff302f36f906d84cc25e ChangeLog 13108
-SHA256 05db29c870318ce09053633c80497aa17d868e4eadafbf26a520ae1b2d5cbb96 ChangeLog 13108
+EBUILD xawtv-3.95-r1.ebuild 3707 RMD160 7b9e2cb36e8d311e841add0df46d4abd5f8553d9 SHA1 b3b34db959e9ea0a5ce8ed6f953ee06a55ddacd2 SHA256 044a655873296b8bfbdc545715bc16638d2fd2d1a15362308eed4ac3b81d5a5d
+MD5 3cb3858fed267f5aa12188b8f1007874 xawtv-3.95-r1.ebuild 3707
+RMD160 7b9e2cb36e8d311e841add0df46d4abd5f8553d9 xawtv-3.95-r1.ebuild 3707
+SHA256 044a655873296b8bfbdc545715bc16638d2fd2d1a15362308eed4ac3b81d5a5d xawtv-3.95-r1.ebuild 3707
+MISC ChangeLog 13311 RMD160 fb86c8ae6aaa97dde55a553e53a207341ceb4ef9 SHA1 ec4cc2a31fcd61c54d4c955f005578d10cd01b0d SHA256 7b5f401247084e4c8ac423a935888595aceb6b2d3e8fd79f81729ad68b4ce659
+MD5 559f6bec0d456b593e781d6fa0e9cd81 ChangeLog 13311
+RMD160 fb86c8ae6aaa97dde55a553e53a207341ceb4ef9 ChangeLog 13311
+SHA256 7b5f401247084e4c8ac423a935888595aceb6b2d3e8fd79f81729ad68b4ce659 ChangeLog 13311
 MISC metadata.xml 161 RMD160 fee76f69ba822cd04301c58fa0c26ecaf8cc8fb9 SHA1 0aee2176f15a238a6d8fbbf83e4e0fd58653a3fa SHA256 82d33b3ca60662bc745d30d53bb20d04ea588d5aae556ed16efcacdcc37fd4bd
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
 RMD160 fee76f69ba822cd04301c58fa0c26ecaf8cc8fb9 metadata.xml 161
diff --git a/media-tv/xawtv/files/xawtv-3.95-libquicktime-compat.patch b/media-tv/xawtv/files/xawtv-3.95-libquicktime-compat.patch
new file mode 100644
index 000000000000..a86c48d83b4e
--- /dev/null
+++ b/media-tv/xawtv/files/xawtv-3.95-libquicktime-compat.patch
@@ -0,0 +1,27 @@
+--- xawtv-3.95/libng/plugins/write-qt.c.old	2006-10-16 20:50:45.000000000 +0200
++++ xawtv-3.95/libng/plugins/write-qt.c	2006-10-17 19:36:09.000000000 +0200
+@@ -348,10 +348,10 @@
+ 		    info[i]->name,info[i]->long_name);
+ 	    for (j = 0; j < info[i]->num_fourccs; j++)
+ 		fprintf(stderr,"   fcc   : %s\n",info[i]->fourccs[j]);
+-	    for (j = 0; j < info[i]->num_encoding_colormodels; j++)
++	    for (j = 0; j < lqt_num_colormodels(); j++)
+ 		fprintf(stderr,"   cmodel: %d [%s]\n",
+-			info[i]->encoding_colormodels[j],
+-			lqt_get_colormodel_string(info[i]->encoding_colormodels[j]));
++			lqt_get_colormodel(j),
++			lqt_get_colormodel_string(j));
+ 	}
+ 
+ 	/* sanity checks */
+@@ -378,8 +378,8 @@
+ 	/* pick colormodel */
+ 	fmtid  = VIDEO_NONE;
+ 	cmodel = 0;
+-	for (j = 0; j < info[i]->num_encoding_colormodels; j++) {
+-	    cmodel = info[i]->encoding_colormodels[j];
++	for (j = 0; j < lqt_num_colormodels(); j++) {
++	    cmodel = lqt_get_colormodel(j);
+ 	    if (cmodel>= sizeof(cmodels)/sizeof(int))
+ 		continue;
+ 	    if (!cmodels[cmodel])
diff --git a/media-tv/xawtv/xawtv-3.95-r1.ebuild b/media-tv/xawtv/xawtv-3.95-r1.ebuild
index e85f02f8150c..81a5a17b747e 100644
--- a/media-tv/xawtv/xawtv-3.95-r1.ebuild
+++ b/media-tv/xawtv/xawtv-3.95-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-tv/xawtv/xawtv-3.95-r1.ebuild,v 1.17 2006/10/14 20:20:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.95-r1.ebuild,v 1.18 2006/10/17 18:35:30 aballier Exp $
 
 inherit eutils font autotools flag-o-matic
 
@@ -74,6 +74,7 @@ src_unpack() {
 	cd "${S}"
 
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	epatch "${FILESDIR}/${P}-libquicktime-compat.patch"
 	eautoreconf
 }