diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-11 15:41:56 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-11 15:41:56 +0000 |
| commit | ee070480256d544c51c80af56e877edc830808d7 (patch) | |
| tree | 73415c05494f7a95a784e9c53f2fcc34e9703425 /media-gfx | |
| parent | Now added graphicsmagick since it is keyworded in all arches (diff) | |
| download | gentoo-2-ee070480256d544c51c80af56e877edc830808d7.tar.gz gentoo-2-ee070480256d544c51c80af56e877edc830808d7.tar.bz2 gentoo-2-ee070480256d544c51c80af56e877edc830808d7.zip | |
Fix building with libpng14.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/freepv/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/freepv/files/freepv-0.3.0-libpng14.patch | 20 | ||||
| -rw-r--r-- | media-gfx/freepv/freepv-0.3.0-r2.ebuild | 11 |
3 files changed, 31 insertions, 6 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/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 |