Added patch against name-collision for function trunc, see bug #140866.

Package-Manager: portage-2.1.1_rc1-r2

5 files changed, 55 insertions, 15 deletions

diff --git a/media-video/effectv/ChangeLog b/media-video/effectv/ChangeLog
index ea405eefcb5d..462f84855b34 100644
--- a/media-video/effectv/ChangeLog
+++ b/media-video/effectv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/effectv
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/effectv/ChangeLog,v 1.2 2006/03/07 16:34:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/effectv/ChangeLog,v 1.3 2006/08/30 15:42:47 zzam Exp $
+
+  30 Aug 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/effectv-0.3.10-trunc-name-collision.patch, effectv-0.3.10.ebuild:
+  Added patch against name-collision for function trunc, see bug #140866.
 
   07 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/effectv-0.3.10-makefile.patch, effectv-0.3.10.ebuild:
diff --git a/media-video/effectv/Manifest b/media-video/effectv/Manifest
index fefddda31abd..fd43ed753eaa 100644
--- a/media-video/effectv/Manifest
+++ b/media-video/effectv/Manifest
@@ -1,25 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 deef5c5f9f27b2390ff53f49007684cd ChangeLog 644
-RMD160 a6c9ac8b6b5200166edbb86111b1f0fd7de1de30 ChangeLog 644
-SHA256 a8947e1d5978c34b4489de9050a823c39b2c8e1575c5497dfb6056e10606cf96 ChangeLog 644
-MD5 1298d46d4a5219845ad0d32c3792c131 effectv-0.3.10.ebuild 961
-RMD160 707e091b65bd094aed823747cb1d424394279064 effectv-0.3.10.ebuild 961
-SHA256 954691844099eb8e588790603cb5016153bd70eb8e5b950aa8c040e687a5021b effectv-0.3.10.ebuild 961
-MD5 04e4ca37e7ef9c7138e8b2147dda4d7f files/digest-effectv-0.3.10 67
-RMD160 bcff9e3bdd338d79fa5c83e1bf732778bab6a1a0 files/digest-effectv-0.3.10 67
-SHA256 f9db583cab024d9e9b4ba4953db63a1bcf219edfe5d1cdf65971c7b7e6e10bba files/digest-effectv-0.3.10 67
+AUX effectv-0.3.10-makefile.patch 598 RMD160 059b929555c06c637b590599899099a607eee510 SHA1 584663ba85190aab3cb6c9e2d77997bee1d53cc4 SHA256 972f4a05c97f934e7a22adf2578c9df4c78f11675da662766c078ac7ac6ba20f
 MD5 6f3b1ab5c4757825af62d93fd6fc1fe5 files/effectv-0.3.10-makefile.patch 598
 RMD160 059b929555c06c637b590599899099a607eee510 files/effectv-0.3.10-makefile.patch 598
 SHA256 972f4a05c97f934e7a22adf2578c9df4c78f11675da662766c078ac7ac6ba20f files/effectv-0.3.10-makefile.patch 598
+AUX effectv-0.3.10-trunc-name-collision.patch 436 RMD160 062f13fe95c49c58a8803a38a6894601beeb047a SHA1 d1e99a4d9ace70ee4147886d6b0e645a4a8d76a1 SHA256 1efaba2e8a67d95822621235bc17189079064265947f17e8f4bb534bbc663393
+MD5 4c00dd78d8176537b7b674714fc6ad17 files/effectv-0.3.10-trunc-name-collision.patch 436
+RMD160 062f13fe95c49c58a8803a38a6894601beeb047a files/effectv-0.3.10-trunc-name-collision.patch 436
+SHA256 1efaba2e8a67d95822621235bc17189079064265947f17e8f4bb534bbc663393 files/effectv-0.3.10-trunc-name-collision.patch 436
+DIST effectv-0.3.10.tar.bz2 101005 RMD160 5f15df71b6ef3a83712ec3c159164c6344ee7547 SHA1 844bcc58dbae5602ec2d3da132fe9e8f34965613 SHA256 6437fbe65d01b31d0e132e7f1d70fd1fda26871b73422745a353e9fa6f119c05
+EBUILD effectv-0.3.10.ebuild 1010 RMD160 f4f6959de3ba5ad4bb1c73380f4157f33bf47e82 SHA1 b03e9043078abd8ec45a739b6c548a24142d8585 SHA256 e0a985db33c98c78a650c7dc01d4ceef76897cc1384a254c2b547cb5f50a1d4a
+MD5 4f55530abc4697a0c5996404ccbab8a0 effectv-0.3.10.ebuild 1010
+RMD160 f4f6959de3ba5ad4bb1c73380f4157f33bf47e82 effectv-0.3.10.ebuild 1010
+SHA256 e0a985db33c98c78a650c7dc01d4ceef76897cc1384a254c2b547cb5f50a1d4a effectv-0.3.10.ebuild 1010
+MISC ChangeLog 842 RMD160 136677abb6b0bfa17b383836de28d244ec8843da SHA1 4512446946aed38ddc86936d64e4a7b288de77db SHA256 323a5c5eb7ef1120d324d4444ceb809e18a33eb49115e0add142479ff2192911
+MD5 99cd73cb0bad81743671d5825d1da109 ChangeLog 842
+RMD160 136677abb6b0bfa17b383836de28d244ec8843da ChangeLog 842
+SHA256 323a5c5eb7ef1120d324d4444ceb809e18a33eb49115e0add142479ff2192911 ChangeLog 842
+MISC metadata.xml 323 RMD160 82d10c7f349509ceabbaf9ac9088eef41d5d39f4 SHA1 f2e34b27a529ef04c0b2ed368bfd88c8127f2995 SHA256 db4c539d074d1626f5128f94aeadbc7856e42784b257144c6f2b08385a02debf
 MD5 7cd1f4a9f91a4f84362d4d5baadabf25 metadata.xml 323
 RMD160 82d10c7f349509ceabbaf9ac9088eef41d5d39f4 metadata.xml 323
 SHA256 db4c539d074d1626f5128f94aeadbc7856e42784b257144c6f2b08385a02debf metadata.xml 323
