summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2016-04-14 21:47:07 +0000
committerwiz <wiz@pkgsrc.org>2016-04-14 21:47:07 +0000
commit1a275af390b46666faf2951c43876e20bca9b8fc (patch)
treea98c465d9e420227885b92f074d0f312ada8609d /emulators
parent22180e9ad241f520811ee2a8ac6318b5b441172b (diff)
downloadpkgsrc-1a275af390b46666faf2951c43876e20bca9b8fc.tar.gz
Update mame to 0.172.
It's with great pleasure that we announce the release of MAME 0.172. This release includes several notable things above and beyond the usual assortment of new systems, new features, and bug fixes. Most importantly, this is the first release of MAME since the change to a proper open-source licensing scheme as announced earlier this month. From this release onward, MAME will be distributed under a GPL-2.0+ license, with the bulk of code being covered under a 3-clause BSD license. MAME now has an up-to-date set of documentation! You can find it under the "Documentation" drop-down at the top of this site, or go to http://docs.mamedev.org/ to check it out. Due to the large number of configuration changes made in this version, we strongly advise all users to delete their existing INI configuration files and re-create them using the "-cc" option. In case you are just overwriting previous release files note that you better remove plugin folder first For those of you running MAME on authentic CRT monitors, MAME now incorporates a number of scaling-related features from GroovyMAME, thanks to its author being brought on board the team, which should help reduce user fragmentation. Please note: If you have issues with MAME 0.172's graphics output, please ensure that "unevenstretch" is set to 1 in your MAME configuration. MAME 0.172 will also introduce a new high-score saving system using Lua scripting. The feature is still experimental, but it's something to keep an eye on for interesting future developments! This version additionally marks the creation of a cross-platform data-driven shader system via the BGFX renderer, which allows you to apply shader effects per-screen, and more.
Diffstat (limited to 'emulators')
-rw-r--r--emulators/mame/Makefile7
-rw-r--r--emulators/mame/PLIST11
-rw-r--r--emulators/mame/distinfo16
-rw-r--r--emulators/mame/patches/patch-3rdparty_luv_deps_uv.cmake33
-rw-r--r--emulators/mame/patches/patch-3rdparty_luv_src_dns.c24
-rw-r--r--emulators/mame/patches/patch-makefile12
-rw-r--r--emulators/mame/patches/patch-scripts_genie.lua38
7 files changed, 41 insertions, 100 deletions
diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index 5884d487ca0..83c78e7b6e0 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2016/04/11 19:01:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.55 2016/04/14 21:47:07 wiz Exp $
-DISTNAME= mame-0.171
-PKGREVISION= 1
+DISTNAME= mame-0.172
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_GITHUB:=mamedev/}
GITHUB_TAG= ${DISTNAME:S/-//S/.//}
@@ -9,7 +8,7 @@ GITHUB_TAG= ${DISTNAME:S/-//S/.//}
MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.mamedev.org/
COMMENT= Multiple Arcade Machine Emulator
-LICENSE= mame-license
+LICENSE= modified-bsd AND gnu-gpl-v2
DOCDIR= share/doc/mame
SHAREDIR= share/mame
diff --git a/emulators/mame/PLIST b/emulators/mame/PLIST
index c07c32c0385..57ac9d198e1 100644
--- a/emulators/mame/PLIST
+++ b/emulators/mame/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2016/03/04 12:47:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2016/04/14 21:47:07 wiz Exp $
bin/castool
bin/chdman
bin/floptool
@@ -36,11 +36,12 @@ share/doc/mame/hlsl.txt
share/doc/mame/imgtool.txt
share/doc/mame/m6502.txt
share/doc/mame/mame.txt
-share/doc/mame/mamelicense.txt
share/doc/mame/newvideo.txt
share/doc/mame/nscsi.txt
share/doc/mame/windows.txt
-share/mame/artwork/adapture-grill.png
+share/mame/artwork/LICENSE
+share/mame/artwork/README.md
+share/mame/artwork/aperture-grille.png
share/mame/artwork/monochrome-chessboard.png
share/mame/artwork/monochrome-matrix.png
share/mame/artwork/shadow-mask.png
@@ -49,6 +50,8 @@ share/mame/artwork/slot-mask.png
share/mame/artwork/white.png
share/mame/hash/32x.xml
share/mame/hash/3do_m2.xml
+share/mame/hash/LICENSE
+share/mame/hash/README.md
share/mame/hash/a2600.xml
share/mame/hash/a2600_cass.xml
share/mame/hash/a5200.hsi
@@ -336,6 +339,8 @@ 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/pokemini.xml
share/mame/hash/pro128_cart.xml
share/mame/hash/pro128s_flop.xml
diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo
index 581b8abf445..2697e4593cc 100644
--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.49 2016/04/04 17:32:17 joerg Exp $
+$NetBSD: distinfo,v 1.50 2016/04/14 21:47:07 wiz Exp $
-SHA1 (mame-0.171.tar.gz) = 53a6c72b2b8c11e72e622c14cb4d2ec710c1dbd5
-RMD160 (mame-0.171.tar.gz) = 7f0468d0240f3dd7f927eb135925d7ad78a66464
-SHA512 (mame-0.171.tar.gz) = 0d15261d6eea983258f6d747f63f159fcba440f0b7f098e5bebd7cefa5cef1e0189e41858df40bbfd0c2e4cb8820a967e7c291632d817fa5d5d29489c51553da
-Size (mame-0.171.tar.gz) = 98456350 bytes
+SHA1 (mame-0.172.tar.gz) = f6ea29f7880a05f8d835c538f4316bd4b0adad18
+RMD160 (mame-0.172.tar.gz) = b2cff1f9890091efec09ed774e20f7510747060b
+SHA512 (mame-0.172.tar.gz) = cf6f4a8da6c8e19ec81da5a79c6d2d0b9b6a687d5103e7010e83566a1eb24a829765c4964e2dbcbf7aa2ea6fe7f1f19faf9b4b0a9051e669bd0f33a8cd58a269
+Size (mame-0.172.tar.gz) = 97300980 bytes
SHA1 (patch-3rdparty_bgfx_examples_common_font_font__manager.cpp) = e39b2dff553505531adb5f0a31b0a22306b8e2e4
SHA1 (patch-3rdparty_bx_include_bx_thread.h) = 779c8b750a3ae5d50d12c6430678ada64a4b82ed
SHA1 (patch-3rdparty_libuv_src_unix_netbsd.c) = 63d2378c19cbbcb71d7540e088c3bdf5940f4dc6
-SHA1 (patch-3rdparty_luv_deps_uv.cmake) = 619cebcb8013139d765c2dfe2bcf7b5b86f50681
-SHA1 (patch-3rdparty_luv_src_dns.c) = 44d480e34971362ee696191c267dbac08005ec0f
-SHA1 (patch-makefile) = 620a9ca0884479f9624dfd8720e9cdbd9afcd1a7
-SHA1 (patch-scripts_genie.lua) = abcdc05a019761b815ce22991062ca546ae2f711
+SHA1 (patch-makefile) = 0be740e7d61cdaa66c1c415f84344b37da267a45
+SHA1 (patch-scripts_genie.lua) = 8bcb97215fcc379b34f893d53843533630d0f26e
SHA1 (patch-scripts_src_3rdparty.lua) = 306917af65da601667ffc9ffaf7b8092a2d03ef7
diff --git a/emulators/mame/patches/patch-3rdparty_luv_deps_uv.cmake b/emulators/mame/patches/patch-3rdparty_luv_deps_uv.cmake
deleted file mode 100644
index 1028cb3fbb0..00000000000
--- a/emulators/mame/patches/patch-3rdparty_luv_deps_uv.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-3rdparty_luv_deps_uv.cmake,v 1.1 2016/03/04 12:47:13 wiz Exp $
-
---- 3rdparty/luv/deps/uv.cmake.orig 2016-02-24 07:02:17.000000000 +0000
-+++ 3rdparty/luv/deps/uv.cmake
-@@ -138,6 +138,14 @@ if("${CMAKE_SYSTEM_NAME}" MATCHES "FreeB
- )
- endif()
-
-+## NetBSD
-+if("${CMAKE_SYSTEM_NAME}" MATCHES "NetBSD")
-+ set(SOURCES ${SOURCES}
-+ ${LIBUVDIR}/src/unix/kqueue.c
-+ ${LIBUVDIR}/src/unix/freebsd.c
-+ )
-+endif()
-+
- ## Linux
- if("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
- add_definitions(
-@@ -187,6 +195,13 @@ if("${CMAKE_SYSTEM_NAME}" MATCHES "FreeB
- )
- endif()
-
-+if("${CMAKE_SYSTEM_NAME}" MATCHES "NetBSD")
-+ target_link_libraries(uv
-+ pthread
-+ kvm
-+ )
-+endif()
-+
- if("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
- target_link_libraries(uv
- pthread
diff --git a/emulators/mame/patches/patch-3rdparty_luv_src_dns.c b/emulators/mame/patches/patch-3rdparty_luv_src_dns.c
deleted file mode 100644
index 82e8d172eef..00000000000
--- a/emulators/mame/patches/patch-3rdparty_luv_src_dns.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-3rdparty_luv_src_dns.c,v 1.1 2016/03/04 12:47:13 wiz Exp $
-
-Only use existing defines.
-
---- 3rdparty/luv/src/dns.c.orig 2016-02-24 07:02:17.000000000 +0000
-+++ 3rdparty/luv/src/dns.c
-@@ -150,13 +150,17 @@ static int luv_getaddrinfo(lua_State* L)
- if (lua_toboolean(L, -1)) hints->ai_flags |= AI_ADDRCONFIG;
- lua_pop(L, 1);
-
-+#if defined(AI_V4MAPPED)
- lua_getfield(L, 3, "v4mapped");
- if (lua_toboolean(L, -1)) hints->ai_flags |= AI_V4MAPPED;
- lua_pop(L, 1);
-+#endif
-
-+#if defined(AI_ALL)
- lua_getfield(L, 3, "all");
- if (lua_toboolean(L, -1)) hints->ai_flags |= AI_ALL;
- lua_pop(L, 1);
-+#endif
-
- lua_getfield(L, 3, "numerichost");
- if (lua_toboolean(L, -1)) hints->ai_flags |= AI_NUMERICHOST;
diff --git a/emulators/mame/patches/patch-makefile b/emulators/mame/patches/patch-makefile
index 7a98c2d1884..f6dce1aabb2 100644
--- a/emulators/mame/patches/patch-makefile
+++ b/emulators/mame/patches/patch-makefile
@@ -1,16 +1,16 @@
-$NetBSD: patch-makefile,v 1.14 2016/04/04 17:32:17 joerg Exp $
+$NetBSD: patch-makefile,v 1.15 2016/04/14 21:47:07 wiz Exp $
---- makefile.orig 2016-04-04 07:38:18.519192767 +0000
+--- makefile.orig 2016-03-30 09:03:03.000000000 +0000
+++ makefile
-@@ -806,11 +806,6 @@ ifeq ($(CLANG_VERSION),)
- $(info GCC $(GCC_VERSION) detected)
+@@ -833,11 +833,6 @@ $(info GCC $(GCC_VERSION) detected)
else
$(info Clang $(CLANG_VERSION) detected)
+ ifneq ($(TARGETOS),asmjs)
-ifeq ($(ARCHITECTURE),_x64)
-ARCHITECTURE := _x64_clang
-else
-ARCHITECTURE := _x86_clang
-endif
endif
- ifneq ($(PYTHON_AVAILABLE),python)
- $(error Python is not available in path)
+ endif
+
diff --git a/emulators/mame/patches/patch-scripts_genie.lua b/emulators/mame/patches/patch-scripts_genie.lua
index 301ad338aec..11d3f3637ed 100644
--- a/emulators/mame/patches/patch-scripts_genie.lua
+++ b/emulators/mame/patches/patch-scripts_genie.lua
@@ -1,11 +1,11 @@
-$NetBSD: patch-scripts_genie.lua,v 1.1 2016/04/04 17:32:17 joerg Exp $
+$NetBSD: patch-scripts_genie.lua,v 1.2 2016/04/14 21:47:07 wiz Exp $
Detect clang correctly.
Use GNU version of the C++ standard to avoid trouble with alloca on NetBSD.
---- scripts/genie.lua.orig 2016-04-04 07:47:22.946297308 +0000
+--- scripts/genie.lua.orig 2016-03-30 09:03:03.000000000 +0000
+++ scripts/genie.lua
-@@ -692,12 +692,12 @@ local version = str_to_version(_OPTIONS[
+@@ -672,22 +672,22 @@ local version = str_to_version(_OPTIONS[
if string.find(_OPTIONS["gcc"], "clang") and ((version < 30500) or (_OPTIONS["targetos"]=="macosx" and (version <= 60000))) then
buildoptions_cpp {
"-x c++",
@@ -19,15 +19,11 @@ Use GNU version of the C++ standard to avoid trouble with alloca on NetBSD.
+ "-std=gnu++1y",
}
else
- if _OPTIONS["targetos"]=="os2" then
-@@ -708,13 +708,13 @@ else
- else
- buildoptions_cpp {
- "-x c++",
-- "-std=c++14",
-+ "-std=gnu++14",
- }
- end
+ buildoptions_cpp {
+ "-x c++",
+- "-std=c++14",
++ "-std=gnu++14",
+ }
buildoptions_objc {
"-x objective-c++",
@@ -36,26 +32,26 @@ Use GNU version of the C++ standard to avoid trouble with alloca on NetBSD.
}
end
-- this speeds it up a bit by piping between the preprocessor/compiler/assembler
-@@ -955,7 +955,17 @@ end
+@@ -933,7 +933,17 @@ end
local version = str_to_version(_OPTIONS["gcc_version"])
-- if string.find(_OPTIONS["gcc"], "clang") then
+- if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "pnacl") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android") then
+ if _OPTIONS["clang_version"] == "" then
+ if (version < 40900) then
+ print("GCC version 4.9 or later needed")
+ os.exit(-1)
+ end
-+ buildoptions {
-+ "-Wno-unused-result", -- needed for fgets,fread on linux
-+ -- array bounds checking seems to be buggy in 4.8.1 (try it on video/stvvdp1.c and video/model1.c without -Wno-array-bounds)
-+ "-Wno-array-bounds",
-+ }
++ buildoptions {
++ "-Wno-unused-result", -- needed for fgets,fread on linux
++ -- array bounds checking seems to be buggy in 4.8.1 (try it on video/stvvdp1.c and video/model1.c without -Wno-array-bounds)
++ "-Wno-array-bounds",
++ }
+ else
if (version < 30400) then
print("Clang version 3.4 or later needed")
os.exit(-1)
-@@ -981,16 +991,6 @@ end
+@@ -959,16 +969,6 @@ end
"-Wno-tautological-undefined-compare",
}
end
@@ -71,4 +67,4 @@ Use GNU version of the C++ standard to avoid trouble with alloca on NetBSD.
- }
end
end
-
+