Fix build with zlib-1.2.6 (bug #403483).

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

4 files changed, 49 insertions, 10 deletions

diff --git a/games-emulation/mednafen/ChangeLog b/games-emulation/mednafen/ChangeLog
index 0ee5175df08a..0492bdb03230 100644
--- a/games-emulation/mednafen/ChangeLog
+++ b/games-emulation/mednafen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/mednafen
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mednafen/ChangeLog,v 1.32 2011/12/14 07:27:56 tupone Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mednafen/ChangeLog,v 1.33 2012/02/18 08:16:13 radhermit Exp $
+
+  18 Feb 2012; Tim Harder <radhermit@gentoo.org> mednafen-0.8.13.3-r1.ebuild,
+  +files/mednafen-0.8.13.3-zlib-1.2.6.patch:
+  Fix build with zlib-1.2.6 (bug #403483).
 
 *mednafen-0.8.13.3-r1 (14 Dec 2011)
 
diff --git a/games-emulation/mednafen/Manifest b/games-emulation/mednafen/Manifest
index cf49fcf30539..9333c05bddcc 100644
--- a/games-emulation/mednafen/Manifest
+++ b/games-emulation/mednafen/Manifest
@@ -1,16 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX mednafen-0.8.13.3-zlib-1.2.6.patch 610 RMD160 e63d6a9098dc9ca73fb15f5ea395f7d227cf72f5 SHA1 cbcf29265d1e6a0fc1449cd3def5dd5c4a885a9e SHA256 616ef849d48d48bffcc54f053f54230c8e04712e19facca3c9b53ca81b23e282
 AUX mednafen-0.8.13.3-zlib.patch 1191 RMD160 8eb62b63ac3bd39723b4d36c0c0d4da2dc1d6fd1 SHA1 1cacdf91eb40dcc57df0aba0f0051a630046e8cb SHA256 d7f84dcdc8240c751f5d74f54fcef7f94fb97653217ed1a0d4e44323c3831325
 DIST mednafen-0.8.D.3.tar.bz2 2442705 RMD160 546f49a9541ba4d0367fe682aef23cdadf3d7325 SHA1 b19b92101853cb653506456fd8ab1c0bb0b6e636 SHA256 d678178f0dc03c89c7a0c83bf0c721af406ee53dfa79295432ab13722ed0eea2
-EBUILD mednafen-0.8.13.3-r1.ebuild 1717 RMD160 2ac678a86e70c0b3258c9a783aebec0d6ef049f3 SHA1 ecc09c45377ada4af4840e6d6df2113e405eac93 SHA256 8af29f4ee611403f0763092929135f34695532a2ec857ddd5db195fbd9279d1a
+EBUILD mednafen-0.8.13.3-r1.ebuild 1764 RMD160 76898d70d48502064a6da80d189339445e9f3ac8 SHA1 7dabb97eacc3d6bd6c3f73cbeea91d9d8bf48d8d SHA256 7fdd5c651f07ce8ceb4de7c61389b51e88aafb945e04bac4a105097b7f50c666
 EBUILD mednafen-0.8.13.3.ebuild 1685 RMD160 fd6fe44a4cc02fdec6c7695506af96da853ee39b SHA1 b08c028f97f6bec6c354d30bbc3d4d9f0ec2241d SHA256 79ff647e5666a8ba35ed15773c83ddf528d37d9942a4c7f2c72044348dbf57f7
-MISC ChangeLog 4521 RMD160 02b41658e67f35e659535481585197f12ddbc567 SHA1 21f9f561fb59e026587f76ae51ddf24df919a895 SHA256 3193c60aae3fd5b4bd94cb4039908b972d3f87f45ae8628f452fef880e15f8dc
+MISC ChangeLog 4691 RMD160 2712fee9eecc04599897f52d52fc3d8a39ca9d40 SHA1 81dfbd647f12ed32b50e683fa9f91b03195c19c5 SHA256 5ec1c164e0450b757db30a87fb8a62ae49ce45e7bd721d0d2d6fba25db6e3645
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7oT+UACgkQIY77eQFFFC27mACeNgBJ3eCOUbR+NbKqN6jNj2ou
-eDUAoJd5wNESVTbQ2bPxxE2b8Cp13Js4
-=y4D5
+iQEcBAEBCgAGBQJPP15WAAoJEEqz6FtPBkyjA3QH/1gqrFwjLe1vzw9x/5IYBGF+
+n88fwc9GtQE9/xvKvyQFbDTRWBjXK+Z0S/BJIrdKw/VMgo3jsEtDuxfhn2X++s37
+dfDw6SqeqMBts7Dmnw1XdRH3no1fcHYPdaqUmAeJ+UjhdfzOYnkcFPErI3npvHOH
++IMSv2YBXT5lHu+YaLUiTb/QtEu+uDiqY2Q1OuOXl6RER/b1TVxlV+r4e+zn/oWN
+3v7YUtndGr9jMc7wSMlyw+4M7IGVtkifoE3IUcR2WOJF7APhkql3jIWbBfBQyr3a
+5GwVSpDIdAAOoaKpwVkV38u0/3PZ5XG0d+8EMH0hBu+IT1Pi+56IensnDmJmc3Y=
+=Zq+H
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/mednafen/files/mednafen-0.8.13.3-zlib-1.2.6.patch b/games-emulation/mednafen/files/mednafen-0.8.13.3-zlib-1.2.6.patch
new file mode 100644
index 000000000000..9437f76ce690
--- /dev/null
+++ b/games-emulation/mednafen/files/mednafen-0.8.13.3-zlib-1.2.6.patch
@@ -0,0 +1,29 @@
+--- mednafen.orig/src/file.cpp
++++ mednafen/src/file.cpp
+@@ -229,7 +229,7 @@
+    goto doret;
+   }
+ 
+-  while((howmany = gzread(tz, tmp->data + cur_size, cur_alloced - cur_size)) > 0)
++  while((howmany = gzread((gzFile)tz, tmp->data + cur_size, cur_alloced - cur_size)) > 0)
+   {
+    cur_size += howmany;
+    cur_alloced <<= 1;
+@@ -282,7 +282,7 @@
+  }
+  else if(type == MDFN_FILETYPE_GZIP)
+  {
+-  gzclose(tz);
++  gzclose((gzFile)tz);
+  }
+  else if(type == MDFN_FILETYPE_ZIP)
+  {
+@@ -444,7 +444,7 @@
+ 
+    if(!(fceufp = MakeMemWrap(t, 1)))
+    {
+-    gzclose(t);
++    gzclose((gzFile)t);
+     return(0);
+    }
+ 
diff --git a/games-emulation/mednafen/mednafen-0.8.13.3-r1.ebuild b/games-emulation/mednafen/mednafen-0.8.13.3-r1.ebuild
index 148cdb873e88..cd66dcf1fb74 100644
--- a/games-emulation/mednafen/mednafen-0.8.13.3-r1.ebuild
+++ b/games-emulation/mednafen/mednafen-0.8.13.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mednafen/mednafen-0.8.13.3-r1.ebuild,v 1.1 2011/12/14 07:27:56 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mednafen/mednafen-0.8.13.3-r1.ebuild,v 1.2 2012/02/18 08:16:13 radhermit Exp $
 
 EAPI=2
 inherit autotools eutils games
@@ -43,6 +43,7 @@ src_prepare() {
 		configure.ac \
 		|| die "sed failed"
 	epatch "${FILESDIR}"/${P}-zlib.patch
+	epatch "${FILESDIR}"/${P}-zlib-1.2.6.patch
 	eautoreconf
 }