Fix building with libpng14.

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

4 files changed, 30 insertions, 14 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index 768e0f86b71c..cad29f996db8 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.62 2010/02/11 07:38:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.63 2010/03/11 20:31:03 ssuominen Exp $
+
+  11 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> vtk-5.4.2-r1.ebuild,
+  +files/vtk-5.4.2-libpng14.patch:
+  Fix building with libpng14.
 
   11 Feb 2010; Justin Lecher (jlec) <jlec@j-schmitz.net> vtk-5.4.2.ebuild,
   vtk-5.4.2-r1.ebuild:
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index a2319870cd14..2adf8ada04ef 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,22 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX vtk-5.0.3-mpi.patch 2653 RMD160 16c80c11c88cd4a671968da9ef3a29c67a979648 SHA1 c1979686901883aa05091845c05235ce8e24e89f SHA256 dd03a1e55674e6f0c3740b996e6a81a68a6e253c5dac60cf0f2fd2e3ead1dcf3
 AUX vtk-5.0.4-gcc4.3.patch 1222 RMD160 28a724ce4e999e68482bfcadc3e776ef37a1e6a6 SHA1 5db37dabd42dca1d93e483e2fd3356fb5a2c653e SHA256 66627b05fd0f71a51b1f5645edaaa369d11896245598acdb3a30818ec716806f
 AUX vtk-5.2.0-tcl-install.patch 580 RMD160 e3654b90212a4f48f707cd4cfaf6069b9cbc4d49 SHA1 94269da0a6d83312d0fc00c3f7adf964531a7d20 SHA256 7373a02d9408f59546486b50efb8934fc2fa14067928e27bd46b2691b80d2fc6
 AUX vtk-5.4.2-boost-property_map.patch 3421 RMD160 a46265b2c4d0c4968037be65f2c52b6436c37499 SHA1 09ccc19c0c8503329c42fc8024142d4f632f54d5 SHA256 e905b931bb719c1f94017f0c76b1994aa785ac0a881b4c96bfbaeb6bc95af65b
 AUX vtk-5.4.2-cg-path.patch 1112 RMD160 8b4dca2322f62ed005585ed35cf5e11bc7ea0614 SHA1 903cd304bda40b64825ca0e806cd4d7c738f7165 SHA256 4097db18c46e1e27b6213ef7c82af07144b5a88ac19bdcf645ad7e8264cc9e10
+AUX vtk-5.4.2-libpng14.patch 548 RMD160 14217aaaad0b1d44d25574084ee2d3c75d52fbec SHA1 0da1e3168daffd3be3154102d8728135a596f707 SHA256 0aa999ba22804a9c3fe13488c0a014d45acf2a958d9a7336d38ae84e96addbda
 DIST vtk-5.4.2.tar.gz 18265310 RMD160 607df8babe7413b92a5bd4d8c264fd69798df83f SHA1 508106a15c32326aa9ac737c7f0e7212c150d55f SHA256 037c0582ee7483e0b495e45a00c4f08784691ef82c4ea159ef86731c3beda73d
 DIST vtkDocHtml-5.4.2.tar.gz 229828672 RMD160 d6372984b74ede33713501219fecd6768edcfad3 SHA1 13da1373bb95f34b1f868b307f0e84fef6626020 SHA256 54dfe1c242c488db1d1099bbf9114f49ee2bd07859c067e77e2d6bd3c077ee25
 DIST vtkdata-5.4.2.tar.gz 52810062 RMD160 0cc24fc7a6a9bb80c619a0555eb288cc97554001 SHA1 5030523c0a9e17c47bf94fe9005e5c91069a571a SHA256 84c9895b72aec96977b8043a4be26ff58e14ae04ab2be9f19a02ca613dc3be26
