diff options
| -rw-r--r-- | emulators/mame/Makefile | 4 | ||||
| -rw-r--r-- | emulators/mame/PLIST | 21 | ||||
| -rw-r--r-- | emulators/mame/distinfo | 12 | ||||
| -rw-r--r-- | emulators/mame/patches/patch-3rdparty_bx_include_bx_thread.h | 18 | ||||
| -rw-r--r-- | emulators/mame/patches/patch-scripts_src_3rdparty.lua | 20 |
5 files changed, 25 insertions, 50 deletions
diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile index 3ba947f6c43..58bd11c9202 100644 --- a/emulators/mame/Makefile +++ b/emulators/mame/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.56 2016/04/29 08:30:50 wiz Exp $ +# $NetBSD: Makefile,v 1.57 2016/05/26 09:02:16 wiz Exp $ -DISTNAME= mame-0.173 +DISTNAME= mame-0.174 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_GITHUB:=mamedev/} GITHUB_TAG= ${DISTNAME:S/-//S/.//} diff --git a/emulators/mame/PLIST b/emulators/mame/PLIST index 0ed6782ef35..caf4f512228 100644 --- a/emulators/mame/PLIST +++ b/emulators/mame/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2016/04/29 08:30:50 wiz Exp $ +@comment $NetBSD: PLIST,v 1.14 2016/05/26 09:02:16 wiz Exp $ bin/castool bin/chdman bin/floptool @@ -25,7 +25,6 @@ man/man1/ldplayer.1 man/man1/ldresample.1 man/man1/ldverify.1 man/man1/romcmp.1 -man/man1/testkeys.1 man/man6/mame.6 man/man6/mess.6 share/doc/mame/SDL.txt @@ -267,6 +266,11 @@ share/mame/hash/mikrosha_cass.xml share/mame/hash/misterx.xml share/mame/hash/mm1_flop.xml share/mame/hash/mo5_cart.xml +share/mame/hash/mo5_cass.xml +share/mame/hash/mo5_flop.xml +share/mame/hash/mo5_qd.xml +share/mame/hash/mo6_cass.xml +share/mame/hash/mo6_flop.xml share/mame/hash/mpu1000.xml share/mame/hash/mpz80.xml share/mame/hash/msx.hsi @@ -344,10 +348,12 @@ share/mame/hash/plus4_cart.xml share/mame/hash/plus4_cass.xml share/mame/hash/plus4_flop.xml share/mame/hash/pmd85_cass.xml -share/mame/hash/pockchalv1.xml share/mame/hash/pockchalv2.xml +share/mame/hash/pockchalw.xml share/mame/hash/pokemini.xml share/mame/hash/pro128_cart.xml +share/mame/hash/pro128_cass.xml +share/mame/hash/pro128_flop.xml share/mame/hash/pro128s_flop.xml share/mame/hash/prof180.xml share/mame/hash/prof80.xml @@ -373,6 +379,7 @@ share/mame/hash/sage2.xml share/mame/hash/samcoupe_cass.xml share/mame/hash/samcoupe_flop.xml share/mame/hash/sat_cart.xml +share/mame/hash/sat_vccart.xml share/mame/hash/saturn.xml share/mame/hash/sawatte.xml share/mame/hash/sc3000_cart.xml @@ -399,6 +406,7 @@ share/mame/hash/sorcerer_cart.xml share/mame/hash/sorcerer_cass.xml share/mame/hash/sorcerer_flop.xml share/mame/hash/spc1000_cass.xml +share/mame/hash/spc1500_cass.xml share/mame/hash/special_cass.xml share/mame/hash/special_flop.xml share/mame/hash/specpls3_flop.xml @@ -409,6 +417,7 @@ share/mame/hash/st_flop.xml share/mame/hash/studio2.xml share/mame/hash/stv.xml share/mame/hash/super6.xml +share/mame/hash/super80_cass.xml share/mame/hash/superpet_flop.xml share/mame/hash/supracan.xml share/mame/hash/sv8000.xml @@ -429,7 +438,13 @@ share/mame/hash/tiki100.xml share/mame/hash/timex_dock.xml share/mame/hash/tntell.xml share/mame/hash/to770_cart.xml +share/mame/hash/to770a_cart.xml share/mame/hash/to7_cart.xml +share/mame/hash/to7_cass.xml +share/mame/hash/to7_qd.xml +share/mame/hash/to8_cass.xml +share/mame/hash/to8_qd.xml +share/mame/hash/to_flop.xml share/mame/hash/trs80m2.xml share/mame/hash/trsm100.xml share/mame/hash/tutor.xml diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo index f2ad92c5a1f..752e98e3b70 100644 --- a/emulators/mame/distinfo +++ b/emulators/mame/distinfo @@ -1,11 +1,9 @@ -$NetBSD: distinfo,v 1.52 2016/05/02 15:52:28 wiz Exp $ +$NetBSD: distinfo,v 1.53 2016/05/26 09:02:16 wiz Exp $ -SHA1 (mame-0.173.tar.gz) = 682035727ac201384d36a28c4ad0ca90011f321c -RMD160 (mame-0.173.tar.gz) = 5f093104d36976fa28ce345e18a5f63ad1b59169 -SHA512 (mame-0.173.tar.gz) = 731e94af1cde80ce0d62a4ff65ed7b1de97ed0e84633396eb9ec6e3a10d5da0717424f277fcbde5cd64a622a669ea7776047837d8f86f8baf6f077916eb982ee -Size (mame-0.173.tar.gz) = 98395748 bytes +SHA1 (mame-0.174.tar.gz) = 0b8a6b68d3414e28fe2214ea02f4540a2965f385 +RMD160 (mame-0.174.tar.gz) = 183cf8c41aab02581c1a10017fdeb28781a565f0 +SHA512 (mame-0.174.tar.gz) = 9e43079bd000105b7ed4f11b64efdde49dda944366acc83c9c5694d5213a05a1129424d4345c5d3ff2ffbc1ddbd46652e7b70d9fc7e44b2fd5fc7a777804a36b +Size (mame-0.174.tar.gz) = 102041793 bytes SHA1 (patch-3rdparty_bgfx_examples_common_font_font__manager.cpp) = e39b2dff553505531adb5f0a31b0a22306b8e2e4 -SHA1 (patch-3rdparty_bx_include_bx_thread.h) = 779c8b750a3ae5d50d12c6430678ada64a4b82ed SHA1 (patch-makefile) = 0be740e7d61cdaa66c1c415f84344b37da267a45 SHA1 (patch-scripts_genie.lua) = f0b6b9fe00b6f572089fc2a7495fe1fd3c86ae4e -SHA1 (patch-scripts_src_3rdparty.lua) = 306917af65da601667ffc9ffaf7b8092a2d03ef7 diff --git a/emulators/mame/patches/patch-3rdparty_bx_include_bx_thread.h b/emulators/mame/patches/patch-3rdparty_bx_include_bx_thread.h deleted file mode 100644 index 46e673246a9..00000000000 --- a/emulators/mame/patches/patch-3rdparty_bx_include_bx_thread.h +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-3rdparty_bx_include_bx_thread.h,v 1.2 2016/03/04 12:47:13 wiz Exp $ - -Adapt to calling convention on NetBSD. - ---- 3rdparty/bx/include/bx/thread.h.orig 2016-02-24 07:02:17.000000000 +0000 -+++ 3rdparty/bx/include/bx/thread.h -@@ -159,7 +159,11 @@ namespace bx - prctl(PR_SET_NAME,_name, 0, 0, 0); - # endif // defined(__GLIBC__) ... - #elif BX_PLATFORM_BSD -+#ifdef __NetBSD__ -+ pthread_setname_np(m_handle, "%s", (void *)_name); -+#else - pthread_setname_np(m_handle, _name); -+#endif - #elif BX_PLATFORM_WINDOWS && BX_COMPILER_MSVC - # pragma pack(push, 8) - struct ThreadName diff --git a/emulators/mame/patches/patch-scripts_src_3rdparty.lua b/emulators/mame/patches/patch-scripts_src_3rdparty.lua deleted file mode 100644 index 938ecb40438..00000000000 --- a/emulators/mame/patches/patch-scripts_src_3rdparty.lua +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-scripts_src_3rdparty.lua,v 1.3 2016/03/04 12:47:13 wiz Exp $ - ---- scripts/src/3rdparty.lua.orig 2016-02-24 07:02:17.000000000 +0000 -+++ scripts/src/3rdparty.lua -@@ -1153,6 +1153,15 @@ project "uv" - MAME_DIR .. "3rdparty/libuv/src/unix/kqueue.c", - } - end -+ if _OPTIONS["targetos"]=="netbsd" then -+ files { -+ MAME_DIR .. "3rdparty/libuv/src/unix/netbsd.c", -+ MAME_DIR .. "3rdparty/libuv/src/unix/kqueue.c", -+ } -+ links { -+ "kvm", -+ } -+ end - - if (_OPTIONS["SHADOW_CHECK"]=="1") then - removebuildoptions { |