summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--emulators/mame/Makefile4
-rw-r--r--emulators/mame/distinfo12
-rw-r--r--emulators/mame/patches/patch-src_emu_netlist_nl__base.h24
-rw-r--r--emulators/mame/patches/patch-src_emu_netlist_nl__lists.h15
-rw-r--r--emulators/mame/patches/patch-src_emu_netlist_pstate.h25
-rw-r--r--emulators/mame/patches/patch-src_osd_sdl_sdl.mak63
-rw-r--r--emulators/mess/Makefile4
-rw-r--r--emulators/mess/PLIST8
-rw-r--r--emulators/mess/distinfo14
-rw-r--r--emulators/mess/patches/patch-src_emu_emualloc.h4
-rw-r--r--emulators/mess/patches/patch-src_emu_netlist_nl__base.h24
-rw-r--r--emulators/mess/patches/patch-src_emu_netlist_nl__lists.h15
-rw-r--r--emulators/mess/patches/patch-src_emu_netlist_pstate.h25
-rw-r--r--emulators/mess/patches/patch-src_osd_sdl_sdl.mak63
14 files changed, 155 insertions, 145 deletions
diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index 3a3d8cdaf1e..6d362712f33 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2013/11/14 08:18:21 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2014/02/06 10:40:19 wiz Exp $
-DISTNAME= mame0151s
+DISTNAME= mame0152s
PKGNAME= ${DISTNAME:S/0/-0./:S/s$//}
MASTER_SITES= http://mamedev.org/downloader.php?file=releases/
diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo
index 98c585f0a0c..5aef2ce4550 100644
--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.17 2013/12/18 17:55:15 joerg Exp $
+$NetBSD: distinfo,v 1.18 2014/02/06 10:40:19 wiz Exp $
-SHA1 (mame0151s.zip) = 94a0a4ac865d7453cf6e8fbc40bc86a9e12b8a52
-RMD160 (mame0151s.zip) = 3e7ce1b9acf9735612a0bfb166b980463ce3a5ca
-Size (mame0151s.zip) = 36052471 bytes
+SHA1 (mame0152s.zip) = 2e11509b39c13dc1336a48a102813589b0793788
+RMD160 (mame0152s.zip) = d8f4accbd639e085c6165374d7b7ebd427d3c4d7
+Size (mame0152s.zip) = 36247883 bytes
SHA1 (patch-src_emu_emualloc.h) = 22cdfbc002cda8053125ef8cedf3bcceea04deaf
-SHA1 (patch-src_osd_sdl_sdl.mak) = e4eacee6ab6c4a889dde0649ebe091970ece9624
+SHA1 (patch-src_emu_netlist_nl__base.h) = 9ee165f601da849a339699f560c371bc58dd0d83
+SHA1 (patch-src_emu_netlist_nl__lists.h) = d31c9cf715f66520e4a1a09584f1c52bbea74fef
+SHA1 (patch-src_emu_netlist_pstate.h) = 4f43b1c621ea7db3e8d31107e48e06acecfb841e
diff --git a/emulators/mame/patches/patch-src_emu_netlist_nl__base.h b/emulators/mame/patches/patch-src_emu_netlist_nl__base.h
new file mode 100644
index 00000000000..b39c0d13027
--- /dev/null
+++ b/emulators/mame/patches/patch-src_emu_netlist_nl__base.h
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_emu_netlist_nl__base.h,v 1.1 2014/02/06 10:40:19 wiz Exp $
+
+clang fixes from upstream SVN 26743.
+
+--- src/emu/netlist/nl_base.h.orig 2013-12-24 08:24:52.000000000 +0000
++++ src/emu/netlist/nl_base.h
+@@ -287,7 +287,7 @@ public:
+
+ ATTR_COLD const pstring &name() const;
+
+- PSTATE_INTERFACE(*m_netlist, name())
++ PSTATE_INTERFACE_DECL()
+
+ #if 0
+ template<class C> ATTR_COLD void save(C &state, const pstring &stname)
+@@ -1120,6 +1120,8 @@ private:
+ // Inline implementations
+ // ----------------------------------------------------------------------------------------
+
++PSTATE_INTERFACE(netlist_object_t, m_netlist, name())
++
+ ATTR_HOT inline void netlist_param_str_t::setTo(const pstring &param)
+ {
+ m_param = param;
diff --git a/emulators/mame/patches/patch-src_emu_netlist_nl__lists.h b/emulators/mame/patches/patch-src_emu_netlist_nl__lists.h
new file mode 100644
index 00000000000..65edd95d8ce
--- /dev/null
+++ b/emulators/mame/patches/patch-src_emu_netlist_nl__lists.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_emu_netlist_nl__lists.h,v 1.1 2014/02/06 10:40:19 wiz Exp $
+
+clang fixes from upstream SVN 26917.
+
+--- src/emu/netlist/nl_lists.h.orig 2013-12-24 08:24:52.000000000 +0000
++++ src/emu/netlist/nl_lists.h
+@@ -16,7 +16,7 @@
+
+
+ template <class _ListClass, int _NumElem = 128>
+-struct netlist_list_t
++class netlist_list_t
+ {
+ public:
+
diff --git a/emulators/mame/patches/patch-src_emu_netlist_pstate.h b/emulators/mame/patches/patch-src_emu_netlist_pstate.h
new file mode 100644
index 00000000000..f1c8740d698
--- /dev/null
+++ b/emulators/mame/patches/patch-src_emu_netlist_pstate.h
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_emu_netlist_pstate.h,v 1.1 2014/02/06 10:40:19 wiz Exp $
+
+clang fixes from upstream SVN 26743.
+
+--- src/emu/netlist/pstate.h.orig 2013-12-24 08:24:52.000000000 +0000
++++ src/emu/netlist/pstate.h
+@@ -15,11 +15,15 @@
+ // state saving ...
+ // ----------------------------------------------------------------------------------------
+
+-#define PSTATE_INTERFACE(manager, module) \
+- template<class C> ATTR_COLD void save(C &state, const pstring &stname) \
++#define PSTATE_INTERFACE_DECL() \
++ template<typename C> ATTR_COLD void save(C &state, const pstring &stname);
++
++#define PSTATE_INTERFACE(obj, manager, module) \
++ template<typename C> ATTR_COLD void obj::save(C &state, const pstring &stname) \
+ { \
+- dynamic_cast<pstate_manager_t &>(manager).save_manager(state, module + "." + stname); \
++ manager->save_manager(state, module + "." + stname); \
+ }
++
+
+ enum netlist_data_type_e {
+ NOT_SUPPORTED,
diff --git a/emulators/mame/patches/patch-src_osd_sdl_sdl.mak b/emulators/mame/patches/patch-src_osd_sdl_sdl.mak
deleted file mode 100644
index 7d4fe36d3ae..00000000000
--- a/emulators/mame/patches/patch-src_osd_sdl_sdl.mak
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-src_osd_sdl_sdl.mak,v 1.1 2013/11/14 08:18:21 wiz Exp $
-
-r26155 | rbelmont | 2013-11-14 04:58:10 +0100 (Thu, 14 Nov 2013) | 3 lines
-
-SDL: fix non-Qt non-Windows build (MT #5364) [R. Belmont]
-
---- src/osd/sdl/sdl.mak.orig 2013-11-05 07:59:52.000000000 +0000
-+++ src/osd/sdl/sdl.mak
-@@ -59,17 +59,16 @@ USE_DISPATCH_GL = 1
- # active development on sdlmame or SDL.
-
- # uncomment the next line to compile and link against SDL2.0
--
- # SDL_LIBVER = sdl2
-
--# uncomment the next line to use couriersud's multi-keyboard patch for sdl2.0
-+# uncomment the next line to use couriersud's multi-keyboard patch for SDL 2.1? (this API was removed prior to the 2.0 release)
- # SDL2_MULTIAPI = 1
-
- # uncomment the next line to specify where you have installed
- # SDL. Equivalent to the ./configure --prefix=<path>
- # SDL_INSTALL_ROOT = /usr/local/sdl13
-
--# uncomment to disable the Qt debugger and fall back to a system default
-+# uncomment to disable the Qt debugger (on non-OSX this disables all debugging)
- # NO_USE_QTDEBUG = 1
-
- # uncomment to disable MIDI
-@@ -307,11 +306,6 @@ SDLMAIN = $(SDLOBJ)/main.o
- LDFLAGS += -Wl,--allow-multiple-definition
- SDL_NETWORK = pcap
-
--# if no Qt, no debugger
--ifdef NO_USE_QTDEBUG
--NO_DEBUGGER = 1
--endif
--
- # enable UNICODE
- DEFS += -Dmain=utf8_main -DUNICODE -D_UNICODE
- LDFLAGS += -municode
-@@ -355,6 +349,13 @@ ifeq ($(BASE_TARGETOS),)
- $(error $(TARGETOS) not supported !)
- endif
-
-+# if no Qt and not OS X, no debugger
-+ifneq ($(TARGETOS),macosx)
-+ifdef NO_USE_QTDEBUG
-+NO_DEBUGGER = 1
-+endif
-+endif
-+
- #-------------------------------------------------
- # object and source roots
- #-------------------------------------------------
-@@ -528,8 +529,6 @@ endif
- QT_INSTALL_HEADERS = $(shell $(QMAKE) -query QT_INSTALL_HEADERS)
- INCPATH += -I$(QT_INSTALL_HEADERS)/QtCore -I$(QT_INSTALL_HEADERS)/QtGui -I$(QT_INSTALL_HEADERS)
- LIBS += -L$(shell $(QMAKE) -query QT_INSTALL_LIBS) -lQtGui -lQtCore
--else
--DEBUGOBJS = $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o
- endif
-
- LIBGL = -lGL
diff --git a/emulators/mess/Makefile b/emulators/mess/Makefile
index 26638559ff6..73982ad4d10 100644
--- a/emulators/mess/Makefile
+++ b/emulators/mess/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2013/11/14 08:18:21 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2014/02/06 10:40:19 wiz Exp $
-DISTNAME= mame0151s
+DISTNAME= mame0152s
PKGNAME= ${DISTNAME:S/mame0/mess-0./:S/s$//}
MASTER_SITES= http://mamedev.org/downloader.php?file=releases/
diff --git a/emulators/mess/PLIST b/emulators/mess/PLIST
index 69fcabdf102..82668f15ade 100644
--- a/emulators/mess/PLIST
+++ b/emulators/mess/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2013/11/14 08:18:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.15 2014/02/06 10:40:19 wiz Exp $
bin/castool
bin/floptool
bin/imgtool
@@ -19,6 +19,7 @@ share/mess/hash/a800_flop.xml
share/mess/hash/abc1600.xml
share/mess/hash/abc80.xml
share/mess/hash/abc800.xml
+share/mess/hash/abc800_hdd.xml
share/mess/hash/abc806.xml
share/mess/hash/adam_cart.xml
share/mess/hash/adam_cass.xml
@@ -161,6 +162,7 @@ share/mess/hash/msx1_cart.xml
share/mess/hash/msx1_cass.xml
share/mess/hash/msx2.hsi
share/mess/hash/msx2_cart.xml
+share/mess/hash/myvision.xml
share/mess/hash/mz2000_cass.xml
share/mess/hash/mz2000_flop.xml
share/mess/hash/mz2500.xml
@@ -205,6 +207,7 @@ share/mess/hash/pecom_cass.xml
share/mess/hash/pentagon_cass.xml
share/mess/hash/pet_cass.xml
share/mess/hash/pet_flop.xml
+share/mess/hash/pet_hdd.xml
share/mess/hash/pet_rom.xml
share/mess/hash/pico.xml
share/mess/hash/pippin.xml
@@ -283,7 +286,8 @@ share/mess/hash/tutor.xml
share/mess/hash/tvc_cart.xml
share/mess/hash/ut88.xml
share/mess/hash/uzebox.xml
-share/mess/hash/v1050.xml
+share/mess/hash/v1050_flop.xml
+share/mess/hash/v1050_hdd.xml
share/mess/hash/vboy.xml
share/mess/hash/vc4000.xml
share/mess/hash/vectrex.xml
diff --git a/emulators/mess/distinfo b/emulators/mess/distinfo
index 908a1153ccc..3c1904d9f3e 100644
--- a/emulators/mess/distinfo
+++ b/emulators/mess/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.16 2013/12/18 17:55:15 joerg Exp $
+$NetBSD: distinfo,v 1.17 2014/02/06 10:40:19 wiz Exp $
-SHA1 (mame0151s.zip) = 94a0a4ac865d7453cf6e8fbc40bc86a9e12b8a52
-RMD160 (mame0151s.zip) = 3e7ce1b9acf9735612a0bfb166b980463ce3a5ca
-Size (mame0151s.zip) = 36052471 bytes
-SHA1 (patch-src_emu_emualloc.h) = f968c3499684a87e36a14f9a4d966ea22aa5126c
-SHA1 (patch-src_osd_sdl_sdl.mak) = e4eacee6ab6c4a889dde0649ebe091970ece9624
+SHA1 (mame0152s.zip) = 2e11509b39c13dc1336a48a102813589b0793788
+RMD160 (mame0152s.zip) = d8f4accbd639e085c6165374d7b7ebd427d3c4d7
+Size (mame0152s.zip) = 36247883 bytes
+SHA1 (patch-src_emu_emualloc.h) = 22cdfbc002cda8053125ef8cedf3bcceea04deaf
+SHA1 (patch-src_emu_netlist_nl__base.h) = 9ee165f601da849a339699f560c371bc58dd0d83
+SHA1 (patch-src_emu_netlist_nl__lists.h) = d31c9cf715f66520e4a1a09584f1c52bbea74fef
+SHA1 (patch-src_emu_netlist_pstate.h) = 4f43b1c621ea7db3e8d31107e48e06acecfb841e
diff --git a/emulators/mess/patches/patch-src_emu_emualloc.h b/emulators/mess/patches/patch-src_emu_emualloc.h
index 2747e3b61f7..91b0bf257f1 100644
--- a/emulators/mess/patches/patch-src_emu_emualloc.h
+++ b/emulators/mess/patches/patch-src_emu_emualloc.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_emu_emualloc.h,v 1.1 2013/12/18 17:55:15 joerg Exp $
+$NetBSD: patch-src_emu_emualloc.h,v 1.2 2014/02/06 10:40:19 wiz Exp $
---- src/emu/emualloc.h.orig 2013-12-18 13:39:10.000000000 +0000
+--- src/emu/emualloc.h.orig 2013-10-16 09:14:50.000000000 +0000
+++ src/emu/emualloc.h
@@ -77,6 +77,7 @@ void dump_unfreed_mem();
// zeromem_t is a dummy class used to tell new to zero memory after allocation
diff --git a/emulators/mess/patches/patch-src_emu_netlist_nl__base.h b/emulators/mess/patches/patch-src_emu_netlist_nl__base.h
new file mode 100644
index 00000000000..b39c0d13027
--- /dev/null
+++ b/emulators/mess/patches/patch-src_emu_netlist_nl__base.h
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_emu_netlist_nl__base.h,v 1.1 2014/02/06 10:40:19 wiz Exp $
+
+clang fixes from upstream SVN 26743.
+
+--- src/emu/netlist/nl_base.h.orig 2013-12-24 08:24:52.000000000 +0000
++++ src/emu/netlist/nl_base.h
+@@ -287,7 +287,7 @@ public:
+
+ ATTR_COLD const pstring &name() const;
+
+- PSTATE_INTERFACE(*m_netlist, name())
++ PSTATE_INTERFACE_DECL()
+
+ #if 0
+ template<class C> ATTR_COLD void save(C &state, const pstring &stname)
+@@ -1120,6 +1120,8 @@ private:
+ // Inline implementations
+ // ----------------------------------------------------------------------------------------
+
++PSTATE_INTERFACE(netlist_object_t, m_netlist, name())
++
+ ATTR_HOT inline void netlist_param_str_t::setTo(const pstring &param)
+ {
+ m_param = param;
diff --git a/emulators/mess/patches/patch-src_emu_netlist_nl__lists.h b/emulators/mess/patches/patch-src_emu_netlist_nl__lists.h
new file mode 100644
index 00000000000..65edd95d8ce
--- /dev/null
+++ b/emulators/mess/patches/patch-src_emu_netlist_nl__lists.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_emu_netlist_nl__lists.h,v 1.1 2014/02/06 10:40:19 wiz Exp $
+
+clang fixes from upstream SVN 26917.
+
+--- src/emu/netlist/nl_lists.h.orig 2013-12-24 08:24:52.000000000 +0000
++++ src/emu/netlist/nl_lists.h
+@@ -16,7 +16,7 @@
+
+
+ template <class _ListClass, int _NumElem = 128>
+-struct netlist_list_t
++class netlist_list_t
+ {
+ public:
+
diff --git a/emulators/mess/patches/patch-src_emu_netlist_pstate.h b/emulators/mess/patches/patch-src_emu_netlist_pstate.h
new file mode 100644
index 00000000000..f1c8740d698
--- /dev/null
+++ b/emulators/mess/patches/patch-src_emu_netlist_pstate.h
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_emu_netlist_pstate.h,v 1.1 2014/02/06 10:40:19 wiz Exp $
+
+clang fixes from upstream SVN 26743.
+
+--- src/emu/netlist/pstate.h.orig 2013-12-24 08:24:52.000000000 +0000
++++ src/emu/netlist/pstate.h
+@@ -15,11 +15,15 @@
+ // state saving ...
+ // ----------------------------------------------------------------------------------------
+
+-#define PSTATE_INTERFACE(manager, module) \
+- template<class C> ATTR_COLD void save(C &state, const pstring &stname) \
++#define PSTATE_INTERFACE_DECL() \
++ template<typename C> ATTR_COLD void save(C &state, const pstring &stname);
++
++#define PSTATE_INTERFACE(obj, manager, module) \
++ template<typename C> ATTR_COLD void obj::save(C &state, const pstring &stname) \
+ { \
+- dynamic_cast<pstate_manager_t &>(manager).save_manager(state, module + "." + stname); \
++ manager->save_manager(state, module + "." + stname); \
+ }
++
+
+ enum netlist_data_type_e {
+ NOT_SUPPORTED,
diff --git a/emulators/mess/patches/patch-src_osd_sdl_sdl.mak b/emulators/mess/patches/patch-src_osd_sdl_sdl.mak
deleted file mode 100644
index 7d4fe36d3ae..00000000000
--- a/emulators/mess/patches/patch-src_osd_sdl_sdl.mak
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-src_osd_sdl_sdl.mak,v 1.1 2013/11/14 08:18:21 wiz Exp $
-
-r26155 | rbelmont | 2013-11-14 04:58:10 +0100 (Thu, 14 Nov 2013) | 3 lines
-
-SDL: fix non-Qt non-Windows build (MT #5364) [R. Belmont]
-
---- src/osd/sdl/sdl.mak.orig 2013-11-05 07:59:52.000000000 +0000
-+++ src/osd/sdl/sdl.mak
-@@ -59,17 +59,16 @@ USE_DISPATCH_GL = 1
- # active development on sdlmame or SDL.
-
- # uncomment the next line to compile and link against SDL2.0
--
- # SDL_LIBVER = sdl2
-
--# uncomment the next line to use couriersud's multi-keyboard patch for sdl2.0
-+# uncomment the next line to use couriersud's multi-keyboard patch for SDL 2.1? (this API was removed prior to the 2.0 release)
- # SDL2_MULTIAPI = 1
-
- # uncomment the next line to specify where you have installed
- # SDL. Equivalent to the ./configure --prefix=<path>
- # SDL_INSTALL_ROOT = /usr/local/sdl13
-
--# uncomment to disable the Qt debugger and fall back to a system default
-+# uncomment to disable the Qt debugger (on non-OSX this disables all debugging)
- # NO_USE_QTDEBUG = 1
-
- # uncomment to disable MIDI
-@@ -307,11 +306,6 @@ SDLMAIN = $(SDLOBJ)/main.o
- LDFLAGS += -Wl,--allow-multiple-definition
- SDL_NETWORK = pcap
-
--# if no Qt, no debugger
--ifdef NO_USE_QTDEBUG
--NO_DEBUGGER = 1
--endif
--
- # enable UNICODE
- DEFS += -Dmain=utf8_main -DUNICODE -D_UNICODE
- LDFLAGS += -municode
-@@ -355,6 +349,13 @@ ifeq ($(BASE_TARGETOS),)
- $(error $(TARGETOS) not supported !)
- endif
-
-+# if no Qt and not OS X, no debugger
-+ifneq ($(TARGETOS),macosx)
-+ifdef NO_USE_QTDEBUG
-+NO_DEBUGGER = 1
-+endif
-+endif
-+
- #-------------------------------------------------
- # object and source roots
- #-------------------------------------------------
-@@ -528,8 +529,6 @@ endif
- QT_INSTALL_HEADERS = $(shell $(QMAKE) -query QT_INSTALL_HEADERS)
- INCPATH += -I$(QT_INSTALL_HEADERS)/QtCore -I$(QT_INSTALL_HEADERS)/QtGui -I$(QT_INSTALL_HEADERS)
- LIBS += -L$(shell $(QMAKE) -query QT_INSTALL_LIBS) -lQtGui -lQtCore
--else
--DEBUGOBJS = $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o
- endif
-
- LIBGL = -lGL
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-13 02:13:00 +0000