diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-27 11:21:12 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-27 11:21:12 +0000 |
| commit | debd4c43d1d4fe8d44489a57a35198d47a6d9915 (patch) | |
| tree | 4bbaa35adff580b73b563408333c3dc70a12ceb5 /sci-geosciences | |
| parent | Change HOMEPAGE to sf.net project page wrt #357863 (diff) | |
| download | gentoo-2-debd4c43d1d4fe8d44489a57a35198d47a6d9915.tar.gz gentoo-2-debd4c43d1d4fe8d44489a57a35198d47a6d9915.tar.bz2 gentoo-2-debd4c43d1d4fe8d44489a57a35198d47a6d9915.zip | |
Fix building with libpng15 wrt #384069 by Martin von Gagern
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/grass/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-geosciences/grass/files/grass-6.4.1-libpng15.patch | 28 | ||||
| -rw-r--r-- | sci-geosciences/grass/grass-6.4.1.ebuild | 5 |
3 files changed, 36 insertions, 3 deletions
diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog index e1427323c7dc..9749ab7eb834 100644 --- a/sci-geosciences/grass/ChangeLog +++ b/sci-geosciences/grass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-geosciences/grass # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.107 2011/08/28 11:18:22 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.108 2011/09/27 11:21:12 ssuominen Exp $ + + 27 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> grass-6.4.1.ebuild, + +files/grass-6.4.1-libpng15.patch: + Fix building with libpng15 wrt #384069 by Martin von Gagern 28 Aug 2011; Markos Chandras <hwoarang@gentoo.org> grass-6.4.1.ebuild: Respect LDFLAGS. bug #375999 diff --git a/sci-geosciences/grass/files/grass-6.4.1-libpng15.patch b/sci-geosciences/grass/files/grass-6.4.1-libpng15.patch new file mode 100644 index 000000000000..3c040e70755c --- /dev/null +++ b/sci-geosciences/grass/files/grass-6.4.1-libpng15.patch @@ -0,0 +1,28 @@ +--- raster/r.out.png/r.out.png.c ++++ raster/r.out.png/r.out.png.c +@@ -261,9 +261,6 @@ + png_info_init(info_ptr); + #endif + png_init_io(png_ptr, fp); +- info_ptr->width = win.cols; +- info_ptr->height = win.rows; +- info_ptr->bit_depth = depth; + + /* explicit filter-type (or none) required */ + if ((filter >= 0) && (filter <= 4)) { +@@ -302,10 +299,13 @@ + /*if(!gscale->answer){ *//* 24BIT COLOR IMAGE */ + + if (TRUE) { ++ int color_type; + if (do_alpha) +- info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA; ++ color_type = PNG_COLOR_TYPE_RGB_ALPHA; + else +- info_ptr->color_type = PNG_COLOR_TYPE_RGB; ++ color_type = PNG_COLOR_TYPE_RGB; ++ ++ png_set_IHDR(png_ptr, info_ptr, win.cols, win.rows, depth, color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); + + /* write the png-info struct */ + png_write_info(png_ptr, info_ptr); diff --git a/sci-geosciences/grass/grass-6.4.1.ebuild b/sci-geosciences/grass/grass-6.4.1.ebuild index 0fd87a8d9c3a..984f83ccd308 100644 --- a/sci-geosciences/grass/grass-6.4.1.ebuild +++ b/sci-geosciences/grass/grass-6.4.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/sci-geosciences/grass/grass-6.4.1.ebuild,v 1.7 2011/08/28 11:18:22 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.1.ebuild,v 1.8 2011/09/27 11:21:12 ssuominen Exp $ EAPI=3 @@ -85,7 +85,8 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MY_P}" PATCHES=( - "${FILESDIR}/${PN}-pkgconf.patch" + "${FILESDIR}"/${PN}-pkgconf.patch + "${FILESDIR}"/${P}-libpng15.patch ) pkg_setup() { |