diff options
author | wiz <wiz@pkgsrc.org> | 2014-04-17 12:09:05 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2014-04-17 12:09:05 +0000 |
commit | f6a3a4c7f5df396751dc6dd64bd8291a58790d38 (patch) | |
tree | ae7725e361045fdc31959d3c5bf4161bfd803eb6 /emulators | |
parent | 773732175badb272b34f3cb65b02cce2445476c1 (diff) | |
download | pkgsrc-f6a3a4c7f5df396751dc6dd64bd8291a58790d38.tar.gz |
Update to 0.153: the usual.
Diffstat (limited to 'emulators')
-rw-r--r-- | emulators/mess/Makefile | 5 | ||||
-rw-r--r-- | emulators/mess/PLIST | 12 | ||||
-rw-r--r-- | emulators/mess/distinfo | 13 | ||||
-rw-r--r-- | emulators/mess/patches/patch-src_emu_emualloc.c | 18 | ||||
-rw-r--r-- | emulators/mess/patches/patch-src_emu_emualloc.h | 20 | ||||
-rw-r--r-- | emulators/mess/patches/patch-src_emu_netlist_nl__base.h | 24 | ||||
-rw-r--r-- | emulators/mess/patches/patch-src_emu_netlist_nl__lists.h | 15 | ||||
-rw-r--r-- | emulators/mess/patches/patch-src_emu_netlist_pstate.h | 25 |
8 files changed, 17 insertions, 115 deletions
diff --git a/emulators/mess/Makefile b/emulators/mess/Makefile index f5471d4ef83..5bb3162d0e0 100644 --- a/emulators/mess/Makefile +++ b/emulators/mess/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.32 2014/03/26 02:24:15 nat Exp $ +# $NetBSD: Makefile,v 1.33 2014/04/17 12:09:05 wiz Exp $ -DISTNAME= mame0152s +DISTNAME= mame0153s PKGNAME= ${DISTNAME:S/mame0/mess-0./:S/s$//} -PKGREVISION= 1 MASTER_SITES= http://mamedev.org/downloader.php?file=releases/ COMMENT= Multi Emulator Super System diff --git a/emulators/mess/PLIST b/emulators/mess/PLIST index 82668f15ade..106f578b63d 100644 --- a/emulators/mess/PLIST +++ b/emulators/mess/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2014/02/06 10:40:19 wiz Exp $ +@comment $NetBSD: PLIST,v 1.16 2014/04/17 12:09:05 wiz Exp $ bin/castool bin/floptool bin/imgtool @@ -79,7 +79,9 @@ share/mess/hash/cdi.xml share/mess/hash/cdtv.xml share/mess/hash/channelf.xml share/mess/hash/coco_cart.xml +share/mess/hash/coco_flop.xml share/mess/hash/coleco.xml +share/mess/hash/compclr2_flop.xml share/mess/hash/compis.xml share/mess/hash/comx35_flop.xml share/mess/hash/copera.xml @@ -108,6 +110,8 @@ share/mess/hash/gamepock.xml share/mess/hash/gba.xml share/mess/hash/gbcolor.xml share/mess/hash/genius.xml +share/mess/hash/gl2000.xml +share/mess/hash/gl6000sl.xml share/mess/hash/gmaster.xml share/mess/hash/gp32.xml share/mess/hash/gx4000.xml @@ -160,6 +164,7 @@ share/mess/hash/mpz80.xml share/mess/hash/msx.hsi share/mess/hash/msx1_cart.xml share/mess/hash/msx1_cass.xml +share/mess/hash/msx1_flop.xml share/mess/hash/msx2.hsi share/mess/hash/msx2_cart.xml share/mess/hash/myvision.xml @@ -174,6 +179,9 @@ share/mess/hash/neocd.xml share/mess/hash/neogeo.xml share/mess/hash/nes.hsi share/mess/hash/nes.xml +share/mess/hash/nes_ade.xml +share/mess/hash/nes_datach.xml +share/mess/hash/nes_kstudio.xml share/mess/hash/nes_ntbrom.xml share/mess/hash/next.xml share/mess/hash/ngp.xml @@ -236,6 +244,7 @@ share/mess/hash/samcoupe_cass.xml share/mess/hash/samcoupe_flop.xml share/mess/hash/sat_cart.xml share/mess/hash/saturn.xml +share/mess/hash/sawatte.xml share/mess/hash/scv.xml share/mess/hash/segacd.xml share/mess/hash/sf7000.xml @@ -265,6 +274,7 @@ share/mess/hash/stv.xml share/mess/hash/super6.xml share/mess/hash/superpet_flop.xml share/mess/hash/supracan.xml +share/mess/hash/sv8000.xml share/mess/hash/svi318_cart.xml share/mess/hash/svi318_cass.xml share/mess/hash/svi318_flop.xml diff --git a/emulators/mess/distinfo b/emulators/mess/distinfo index 5154ec10473..9302ecb2d0d 100644 --- a/emulators/mess/distinfo +++ b/emulators/mess/distinfo @@ -1,10 +1,5 @@ -$NetBSD: distinfo,v 1.18 2014/03/26 02:24:15 nat Exp $ +$NetBSD: distinfo,v 1.19 2014/04/17 12:09:05 wiz Exp $ -SHA1 (mame0152s.zip) = 2e11509b39c13dc1336a48a102813589b0793788 -RMD160 (mame0152s.zip) = d8f4accbd639e085c6165374d7b7ebd427d3c4d7 -Size (mame0152s.zip) = 36247883 bytes -SHA1 (patch-src_emu_emualloc.c) = 6df67d1d1aaf982444db3db65c066bc83644ae9b -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 +SHA1 (mame0153s.zip) = aff24a7f76fe2bdd3948fbc15c9c6527f63d3c94 +RMD160 (mame0153s.zip) = a381c9790281a1da835604f1ffad0d3bd56c5e14 +Size (mame0153s.zip) = 37829714 bytes diff --git a/emulators/mess/patches/patch-src_emu_emualloc.c b/emulators/mess/patches/patch-src_emu_emualloc.c deleted file mode 100644 index dcdda71fc99..00000000000 --- a/emulators/mess/patches/patch-src_emu_emualloc.c +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-src_emu_emualloc.c,v 1.1 2014/03/26 02:24:15 nat Exp $ - -This resolves a crash on startup. - ---- src/emu/emualloc.c.orig 2013-10-15 22:14:50.000000000 +0000 -+++ src/emu/emualloc.c -@@ -266,6 +266,11 @@ void resource_pool::add(resource_pool_it - memory_entry *entry = memory_entry::find(item.m_ptr); - if (entry == NULL) - entry = memory_entry::find(reinterpret_cast<UINT8 *>(item.m_ptr) - sizeof(size_t)); -+ if (entry == NULL) { -+ osd_lock_release(m_listlock); -+ return; -+ } -+ - assert(entry != NULL); - item.m_id = entry->m_id; - if (LOG_ALLOCS) diff --git a/emulators/mess/patches/patch-src_emu_emualloc.h b/emulators/mess/patches/patch-src_emu_emualloc.h deleted file mode 100644 index 91b0bf257f1..00000000000 --- a/emulators/mess/patches/patch-src_emu_emualloc.h +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-src_emu_emualloc.h,v 1.2 2014/02/06 10:40:19 wiz Exp $ - ---- 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 - class zeromem_t { }; - -+#if 0 - #ifndef NO_MEM_TRACKING - - // standard new/delete operators (try to avoid using) -@@ -109,6 +110,7 @@ ATTR_FORCE_INLINE inline void operator d - } - - #endif -+#endif - - // file/line new/delete operators - ATTR_FORCE_INLINE inline void *operator new(std::size_t size, const char *file, int line) throw (std::bad_alloc) diff --git a/emulators/mess/patches/patch-src_emu_netlist_nl__base.h b/emulators/mess/patches/patch-src_emu_netlist_nl__base.h deleted file mode 100644 index b39c0d13027..00000000000 --- a/emulators/mess/patches/patch-src_emu_netlist_nl__base.h +++ /dev/null @@ -1,24 +0,0 @@ -$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 ¶m) - { - 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 deleted file mode 100644 index 65edd95d8ce..00000000000 --- a/emulators/mess/patches/patch-src_emu_netlist_nl__lists.h +++ /dev/null @@ -1,15 +0,0 @@ -$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 deleted file mode 100644 index f1c8740d698..00000000000 --- a/emulators/mess/patches/patch-src_emu_netlist_pstate.h +++ /dev/null @@ -1,25 +0,0 @@ -$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, |