diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-10 16:31:23 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-10 16:31:23 +0000 |
| commit | 3d7f6cda077471fc06ae733e3ec0b1fa8aa894d1 (patch) | |
| tree | d7b665952ad69a805548f7a63140530130ef774c /media-gfx/hugin | |
| parent | Marked ppc/ppc64 stable for bug #308809. (diff) | |
| download | gentoo-2-3d7f6cda077471fc06ae733e3ec0b1fa8aa894d1.tar.gz gentoo-2-3d7f6cda077471fc06ae733e3ec0b1fa8aa894d1.tar.bz2 gentoo-2-3d7f6cda077471fc06ae733e3ec0b1fa8aa894d1.zip | |
Fix building with libpng14.
(Portage version: 2.2_rc66/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/hugin')
| -rw-r--r-- | media-gfx/hugin/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/hugin/files/hugin-2010.0.0_rc1-libpng14.patch | 15 | ||||
| -rw-r--r-- | media-gfx/hugin/hugin-2010.0.0_rc1.ebuild | 10 |
3 files changed, 26 insertions, 5 deletions
diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog index c3cdf889b336..8348f59a85f2 100644 --- a/media-gfx/hugin/ChangeLog +++ b/media-gfx/hugin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/hugin # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.86 2010/03/07 23:00:28 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.87 2010/03/10 16:31:21 ssuominen Exp $ + + 10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> + hugin-2010.0.0_rc1.ebuild, +files/hugin-2010.0.0_rc1-libpng14.patch: + Fix building with libpng14. *hugin-2010.0.0_rc1 (07 Mar 2010) diff --git a/media-gfx/hugin/files/hugin-2010.0.0_rc1-libpng14.patch b/media-gfx/hugin/files/hugin-2010.0.0_rc1-libpng14.patch new file mode 100644 index 000000000000..fdc026368c4d --- /dev/null +++ b/media-gfx/hugin/files/hugin-2010.0.0_rc1-libpng14.patch @@ -0,0 +1,15 @@ +http://repos.archlinux.org/wsvn/packages/hugin/trunk/libpng14.patch + +--- src/foreign/vigra/vigra_impex/png.cxx ++++ src/foreign/vigra/vigra_impex/png.cxx +@@ -271,8 +271,8 @@ + // expand gray values to at least one byte size + if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { + if (setjmp(png->jmpbuf)) +- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str()); +- png_set_gray_1_2_4_to_8(png); ++ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str()); ++ png_set_expand_gray_1_2_4_to_8(png); + bit_depth = 8; + } + diff --git a/media-gfx/hugin/hugin-2010.0.0_rc1.ebuild b/media-gfx/hugin/hugin-2010.0.0_rc1.ebuild index 8e6ab7897417..ed4654cc2669 100644 --- a/media-gfx/hugin/hugin-2010.0.0_rc1.ebuild +++ b/media-gfx/hugin/hugin-2010.0.0_rc1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2010.0.0_rc1.ebuild,v 1.1 2010/03/07 23:00:28 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2010.0.0_rc1.ebuild,v 1.2 2010/03/10 16:31:21 ssuominen Exp $ -EAPI="2" +EAPI=2 WX_GTK_VER="2.8" inherit cmake-utils wxwidgets versionator @@ -23,7 +23,7 @@ DEPEND=" >=dev-libs/boost-1.35.0-r5 >=media-gfx/enblend-3.0_p20080807 media-gfx/exiv2 - media-libs/jpeg + media-libs/jpeg:0 >=media-libs/libpano13-2.9.14 media-libs/libpng media-libs/openexr @@ -36,7 +36,9 @@ DEPEND=" RDEPEND="${DEPEND} media-libs/exiftool" -S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)" +S=${WORKDIR}/${PN}-$(get_version_component_range 1-3) + +PATCHES=( "${FILESDIR}/${P}-libpng14.patch" ) pkg_setup() { DOCS="AUTHORS README TODO" |