bump new mednafen version (picked up from roslin overlay)

This commit is contained in:
Sergey Popov 2012-02-26 15:10:06 +04:00
parent 4742da901a
commit 90952eff17
5 changed files with 63 additions and 67 deletions

View File

@ -1,3 +1,4 @@
AUX mednafen-ipv6.patch 1899 RMD160 e0b11b9ed892d092812db63414151f2e52960e58 SHA1 da86bfd379ef699492fc24ab69d8f50ada7d5178 SHA256 8676e1855c29382bcd3f9000c93224bbca56cda2ebb4834b2f97220288b1fe4d
DIST mednafen-0.9.17-wip.tar.bz2 3408990 RMD160 c681de86a12d44a4d59a837078b1d14441a46ba0 SHA1 4a002a08ab99fd9526f1fd4490cd3f3cfd7108cf SHA256 391961caa4fba0aa45f73c00bb7b29b636a4ac5394bce2fdcc41d1c5765f3ab8
EBUILD mednafen-0.9.17-r9999.ebuild 1777 RMD160 349449594d5ee646be55a7673bef0d53b4e19947 SHA1 efed22101692f8a4868385368ead849564aba47d SHA256 60903af1472c7a78da1b14ed8e9ed1b92f40f79111d043b2be404ccf0795dc4b
AUX mednafen-0.9.19-psx-debug.patch 398 RMD160 e8706880bd304f7649470856805e9f62973d2656 SHA1 672dfe9b682e4c2484bd25f8788de0a13ac7fdaa SHA256 d6e01ac60e2d463d78efec65a76431d81a615b9c2afbd5093040d4897be389f7
AUX mednafen-0.9.19-zlib-1.2.6.patch 1005 RMD160 af72daab954cfa81668337270262956294492035 SHA1 140968f3f194274b13d7ccba4657b56c29fac798 SHA256 de2cd0b4ef72e7e32b523d8d9d2b452376e8aab4e931055ab57b4ee906580dac
DIST mednafen-0.9.19.tar.bz2 3710809 RMD160 be8be3544915ee7804b5510790417983fb4ef555 SHA1 319ecb59cfca1baa9e733cb695186cc86f36151a SHA256 f09d0783676a52eb7b24941f50065b52e748107c50194ec96a8095a7956b7864
EBUILD mednafen-0.9.19-r1.ebuild 1722 RMD160 308f3c25494afbcadd2545682a11a1e1fe2689c0 SHA1 276853afc3cd7f8a3e097f200bdd92bb29bff59d SHA256 c2a16f0291015522292bc94f44057164e182d174d63e59a3add72f3bc109c44a

View File

@ -0,0 +1,14 @@
diff --git a/src/psx/gpu.cpp b/src/psx/gpu.cpp
index 78fb66f..107cab0 100644
--- a/src/psx/gpu.cpp
+++ b/src/psx/gpu.cpp
@@ -1068,7 +1068,9 @@ pscpu_timestamp_t PS_GPU::Update(const pscpu_timestamp_t sys_timestamp)
PSX_RequestMLExit();
}
+#ifdef WANT_DEBUGGER
DBG_GPUScanlineHook(scanline);
+#endif
// printf("[GPU] DTA scanline=%3d --- %8d\n", scanline, DrawTimeAvail);

View File

