Trivial gcc4 fix

Package-Manager: portage-2.1_pre4-r1

4 files changed, 68 insertions, 14 deletions

diff --git a/media-libs/libdv/ChangeLog b/media-libs/libdv/ChangeLog
index bd302b8718fd..ee6aa55372b9 100644
--- a/media-libs/libdv/ChangeLog
+++ b/media-libs/libdv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libdv
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/ChangeLog,v 1.46 2006/01/14 05:58:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/ChangeLog,v 1.47 2006/02/07 18:06:11 chutzpah Exp $
+
+  07 Feb 2006; Patrick McLean <chutzpah@gentoo.org>
+  +files/libdv-0.104-gcc4.patch, libdv-0.104-r1.ebuild:
+  Trivial patch to fix compilation with gcc4.
 
   24 Dec 2005; Rene Nussbaumer <killerfox@gentoo.org> libdv-0.102.ebuild:
   Stable on hppa.
diff --git a/media-libs/libdv/Manifest b/media-libs/libdv/Manifest
index ed2630286796..7a36d34eadf7 100644
--- a/media-libs/libdv/Manifest
+++ b/media-libs/libdv/Manifest
@@ -1,26 +1,51 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 fab23c1342f207f1d52903ff6c2bea4b ChangeLog 6443
+MD5 c2f06e788e3f4e658ba3a35405c47a59 ChangeLog 6600
+RMD160 1277b756f5be246acd89e0d7357186219bab4f6d ChangeLog 6600
+SHA256 d425ea54269d28ee45204e6bc08a89837b725d1d781bab313e4df796a114a2b9 ChangeLog 6600
 MD5 21abc06a6e969b1a6b5b1ca2f1f09474 files/digest-libdv-0.101 63
+RMD160 67d8e0b620064f9fe2ac2591b2204a01655c30ae files/digest-libdv-0.101 63
+SHA256 9732318f48c3713f34c233de2ecb9aa5c890697616176a725d74d0ab08dc4223 files/digest-libdv-0.101 63
 MD5 d577f2ed689030f4f13088422f1fa185 files/digest-libdv-0.102 63
+RMD160 94dd044ea429b05751a9bde204b2347bd52acc8b files/digest-libdv-0.102 63
+SHA256 41916f10e5b8333e4e920ea648444634a9f3ea384144913f6a5b2a71ebf21516 files/digest-libdv-0.102 63
 MD5 2524a27d2f6e849452d1d5d1f97580ec files/digest-libdv-0.104 63
+RMD160 ca2d05aee8df66121ecba5ad1f88c98483c22b41 files/digest-libdv-0.104 63
+SHA256 59e557dbd0afeeb8ddb795f54ee496b72ae902a1e109e6462d681b13ea7e82d7 files/digest-libdv-0.104 63
 MD5 eb5a28a360cc8abef3b68c49d666758e files/digest-libdv-0.104-r1 135
+RMD160 30ff6b15da731894a71db1579c3f1aaee251f33f files/digest-libdv-0.104-r1 135
+SHA256 c16796e3ac7d6d27aa03b90f90952d3e3e2234ef7132ecc8c0a4711d5f1ad651 files/digest-libdv-0.104-r1 135
 MD5 3d3bbf2ecd039329fe6b73dc9ada38bf files/digest-libdv-0.99-r1 62
+RMD160 5ff13b02a01518faf9c931d11f3a74619794ee72 files/digest-libdv-0.99-r1 62
+SHA256 8fcd2519bb397f8d1bbd1fb22c9b8c1fbf39c2941c1f576a91ae3f7eb9401e3b files/digest-libdv-0.99-r1 62
 MD5 ccdc17c32d38a07aab1b06d6932a13f8 files/libdv-0.104-amd64reloc.patch 9114
