From 7b06c7fba13e6d8c143e8dade69bb6dffff44a90 Mon Sep 17 00:00:00 2001 From: Alfredo Tupone Date: Wed, 14 Dec 2011 07:27:56 +0000 Subject: [PATCH] Build with latest zlib. Bug #387821 Package-Manager: portage-2.1.10.39/cvs/Linux i686 --- games-emulation/mednafen/ChangeLog | 8 ++- games-emulation/mednafen/Manifest | 14 +++- .../files/mednafen-0.8.13.3-zlib.patch | 27 ++++++++ .../mednafen/mednafen-0.8.13.3-r1.ebuild | 65 +++++++++++++++++++ 4 files changed, 112 insertions(+), 2 deletions(-) create mode 100644 games-emulation/mednafen/files/mednafen-0.8.13.3-zlib.patch create mode 100644 games-emulation/mednafen/mednafen-0.8.13.3-r1.ebuild diff --git a/games-emulation/mednafen/ChangeLog b/games-emulation/mednafen/ChangeLog index 4486ad6156a2..0ee5175df08a 100644 --- a/games-emulation/mednafen/ChangeLog +++ b/games-emulation/mednafen/ChangeLog @@ -1,6 +1,12 @@ # 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.31 2011/01/15 15:54:40 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/mednafen/ChangeLog,v 1.32 2011/12/14 07:27:56 tupone Exp $ + +*mednafen-0.8.13.3-r1 (14 Dec 2011) + + 14 Dec 2011; Tupone Alfredo +mednafen-0.8.13.3-r1.ebuild, + +files/mednafen-0.8.13.3-zlib.patch: + Build with latest zlib. Bug #387821 by Diego Elio Pettenò 15 Jan 2011; Markus Meier mednafen-0.8.13.3.ebuild: x86 stable, bug #351332 diff --git a/games-emulation/mednafen/Manifest b/games-emulation/mednafen/Manifest index cfa26cae079c..cf49fcf30539 100644 --- a/games-emulation/mednafen/Manifest +++ b/games-emulation/mednafen/Manifest @@ -1,4 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +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.ebuild 1685 RMD160 fd6fe44a4cc02fdec6c7695506af96da853ee39b SHA1 b08c028f97f6bec6c354d30bbc3d4d9f0ec2241d SHA256 79ff647e5666a8ba35ed15773c83ddf528d37d9942a4c7f2c72044348dbf57f7 -MISC ChangeLog 4303 RMD160 2919a89f23fd2e3a55448facb253a231888479a3 SHA1 db14dad347390a37121d998438c481cc26ae2aaf SHA256 e873fabe4bbebdc1a885b8b50b9fcfae035fc5da9d0481ad543afebae40ab29d +MISC ChangeLog 4521 RMD160 02b41658e67f35e659535481585197f12ddbc567 SHA1 21f9f561fb59e026587f76ae51ddf24df919a895 SHA256 3193c60aae3fd5b4bd94cb4039908b972d3f87f45ae8628f452fef880e15f8dc 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 +-----END PGP SIGNATURE----- diff --git a/games-emulation/mednafen/files/mednafen-0.8.13.3-zlib.patch b/games-emulation/mednafen/files/mednafen-0.8.13.3-zlib.patch new file mode 100644 index 000000000000..70a01459b81c --- /dev/null +++ b/games-emulation/mednafen/files/mednafen-0.8.13.3-zlib.patch @@ -0,0 +1,27 @@ +--- src/compress/Makefile.am.inc.old 2011-12-13 10:29:48.462857200 +0100 ++++ src/compress/Makefile.am.inc 2011-12-13 10:30:13.252857319 +0100 +@@ -1 +1 @@ +-mednafen_SOURCES += compress/minilzo.c compress/quicklz.cpp compress/blz.cpp compress/ioapi.c compress/unzip.c ++mednafen_SOURCES += compress/minilzo.c compress/quicklz.cpp compress/blz.cpp +--- src/Makefile.am.old 2011-12-13 10:29:07.702857010 +0100 ++++ src/Makefile.am 2011-12-13 10:34:21.062858500 +0100 +@@ -5,7 +5,7 @@ + + bin_PROGRAMS = mednafen + mednafen_SOURCES = debug.cpp error.cpp mempatcher.cpp settings.cpp Blip_Buffer.cpp Stereo_Buffer.cpp endian.cpp mednafen.cpp file.cpp general.cpp md5.cpp memory.cpp netplay.cpp state.cpp movie.cpp wave.cpp player.cpp psf.cpp tests.cpp +-mednafen_LDADD = @LIBINTL@ @LIBICONV@ trio/libtrio.a @SDL_LIBS@ ++mednafen_LDADD = @LIBINTL@ @LIBICONV@ trio/libtrio.a @SDL_LIBS@ -lminizip + mednafen_DEPENDENCIES = trio/libtrio.a + + if WANT_DEBUGGER +--- src/file.cpp.old 2011-12-13 10:26:06.622856149 +0100 ++++ src/file.cpp 2011-12-13 10:26:24.122856234 +0100 +@@ -32,7 +32,7 @@ + + + #include +-#include "compress/unzip.h" ++#include + + #include "file.h" + #include "endian.h" diff --git a/games-emulation/mednafen/mednafen-0.8.13.3-r1.ebuild b/games-emulation/mednafen/mednafen-0.8.13.3-r1.ebuild new file mode 100644 index 000000000000..148cdb873e88 --- /dev/null +++ b/games-emulation/mednafen/mednafen-0.8.13.3-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2011 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 $ + +EAPI=2 +inherit autotools eutils games + +DESCRIPTION="An advanced NES, GB/GBC/GBA, TurboGrafx 16/CD, NGPC and Lynx emulator" +HOMEPAGE="http://mednafen.sourceforge.net/" +SRC_URI="mirror://sourceforge/mednafen/mednafen-${PV/13/D}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="alsa altivec cjk debug jack nls" + +RDEPEND="virtual/opengl + media-libs/libsndfile + dev-libs/libcdio + media-libs/libsdl[audio,joystick,video] + media-libs/sdl-net + sys-libs/zlib[minizip] + alsa? ( media-libs/alsa-lib ) + jack? ( media-sound/jack-audio-connection-kit ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + nls? ( sys-devel/gettext )" + +S=${WORKDIR}/${PN} + +src_prepare() { + sed -i \ + -e 's:$(datadir)/locale:/usr/share/locale:' \ + $(find . -name 'Makefile.am') \ + intl/Makefile.in \ + || die 'sed failed' + sed -i \ + -e '/-fomit-frame-pointer/d' \ + -e '/-ffast-math/d' \ + -e '/CPPFLAGS=.*CFLAGS/s/CFLAGS/CXXFLAGS/' \ + -e '/^AX_CFLAGS_GCC_OPTION.*OPTIMIZER_FLAGS/d' \ + configure.ac \ + || die "sed failed" + epatch "${FILESDIR}"/${P}-zlib.patch + eautoreconf +} + +src_configure() { + egamesconf \ + --disable-dependency-tracking \ + $(use_enable alsa) \ + $(use_enable altivec) \ + $(use_enable cjk cjk-fonts) \ + $(use_enable debug debugger) \ + $(use_enable jack) \ + $(use_enable nls) +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc Documentation/cheats.txt AUTHORS ChangeLog TODO + dohtml Documentation/* + prepgamesdirs +} -- 2.26.2