diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-04-05 18:50:52 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-04-05 18:50:52 +0000 |
| commit | 9a04494c5e28cb07a37f7534b0197dd58b0736a1 (patch) | |
| tree | 44dbffa59408468a367d216171bd1648abe20a6c | |
| parent | Fix deprecation warning. (diff) | |
| download | gentoo-2-9a04494c5e28cb07a37f7534b0197dd58b0736a1.tar.gz gentoo-2-9a04494c5e28cb07a37f7534b0197dd58b0736a1.tar.bz2 gentoo-2-9a04494c5e28cb07a37f7534b0197dd58b0736a1.zip | |
Fix building with libpng-1.5. Fixes bug #362059.
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
| -rw-r--r-- | media-libs/vigra/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/vigra/files/1.7.1-png-1.5.patch | 36 | ||||
| -rw-r--r-- | media-libs/vigra/vigra-1.7.1.ebuild | 3 |
3 files changed, 43 insertions, 2 deletions
diff --git a/media-libs/vigra/ChangeLog b/media-libs/vigra/ChangeLog index 661a8e96cebf..1be0d1ffc07f 100644 --- a/media-libs/vigra/ChangeLog +++ b/media-libs/vigra/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/vigra # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.28 2011/03/31 18:25:59 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.29 2011/04/05 18:50:52 scarabeus Exp $ + + 05 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> + +files/1.7.1-png-1.5.patch, vigra-1.7.1.ebuild: + Fix building with libpng-1.5. Fixes bug #362059. *vigra-1.7.1 (31 Mar 2011) diff --git a/media-libs/vigra/files/1.7.1-png-1.5.patch b/media-libs/vigra/files/1.7.1-png-1.5.patch new file mode 100644 index 000000000000..3fe6448b9ad9 --- /dev/null +++ b/media-libs/vigra/files/1.7.1-png-1.5.patch @@ -0,0 +1,36 @@ + +# HG changeset patch +# User Ullrich Koethe <ullrich.koethe@iwr.uni-heidelberg.de> +# Date 1299851742 -3600 +# Node ID c3a55cf81b34ae5e71e14b1dc90ece7e646a02dd +# Parent 90494fd71974b95c61181a47580f4d1f02642723 +update for libpng 1.5 (fix by Mark Brand, mingw-cross-env) + +diff -r 90494fd71974 -r c3a55cf81b34 src/impex/png.cxx +--- a/src/impex/png.cxx Thu Mar 10 18:47:50 2011 +0100 ++++ b/src/impex/png.cxx Fri Mar 11 14:55:42 2011 +0100 +@@ -320,7 +320,11 @@ + #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED) + char * dummyName; + int dummyCompType; ++#if (PNG_LIBPNG_VER < 10500) + char * profilePtr; ++#else ++ png_byte * profilePtr; ++#endif + png_uint_32 profileLen; + if (png_get_valid( png, info, PNG_INFO_iCCP )) { + png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ; +@@ -593,7 +597,11 @@ + // set icc profile + if (iccProfile.size() > 0) { + png_set_iCCP(png, info, (png_charp)("icc"), 0, ++#if (PNG_LIBPNG_VER < 10500) + (png_charp)iccProfile.begin(), (png_uint_32)iccProfile.size()); ++#else ++ (png_byte*)iccProfile.begin(), (png_uint_32)iccProfile.size()); ++#endif + } + #endif + + diff --git a/media-libs/vigra/vigra-1.7.1.ebuild b/media-libs/vigra/vigra-1.7.1.ebuild index 20af9d7f3e11..5fade157d8c1 100644 --- a/media-libs/vigra/vigra-1.7.1.ebuild +++ b/media-libs/vigra/vigra-1.7.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.7.1.ebuild,v 1.2 2011/03/31 18:50:42 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.7.1.ebuild,v 1.3 2011/04/05 18:50:52 scarabeus Exp $ EAPI=4 @@ -26,6 +26,7 @@ RDEPEND=" DEPEND="${RDEPEND}" PATCHES=( + "${FILESDIR}/1.7.1-png-1.5.patch" "${FILESDIR}/1.7.1-automagicness.patch" "${FILESDIR}/1.7.1-hdf5.patch" ) |