+RMD160 239e36fe1d36e1188c11a6c36f21e8775aa4c8ee files/libdv-0.104-amd64reloc.patch 9114
+SHA256 aef82a5b9a3e55ec32a81f420cc332bef102000c5b75a21ea21b2417f49603e4 files/libdv-0.104-amd64reloc.patch 9114
+MD5 9c164b3ac9ace66bb2fcefc9ca939d28 files/libdv-0.104-gcc4.patch 1445
+RMD160 bd150c6b3ae4082fef0bd4347240af9764b47cfc files/libdv-0.104-gcc4.patch 1445
+SHA256 32c301e574c598328c2b72e54cec93431820b823b56aba55969350d46d936977 files/libdv-0.104-gcc4.patch 1445
 MD5 aa87e4d4bdd76b94e1f9536680c9fdda files/libdv-0.104-no-exec-stack.patch 2678
+RMD160 740c2a50357985bc660e6fde1ecabfc707bea20e files/libdv-0.104-no-exec-stack.patch 2678
+SHA256 e635e83fd242f2bc17f15c8141527fedbcbb3043d92a98ba92164480b02fd3d4 files/libdv-0.104-no-exec-stack.patch 2678
 MD5 592d600ce50f0a107ecd5b348d434f9f files/libdv-0.99-2.6.patch 439
+RMD160 507326ff0fbc305bf63c67790736f2251a98ce74 files/libdv-0.99-2.6.patch 439
+SHA256 acaaafa94768d3b78d6923d54cabf7386da1c4ddf39f61c334b3f320aaadc7c3 files/libdv-0.99-2.6.patch 439
 MD5 db1c07312c8a5de3d64bc80c44b26d6e files/libdv-0.99-disablegtk.patch 3309
+RMD160 7d61763cc742f8aaddc1931e030128490c0b0e69 files/libdv-0.99-disablegtk.patch 3309
+SHA256 57189f7e660507c50c80b16637f4b1cfdf345dd0d9718ed0c2c2c3db337cf166 files/libdv-0.99-disablegtk.patch 3309
 MD5 9ff480f44ba52c721c629991852b4ddf libdv-0.101.ebuild 1147
+RMD160 28d0182504ad83d86fcb6edadd65057c420c4ab3 libdv-0.101.ebuild 1147
+SHA256 2a7ae09476b120d250dad64f1d8616af9bcd70620630bfd99378f2959d9feb07 libdv-0.101.ebuild 1147
 MD5 46f8f748604df97f78df00b0b89a3768 libdv-0.102.ebuild 1155
-MD5 720af0c87e917d04b59d9754ce045b6c libdv-0.104-r1.ebuild 1433
+RMD160 212393c666a10434cc5627424fdb7307459988f4 libdv-0.102.ebuild 1155
+SHA256 337cd4a6787fecf35a89ece63d32481c36c4f44c4496710d2c3e770b6e08c69b libdv-0.102.ebuild 1155
+MD5 4252bbe0681e215183b4f5b1c1d8f0a7 libdv-0.104-r1.ebuild 1500
+RMD160 3aa3c933cd5eaced0fdf1f14a6070000b7d343dd libdv-0.104-r1.ebuild 1500
+SHA256 d1b173debca57f5c0c745404098be118e811694de75adb587095fc01ab8706d1 libdv-0.104-r1.ebuild 1500
 MD5 4b6f2ab5770ea5c031c0cebdcd4e3c90 libdv-0.104.ebuild 1225
+RMD160 d91c6065bd0c8918c282fd94071e2cb1ddd56a5f libdv-0.104.ebuild 1225
+SHA256 aad42beffb4248ed95a7b1cf868211ee57a68f1e2e1d006f2f939fb4baf08794 libdv-0.104.ebuild 1225
 MD5 9eddaa9f84b052f62b463beadff4dfe7 libdv-0.99-r1.ebuild 1169
