Hi ports --
Here's the update for MAME. Will send the MESS diff (basically the same
thing) in a separate email.
Works on amd64, can I get an i386 test?
OK?
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/sdlmame/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile 14 May 2014 23:32:50 -0000 1.39
+++ Makefile 31 Jul 2014 20:40:21 -0000
@@ -8,7 +8,7 @@ MULTI_PACKAGES = -main -tools
COMMENT-main = emulates a massive variety of arcades machines
COMMENT-tools = tools to manipulate MAME/MESS roms and disk images
-V = 153
+V = 154
DISTNAME = mame0${V}s
PKGNAME-main = sdlmame-0.${V}
PKGNAME-tools = sdlmame-tools-0.${V}
@@ -24,8 +24,8 @@ MAINTAINER = Brian Callahan <bcallah@op
PERMIT_PACKAGE_CDROM = may not sell
PERMIT_PACKAGE_FTP = Yes
-WANTLIB += SDL SDL_ttf X11 Xinerama c expat fontconfig m pthread
-WANTLIB += stdc++ util z
+WANTLIB += SDL SDL_ttf X11 Xinerama c expat fontconfig freetype
+WANTLIB += m pthread util z
MASTER_SITES = http://mamedev.org/downloader.php?file=releases/ \
http://whiper.com/mame/${V}/
@@ -37,7 +37,7 @@ DIST_SUBDIR = mame
# PATCHFILES doesn't work for .zip
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
- history${V}.zip:1
+ history${V}a.zip:1
MODULES = devel/gettext \
lang/python
Index: distinfo
===================================================================
RCS file: /cvs/ports/emulators/sdlmame/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo 14 May 2014 23:32:50 -0000 1.18
+++ distinfo 31 Jul 2014 20:40:21 -0000
@@ -1,4 +1,4 @@
-SHA256 (mame/history153.zip) = XOhfcIvZnjsS3SIkYGExG5Kt/KKK6fz/LWJQGKyyYhc=
-SHA256 (mame/mame0153s.zip) = q/b7TaSJhczv6vYBau7b6R0HrWsM192nwPPcDrgzVeQ=
-SIZE (mame/history153.zip) = 5233618
-SIZE (mame/mame0153s.zip) = 37829714
+SHA256 (mame/history154a.zip) = HBzfS1dutE9tE4VrIkIOqM78ze/PyACmAQEkbou2/RI=
+SHA256 (mame/mame0154s.zip) = UiupJ16fYzq2FtzQrAq0/NO3JpDtCZFdzU0LYnxpYUk=
+SIZE (mame/history154a.zip) = 5580897
+SIZE (mame/mame0154s.zip) = 39697095
Index: patches/patch-makefile
===================================================================
RCS file: /cvs/ports/emulators/sdlmame/patches/patch-makefile,v
retrieving revision 1.8
diff -u -p -r1.8 patch-makefile
--- patches/patch-makefile 14 May 2014 23:32:50 -0000 1.8
+++ patches/patch-makefile 31 Jul 2014 20:40:21 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-makefile,v 1.8 2014/05/14 23:32:50 bcallah Exp $
---- makefile.orig Wed Apr 16 23:16:03 2014
-+++ makefile Wed Apr 16 23:16:03 2014
+--- makefile.orig Mon Jul 28 11:22:54 2014
++++ makefile Mon Jul 28 11:22:54 2014
@@ -217,10 +217,10 @@ endif
# BIGENDIAN = 1
@@ -14,7 +14,7 @@ $OpenBSD: patch-makefile,v 1.8 2014/05/1
# uncomment next line to build libflac as part of MAME build
BUILD_FLAC = 1
-@@ -337,7 +337,7 @@ endif
+@@ -340,7 +340,7 @@ endif
# compiler, linker and utilities
ifneq ($(TARGETOS),emscripten)
AR = @ar
@@ -23,7 +23,7 @@ $OpenBSD: patch-makefile,v 1.8 2014/05/1
LD = @g++
endif
MD = -mkdir$(EXE)
-@@ -387,7 +387,7 @@ NAME = $(TARGET)$(SUBTARGET)
+@@ -394,7 +394,7 @@ NAME = $(TARGET)$(SUBTARGET)
endif
# fullname is prefix+name+suffix+suffix64+suffixdebug
@@ -32,7 +32,7 @@ $OpenBSD: patch-makefile,v 1.8 2014/05/1
# add an EXE suffix to get the final emulator name
EMULATOR = $(FULLNAME)$(EXE)
-@@ -486,7 +486,7 @@ CPPONLYFLAGS =
+@@ -493,7 +493,7 @@ CPPONLYFLAGS =
# CFLAGS is defined based on C or C++ targets
# (remember, expansion only happens when used, so doing it here is ok)
@@ -41,7 +41,7 @@ $OpenBSD: patch-makefile,v 1.8 2014/05/1
# we compile C-only to C89 standard with GNU extensions
# we compile C++ code to C++98 standard with GNU extensions
-@@ -519,7 +519,7 @@ CCOMFLAGS += -pg
+@@ -526,7 +526,7 @@ CCOMFLAGS += -pg
endif
# add the optimization flag
Index: patches/patch-src_emu_luaengine_c
===================================================================
RCS file: patches/patch-src_emu_luaengine_c
diff -N patches/patch-src_emu_luaengine_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_emu_luaengine_c 31 Jul 2014 20:40:21 -0000
@@ -0,0 +1,40 @@
+$OpenBSD$
+--- src/emu/luaengine.c.orig Mon Jul 28 14:22:56 2014
++++ src/emu/luaengine.c Mon Jul 28 14:23:20 2014
+@@ -126,19 +126,19 @@ lua_engine::hook::hook()
+ cb = -1;
+ }
+
+-void lua_engine::hook::set(lua_State *_L, int idx)
++void lua_engine::hook::set(lua_State *_AL, int idx)
+ {
+ if (L)
+ luaL_unref(L, LUA_REGISTRYINDEX, cb);
+
+- if (lua_isnil(_L, idx)) {
++ if (lua_isnil(_AL, idx)) {
+ L = NULL;
+ cb = -1;
+
+ } else {
+- L = _L;
+- lua_pushvalue(_L, idx);
+- cb = luaL_ref(_L, LUA_REGISTRYINDEX);
++ L = _AL;
++ lua_pushvalue(_AL, idx);
++ cb = luaL_ref(_AL, LUA_REGISTRYINDEX);
+ }
+ }
+
+@@ -183,9 +183,9 @@ void lua_engine::resume(lua_State *L, int nparam, lua_
+ }
+ }
+
+-void lua_engine::resume(void *_L, INT32 param)
++void lua_engine::resume(void *_AL, INT32 param)
+ {
+- resume(static_cast<lua_State *>(_L));
++ resume(static_cast<lua_State *>(_AL));
+ }
+
+ int lua_engine::l_ioport_write(lua_State *L)
Index: patches/patch-src_emu_netlist_nl_base_h
===================================================================
RCS file: /cvs/ports/emulators/sdlmame/patches/patch-src_emu_netlist_nl_base_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_emu_netlist_nl_base_h
--- patches/patch-src_emu_netlist_nl_base_h 14 May 2014 23:32:50 -0000 1.1
+++ patches/patch-src_emu_netlist_nl_base_h 31 Jul 2014 20:40:21 -0000
@@ -1,21 +1,21 @@
$OpenBSD: patch-src_emu_netlist_nl_base_h,v 1.1 2014/05/14 23:32:50 bcallah Exp $
---- src/emu/netlist/nl_base.h.orig Mon Apr 7 08:04:20 2014
-+++ src/emu/netlist/nl_base.h Wed Apr 16 23:37:47 2014
-@@ -1043,38 +1043,38 @@ class netlist_base_t : public netlist_object_t, public
+--- src/emu/netlist/nl_base.h.orig Mon Jul 28 11:19:24 2014
++++ src/emu/netlist/nl_base.h Mon Jul 28 11:21:12 2014
+@@ -1145,39 +1145,39 @@ class netlist_base_t : public netlist_object_t, public
ATTR_COLD void warning(const char *format, ...) const ATTR_PRINTF(2,3);
ATTR_COLD void log(const char *format, ...) const ATTR_PRINTF(2,3);
- template<class _C>
-- netlist_list_t<_C *> get_device_list()
-+ template<class AC>
-+ netlist_list_t<AC *> get_device_list()
+- plinearlist_t<_C *> get_device_list()
++ template<class _AC>
++ plinearlist_t<_AC *> get_device_list()
{
-- netlist_list_t<_C *> tmp;
-+ netlist_list_t<AC *> tmp;
- for (tagmap_devices_t::entry_t *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry))
+- plinearlist_t<_C *> tmp;
++ plinearlist_t<_AC *> tmp;
+ for (netlist_device_t * const *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry))
{
-- _C *dev = dynamic_cast<_C *>(entry->object());
-+ AC *dev = dynamic_cast<AC *>(entry->object());
+- _C *dev = dynamic_cast<_C *>(*entry);
++ _AC *dev = dynamic_cast<_AC *>(*entry);
if (dev != NULL)
tmp.add(dev);
}
@@ -24,13 +24,14 @@ $OpenBSD: patch-src_emu_netlist_nl_base_
- template<class _C>
- _C *get_first_device()
-+ template<class AC>
-+ AC *get_first_device()
++ template<class _AC>
++ _AC *get_first_device()
{
- for (tagmap_devices_t::entry_t *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry))
+ //FIXME:
+ for (netlist_device_t * const *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry))
{
-- _C *dev = dynamic_cast<_C *>(entry->object());
-+ AC *dev = dynamic_cast<AC *>(entry->object());
+- _C *dev = dynamic_cast<_C *>(*entry);
++ _AC *dev = dynamic_cast<_AC *>(*entry);
if (dev != NULL)
return dev;
}
@@ -39,29 +40,29 @@ $OpenBSD: patch-src_emu_netlist_nl_base_
- template<class _C>
- _C *get_single_device(const char *classname)
-+ template<class AC>
-+ AC *get_single_device(const char *classname)
++ template<class _AC>
++ _AC *get_single_device(const char *classname)
{
- _C *ret = NULL;
-+ AC *ret = NULL;
- for (tagmap_devices_t::entry_t *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry))
++ _AC *ret = NULL;
+ for (netlist_device_t * const *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry))
{
-- _C *dev = dynamic_cast<_C *>(entry->object());
-+ AC *dev = dynamic_cast<AC *>(entry->object());
+- _C *dev = dynamic_cast<_C *>(*entry);
++ _AC *dev = dynamic_cast<_AC *>(*entry);
if (dev != NULL)
{
if (ret != NULL)
-@@ -1281,11 +1281,11 @@ class netlist_factory_t
(public)
+@@ -1426,11 +1426,11 @@ class netlist_factory_t
(public)
ATTR_COLD void initialize();
- template<class _C>
-+ template<class AC>
++ template<class _AC>
ATTR_COLD void register_device(const pstring &name, const pstring &classname,
const pstring &def_param)
{
- m_list.add(new net_device_t_factory< _C >(name, classname, def_param) );
-+ m_list.add(new net_device_t_factory< AC >(name, classname, def_param) );
++ m_list.add(new net_device_t_factory< _AC >(name, classname, def_param) );
}
ATTR_COLD netlist_device_t *new_device_by_classname(const pstring &classname, netlist_setup_t &setup) const;
Index: patches/patch-src_emu_netlist_plists_h
===================================================================
RCS file: patches/patch-src_emu_netlist_plists_h
diff -N patches/patch-src_emu_netlist_plists_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_emu_netlist_plists_h 31 Jul 2014 20:40:21 -0000
@@ -0,0 +1,45 @@
+$OpenBSD$
+--- src/emu/netlist/plists.h.orig Mon Jul 28 11:32:03 2014
++++ src/emu/netlist/plists.h Mon Jul 28 11:32:35 2014
+@@ -199,32 +199,32 @@ class plinearlist_t
(private)
+ // pnamedlist_t: a simple list
+ // ----------------------------------------------------------------------------------------
+
+-template <class _C>
+-class pnamedlist_t : public plinearlist_t<_C>
++template <class _AC>
++class pnamedlist_t : public plinearlist_t<_AC>
+ {
+ public:
+- _C find(const pstring name) const
++ _AC find(const pstring name) const
+ {
+ for (int i=0; i < this->count(); i++)
+ if (get_name((*this)[i]) == name)
+ return (*this)[i];
+- return _C(NULL);
++ return _AC(NULL);
+ }
+
+ void remove_by_name(const pstring name)
+ {
+- plinearlist_t<_C>::remove(find(name));
++ plinearlist_t<_AC>::remove(find(name));
+ }
+
+- bool add(_C dev, bool allow_duplicate)
++ bool add(_AC dev, bool allow_duplicate)
+ {
+ if (allow_duplicate)
+- plinearlist_t<_C>::add(dev);
++ plinearlist_t<_AC>::add(dev);
+ else
+ {
+- if (!(this->find(get_name(dev)) == _C(NULL)))
++ if (!(this->find(get_name(dev)) == _AC(NULL)))
+ return false;
+- plinearlist_t<_C>::add(dev);
++ plinearlist_t<_AC>::add(dev);
+ }
+ return true;
+ }
Index: patches/patch-src_mame_includes_n64_h
===================================================================
RCS file: patches/patch-src_mame_includes_n64_h
diff -N patches/patch-src_mame_includes_n64_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_mame_includes_n64_h 31 Jul 2014 20:40:21 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/mame/includes/n64.h.orig Thu Jul 31 13:05:21 2014
++++ src/mame/includes/n64.h Thu Jul 31 13:05:33 2014
+@@ -227,7 +227,7 @@ class n64_periphs : public device_t,
(private)
+ UINT32 si_pif_addr;
+ UINT32 si_pif_addr_rd64b;
+ UINT32 si_pif_addr_wr64b;
+- UINT32 si_status;
++ UINT32 si_status_e;
+ UINT32 cic_status;
+ int cic_type;
+
Index: patches/patch-src_mame_machine_n64_c
===================================================================
RCS file: patches/patch-src_mame_machine_n64_c
diff -N patches/patch-src_mame_machine_n64_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_mame_machine_n64_c 31 Jul 2014 20:40:21 -0000
@@ -0,0 +1,39 @@
+$OpenBSD$
+--- src/mame/machine/n64.c.orig Thu Jul 31 13:05:49 2014
++++ src/mame/machine/n64.c Thu Jul 31 13:06:12 2014
+@@ -194,7 +194,7 @@ void n64_periphs::device_reset()
+ memset(pif_cmd, 0, sizeof(pif_cmd));
+ si_dram_addr = 0;
+ si_pif_addr = 0;
+- si_status = 0;
++ si_status_e = 0;
+
+ memset(m_save_data.eeprom, 0, 2048);
+
+@@ -2094,7 +2094,7 @@ void n64_periphs::pif_dma(int direction)
+ }
+ }
+
+- si_status |= 0x1000;
++ si_status_e |= 0x1000;
+ signal_rcp_interrupt(SI_INTERRUPT);
+ }
+
+@@ -2107,7 +2107,7 @@ READ32_MEMBER( n64_periphs::si_reg_r )
+ //return si_dram_addr;
+
+ case 0x18/4: // SI_STATUS_REG
+- ret = si_status;
++ ret = si_status_e;
+ }
+
+ //printf("si_reg_r %08x = %08x\n", offset * 4, ret); fflush(stdout);
+@@ -2138,7 +2138,7 @@ WRITE32_MEMBER( n64_periphs::si_reg_w )
+ break;
+
+ case 0x18/4: // SI_STATUS_REG
+- si_status &= ~0x1000;
++ si_status_e &= ~0x1000;
+ clear_rcp_interrupt(SI_INTERRUPT);
+ break;
+
Index: patches/patch-src_osd_osdcore_h
===================================================================
RCS file: patches/patch-src_osd_osdcore_h
diff -N patches/patch-src_osd_osdcore_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_osd_osdcore_h 31 Jul 2014 20:40:21 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- src/osd/osdcore.h.orig Mon Jul 28 11:26:38 2014
++++ src/osd/osdcore.h Mon Jul 28 11:27:30 2014
+@@ -21,6 +21,7 @@
+
+ #include "osdcomm.h"
+ #include "delegate.h"
++#include <stdarg.h>
+
+ /***************************************************************************
+ FILE I/O INTERFACES
Index: patches/patch-src_osd_sdl_sdl_mak
===================================================================
RCS file: /cvs/ports/emulators/sdlmame/patches/patch-src_osd_sdl_sdl_mak,v
retrieving revision 1.11
diff -u -p -r1.11 patch-src_osd_sdl_sdl_mak
--- patches/patch-src_osd_sdl_sdl_mak 14 May 2014 23:32:50 -0000 1.11
+++ patches/patch-src_osd_sdl_sdl_mak 31 Jul 2014 20:40:21 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_osd_sdl_sdl_mak,v 1.11 2014/05/14 23:32:50 bcallah Exp $
---- src/osd/sdl/sdl.mak.orig Wed Apr 16 23:16:03 2014
-+++ src/osd/sdl/sdl.mak Wed Apr 16 23:16:03 2014
-@@ -703,9 +703,9 @@ LIBS += `pkg-config QtGui --libs`
+--- src/osd/sdl/sdl.mak.orig Mon Jul 28 11:22:54 2014
++++ src/osd/sdl/sdl.mak Mon Jul 28 11:22:54 2014
+@@ -712,9 +712,9 @@ LIBS += `pkg-config QtGui --libs`
endif
# some systems still put important things in a different prefix