-EBUILD vtk-5.4.2-r1.ebuild 6252 RMD160 d0226b84c386870fb6f9e3096da7723c8e5355ff SHA1 760eafccf171ed4378449890df2a85624c347f50 SHA256 f0a81a3e8a30e3c6ab8800f9189d34b16d3b8fe886aeba7ca05508efe1d8b2bf
+EBUILD vtk-5.4.2-r1.ebuild 6299 RMD160 23d977f242ce5999201b278beeea3f6b05372135 SHA1 9e5d5baefeda7bbb17e44327e1a12b43d0c66008 SHA256 cedcce6a973b347e3fae94b9f8ddb28956af56aabbd535e47786fcfabeaf5db6
 EBUILD vtk-5.4.2.ebuild 9230 RMD160 f11179ecea0e9e03c3456c7ad2851abc29f45cd2 SHA1 86870e4bea6b7d8e7350c0ed9ebf2db8657bd755 SHA256 48535d9cc5861fbe3564620d6039b8a9851446c9d2f392f357ecfc8e2b4bbf07
-MISC ChangeLog 10682 RMD160 6c7af879be22ff9d7cc2a662a74ffbb64e8dd688 SHA1 6bcc1512b26c1cf97d9de957d072ff12de184f53 SHA256 2284f019eace0d915e3f59fcb60cfc19d34d6cd3aa836700aafb27ec9f487f31
+MISC ChangeLog 10828 RMD160 a5e3295eead8a97e8e10d5e413ce2fb7ba3ffdfe SHA1 b481b7377e656d721c9025eda029a8966c9fc726 SHA256 404478e8a36f77701ae0c3ff81fc082ca922f40aff5a6bd72b83b3d4b344ab73
 MISC metadata.xml 432 RMD160 2b5009d16ed172daa9ae089e59ceadabeaab5884 SHA1 4163aa67aa3d1d46b8efc21d2af85a2105f6a77c SHA256 8dadae25a4cdeedb63f94cbaf7fc6a8ce7a1950feae7047e859839d2eee30747
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktzs/IACgkQgAnW8HDreRZ/1gCfW7dNB0M0pY8OgfnB4hbcbdr8
-c+MAoJKFBLaMfp4Oi2LELO3oaQbXWFD1
-=ykWJ
------END PGP SIGNATURE-----
diff --git a/sci-libs/vtk/files/vtk-5.4.2-libpng14.patch b/sci-libs/vtk/files/vtk-5.4.2-libpng14.patch
new file mode 100644
index 000000000000..1f12ae92658d
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-5.4.2-libpng14.patch
@@ -0,0 +1,20 @@
+--- IO/vtkPNGReader.cxx
++++ IO/vtkPNGReader.cxx
+@@ -116,7 +116,7 @@
+   // minimum of a byte per pixel
+   if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) 
+     {
+-    png_set_gray_1_2_4_to_8(png_ptr);
++    png_set_expand_gray_1_2_4_to_8(png_ptr);
+     }
+ 
+   // add alpha if any alpha found
+@@ -225,7 +225,7 @@
+   // minimum of a byte per pixel
+   if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) 
+     {
+-    png_set_gray_1_2_4_to_8(png_ptr);
++    png_set_expand_gray_1_2_4_to_8(png_ptr);
+     }
+ 
+   // add alpha if any alpha found
diff --git a/sci-libs/vtk/vtk-5.4.2-r1.ebuild b/sci-libs/vtk/vtk-5.4.2-r1.ebuild
index 1b9ac9493c6e..886255d8cb04 100644
--- a/sci-libs/vtk/vtk-5.4.2-r1.ebuild
+++ b/sci-libs/vtk/vtk-5.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.4 2010/02/11 07:38:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.5 2010/03/11 20:31:03 ssuominen Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2 python qt3 qt4 cmake-utils
@@ -67,6 +67,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-cg-path.patch
 	epatch "${FILESDIR}"/${PN}-5.2.0-tcl-install.patch
 	epatch "${FILESDIR}"/${P}-boost-property_map.patch
+	epatch "${FILESDIR}"/${P}-libpng14.patch
 	sed -e "s:@VTK_TCL_LIBRARY_DIR@:/usr/$(get_libdir):" \
 		-i Wrapping/Tcl/pkgIndex.tcl.in \
 		|| die "Failed to fix tcl pkgIndex file"