diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2012-02-18 03:37:58 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2012-02-18 03:37:58 +0000 |
| commit | cb8dd065884f772f555467fa50eab61b65239af2 (patch) | |
| tree | 27289ad033ee9d8711a8eb7781d7208e782c74d4 | |
| parent | Fix PREFIX parameter. (diff) | |
| download | gentoo-2-cb8dd065884f772f555467fa50eab61b65239af2.tar.gz gentoo-2-cb8dd065884f772f555467fa50eab61b65239af2.tar.bz2 gentoo-2-cb8dd065884f772f555467fa50eab61b65239af2.zip | |
Fix compile issue with zlib-1.2.6 (bug #403485).
(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)
| -rw-r--r-- | games-emulation/vbam/ChangeLog | 8 | ||||
| -rw-r--r-- | games-emulation/vbam/files/vbam-1.8.0.1009-zlib-1.2.6.patch | 47 | ||||
| -rw-r--r-- | games-emulation/vbam/vbam-1.8.0.1009-r1.ebuild | 7 |
3 files changed, 57 insertions, 5 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/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 |