diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-01-09 16:35:31 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-01-09 16:35:31 +0000 |
| commit | e260be6e2d94d8e821f8149aa0a4b631deaa53b1 (patch) | |
| tree | 43e1bf46c8e938181a16f34e1a5d14186aaa58e5 /media-gfx/yafray | |
| parent | Transfer Prefix keywords (diff) | |
| download | historical-e260be6e2d94d8e821f8149aa0a4b631deaa53b1.tar.gz historical-e260be6e2d94d8e821f8149aa0a4b631deaa53b1.tar.bz2 historical-e260be6e2d94d8e821f8149aa0a4b631deaa53b1.zip | |
Fix building with GCC 4.4+ wrt #278216.
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'media-gfx/yafray')
| -rw-r--r-- | media-gfx/yafray/ChangeLog | 8 | ||||
| -rw-r--r-- | media-gfx/yafray/Manifest | 5 | ||||
| -rw-r--r-- | media-gfx/yafray/files/yafray-0.0.9-gcc44.patch | 12 | ||||
| -rw-r--r-- | media-gfx/yafray/yafray-0.0.9-r1.ebuild | 7 |
4 files changed, 25 insertions, 7 deletions
diff --git a/media-gfx/yafray/ChangeLog b/media-gfx/yafray/ChangeLog index 34e1dd91cc61..bc5ce613af65 100644 --- a/media-gfx/yafray/ChangeLog +++ b/media-gfx/yafray/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/yafray -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/yafray/ChangeLog,v 1.52 2009/12/31 17:10:38 ranger Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/yafray/ChangeLog,v 1.53 2010/01/09 16:35:30 ssuominen Exp $ + + 09 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> + yafray-0.0.9-r1.ebuild, +files/yafray-0.0.9-gcc44.patch: + Fix building with GCC 4.4+ wrt #278216. 31 Dec 2009; Brent Baude <ranger@gentoo.org> yafray-0.0.9-r1.ebuild: Marking yafray-0.0.9-r1 ~ppc64 for bug 285846 diff --git a/media-gfx/yafray/Manifest b/media-gfx/yafray/Manifest index e7aa23af858e..91881893e1e8 100644 --- a/media-gfx/yafray/Manifest +++ b/media-gfx/yafray/Manifest @@ -1,9 +1,10 @@ AUX yafray-0.0.9-asneeded.patch 518 RMD160 1634150668a2d4cfabc4623c600c07573728e3ac SHA1 864edc47fb4686df0e28bc7d9d9dfe8967f583ff SHA256 d882e547c8944bae166e246086475aa15d1735dc33585211511fcb297e9fe948 AUX yafray-0.0.9-etc.patch 469 RMD160 c35b182573cbf97fe7c7a4de08baad68f593167b SHA1 e550fe54a9755a2e5de35317cda577946914ca88 SHA256 50fa202811aa15ed9ac6f89d8757f6abc2cdc0ce69d14c9e1b6390b50740960b AUX yafray-0.0.9-gcc43.patch 2742 RMD160 5e32f100d1afb9aa0f0595b64a13922949fe6314 SHA1 229e1e105d8bcbfb8c9455cd2a8484a15a6cded2 SHA256 e5f8a7fc09267d37fbb2644d55931805c46069c617db19de3809664c70c84ade +AUX yafray-0.0.9-gcc44.patch 486 RMD160 b4e4a9d75ce9d091a0539eca7b1b11ad3fde173c SHA1 ad70c5a4a5bc06d4491d061aad498145afcd1f9f SHA256 e912dd0aa285dcdd7d7f3484a17ffcc93e4c7082abbbc4b2396a84d1eca72e5c AUX yafray-0.0.9-libdir.patch 983 RMD160 ec5c974d64c8812f5942f4ab9b9cfdbc1c46b8bf SHA1 168f6aa6bab380de339552775523ffc3a4f99619 SHA256 4e407364d02db1215df1228f6e0263a0c957fc6e82e805ce6b2d6dbb08d25cf7 AUX yafray-0.0.9-scons.patch 780 RMD160 4b0993a1495d3a947eb5caa89b210b73779452a5 SHA1 b4ca3dfe8bb5b3b18343c8125140f57c2dfa19ec SHA256 feb2fc791d743d24cd876122e75634165b9ffc042277cc77e2daa1327ff31bf3 DIST yafray-0.0.9.tar.gz 316033 RMD160 4bad504cf78e86718869b9ced3967d31ec66a608 SHA1 30eaf082f66da4948cc6fb9651b4945914929f74 SHA256 f803e7058fb65cab9c0d00599daa85ca291fb57941822d622426e3466ec0aefb -EBUILD yafray-0.0.9-r1.ebuild 1294 RMD160 c001e4b4b04a6ff725016f22c8372a1182792f4e SHA1 0046752137482e4a5f2738fecadea8d0918d3fab SHA256 a927319dfe3cebe3dbd03363afdab69a533b9e458695adc210995578f5ccd128 -MISC ChangeLog 6701 RMD160 50d1af5a1fa690def8b18ea1240aebd340d23c20 SHA1 61448704b6b58cf1daa247695c61108829ea6076 SHA256 b513cf1cf9575246c3ec2cec455a70cd749df1d11c7e5e8c6325804df7c3d3e2 +EBUILD yafray-0.0.9-r1.ebuild 1332 RMD160 bd3800b221ace5adbe393d671063090d352dbec2 SHA1 92f8f8133b734f061405fda4f22f226a611978a9 SHA256 7ad1eb833147d1a6ae844f25584a79f62171966e8faa1d9d5c5f2caac70561cb +MISC ChangeLog 6860 RMD160 11bad9e3aeed3d4a60cb59647bc90baa2c119898 SHA1 c0c58a193f8cff85df2421c988ed2c677e7e753e SHA256 891f209bba3a7138938e2e4ce731ceedfc667d4734b9a59ea2a2248d630c54d5 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1 diff --git a/media-gfx/yafray/files/yafray-0.0.9-gcc44.patch b/media-gfx/yafray/files/yafray-0.0.9-gcc44.patch new file mode 100644 index 000000000000..52183d225363 --- /dev/null +++ b/media-gfx/yafray/files/yafray-0.0.9-gcc44.patch @@ -0,0 +1,12 @@ +diff -ur yafray.orig/src/shaders/basictex.cc yafray/src/shaders/basictex.cc +--- yafray.orig/src/shaders/basictex.cc 2006-06-10 03:41:26.000000000 +0300 ++++ yafray/src/shaders/basictex.cc 2010-01-09 18:36:28.000000000 +0200 +@@ -259,7 +259,7 @@ + intp_type = BICUBIC; + + // Load image, try to determine from extensions first +- char *ext = strrchr(filename, '.'); ++ const char *ext = strrchr(filename, '.'); + bool jpg_tried = false; + bool tga_tried = false; + bool hdr_tried = false; diff --git a/media-gfx/yafray/yafray-0.0.9-r1.ebuild b/media-gfx/yafray/yafray-0.0.9-r1.ebuild index 46f0b1afe506..56a84065ff1f 100644 --- a/media-gfx/yafray/yafray-0.0.9-r1.ebuild +++ b/media-gfx/yafray/yafray-0.0.9-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/yafray/yafray-0.0.9-r1.ebuild,v 1.8 2009/12/31 17:10:38 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/yafray/yafray-0.0.9-r1.ebuild,v 1.9 2010/01/09 16:35:30 ssuominen Exp $ inherit eutils multilib python @@ -28,7 +28,8 @@ src_unpack() { "${FILESDIR}"/${P}-libdir.patch \ "${FILESDIR}"/${P}-etc.patch \ "${FILESDIR}"/${P}-gcc43.patch \ - "${FILESDIR}"/${P}-asneeded.patch + "${FILESDIR}"/${P}-asneeded.patch \ + "${FILESDIR}"/${P}-gcc44.patch sed -i -e "s:-O3:${CXXFLAGS} -fsigned-char:g" *-settings.py || die "sed failed." } |