diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2012-02-18 08:16:13 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2012-02-18 08:16:13 +0000 |
| commit | 9a9a75921bea4d329f7414f6b7ed51e103031ad1 (patch) | |
| tree | 72bb8fbd27dbd716d2c037979ae49f9a8b21a3e4 /games-emulation/mednafen | |
| parent | Cleanup (diff) | |
| download | gentoo-2-9a9a75921bea4d329f7414f6b7ed51e103031ad1.tar.gz gentoo-2-9a9a75921bea4d329f7414f6b7ed51e103031ad1.tar.bz2 gentoo-2-9a9a75921bea4d329f7414f6b7ed51e103031ad1.zip | |
Fix build with zlib-1.2.6 (bug #403483).
(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)
Diffstat (limited to 'games-emulation/mednafen')
| -rw-r--r-- | games-emulation/mednafen/ChangeLog | 8 | ||||
| -rw-r--r-- | games-emulation/mednafen/files/mednafen-0.8.13.3-zlib-1.2.6.patch | 29 | ||||
| -rw-r--r-- | games-emulation/mednafen/mednafen-0.8.13.3-r1.ebuild | 5 |
3 files changed, 38 insertions, 4 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/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 } |