Fix compile issue with zlib-1.2.6 (bug #403485).

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

4 files changed, 67 insertions, 14 deletions

diff --git a/games-emulation/vbam/ChangeLog b/games-emulation/vbam/ChangeLog
index 9cd6aa3ff7f7..e7def38663f0 100644
--- a/games-emulation/vbam/ChangeLog
+++ b/games-emulation/vbam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/vbam
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/ChangeLog,v 1.8 2011/09/21 06:23:09 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/ChangeLog,v 1.9 2012/02/18 03:37:58 radhermit Exp $
+
+  18 Feb 2012; Tim Harder <radhermit@gentoo.org> vbam-1.8.0.1009-r1.ebuild,
+  +files/vbam-1.8.0.1009-zlib-1.2.6.patch:
+  Fix compile issue with zlib-1.2.6 (bug #403485).
 
   21 Sep 2011; Tim Harder <radhermit@gentoo.org> vbam-1.8.0.1009-r1.ebuild:
   Fix build issue with the latest zlib macro issues thanks to vapier (bug
diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 70db6dd815ba..aaf49c0be627 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -3,18 +3,19 @@ Hash: SHA512
 
 AUX vbam-1.8.0.1009-desktop.patch 617 RMD160 ad4b37155c087ad17424f08d49dfe77db46f9158 SHA1 8fb592fa3dc60368fc9c2ff51fa2a3b1bc2b0a22 SHA256 85b17f66384de563cefe4809fa95a4b9f5e63ef4f962811ffe8f21b872633790
 AUX vbam-1.8.0.1009-no-nls.patch 1164 RMD160 000aa2142bb3c367b1842ba8ecf722ed057f945e SHA1 137263718de75e6c9fb239515e2829fe2ac3f08b SHA256 8e32294dd094d060dbc39b415ef4a20baa4704876a63ae9cbf2b0bd51203d895
+AUX vbam-1.8.0.1009-zlib-1.2.6.patch 1253 RMD160 8d60cf9c06c2291428aed37d36bddaa6491ab86f SHA1 0d7d8f4de6cff3a04867944fb3438d5b111ba30a SHA256 08ba1b0b123b30e31e1f336ca118972679481ba5a9e54db706c90fae60905548
 DIST vbam-1.8.0.1009.tar.bz2 779577 RMD160 571b51946dfd0aa85c56701e0279aef866431c64 SHA1 affc48667d140ca232120d1c3f80f311f52dc0bc SHA256 918143ae0d8a4cd30a0af16692e836b57c2d3627e8ab4db5729ff7017b6169cd
-EBUILD vbam-1.8.0.1009-r1.ebuild 1914 RMD160 814ef38656c25a92b3c524f61e294bea59b8a4fb SHA1 b8bd69103cc73dbfae8e4028f0160eb362fd9064 SHA256 905e9821bde3afdc65c1f1d35f2e0249ce5206686730e85d375846af01d9dad1
-MISC ChangeLog 1958 RMD160 b77a911aa0b4664ede11e61bb919a77cea4c5f72 SHA1 0496c6bc6e5bbae35089239759a25ff473f859f0 SHA256 b064bcb4b64827576e8a66733bd8f7fda2b92bac7e6789ff57078c1f899da0c1
+EBUILD vbam-1.8.0.1009-r1.ebuild 1954 RMD160 1a34684fe2de751fead6812d7aa9ce737f5259e2 SHA1 aeb509b274b11568e9271c96260586006d1d7141 SHA256 8d3ddce2c7ccda9459c89525bd017a79e92b15214145f34c41a160fa489d5e85
+MISC ChangeLog 2129 RMD160 893b43e3325764df339a971b0adc5adc114df0ad SHA1 61529d7a1943c0d05e560248a8afdd0425c63b05 SHA256 f83745761de7abf646d089baeac77da112bda218d26c27a212618d1ff7100384
 MISC metadata.xml 331 RMD160 34d4fd47bec0dcb8f0d08d4a17cab47d506633a5 SHA1 fc463ad416b0cfc238ea427f72ae068b069da90b SHA256 d6054d5a8bdfb747166a4b83c1f7db04be3898899323aa316cbef1ab7a6b7daa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOeYLTAAoJEEqz6FtPBkyjPH8H/0sUDZhf+PadXJPlEHF5sOx8
-K5L/Iq8s3rgFVkHvioHMkTPlU8YWUT1kqgmAq1sbF1T7FUErmlOsTcaASwaoqHSB
-pyRagedvtyAvhnisnQffgwXM0/vwGSnxgV3Zu109tQATMektQXMK+XKmjFnN74CL
-c1gb9dQIk6m6f7WSjj/YwgsVQB9ZI1rE29AV17nnCbakoEekz8BRGzJrKZsP8z0l
-FvblbuHToFk3EsKkyPXCLKFZNKsvZKGgnkILM6dnwY84+iPXTkDveoDhmxtZjYi1
-DOqEBlAOuoc9lJPU0gHXHBimm9tV0e+2E8B3HUTL6wPTJl4cYbT8AKEep5tjkAo=
-=QJQm
+iQEcBAEBCgAGBQJPPx0jAAoJEEqz6FtPBkyjb5oH/AjkHuEcmFjBAnPa8Nql3e89
+cPPJ5/aAtLmqHk57fjIfG+cZ6SX8KNHxaCx6XDr32XmNRtUNDYVaeBUoW9K7t3QZ
+VsIf9lwUPahd1OWvW/ZAlxI65rePV4jZ+/FLguIOE41dO24WyorsSQ6LZxExDDGa
+9PWUJJ743AXS4K9vz9SabwgN/EneRRKya/k1KcdxvmVggK9Utwdn7QsTY7KJTgZk
+IIHoGAz4eB0ll4Phs2w9/pU4dwX8XzjENekd2MgvWOoRrmzy5cfe4d60/NFKadAd
+zn6pfNvrOVXKptu198b3zXoqhqV3gK5+6PUvZlyR2hpx6igwIH9+jdO2GDpcO9s=
+=UZRN
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/vbam/files/vbam-1.8.0.1009-zlib-1.2.6.patch b/games-emulation/vbam/files/vbam-1.8.0.1009-zlib-1.2.6.patch
new file mode 100644
index 000000000000..2be7c50b2963
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-1.8.0.1009-zlib-1.2.6.patch
@@ -0,0 +1,47 @@
+--- vbam-1.8.0.1009.orig/fex/fex/Data_Reader.cpp
++++ vbam-1.8.0.1009/fex/fex/Data_Reader.cpp
+@@ -732,11 +732,11 @@
+ 
+ blargg_err_t Gzip_File_Reader::read_v( void* p, int s )
+ {
+-	int result = gzread( file_, p, s );
++	int result = gzread( (gzFile)file_, p, s );
+ 	if ( result != s )
+ 	{
+ 		if ( result < 0 )
+-			return convert_gz_error( file_ );
++			return convert_gz_error( (gzFile)file_ );
+ 		
+ 		return blargg_err_file_corrupt;
+ 	}
+@@ -746,8 +746,8 @@
+ 
+ blargg_err_t Gzip_File_Reader::seek_v( int n )
+ {
+-	if ( gzseek( file_, n, SEEK_SET ) < 0 )
+-		return convert_gz_error( file_ );
++	if ( gzseek( (gzFile)file_, n, SEEK_SET ) < 0 )
++		return convert_gz_error( (gzFile)file_ );
+ 
+ 	return blargg_ok;
+ }
+@@ -756,7 +756,7 @@
+ {
+ 	if ( file_ )
+ 	{
+-		if ( gzclose( file_ ) )
++		if ( gzclose( (gzFile)file_ ) )
+ 			check( false );
+ 		file_ = NULL;
+ 	}
+--- vbam-1.8.0.1009.orig/src/Util.cpp
++++ vbam-1.8.0.1009/src/Util.cpp
+@@ -544,7 +544,7 @@
+ 
+ gzFile utilGzOpen(const char *file, const char *mode)
+ {
+-  utilGzWriteFunc = (int (ZEXPORT *)(void *,void * const, unsigned int))gzwrite;
++  utilGzWriteFunc = (int (ZEXPORT *)(gzFile, void * const, unsigned int))gzwrite;
+   utilGzReadFunc = gzread;
+   utilGzCloseFunc = gzclose;
+   utilGzSeekFunc = gzseek;
diff --git a/games-emulation/vbam/vbam-1.8.0.1009-r1.ebuild b/games-emulation/vbam/vbam-1.8.0.1009-r1.ebuild
index 34a959e81e1b..778339e62b16 100644
--- a/games-emulation/vbam/vbam-1.8.0.1009-r1.ebuild
+++ b/games-emulation/vbam/vbam-1.8.0.1009-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/vbam/vbam-1.8.0.1009-r1.ebuild,v 1.4 2011/09/21 06:23:09 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/vbam-1.8.0.1009-r1.ebuild,v 1.5 2012/02/18 03:37:58 radhermit Exp $
 
 EAPI=2
 
@@ -37,7 +37,8 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-desktop.patch \
-		"${FILESDIR}"/${P}-no-nls.patch
+		"${FILESDIR}"/${P}-no-nls.patch \
+		"${FILESDIR}"/${P}-zlib-1.2.6.patch
 
 	# Fix issue with zlib-1.2.5.1 macros (bug #383179)
 	sed -i '1i#define OF(x) x' src/common/memgzio.c || die