Fix building with libpng15 wrt #378171 by Diego Elio Pettenò

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

4 files changed, 30 insertions, 10 deletions

diff --git a/games-emulation/openmsx/ChangeLog b/games-emulation/openmsx/ChangeLog
index 7567a72c49c7..e6c1d24c5bbe 100644
--- a/games-emulation/openmsx/ChangeLog
+++ b/games-emulation/openmsx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/openmsx
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/openmsx/ChangeLog,v 1.40 2011/08/24 19:38:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/openmsx/ChangeLog,v 1.41 2011/09/14 16:58:32 ssuominen Exp $
+
+  14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> openmsx-0.8.1.ebuild,
+  +files/openmsx-0.8.1-libpng15.patch:
+  Fix building with libpng15 wrt #378171 by Diego Elio Pettenò
 
   24 Aug 2011; Markus Meier <maekke@gentoo.org> openmsx-0.8.1.ebuild:
   x86 stable, bug #380179
diff --git a/games-emulation/openmsx/Manifest b/games-emulation/openmsx/Manifest
index 8648e186db9a..e824f437bfd0 100644
--- a/games-emulation/openmsx/Manifest
+++ b/games-emulation/openmsx/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX openmsx-0.8.1-libpng15.patch 469 RMD160 ce5f05abe07ec3dd2545d1ea1a84bab088504b01 SHA1 8d9a3c9e8e42f2b32e6585f3b28bed40818cb5e5 SHA256 a8544317435dea407d261ae9b24ffcc43c3baad7ecd313ef1c88c3b00797c206
 DIST openmsx-0.7.2.tar.gz 2653475 RMD160 cca186fbf2edea5fb76bc135bef11b1bee08bcde SHA1 e600bf3fc7b5e69762de12cc6dc075a54b78a9ec SHA256 61bd5323ff9c1f4ae3b6a7c57c3acf5131fc643667f91bc669639d690de7efd2
 DIST openmsx-0.8.0.tar.gz 2830301 RMD160 647c1042d6abdf52684277565caf42ab398fc9b8 SHA1 17aeeb5e456388736d8a0f62e2e207c51cd75771 SHA256 e6105a351aa5d66d799c3e9c6c16226db9b379588d4c52478820c111437185c4
 DIST openmsx-0.8.1.tar.gz 2834894 RMD160 2a2b7e87407e5d23c311b6b43790cef62d80f34d SHA1 08ebdebadb67b8c326080c581bfc912442eb2abf SHA256 5a882dfc1faa9bc30c055e1645f675c652b8173908991ed296dbc7359ca901e5
 EBUILD openmsx-0.7.2.ebuild 1338 RMD160 d8726bb88dcc93febf8aee359abfb8d00ff117c5 SHA1 bd2f16bad8cdfc8b2843732c705e65c0b7b42b38 SHA256 cd8aa9b9c721426ffc1379bc5db7f1aa01a0d1f9de51077069d1ee9baa002033
 EBUILD openmsx-0.8.0.ebuild 1601 RMD160 ca19b703b59ab79a5ae12fcf0fce1e2a71bbc854 SHA1 d8cd05aede9b985ffa5b00565633d5a9c6e1868c SHA256 a21645a1650f8597eaa920afcdea7fd498352ab32e71b8fdfcf10e58f1c002fa
-EBUILD openmsx-0.8.1.ebuild 1648 RMD160 562ef56fdb013660a59ea781076172e85764f86f SHA1 b7ee0fc9f9cc4c138be356b5058232d4f0f083d9 SHA256 d221399777ef694f5f7c5001aecaff125d39be5a4a5f824c43e63bb6b0c31952
-MISC ChangeLog 5671 RMD160 356cf2943e631893bd3588fe7a4cd88426cb8307 SHA1 e6b3885926f45223705ec6277231cf829660fc4b SHA256 2144ba32cfe77aa77b180c483095f8a04474d105d94e539da5f109d333d3b4f4
+EBUILD openmsx-0.8.1.ebuild 1701 RMD160 e0f725706770dac79bc9fda854f63fb33a9fbeba SHA1 3189c66428b974ec698ba675427446dc18f79b9f SHA256 49ba3ce0831400efa8efc0771061e77d9bb6d721ef2d9d7181ec5f6ec213bdf6
+MISC ChangeLog 5854 RMD160 23f50e57932f0f7bb53c5b262c1339cd2ccb5360 SHA1 efd2e40d98b717b026a2d0d039c711b0660995e7 SHA256 f461a25ea83304a50fd1731bf61a1f4c5734944e0fc0826a553f8d8cacfd6e76
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5VU4YACgkQkKaRLQcq0GLIPACfSCK06Ilg5ZqcvnESye5dZPeh
-EO8AnixITtQPIrdU2fv58AgxS4pJDQiP
-=ANLa
+iF4EAREIAAYFAk5w3W8ACgkQXkR9YqOcLPHmRQD/bPxeRBxwJoWbz1RHsz+3eqxt
+G7YTJl6JlJ2BCCHw+rsA/27bug0ntc4Xx5vJW4dQqhi+BIwA3l50TRGYwimxxCQj
+=x0wW
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/openmsx/files/openmsx-0.8.1-libpng15.patch b/games-emulation/openmsx/files/openmsx-0.8.1-libpng15.patch
new file mode 100644
index 000000000000..46f13a0fbc84
--- /dev/null
+++ b/games-emulation/openmsx/files/openmsx-0.8.1-libpng15.patch
@@ -0,0 +1,13 @@
+http://openmsx.svn.sourceforge.net/viewvc/openmsx/openmsx/trunk/src/video/PNG.cc?r1=11609&r2=12214
+
+--- src/video/PNG.cc
++++ src/video/PNG.cc
+@@ -167,7 +167,7 @@
+ 				"Attempted to create a surface with excessive height: "
+ 				<< height << ", max " << MAX_SIZE);
+ 		}
+-		int bpp = png.info->channels * 8;
++		int bpp = png_get_channels(png.ptr, png.info) * 8;
+ 		assert(bpp == 24 || bpp == 32);
+ 		Uint32 redMask, grnMask, bluMask, alpMask;
+ 		if (OPENMSX_BIGENDIAN) {
diff --git a/games-emulation/openmsx/openmsx-0.8.1.ebuild b/games-emulation/openmsx/openmsx-0.8.1.ebuild
index d6f25f378901..2c8c35019521 100644
--- a/games-emulation/openmsx/openmsx-0.8.1.ebuild
+++ b/games-emulation/openmsx/openmsx-0.8.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/openmsx/openmsx-0.8.1.ebuild,v 1.3 2011/08/24 19:38:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/openmsx/openmsx-0.8.1.ebuild,v 1.4 2011/09/14 16:58:32 ssuominen Exp $
 
 EAPI=2
-inherit games
+inherit eutils games
 
 DESCRIPTION="MSX emulator that aims for perfection"
 HOMEPAGE="http://openmsx.sourceforge.net/"
@@ -24,6 +24,8 @@ DEPEND="dev-lang/tcl
 	virtual/opengl"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+
 	sed -i \
 		-e '/^LDFLAGS:=/d' \
 		-e '/LINK_FLAGS_PREFIX/d' \