diff options
author | Matthias Schwarzott <zzam@gentoo.org> | 2006-08-30 15:42:47 +0000 |
---|---|---|
committer | Matthias Schwarzott <zzam@gentoo.org> | 2006-08-30 15:42:47 +0000 |
commit | 36847fa61be0a6a3d19a046269383f61110a7f80 (patch) | |
tree | 313e8d872a4e470106e9302d41f7baacaf913e91 /media-video | |
parent | version bump (diff) | |
download | gentoo-2-36847fa61be0a6a3d19a046269383f61110a7f80.tar.gz gentoo-2-36847fa61be0a6a3d19a046269383f61110a7f80.tar.bz2 gentoo-2-36847fa61be0a6a3d19a046269383f61110a7f80.zip |
Added patch against name-collision for function trunc, see bug #140866.
(Portage version: 2.1.1_rc1-r2)
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/effectv/ChangeLog | 6 | ||||
-rw-r--r-- | media-video/effectv/effectv-0.3.10.ebuild | 3 | ||||
-rw-r--r-- | media-video/effectv/files/digest-effectv-0.3.10 | 2 | ||||
-rw-r--r-- | media-video/effectv/files/effectv-0.3.10-trunc-name-collision.patch | 24 |
4 files changed, 33 insertions, 2 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/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); + } + + /* |