summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
Diffstat (limited to 'emulators')
-rw-r--r--emulators/mame/Makefile6
-rw-r--r--emulators/mame/PLIST5
-rw-r--r--emulators/mame/distinfo11
-rw-r--r--emulators/mame/patches/patch-3rdparty_asio_include_asio_detail_config.hpp15
-rw-r--r--emulators/mame/patches/patch-3rdparty_asio_include_asio_detail_impl_kqueue__reactor.ipp27
-rw-r--r--emulators/mame/patches/patch-scripts_genie.lua19
6 files changed, 12 insertions, 71 deletions
diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index b95b988b0fb..d7b45ec768a 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.141 2021/10/27 09:31:44 wiz Exp $
+# $NetBSD: Makefile,v 1.142 2021/11/24 14:07:49 wiz Exp $
-DISTNAME= mame-0.237
+DISTNAME= mame-0.238
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_GITHUB:=mamedev/}
GITHUB_TAG= ${DISTNAME:S/-//S/.//}
@@ -35,6 +35,8 @@ MAKE_ENV+= LDOPTS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.flac}/lib -L${BUILDL
MAKE_ENV+= LDOPTS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.flac}/lib -L${BUILDLINK_PREFIX.flac}/lib"
.endif
+MAKE_FLAGS+= PRECOMPILE=0
+
.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64"
# \todo Arch detection for aarch64 fails, investigate why
MAKE_FLAGS+= NOASM=1
diff --git a/emulators/mame/PLIST b/emulators/mame/PLIST
index 0171be12238..09b2bb9f993 100644
--- a/emulators/mame/PLIST
+++ b/emulators/mame/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.59 2021/10/27 09:31:44 wiz Exp $
+@comment $NetBSD: PLIST,v 1.60 2021/11/24 14:07:49 wiz Exp $
bin/castool
bin/chdman
bin/floptool
@@ -130,6 +130,8 @@ share/mame/hash/aquarius_cass.xml
share/mame/hash/arb.xml
share/mame/hash/arcadia.xml
share/mame/hash/archimedes.xml
+share/mame/hash/archimedes_hdd.xml
+share/mame/hash/archimedes_rom.xml
share/mame/hash/astrocde.xml
share/mame/hash/atom_cass.xml
share/mame/hash/atom_flop.xml
@@ -485,6 +487,7 @@ share/mame/hash/pc1512_flop.xml
share/mame/hash/pc1512_hdd.xml
share/mame/hash/pc1640_flop.xml
share/mame/hash/pc1640_hdd.xml
+share/mame/hash/pc200.xml
share/mame/hash/pc6001_cart.xml
share/mame/hash/pc8001_flop.xml
share/mame/hash/pc8001mk2_flop.xml
diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo
index ea9897c4402..18789ef432d 100644
--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.113 2021/10/27 09:31:44 wiz Exp $
+$NetBSD: distinfo,v 1.114 2021/11/24 14:07:49 wiz Exp $
-BLAKE2s (mame-0.237.tar.gz) = 3f0a8343e92cbcc36dca578293253f097258743d5350ba9afe4b76b724db6e6f
-SHA512 (mame-0.237.tar.gz) = c6425298894677f0f1bb69504e0fe856454caf51a6c3080422d4105c6273017bcbe4a890941499b0a1ca0307f282fdb7a6e8096c290be21f0d9f32530a3e9e33
-Size (mame-0.237.tar.gz) = 186374918 bytes
-SHA1 (patch-3rdparty_asio_include_asio_detail_config.hpp) = 9b0d6139e853d8efb9d51270bbfa5382feac42a7
-SHA1 (patch-3rdparty_asio_include_asio_detail_impl_kqueue__reactor.ipp) = ad5e2171731864528331f2f1d2d43608b1b4ed01
+BLAKE2s (mame-0.238.tar.gz) = c9634a8283769e01382bfb485e09016e707f7045139d435267c18d66b2eb5811
+SHA512 (mame-0.238.tar.gz) = 55d64274c78885b850764ed1a21585f5f85fd62995f287dafbbf831a645e2abcae9107df668f91a53fb74fd115045f977d10d4268eb31c2ec7fc6163998136a0
+Size (mame-0.238.tar.gz) = 186182656 bytes
SHA1 (patch-3rdparty_genie_build_gmake.darwin_genie.make) = bb2e8c06d4b5f5869fb48e06390d5ca94a190056
SHA1 (patch-makefile) = 343fac4d165438a26e2e8077216db1c6c46a5d1e
-SHA1 (patch-scripts_genie.lua) = 6c72b76c9a9ea952a787bf3994680f8711c8b64a
diff --git a/emulators/mame/patches/patch-3rdparty_asio_include_asio_detail_config.hpp b/emulators/mame/patches/patch-3rdparty_asio_include_asio_detail_config.hpp
deleted file mode 100644
index a43bc023072..00000000000
--- a/emulators/mame/patches/patch-3rdparty_asio_include_asio_detail_config.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-3rdparty_asio_include_asio_detail_config.hpp,v 1.1 2016/11/05 10:05:26 wiz Exp $
-
-gcc coming with NetBSD does not provide string_view.
-
---- 3rdparty/asio/include/asio/detail/config.hpp.orig 2016-10-25 23:47:23.000000000 +0000
-+++ 3rdparty/asio/include/asio/detail/config.hpp
-@@ -714,7 +714,7 @@
- # endif // __has_include(<experimental/string_view>)
- # endif // (__cplusplus >= 201103)
- # endif // defined(__clang__)
--# if defined(__GNUC__)
-+# if defined(__GNUC__) && !defined(__NetBSD__)
- # if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4)
- # if (__cplusplus >= 201300)
- # define ASIO_HAS_STD_STRING_VIEW 1
diff --git a/emulators/mame/patches/patch-3rdparty_asio_include_asio_detail_impl_kqueue__reactor.ipp b/emulators/mame/patches/patch-3rdparty_asio_include_asio_detail_impl_kqueue__reactor.ipp
deleted file mode 100644
index d891900010e..00000000000
--- a/emulators/mame/patches/patch-3rdparty_asio_include_asio_detail_impl_kqueue__reactor.ipp
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-3rdparty_asio_include_asio_detail_impl_kqueue__reactor.ipp,v 1.2 2019/10/17 13:52:08 wiz Exp $
-
-NetBSD 9.99.14 changed the type to be more compatible to other operating systems.
-https://github.com/chriskohlhoff/asio/pull/433
-
---- 3rdparty/asio/include/asio/detail/impl/kqueue_reactor.ipp.orig 2019-08-02 19:05:18.000000000 +0000
-+++ 3rdparty/asio/include/asio/detail/impl/kqueue_reactor.ipp
-@@ -16,6 +16,10 @@
- # pragma once
- #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
-
-+#if defined(__NetBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include "asio/detail/config.hpp"
-
- #if defined(ASIO_HAS_KQUEUE)
-@@ -27,7 +31,7 @@
-
- #include "asio/detail/push_options.hpp"
-
--#if defined(__NetBSD__)
-+#if defined(__NetBSD__) && (__NetBSD_Version__ <= 999001400)
- # define ASIO_KQUEUE_EV_SET(ev, ident, filt, flags, fflags, data, udata) \
- EV_SET(ev, ident, filt, flags, fflags, data, \
- reinterpret_cast<intptr_t>(static_cast<void*>(udata)))
diff --git a/emulators/mame/patches/patch-scripts_genie.lua b/emulators/mame/patches/patch-scripts_genie.lua
deleted file mode 100644
index 0965d072103..00000000000
--- a/emulators/mame/patches/patch-scripts_genie.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-scripts_genie.lua,v 1.7 2019/11/08 09:44:17 wiz Exp $
-
-Precompilation is broken on NetBSD with gcc-5.3.
-Use GNU version of the C++ standard to avoid trouble with alloca on NetBSD.
-
---- scripts/genie.lua.orig 2019-10-29 17:16:37.000000000 +0000
-+++ scripts/genie.lua
-@@ -73,11 +73,6 @@ function layoutbuildtask(_folder, _name)
- end
-
- function precompiledheaders()
-- if _OPTIONS["precompile"]==nil or (_OPTIONS["precompile"]~=nil and _OPTIONS["precompile"]=="1") then
-- configuration { "not xcode4" }
-- pchheader("emu.h")
-- configuration { }
-- end
- end
-
- function precompiledheaders_novs()