diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-11 20:31:04 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-11 20:31:04 +0000 |
| commit | 24dd3b5dadd87d30d0fb291734fde11c75de2d64 (patch) | |
| tree | e22cd6f07e63398cb9363ca3570eb5bfe136072c /sci-libs/vtk | |
| parent | fix typos (diff) | |
| download | gentoo-2-24dd3b5dadd87d30d0fb291734fde11c75de2d64.tar.gz gentoo-2-24dd3b5dadd87d30d0fb291734fde11c75de2d64.tar.bz2 gentoo-2-24dd3b5dadd87d30d0fb291734fde11c75de2d64.zip | |
Fix building with libpng14.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/vtk')
| -rw-r--r-- | sci-libs/vtk/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/vtk/files/vtk-5.4.2-libpng14.patch | 20 | ||||
| -rw-r--r-- | sci-libs/vtk/vtk-5.4.2-r1.ebuild | 3 |
3 files changed, 27 insertions, 2 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/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" |