Fix building with libpng14.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 33 insertions, 6 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/Manifest b/media-gfx/povray/Manifest
index 54f1448b35c1..79a2dd5ab075 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -3,12 +3,13 @@ AUX povray-3.6.1-find-egrep.patch 2463 RMD160 6af6c01daec1a0eb5ae27f65ede5411c4a
 AUX povray-3.6.1-use-system-libpng.patch 1922 RMD160 dd5481f9ff81f06c596dc0a19386e5ca01f4ad57 SHA1 98333f7701ffd1803adc9b04d5d09beff2f34c27 SHA256 efb0d8345d8409d6c92d024b0b1621bea88f460d73ad9d00b4b670e1ae6b127f
 AUX povray-3.7.0_beta29-fix-expiration-bug.patch 633 RMD160 e3eba65af69299584659c1a4e3c69b64ebc65f54 SHA1 924d572c6ab51474edf3a0e213b1863a3b927ebf SHA256 1b52f9d992744fcc257567ef4ef0ec9d612997bcf786574ed46ba66f8c69afc1
 AUX povray-3.7.0_beta29-print-extend-expiration-info.patch 1179 RMD160 8dad1af951d062c06a14ffe3b68fc17f1fda4fa7 SHA1 c2d8ca630a3f0b479c7f85728549455059e05ff3 SHA256 3f787d0d96b1d193c70d6a6684f84b31618e25b768dccb0fb114b832da023df9
+AUX povray-3.7.0_beta32-libpng14.patch 688 RMD160 585ab7e81a865fa7eab202018677cbde507dd385 SHA1 5a8aed165da70db515a825bd818fda4ba28aeff1 SHA256 e4665235b97475ab3087c1adce002da32cba2585bf5ccb51cc2d65e1f8fa7be1
 AUX povray-3.7.0_beta32-print-extend-expiration-info.patch 1160 RMD160 a1c662813a18681ccd8143f3fe5a7dde4a7a2582 SHA1 eb459a8c01e48ab3cf88f05827286a82cd3b5feb SHA256 ec323fcbd116b01f08cd7d65d5aea496b9c551b2463b89d1cdface2dd694580d
 DIST povray-3.6.1.tar.bz2 8200160 RMD160 84ba679da66089f192cc1bfcf8bdd498e736a9a3 SHA1 1fab3ccbdedafbf77e3a66087709bbdf60bc643d SHA256 4e8a7fecd44807343b6867e1f2440aa0e09613d6d69a7385ac48f4e5e7737a73
 DIST povray-3.7.0.beta.32.tar.bz2 6229739 RMD160 a3e758d628352036fed5bb4ffb31bc773d7b69f1 SHA1 73d8b18bfdaf74b1a60d4faec33b1fcd201388da SHA256 005a8c7d6e4787b18e94c9838f4d181c284fc764723424d18960d0165a3a9278
 DIST povray-src-3.7.0.beta.29.tar.bz2 6202387 RMD160 5073463b1068fc95a31f77da6458286888eccff8 SHA1 4c7a4c22472d3b9a2d88e660a6df6c3b3d497efb SHA256 88655167a4ae0ba97a7e1e19c261d592692bbbdc7f77d287c0b3d084334b45b3
 EBUILD povray-3.6.1-r4.ebuild 2740 RMD160 49947c21b48379364d98711f032a9c949c9e603b SHA1 2e90864be295876c14646c08b79f158956e52e49 SHA256 96176df1d8fcd2fbebe5dc6c9cf22cb4c7e1a848f8142dae20fdd0a8f6352d00
 EBUILD povray-3.7.0_beta29-r2.ebuild 4169 RMD160 0284ef9eea9908d6e6855d2ee02c5148219e5c06 SHA1 67e181824a60a1e16d659daaddb2e2072b931b98 SHA256 2ee618c0ae7dd420df1fcc7254f8332d68bbf99b0c416c71d7454d356c856331
-EBUILD povray-3.7.0_beta32.ebuild 4173 RMD160 ce76525c4c9e506c47e530b33f5bbce7b4692991 SHA1 8331e3bcb58bf445fa102950d24b1096a382931f SHA256 a5e4efe2cad4abdcd93b90d026c1157960304807cb5eefb102e6f4390d616d66
-MISC ChangeLog 14501 RMD160 c518446c3b69e7da421450bf7f36dc8b302d44cb SHA1 7e97485a055b38a84e9644b6bf1e9ecc184e4758 SHA256 9df390bab260cc3d8dae82b9ec212c4d6178dad14db2c96ae0433466b70e3324
+EBUILD povray-3.7.0_beta32.ebuild 4313 RMD160 e78056fa8cce2527875344ebc739c5ba67464d1c SHA1 17c0d70dcd2a661b158065137e97ef852487fad7 SHA256 b5404a02ce22a478a7388f412fd78036003d9d5bfb749460fe307bc298035ec2
+MISC ChangeLog 14661 RMD160 229ccd669101782ecf85d0b84a3235eee436e3e0 SHA1 1474061ace2c34684fa1cd3dd1ef33adf3c40272 SHA256 e409006d03868ca0f5bbef64ae064c2fd1561acbc2336518d81d5dadb014e1f5
 MISC metadata.xml 223 RMD160 0c9c59654305e8789fe6c93fd07c561cfe003f54 SHA1 7904e6fb45104baf2cb67fb9886c633af4dc7056 SHA256 a24b49fe5448d4cb329acf1d8113ac30eb1d61d63a7319b66c077d3f1775d055
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.