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 | 5dfd7abb2baa02322dd4b1bfb4b473f4bd836e00 (patch) | |
| tree | 38ca94a54c795a5d714fa903b2f671820b0ed557 | |
| parent | Transfer Prefix keywords (diff) | |
| download | gentoo-2-5dfd7abb2baa02322dd4b1bfb4b473f4bd836e00.tar.gz gentoo-2-5dfd7abb2baa02322dd4b1bfb4b473f4bd836e00.tar.bz2 gentoo-2-5dfd7abb2baa02322dd4b1bfb4b473f4bd836e00.zip | |
Fix building with GCC 4.4+ wrt #278216.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
| -rw-r--r-- | media-gfx/yafray/ChangeLog | 8 | ||||
| -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 |
3 files changed, 22 insertions, 5 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/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." } |