@ -0,0 +1,31 @@
diff --git a/src/file.cpp b/src/file.cpp
index 57f4e13..ec1181c 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -293,7 +293,7 @@ bool MDFNFILE::MakeMemWrapAndClose(void *tz, int type)
goto doret;
}
- while((howmany = gzread(tz, f_data + cur_size, cur_alloced - cur_size)) > 0)
+ while((howmany = gzread((gzFile)tz, f_data + cur_size, cur_alloced - cur_size)) > 0)
{
cur_size += howmany;
cur_alloced <<= 1;
@@ -320,7 +320,7 @@ bool MDFNFILE::MakeMemWrapAndClose(void *tz, int type)
{
int gzerrnum = 0;
const char *gzerrstring;
- if((gzerrstring = gzerror(tz, &gzerrnum)) && gzerrnum != Z_OK && gzerrnum != Z_STREAM_END)
+ if((gzerrstring = gzerror((gzFile)tz, &gzerrnum)) && gzerrnum != Z_OK && gzerrnum != Z_STREAM_END)
{
if(gzerrnum != Z_ERRNO)
{
@@ -365,7 +365,7 @@ bool MDFNFILE::MakeMemWrapAndClose(void *tz, int type)
}
else if(type == MDFN_FILETYPE_GZIP)
{
- gzclose(tz);
+ gzclose((gzFile)tz);
}
else if(type == MDFN_FILETYPE_ZIP)
{

View File

@ -1,55 +0,0 @@
--- configure.ac.orig 2011-07-03 01:21:46.937790000 +0400
+++ configure.ac 2011-07-03 01:24:57.947895000 +0400
@@ -414,5 +414,27 @@
CFLAGS="$LIBCDIO_CFLAGS $SNDFILE_CFLAGS $CFLAGS"
CPPFLAGS="$LIBCDIO_CFLAGS $SNDFILE_CFLAGS $CPPFLAGS"
+dnl ipv6 check
+AC_ARG_ENABLE(ipv6,
+[ --enable-ipv6 Use ipv6, if available. [default=yes]],enable_ipv6=$enableval,enable_ipv6=yes)
+
+AC_MSG_CHECKING(whether to enable ipv6)
+
+if test "x$enable_ipv6" = "xyes" ; then
+ AC_TRY_COMPILE([#define INET6
+#include <sys/types.h>
+#include <netinet/in.h>],
+ [int x = IPPROTO_IPV6; struct in6_addr a;],
+ [ts_cv_ipv6="yes"], [ts_cv_ipv6="no"])
+else
+ ts_cv_ipv6="no"
+fi
+
+AC_MSG_RESULT($ts_cv_ipv6)
+
+if test "x$ts_cv_ipv6" = "xyes"; then
+ AC_DEFINE([USE_IPV6], [], [Enable ipv6 support])
+fi
+
dnl Output Makefiles
AC_OUTPUT([Makefile src/Makefile src/tremor/Makefile src/mpcdec/Makefile src/trio/Makefile src/gb/Makefile src/gba/Makefile src/lynx/Makefile src/pce/Makefile src/pcfx/Makefile src/sms/Makefile src/wswan/Makefile src/nes/Makefile src/ngp/Makefile po/Makefile.in intl/Makefile])
--- src/drivers/netplay.cpp.orig 2010-12-19 01:24:01.000000000 +0300
+++ src/drivers/netplay.cpp 2011-07-03 02:14:07.513970385 +0400
@@ -244,13 +244,21 @@
unsigned int remote_port = MDFN_GetSettingUI("netplay.port");
std::string game_key = MDFN_GetSettingS("netplay.gamekey");
+#ifdef USE_IPV6
+ if(SDLNet_ResolveHost(SDLNET_ANY, &IPa, remote_host.c_str(), remote_port) == -1)
+#else
if(SDLNet_ResolveHost(&IPa, remote_host.c_str(), remote_port) == -1)
+#endif
{
PrintNetError(_("*** Error resolving host \"%s\"!"), remote_host.c_str());
return(0);
}
+#ifdef USE_IPV6
+ Socket = SDLNet_TCP_Connect(&IPa);
+#else
Socket = SDLNet_TCP_Open(&IPa);
+#endif
if(!Socket)
{
PrintNetError(_("*** Error connecting to remote host \"%s\" on port %u!"), remote_host.c_str(), remote_port);

View File

@ -1,17 +1,17 @@
# 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.ebuild,v 1.5 2011/01/15 15:54:40 maekke Exp $
EAPI=2
inherit autotools eutils games
inherit autotools eutils flag-o-matic games
DESCRIPTION="An advanced NES, GB/GBC/GBA, TurboGrafx 16/CD, NGPC and Lynx emulator"
HOMEPAGE="http://mednafen.sourceforge.net/"
SRC_URI="http://home.pinkbyte.ru/emulators/${P}-wip.tar.bz2"
SRC_URI="http://forum.fobby.net/index.php?t=getfile&id=345 -> ${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
KEYWORDS="~amd64 ~x86"
IUSE="alsa altivec cjk debug jack nls"
RDEPEND="virtual/opengl
@ -29,7 +29,16 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${PN}
pkg_setup() {
append-flags -fno-strict-overflow
append-flags -fomit-frame-pointer
games_pkg_setup
}
src_prepare() {
epatch "${FILESDIR}/${P}-psx-debug.patch" \
"${FILESDIR}/${P}-zlib-1.2.6.patch"
sed -i \
-e 's:$(datadir)/locale:/usr/share/locale:' \
-e 's:$(localedir):/usr/share/locale:' \
@ -38,13 +47,9 @@ src_prepare() {
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"
# Pinkbyte: add ipv6 patch (DEPRECATED)
# use ipv6 && epatch "${FILESDIR}/${PN}-ipv6.patch"
#
eautoreconf
}