diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 12:26:11 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 12:26:11 +0000 |
| commit | a86dba58808993966d35b5debaa6821fcd2ad073 (patch) | |
| tree | b9beab025d056e23821071b47330702279827e8a /dev-games | |
| parent | Build with media-libs/libpng-1.5 Bug #380631 (diff) | |
| download | gentoo-2-a86dba58808993966d35b5debaa6821fcd2ad073.tar.gz gentoo-2-a86dba58808993966d35b5debaa6821fcd2ad073.tar.bz2 gentoo-2-a86dba58808993966d35b5debaa6821fcd2ad073.zip | |
Fix building with libpng15 wrt #378351 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'dev-games')
| -rw-r--r-- | dev-games/vamos/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-games/vamos/files/vamos-0.6.2-libpng15.patch | 23 | ||||
| -rw-r--r-- | dev-games/vamos/vamos-0.6.2.ebuild | 8 |
3 files changed, 34 insertions, 5 deletions
diff --git a/dev-games/vamos/ChangeLog b/dev-games/vamos/ChangeLog index b410bdc2f575..2a28e53c2b5f 100644 --- a/dev-games/vamos/ChangeLog +++ b/dev-games/vamos/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-games/vamos -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/vamos/ChangeLog,v 1.15 2010/09/17 11:09:08 scarabeus Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-games/vamos/ChangeLog,v 1.16 2011/09/14 12:26:11 ssuominen Exp $ + + 14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> vamos-0.6.2.ebuild, + +files/vamos-0.6.2-libpng15.patch: + Fix building with libpng15 wrt #378351 by Diego Elio Pettenò 17 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> vamos-0.6.2.ebuild: Remove virtual/glu where already virtual/opengl is stated. diff --git a/dev-games/vamos/files/vamos-0.6.2-libpng15.patch b/dev-games/vamos/files/vamos-0.6.2-libpng15.patch new file mode 100644 index 000000000000..19a564c99fef --- /dev/null +++ b/dev-games/vamos/files/vamos-0.6.2-libpng15.patch @@ -0,0 +1,23 @@ +--- media/Texture_Image.cc ++++ media/Texture_Image.cc +@@ -162,15 +162,15 @@ + + png_bytep* row_pointers = png_get_rows (png_ptr, info_ptr); + +- m_width_pixels = info_ptr->width; +- m_height_pixels = info_ptr->height; +- m_channels = info_ptr->channels; +- size_t row_size = info_ptr->width * info_ptr->channels; ++ m_width_pixels = png_get_image_width(png_ptr, info_ptr); ++ m_height_pixels = png_get_image_height(png_ptr, info_ptr); ++ m_channels = png_get_channels(png_ptr, info_ptr); ++ size_t row_size = png_get_image_width(png_ptr, info_ptr) * png_get_channels(png_ptr, info_ptr); + + size_t data_size = row_size * m_height_pixels; + unsigned char* data = new unsigned char [data_size]; + +- for (size_t i = 0; i < info_ptr->height; i++) ++ for (size_t i = 0; i < png_get_image_height(png_ptr, info_ptr); i++) + { + for (size_t j = 0; j < row_size; j++) + { diff --git a/dev-games/vamos/vamos-0.6.2.ebuild b/dev-games/vamos/vamos-0.6.2.ebuild index fc820fec9827..ef5df3385e9f 100644 --- a/dev-games/vamos/vamos-0.6.2.ebuild +++ b/dev-games/vamos/vamos-0.6.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/vamos/vamos-0.6.2.ebuild,v 1.6 2010/09/17 11:09:08 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/vamos/vamos-0.6.2.ebuild,v 1.7 2011/09/14 12:26:11 ssuominen Exp $ EAPI=2 inherit eutils @@ -24,7 +24,9 @@ DEPEND="${RDEPEND} dev-util/pkgconfig" src_prepare() { - epatch "${FILESDIR}"/${P}-as-needed.patch + epatch \ + "${FILESDIR}"/${P}-as-needed.patch \ + "${FILESDIR}"/${P}-libpng15.patch } src_configure() { |