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

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

4 files changed, 30 insertions, 11 deletions

diff --git a/games-emulation/zsnes/ChangeLog b/games-emulation/zsnes/ChangeLog
index ab28b4714c3e..62a11c82543b 100644
--- a/games-emulation/zsnes/ChangeLog
+++ b/games-emulation/zsnes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/zsnes
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.46 2010/01/03 11:52:55 fauli Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.47 2011/09/14 08:45:05 ssuominen Exp $
+
+  14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> zsnes-1.51-r2.ebuild,
+  +files/zsnes-1.51-libpng15.patch:
+  Fix building with libpng15 wrt #378735 by Diego Elio Pettenò
 
   03 Jan 2010; Christian Faulhammer <fauli@gentoo.org> zsnes-1.51-r2.ebuild:
   Transfer Prefix keywords
diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index 819b2eda3dd4..8256e79ce6c1 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX zsnes-1.51-CC-quotes.patch 812 RMD160 e0ed454da3a4ceb034089d8ca8b4ad5ea634a91e SHA1 73b2b1a5536e9bd7e3d0a24f86c2ce36103cfe66 SHA256 88082857f72d10e629a0b725d7ca3b558e9e0e733e1da49494c52cafadbb48a9
 AUX zsnes-1.51-archopt-july-23-update.patch 12740 RMD160 e8004f97f795c13d51fa16c5bf386dfc8b12058f SHA1 4e59c16f0e5c57cfa6e5df2b50026598e77eab5a SHA256 4fc49ccafe46dafb1db57226e6989f6a5c97e826595df881d90bad1694a9906e
@@ -7,14 +7,15 @@ AUX zsnes-1.51-depbuild.patch 631 RMD160 bd17f4dc521fb186a62e91350c9dcdc97c1c325
 AUX zsnes-1.51-gcc43.patch 913 RMD160 95ab52f570dd1e5c7d0852dac17d56ada4939079 SHA1 9bbececf44cc48a4d6b48ebff66ba657ef409168 SHA256 9eb0aff2be2b303295b0d0a76240facd13dca170b97fe3ee827a6c26d89d53de
 AUX zsnes-1.51-libao-thread.patch 663 RMD160 10b0ce28577e39187f98d8f392462585148d34eb SHA1 67a34c9a5f8c6abb2881007d47ba10647ca4503a SHA256 71be0bbb8b683edc7c7780b68a43e54be7a8c341bf9b2a01e5cceb53834b1a73
 AUX zsnes-1.51-libpng.patch 974 RMD160 36bdb059c6641376bee6ea5040a7045420c02870 SHA1 a4f7960de8eece5ac1c51cc8b58f6fb8964bca40 SHA256 9e5ba014ba847f7e10075dfd51b0ca42b86aa2dcc47952d569c304f3e8e15470
+AUX zsnes-1.51-libpng15.patch 510 RMD160 72682ef320f6b23e3626e7acfa2479b2ccb00b7f SHA1 e6c8d2985d602c659a472e23278f9e0f2c2e6aea SHA256 c9636e76441ae1624c8ddc92e47facc20b43871fb0f55fd50d526b10944c6560
 DIST zsnes151src.tar.bz2 1071712 RMD160 337407bf7e5516bcd7bf310c7b17d6d12a948750 SHA1 03df35490870c9950d7010747d0546c8525c0362 SHA256 eb013f824f5a9814a714cf0daaea3ea68a1c74fd741e5b0979fcb7964236a866
-EBUILD zsnes-1.51-r2.ebuild 2279 RMD160 70691d74fdf674bc51c59871d11dd228fa6919f2 SHA1 eb69b3f83ceafcfeb9f2ea66ec829687106b00bb SHA256 6b86faaa0bd4d715bb14bcfdd7db767ee24a93ee4fba884648d16096ebe131e4
-MISC ChangeLog 9286 RMD160 854472c4a3d726b70d420ed7f49edaf2585ee072 SHA1 4be0d1c45f148d99f83a96f575383f293cdd013b SHA256 925dd9a3693abd2e24e864e3a276385222913127e7c200762d4d1213061890a9
+EBUILD zsnes-1.51-r2.ebuild 2370 RMD160 6ea1fae4980aabd6d82b45d9a80d5417a39f68b2 SHA1 9073650390e4d5c779aba3db23a3596f4cfc57ca SHA256 1d2ba920a3bdaa5c1c1569fb8cc9f2a922f89c0b273d70e57e09e11ad622fb7e
+MISC ChangeLog 9467 RMD160 93f92bee09973691c3715096be1c3a5c137002fc SHA1 821e0926cb6cc29c0048430852580b3469b11899 SHA256 1734c12ad620e3ddc44fbc83e41ab1b468113668de5eea7c8a8eee7ba65de16a
 MISC metadata.xml 160 RMD160 f839c00d9f25c1f873f95ab899fb64060c1d0bf5 SHA1 08c3d180cf8dbef87e40c42a18b457516a5d7ffe SHA256 5ac0a3647e8149d52ce55d391cf1680ac52d6f0330be21c3bca4790b971b5e5d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAktAhR0ACgkQNQqtfCuFnePSAACdGm9G4jr6xTpBeaSTCzusnD1v
-Ja4AoIeoqkyXn6JYRlv+WkaNM+TMLbgK
-=D4XZ
+iF4EAREIAAYFAk5wacgACgkQXkR9YqOcLPH3YQD+NqISUVMwD0CLm8VVOKOe49VS
+WoAtwX5vH4H9WDo01LIA/RlleKQYgVhyfiro7MK814TuA9oABil593hTGZ/ntX2h
+=VRwM
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/zsnes/files/zsnes-1.51-libpng15.patch b/games-emulation/zsnes/files/zsnes-1.51-libpng15.patch
new file mode 100644
index 000000000000..b32c30967547
--- /dev/null
+++ b/games-emulation/zsnes/files/zsnes-1.51-libpng15.patch
@@ -0,0 +1,12 @@
+Use existing png_set_IHDR() and stop accessing PNG structure members directly
+
+--- src/zip/zpng.c
++++ src/zip/zpng.c
+@@ -129,7 +129,6 @@
+         png_set_IHDR(png_ptr, info_ptr, width, height, 8,
+                      PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
+                      PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+-        info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+ 
+         //Allocate an array of scanline pointers
+         row_pointers = (png_bytep*)malloc(height*sizeof(png_bytep));
diff --git a/games-emulation/zsnes/zsnes-1.51-r2.ebuild b/games-emulation/zsnes/zsnes-1.51-r2.ebuild
index 320cf726835c..8853821544bf 100644
--- a/games-emulation/zsnes/zsnes-1.51-r2.ebuild
+++ b/games-emulation/zsnes/zsnes-1.51-r2.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/games-emulation/zsnes/zsnes-1.51-r2.ebuild,v 1.7 2010/01/03 11:52:55 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r2.ebuild,v 1.8 2011/09/14 08:45:05 ssuominen Exp $
 
 inherit eutils autotools flag-o-matic toolchain-funcs multilib games
 
@@ -40,6 +40,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-depbuild.patch
 	# Fix bug #260247
 	epatch "${FILESDIR}"/${P}-CC-quotes.patch
+	# Fix compability with libpng15 wrt #378735
+	epatch "${FILESDIR}"/${P}-libpng15.patch
 
 	# Remove hardcoded CFLAGS and LDFLAGS
 	sed -i \