+MD5 a99d0001cf978e9831925304c4aebcec files/digest-effectv-0.3.10 247
+RMD160 8849b16cf6db50e7a9663f593a4c4b5c6062c914 files/digest-effectv-0.3.10 247
+SHA256 f6e89c293bc620990bebbf45b88d0e1f8666505261fd2bb83ec7e9a349efda01 files/digest-effectv-0.3.10 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEDbYdAiZjviIA2XgRAvlBAKCJpDSghcU0keFnAEHqe0fX9LTTEQCfQJK7
-AGdr30OX9Nl3KRL0VAlK9TY=
-=DA8u
+iD8DBQFE9bIEt2vP6XvVdOcRAkbTAJsH+cnIT3+KNFgsfbgA03Id5C5bZwCgwP81
+PpjQ7XaL+GBt273pQqhCHsQ=
+=CvXj
 -----END PGP SIGNATURE-----
diff --git a/media-video/effectv/effectv-0.3.10.ebuild b/media-video/effectv/effectv-0.3.10.ebuild
index a552969ce5e9..1383492081ec 100644
--- a/media-video/effectv/effectv-0.3.10.ebuild
+++ b/media-video/effectv/effectv-0.3.10.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/effectv/effectv-0.3.10.ebuild,v 1.2 2006/03/07 16:34:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/effectv/effectv-0.3.10.ebuild,v 1.3 2006/08/30 15:42:47 zzam Exp $
 
 inherit eutils toolchain-funcs
 
@@ -18,6 +18,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch "${FILESDIR}/${P}-makefile.patch"
+	epatch "${FILESDIR}/${P}-trunc-name-collision.patch"
 }
 
 src_compile() {
diff --git a/media-video/effectv/files/digest-effectv-0.3.10 b/media-video/effectv/files/digest-effectv-0.3.10
index b849c80d1f99..59153f470560 100644
--- a/media-video/effectv/files/digest-effectv-0.3.10
+++ b/media-video/effectv/files/digest-effectv-0.3.10
@@ -1 +1,3 @@
 MD5 6ce55f7c5a64df3199991bc237593a46 effectv-0.3.10.tar.bz2 101005
+RMD160 5f15df71b6ef3a83712ec3c159164c6344ee7547 effectv-0.3.10.tar.bz2 101005
+SHA256 6437fbe65d01b31d0e132e7f1d70fd1fda26871b73422745a353e9fa6f119c05 effectv-0.3.10.tar.bz2 101005
diff --git a/media-video/effectv/files/effectv-0.3.10-trunc-name-collision.patch b/media-video/effectv/files/effectv-0.3.10-trunc-name-collision.patch
new file mode 100644
index 000000000000..3021e6593fbd
--- /dev/null
+++ b/media-video/effectv/files/effectv-0.3.10-trunc-name-collision.patch
@@ -0,0 +1,24 @@
+--- utils.c.orig	2006-07-18 00:13:19.000000000 -0400
++++ utils.c	2006-07-18 00:15:43.000000000 -0400
+@@ -26,7 +26,7 @@
+ /*
+  * HSI color system utilities
+  */
+-static int trunc(double f)
++static int truncate(double f)
+ {
+ 	int i;
+ 
+@@ -44,9 +44,9 @@
+ 	Gv=1+S*sin(H);
+ 	Bv=1+S*sin(H+2*M_PI/3);
+ 	T=255.999*I/2;
+-	*r=trunc(Rv*T);
+-	*g=trunc(Gv*T);
+-	*b=trunc(Bv*T);
++	*r=truncate(Rv*T);
++	*g=truncate(Gv*T);
++	*b=truncate(Bv*T);
+ }
+ 
+ /*