diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-12 08:54:20 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-12 08:54:20 +0000 |
| commit | 34c9d1f79962085d0fcaf7635408d25521b5680c (patch) | |
| tree | 481db0c025f6fab43248bafaa49978ec383afcd3 /media-gfx | |
| parent | Python changes added (diff) | |
| download | gentoo-2-34c9d1f79962085d0fcaf7635408d25521b5680c.tar.gz gentoo-2-34c9d1f79962085d0fcaf7635408d25521b5680c.tar.bz2 gentoo-2-34c9d1f79962085d0fcaf7635408d25521b5680c.zip | |
Fix building with libpng14.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/povray/ChangeLog | 8 | ||||
| -rw-r--r-- | media-gfx/povray/files/povray-3.7.0_beta32-libpng14.patch | 20 | ||||
| -rw-r--r-- | media-gfx/povray/povray-3.7.0_beta32.ebuild | 6 |
3 files changed, 30 insertions, 4 deletions
diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog index b7add6a0c14c..ea8b955cd40a 100644 --- a/media-gfx/povray/ChangeLog +++ b/media-gfx/povray/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/povray -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.98 2009/06/14 17:56:40 lavajoe Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.99 2010/03/12 08:54:19 ssuominen Exp $ + + 12 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> + povray-3.7.0_beta32.ebuild, +files/povray-3.7.0_beta32-libpng14.patch: + Fix building with libpng14. *povray-3.7.0_beta32 (14 Jun 2009) diff --git a/media-gfx/povray/files/povray-3.7.0_beta32-libpng14.patch b/media-gfx/povray/files/povray-3.7.0_beta32-libpng14.patch new file mode 100644 index 000000000000..efc4ca46b10b --- /dev/null +++ b/media-gfx/povray/files/povray-3.7.0_beta32-libpng14.patch @@ -0,0 +1,20 @@ +--- source/base/image/png.cpp ++++ source/base/image/png.cpp +@@ -433,7 +433,7 @@ + entry.alpha = 1.0f ; + if (has_alpha) + if (index < r_info_ptr->num_trans) +- entry.alpha = (float) (r_info_ptr->trans[index]) / 255.0; ++ entry.alpha = (float) (r_info_ptr->trans_alpha[index]) / 255.0; + colormap.push_back (entry); + } + +@@ -459,7 +459,7 @@ + entry.alpha = 1.0f ; + if (r_info_ptr->valid & PNG_INFO_tRNS) + if (index < r_info_ptr->num_trans) +- entry.alpha = (float) (r_info_ptr->trans[index]) / 255.0; ++ entry.alpha = (float) (r_info_ptr->trans_alpha[index]) / 255.0; + colormap.push_back (entry); + } + diff --git a/media-gfx/povray/povray-3.7.0_beta32.ebuild b/media-gfx/povray/povray-3.7.0_beta32.ebuild index b31d4380a7ac..f0c1447c10ba 100644 --- a/media-gfx/povray/povray-3.7.0_beta32.ebuild +++ b/media-gfx/povray/povray-3.7.0_beta32.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/povray/povray-3.7.0_beta32.ebuild,v 1.1 2009/06/14 17:56:40 lavajoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.7.0_beta32.ebuild,v 1.2 2010/03/12 08:54:19 ssuominen Exp $ inherit eutils autotools flag-o-matic versionator @@ -35,6 +35,8 @@ S="${WORKDIR}/${PN}-${MY_PV}" src_unpack() { unpack ${A} cd "${S}" + # r_info_ptr->trans_alpha might be no-go with libpn12 + has_version ">=media-libs/libpng-1.4" && epatch "${FILESDIR}"/${P}-libpng14.patch # Print info on how to extend the expiration date of the beta # if it has expired. |