summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
Diffstat (limited to 'emulators')
-rw-r--r--emulators/mame/Makefile4
-rw-r--r--emulators/mame/PLIST8
-rw-r--r--emulators/mame/distinfo13
-rw-r--r--emulators/mame/patches/patch-3rdparty_bx_include_bx_platform.h44
-rw-r--r--emulators/mame/patches/patch-3rdparty_bx_src_mutex.cpp15
-rw-r--r--emulators/mame/patches/patch-3rdparty_bx_src_thread.cpp15
6 files changed, 13 insertions, 86 deletions
diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index ddb473fccbc..61baaaa1f68 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.106 2019/12/01 11:05:34 wiz Exp $
+# $NetBSD: Makefile,v 1.107 2020/01/04 22:55:58 wiz Exp $
-DISTNAME= mame-0.215
+DISTNAME= mame-0.217
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_GITHUB:=mamedev/}
GITHUB_TAG= ${DISTNAME:S/-//S/.//}
diff --git a/emulators/mame/PLIST b/emulators/mame/PLIST
index 8ddd51527f0..ee889a0fec8 100644
--- a/emulators/mame/PLIST
+++ b/emulators/mame/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.39 2019/11/08 09:44:17 wiz Exp $
+@comment $NetBSD: PLIST,v 1.40 2020/01/04 22:55:58 wiz Exp $
bin/castool
bin/chdman
bin/floptool
@@ -159,7 +159,9 @@ share/mame/hash/c128_rom.xml
share/mame/hash/c2color_cart.xml
share/mame/hash/c64_cart.xml
share/mame/hash/c64_cass.xml
-share/mame/hash/c64_flop.xml
+share/mame/hash/c64_flop_clcracked.xml
+share/mame/hash/c64_flop_misc.xml
+share/mame/hash/c64_flop_orig.xml
share/mame/hash/c65_flop.xml
share/mame/hash/camplynx_cass.xml
share/mame/hash/camplynx_flop.xml
@@ -252,6 +254,7 @@ share/mame/hash/gamepock.xml
share/mame/hash/gba.xml
share/mame/hash/gba_ereader.xml
share/mame/hash/gbcolor.xml
+share/mame/hash/gcslottv.xml
share/mame/hash/ggm.xml
share/mame/hash/gimix.xml
share/mame/hash/gj4000.xml
@@ -538,6 +541,7 @@ share/mame/hash/spectrum_betadisc_flop.xml
share/mame/hash/spectrum_cart.xml
share/mame/hash/spectrum_cass.xml
share/mame/hash/spectrum_flop_opus.xml
+share/mame/hash/spectrum_mgt_flop.xml
share/mame/hash/spectrum_microdrive.xml
share/mame/hash/spectrum_wafadrive.xml
share/mame/hash/squale_cart.xml
diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo
index 124ffc442fb..1a6773e12b3 100644
--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@@ -1,15 +1,12 @@
-$NetBSD: distinfo,v 1.90 2019/11/08 09:44:17 wiz Exp $
+$NetBSD: distinfo,v 1.91 2020/01/04 22:55:58 wiz Exp $
-SHA1 (mame-0.215.tar.gz) = 5acf6717f93f277adc328d1ee60d9a85d23b41b8
-RMD160 (mame-0.215.tar.gz) = 4c6f4c81ca72c6394f1322e3ae14c9f6a7035331
-SHA512 (mame-0.215.tar.gz) = c3a1dcfef6f29fb54872ffd8f1b2730ced7aabc3d9aa52c432292a2ac31153db6878cc81d16acaa365db0da12c32709ab6133ddfc2548e4657dc738f25a46771
-Size (mame-0.215.tar.gz) = 181892564 bytes
+SHA1 (mame-0.217.tar.gz) = 4ae2be4f4bcf9c0e1f89749b56d2605b57f184e9
+RMD160 (mame-0.217.tar.gz) = 2698b863a73cdfa8c6f83b8e61a953c3f363cd76
+SHA512 (mame-0.217.tar.gz) = 8779b2f6c3ce1f380881c4137ebbcdf6f2a68dbe682aa8bacd41eeaca60e079843450864d62b01944fa55bc221f304bcfca6942ed9004a0179b8180bf6ef45af
+Size (mame-0.217.tar.gz) = 182774389 bytes
SHA1 (patch-3rdparty_asio_include_asio_detail_config.hpp) = 9b0d6139e853d8efb9d51270bbfa5382feac42a7
SHA1 (patch-3rdparty_asio_include_asio_detail_impl_kqueue__reactor.ipp) = ad5e2171731864528331f2f1d2d43608b1b4ed01
SHA1 (patch-3rdparty_bgfx_examples_common_font_font__manager.cpp) = 3b52b49bc9bb9e8810a478f13dcc306512acab21
-SHA1 (patch-3rdparty_bx_include_bx_platform.h) = 7b4568ba9cfbf559cb25d3a501dd8e7d9b7e3ac4
-SHA1 (patch-3rdparty_bx_src_mutex.cpp) = 44146d09766b828fbfc9531933848c7fd969a694
-SHA1 (patch-3rdparty_bx_src_thread.cpp) = f4f540fb95a6b0bc5c1258f85bdc93c8e5deed3f
SHA1 (patch-3rdparty_genie_build_gmake.darwin_genie.make) = bb2e8c06d4b5f5869fb48e06390d5ca94a190056
SHA1 (patch-makefile) = d04055d8c0a9c3c4965ebe017811936ef01b03a0
SHA1 (patch-scripts_genie.lua) = 6c72b76c9a9ea952a787bf3994680f8711c8b64a
diff --git a/emulators/mame/patches/patch-3rdparty_bx_include_bx_platform.h b/emulators/mame/patches/patch-3rdparty_bx_include_bx_platform.h
deleted file mode 100644
index c37920702d9..00000000000
--- a/emulators/mame/patches/patch-3rdparty_bx_include_bx_platform.h
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-3rdparty_bx_include_bx_platform.h,v 1.8 2019/11/08 09:44:17 wiz Exp $
-
-Improve NetBSD support.
-https://github.com/bkaradzic/bx/pull/219
-
---- 3rdparty/bx/include/bx/platform.h.orig 2019-10-29 17:16:37.000000000 +0000
-+++ 3rdparty/bx/include/bx/platform.h
-@@ -35,6 +35,7 @@
- #define BX_CRT_MINGW 0
- #define BX_CRT_MSVC 0
- #define BX_CRT_NEWLIB 0
-+#define BX_CRT_BSD 0
-
- #ifndef BX_CRT_MUSL
- # define BX_CRT_MUSL 0
-@@ -242,6 +243,9 @@
- # elif defined(__apple_build_version__) || defined(__ORBIS__) || defined(__EMSCRIPTEN__) || defined(__llvm__) || defined(__HAIKU__)
- # undef BX_CRT_LIBCXX
- # define BX_CRT_LIBCXX 1
-+# elif BX_PLATFORM_BSD
-+# undef BX_CRT_BSD
-+# define BX_CRT_BSD 1
- # endif //
-
- # if !BX_CRT_BIONIC \
-@@ -250,7 +254,8 @@
- && !BX_CRT_MINGW \
- && !BX_CRT_MSVC \
- && !BX_CRT_MUSL \
-- && !BX_CRT_NEWLIB
-+ && !BX_CRT_NEWLIB \
-+ && !BX_CRT_BSD
- # undef BX_CRT_NONE
- # define BX_CRT_NONE 1
- # endif // BX_CRT_*
-@@ -425,6 +430,8 @@
- # define BX_CRT_NAME "Newlib"
- #elif BX_CRT_MUSL
- # define BX_CRT_NAME "musl libc"
-+#elif BX_CRT_BSD
-+# define BX_CRT_NAME "BSD"
- #elif BX_CRT_NONE
- # define BX_CRT_NAME "None"
- #else
diff --git a/emulators/mame/patches/patch-3rdparty_bx_src_mutex.cpp b/emulators/mame/patches/patch-3rdparty_bx_src_mutex.cpp
deleted file mode 100644
index 75d7580bc25..00000000000
--- a/emulators/mame/patches/patch-3rdparty_bx_src_mutex.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-3rdparty_bx_src_mutex.cpp,v 1.2 2019/10/17 14:01:03 wiz Exp $
-
-Improve NetBSD support.
-https://github.com/bkaradzic/bx/pull/219
-
---- 3rdparty/bx/src/mutex.cpp.orig 2018-02-27 15:59:06.000000000 +0000
-+++ 3rdparty/bx/src/mutex.cpp
-@@ -13,6 +13,7 @@
- || BX_PLATFORM_IOS \
- || BX_PLATFORM_OSX \
- || BX_PLATFORM_PS4 \
-+ || BX_PLATFORM_BSD \
- || BX_PLATFORM_RPI
- # include <pthread.h>
- #elif BX_PLATFORM_WINDOWS \
diff --git a/emulators/mame/patches/patch-3rdparty_bx_src_thread.cpp b/emulators/mame/patches/patch-3rdparty_bx_src_thread.cpp
deleted file mode 100644
index a02722043d7..00000000000
--- a/emulators/mame/patches/patch-3rdparty_bx_src_thread.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-3rdparty_bx_src_thread.cpp,v 1.2 2019/10/17 14:01:03 wiz Exp $
-
-Improve NetBSD support.
-https://github.com/bkaradzic/bx/pull/219
-
---- 3rdparty/bx/src/thread.cpp.orig 2018-02-27 15:59:06.000000000 +0000
-+++ 3rdparty/bx/src/thread.cpp
-@@ -11,6 +11,7 @@
- || BX_PLATFORM_IOS \
- || BX_PLATFORM_OSX \
- || BX_PLATFORM_PS4 \
-+ || BX_PLATFORM_BSD \
- || BX_PLATFORM_RPI
- # include <pthread.h>
- # if defined(__FreeBSD__)