+RMD160 c1cb5010e46bb19dafc015403a2ce8bb82f5f24d libdv-0.99-r1.ebuild 1169
+SHA256 da434d25ecbb198f1bb0af50ffc141a4a32f35fd7cf7656a5269360a4afaadc1 libdv-0.99-r1.ebuild 1169
 MD5 526f11a066c4a4c196484c623e3aa5c5 metadata.xml 164
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDyJNy2+ySkm8kpY0RAiGBAKCGDf8BsoVQrbwU2xXCye+9Km1BOgCfYNR8
-VVHXkLeYyhB5Z0Pveh/T2sM=
-=t2di
------END PGP SIGNATURE-----
+RMD160 3c24e64c1e8557e8c37cfdc030f383ac44749310 metadata.xml 164
+SHA256 761783547a084be64faca947db832f95e60dac384c2ddcfb42ea35c5c759fa39 metadata.xml 164
diff --git a/media-libs/libdv/files/libdv-0.104-gcc4.patch b/media-libs/libdv/files/libdv-0.104-gcc4.patch
new file mode 100644
index 000000000000..bfcd44097e0a
--- /dev/null
+++ b/media-libs/libdv/files/libdv-0.104-gcc4.patch
@@ -0,0 +1,22 @@
+--- libdv/quant.h.orig	2006-02-07 17:39:08.000000000 +0000
++++ libdv/quant.h	2006-02-07 17:42:37.000000000 +0000
+@@ -27,7 +27,7 @@
+ extern void _dv_quant_88_inverse(dv_coeff_t *block,int qno,int klass);
+ extern void (*_dv_quant_248_inverse) (dv_coeff_t *block,int qno,int klass,
+                                   dv_248_coeff_t *co);
+-extern void _dv_quant_88_inverse_x86(dv_coeff_t *block,int qno,int klass, uint8_t offset[], uint8_t shifts[][]);
++extern void _dv_quant_88_inverse_x86(dv_coeff_t *block,int qno,int klass, uint8_t *offset, uint8_t **shifts);
+ extern void _dv_quant_88_inverse_x86_64(dv_coeff_t *block,int qno,int klass);
+ extern void dv_quant_init (void);
+ #ifdef __cplusplus
+--- libdv/quant.c.orig	2006-02-07 17:42:57.000000000 +0000
++++ libdv/quant.c	2006-02-07 17:43:17.000000000 +0000
+@@ -144,7 +144,7 @@
+ uint32_t	dv_quant_248_mul_tab [2] [22] [64];
+ uint32_t dv_quant_88_mul_tab [2] [22] [64];
+ 
+-extern void             _dv_quant_x86(dv_coeff_t *block,int qno,int klass,uint8_t  dv_quant_offset[],uint8_t dv_quant_shifts[][]);
++extern void             _dv_quant_x86(dv_coeff_t *block,int qno,int klass,uint8_t  *dv_quant_offset,uint8_t **dv_quant_shifts);
+ extern void             _dv_quant_x86_64(dv_coeff_t *block,int qno,int klass);
+ static void quant_248_inverse_std(dv_coeff_t *block,int qno,int klass,dv_248_coeff_t *co);
+ static void quant_248_inverse_mmx(dv_coeff_t *block,int qno,int klass,dv_248_coeff_t *co);
diff --git a/media-libs/libdv/libdv-0.104-r1.ebuild b/media-libs/libdv/libdv-0.104-r1.ebuild
index 968690c3e246..d6c3867eb8e3 100644
--- a/media-libs/libdv/libdv-0.104-r1.ebuild
+++ b/media-libs/libdv/libdv-0.104-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/libdv/libdv-0.104-r1.ebuild,v 1.4 2006/01/14 05:58:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.104-r1.ebuild,v 1.5 2006/02/07 18:06:11 chutzpah Exp $
 
 inherit eutils flag-o-matic
 
@@ -35,6 +35,9 @@ src_unpack() {
 	# big patch.. test here hard and fast then push upstream
 	epatch "${WORKDIR}"/libdv-0.104-pic-fix.patch
 
+	# tiny gcc4 fixes
+	epatch "${FILESDIR}"/${PN}-0.104-gcc4.patch
+
 	epunt_cxx #74497
 }