Fix building with libpng14.

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

4 files changed, 34 insertions, 8 deletions

diff --git a/media-gfx/freepv/ChangeLog b/media-gfx/freepv/ChangeLog
index 5373a7eb95d6..d30ba538a712 100644
--- a/media-gfx/freepv/ChangeLog
+++ b/media-gfx/freepv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/freepv
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freepv/ChangeLog,v 1.7 2010/03/11 15:30:44 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freepv/ChangeLog,v 1.8 2010/03/11 15:41:55 ssuominen Exp $
+
+  11 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  freepv-0.3.0-r2.ebuild, +files/freepv-0.3.0-libpng14.patch:
+  Fix building with libpng14.
 
 *freepv-0.3.0-r2 (11 Mar 2010)
 
diff --git a/media-gfx/freepv/Manifest b/media-gfx/freepv/Manifest
index 4612ffb914d8..d4677a8402b9 100644
--- a/media-gfx/freepv/Manifest
+++ b/media-gfx/freepv/Manifest
@@ -1,8 +1,9 @@
 AUX freepv-0.3.0-gcc44.patch 2186 RMD160 fc9140e03bc5ad552314a7426519629e49fa4dc3 SHA1 d83038667b72c94c1e321c6e89a34702d486be0b SHA256 f0b4210fcbd3c2d3d13bc7c541b1c9ad0134248612d5a034b5876cecba89afba
+AUX freepv-0.3.0-libpng14.patch 741 RMD160 01268a8dbff3a1203d58c728ebe927263f6e580d SHA1 e21e8ee724688ddfd2c279ddee7e95518d8319fa SHA256 aa46573860058df319bf6bab4889eb5aafe4ef478e3396d1a9be718b1d2c112a
 AUX freepv-0.3.0-noplugin.patch 1099 RMD160 849d580daf2557e950e8a3cab4aa7acdafd3b84e SHA1 86fba5995e19a1fd4c5c42c617341ffd1a2f1c07 SHA256 31b2c15f15a314e005ede81387d02a1f6f74ed980bd9dd6ba0ea5591cc88705a
 AUX freepv-0.3.0-xulrunner-1.9.1.patch 15882 RMD160 346c2e3a0d0095a2e0a65b3a73003d0ac22075a2 SHA1 9e3272d2857037081fd7d65ea982c90d21d1cbd9 SHA256 41953baca187c225e54aabb39d44d680f60cf8e027ff94ef7a88d80e62948a49
 DIST freepv-0.3.0.tar.gz 175545 RMD160 cb5d462844fd731d72886a7def71090bf91b39da SHA1 01ebbb6949680ae5535d90ccfbcc7959346f3ea1 SHA256 a66c58616cbe814b2e23c6fe109c3de906dad83a8faa32ea219c182bf15229f0
 EBUILD freepv-0.3.0-r1.ebuild 1067 RMD160 27fda895410f5c28707959c60837f913c7d6ffe7 SHA1 be2d82ea808e9e546fb2a1406d5b25334617b48b SHA256 0e907619e97a0bd2869e42a1e9b825cc9e66ff9e56a9bd1ed2d77e5e54c52376
-EBUILD freepv-0.3.0-r2.ebuild 837 RMD160 530bd4a5c4999412b82fc36a01cda97d5f5d5486 SHA1 b1cba4e7b3ff4c3d74e91b580d00d7a545720248 SHA256 162f7ea683e613619ef26679919cd68af41a2fa9f16fe6023dfa0f39ab0da05f
-MISC ChangeLog 1659 RMD160 02315dfddabb1e37babdcb7e8b91d5bc4137ecd0 SHA1 09098a41bc7f71549c597bc2d1a3d9d32e5d1580 SHA256 1d9c001db34a9b7c143e2d328c7247758d32c9373781d3ee4052c33d373eace2
+EBUILD freepv-0.3.0-r2.ebuild 879 RMD160 e9d6accb8bb273e8c53893ef8682d4995c92e061 SHA1 5ff4bb87432e34616f7e7e4ae85166c4c7f5d9cd SHA256 01154b5e103084a4eb4d05027d93f6cd062c0e2694abc1cbc422d2c2680ea2ee
+MISC ChangeLog 1807 RMD160 cdbd3cf6a489cfb7695bc9186ec9e1a50415a8b3 SHA1 968a018eb4433d2316ca590ec4ba3c3e094753b1 SHA256 e264a4a0ebf36df6ab47199530e5a7f75e1e7c78dd89004c03c15134413905bc
 MISC metadata.xml 406 RMD160 f02e3cecd596f45f2595e96b74ff357de1bd7213 SHA1 c0a79053a4af4284742602f3ecf73c5c93e12e92 SHA256 fe6b0623f18d4242be99afc2a93feefee5cfc2ad46fcc3d1fef05b6e77306190
diff --git a/media-gfx/freepv/files/freepv-0.3.0-libpng14.patch b/media-gfx/freepv/files/freepv-0.3.0-libpng14.patch
new file mode 100644
index 000000000000..e3b614f57490
--- /dev/null
+++ b/media-gfx/freepv/files/freepv-0.3.0-libpng14.patch
@@ -0,0 +1,20 @@
+--- src/libfreepv/pngReader.cpp
++++ src/libfreepv/pngReader.cpp
+@@ -135,7 +135,7 @@
+     //Transfor grayscale images with less
+     //than 8 bits to 8 bits
+     if(color_t == PNG_COLOR_TYPE_GRAY && depth<8)
+-      png_set_gray_1_2_4_to_8(p_png_struct);
++      png_set_expand_gray_1_2_4_to_8(p_png_struct);
+ 
+     //Add a full alpha channel if there is
+     //transparency information in the tRNS chunk
+@@ -283,7 +283,7 @@
+     //Transfor grayscale images with less
+     //than 8 bits to 8 bits.
+     if(color_t == PNG_COLOR_TYPE_GRAY && depth<8)
+-      png_set_gray_1_2_4_to_8(p_png_struct);
++      png_set_expand_gray_1_2_4_to_8(p_png_struct);
+ 
+     //Add a full alpha channel if there is
+     //transparency information in the tRNS chunk
diff --git a/media-gfx/freepv/freepv-0.3.0-r2.ebuild b/media-gfx/freepv/freepv-0.3.0-r2.ebuild
index 41fe1da322d4..121e1abd97d6 100644
--- a/media-gfx/freepv/freepv-0.3.0-r2.ebuild
+++ b/media-gfx/freepv/freepv-0.3.0-r2.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freepv/freepv-0.3.0-r2.ebuild,v 1.1 2010/03/11 15:30:44 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freepv/freepv-0.3.0-r2.ebuild,v 1.2 2010/03/11 15:41:55 ssuominen Exp $
 
 EAPI=2
-
-inherit cmake-utils
+inherit cmake-utils eutils
 
 DESCRIPTION="Panorama viewer (Quicktime, PangeaVR, GLPanoView formats)"
 HOMEPAGE="http://freepv.sourceforge.net/"
@@ -26,8 +25,10 @@ DEPEND="dev-libs/libxml2
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-	epatch "${FILESDIR}"/${P}-noplugin.patch
+	epatch "${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-noplugin.patch \
+		"${FILESDIR}"/${P}-libpng14.patch
+
 	sed -i \
 		-e 's:jpeg_mem_src:freepv_jpeg_mem_src:g' \
 		src/libfreepv/JpegReader.cpp || die