diff options
author | wiz <wiz@pkgsrc.org> | 2015-07-29 12:03:40 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2015-07-29 12:03:40 +0000 |
commit | 2773288a4c8009adc13a1cb72973a5267bff5d78 (patch) | |
tree | 3150b8a3ef440cef75265db862566b4ca348aa9e /emulators | |
parent | dee7c8100f114a8632349b72056b80c0f7321913 (diff) | |
download | pkgsrc-2773288a4c8009adc13a1cb72973a5267bff5d78.tar.gz |
Update to 0.164.
The usual changes.
Diffstat (limited to 'emulators')
-rw-r--r-- | emulators/mame/Makefile | 4 | ||||
-rw-r--r-- | emulators/mame/PLIST | 4 | ||||
-rw-r--r-- | emulators/mame/distinfo | 17 | ||||
-rw-r--r-- | emulators/mame/patches/patch-3rdparty_bgfx_src_renderer__null.cpp | 43 | ||||
-rw-r--r-- | emulators/mame/patches/patch-3rdparty_bx_include_bx_os.h | 29 | ||||
-rw-r--r-- | emulators/mame/patches/patch-3rdparty_bx_include_bx_platform.h | 41 | ||||
-rw-r--r-- | emulators/mame/patches/patch-3rdparty_mongoose_mongoose.h | 14 | ||||
-rw-r--r-- | emulators/mame/patches/patch-3rdparty_portmidi_porttime_ptlinux.c | 39 | ||||
-rw-r--r-- | emulators/mame/patches/patch-makefile | 44 | ||||
-rw-r--r-- | emulators/mame/patches/patch-scripts_src_3rdparty.lua | 32 | ||||
-rw-r--r-- | emulators/mame/patches/patch-scripts_toolchain.lua | 56 | ||||
-rw-r--r-- | emulators/mame/patches/patch-src_osd_osdmini_minifile.c | 32 |
12 files changed, 24 insertions, 331 deletions
diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile index 92c628b9489..df3176accb1 100644 --- a/emulators/mame/Makefile +++ b/emulators/mame/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.43 2015/07/15 12:37:03 wiz Exp $ +# $NetBSD: Makefile,v 1.44 2015/07/29 12:03:40 wiz Exp $ -DISTNAME= mame-0.163 +DISTNAME= mame-0.164 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_GITHUB:=mamedev/} GITHUB_TAG= ${DISTNAME:S/-//S/.//} diff --git a/emulators/mame/PLIST b/emulators/mame/PLIST index 6b49d622276..899767f1b10 100644 --- a/emulators/mame/PLIST +++ b/emulators/mame/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2015/07/14 20:14:49 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4 2015/07/29 12:03:40 wiz Exp $ bin/castool bin/chdman bin/floptool @@ -161,6 +161,7 @@ share/mame/hash/gameboy.xml share/mame/hash/gamecom.xml share/mame/hash/gamegear.xml share/mame/hash/gameking.xml +share/mame/hash/gameking3.xml share/mame/hash/gamepock.xml share/mame/hash/gba.xml share/mame/hash/gbcolor.xml @@ -172,6 +173,7 @@ share/mame/hash/gl6000sl.xml share/mame/hash/glcolor.xml share/mame/hash/gmaster.xml share/mame/hash/gp32.xml +share/mame/hash/guab.xml share/mame/hash/gx4000.xml share/mame/hash/horizon.xml share/mame/hash/hp9835a_rom.xml diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo index 05550c48138..f829dd10d64 100644 --- a/emulators/mame/distinfo +++ b/emulators/mame/distinfo @@ -1,13 +1,6 @@ -$NetBSD: distinfo,v 1.38 2015/07/15 12:37:03 wiz Exp $ +$NetBSD: distinfo,v 1.39 2015/07/29 12:03:40 wiz Exp $ -SHA1 (mame-0.163.tar.gz) = f3f3a8c74758db5bedaf6ee5dd31c30574d2510b -RMD160 (mame-0.163.tar.gz) = 722dd17f78c53a72fa9003d50bbf11b9248c0837 -Size (mame-0.163.tar.gz) = 88920010 bytes -SHA1 (patch-3rdparty_bgfx_src_renderer__null.cpp) = 908f196d68c9b759b26a75331f543ed3ab73970c -SHA1 (patch-3rdparty_bx_include_bx_os.h) = 31d9e848dafc0f9a7459deac122577e9aebdc230 -SHA1 (patch-3rdparty_bx_include_bx_platform.h) = a971c90f2ed169d35d4c600a0b4266f942f99383 -SHA1 (patch-3rdparty_portmidi_porttime_ptlinux.c) = 3d7ac3eb870764ed8a94712708299e0391941221 -SHA1 (patch-makefile) = 48eeb6f119b0affb4614c9ff6a51933b4f0c08bf -SHA1 (patch-scripts_src_3rdparty.lua) = db85c6c50bdd456f8e8127b956f32df809b706be -SHA1 (patch-scripts_toolchain.lua) = 0b6b8708b5102b154a38872d2a3069f4061ca353 -SHA1 (patch-src_osd_osdmini_minifile.c) = c1ddef744ecaefc19d295fae7b015e0505a6f126 +SHA1 (mame-0.164.tar.gz) = bb6379ff2257ced39e21f154e16b819e53edb4d1 +RMD160 (mame-0.164.tar.gz) = 09cf056cda39da65a751ff3ce23a9a91c466d9ae +Size (mame-0.164.tar.gz) = 89077882 bytes +SHA1 (patch-3rdparty_mongoose_mongoose.h) = db3febac3da4de6bf4c5d629e6fae034c68030b7 diff --git a/emulators/mame/patches/patch-3rdparty_bgfx_src_renderer__null.cpp b/emulators/mame/patches/patch-3rdparty_bgfx_src_renderer__null.cpp deleted file mode 100644 index 1ff438b389a..00000000000 --- a/emulators/mame/patches/patch-3rdparty_bgfx_src_renderer__null.cpp +++ /dev/null @@ -1,43 +0,0 @@ -$NetBSD: patch-3rdparty_bgfx_src_renderer__null.cpp,v 1.1 2015/07/14 20:14:49 wiz Exp $ - -Fix build. -https://github.com/bkaradzic/bgfx/commit/e1a564ca720ae66298b61928e6ef0e9d1ee40d30#diff-d51370988baf340d4de0bc2861591415 - ---- 3rdparty/bgfx/src/renderer_null.cpp.orig 2015-06-24 09:53:24.000000000 +0000 -+++ 3rdparty/bgfx/src/renderer_null.cpp -@@ -33,7 +33,7 @@ namespace bgfx { namespace noop - { - } - -- void createIndexBuffer(IndexBufferHandle /*_handle*/, Memory* /*_mem*/, uint8_t /*_flags*/) BX_OVERRIDE -+ void createIndexBuffer(IndexBufferHandle /*_handle*/, Memory* /*_mem*/, uint16_t /*_flags*/) BX_OVERRIDE - { - } - -@@ -49,7 +49,7 @@ namespace bgfx { namespace noop - { - } - -- void createVertexBuffer(VertexBufferHandle /*_handle*/, Memory* /*_mem*/, VertexDeclHandle /*_declHandle*/, uint8_t /*_flags*/) BX_OVERRIDE -+ void createVertexBuffer(VertexBufferHandle /*_handle*/, Memory* /*_mem*/, VertexDeclHandle /*_declHandle*/, uint16_t /*_flags*/) BX_OVERRIDE - { - } - -@@ -57,7 +57,7 @@ namespace bgfx { namespace noop - { - } - -- void createDynamicIndexBuffer(IndexBufferHandle /*_handle*/, uint32_t /*_size*/, uint8_t /*_flags*/) BX_OVERRIDE -+ void createDynamicIndexBuffer(IndexBufferHandle /*_handle*/, uint32_t /*_size*/, uint16_t /*_flags*/) BX_OVERRIDE - { - } - -@@ -69,7 +69,7 @@ namespace bgfx { namespace noop - { - } - -- void createDynamicVertexBuffer(VertexBufferHandle /*_handle*/, uint32_t /*_size*/, uint8_t /*_flags*/) BX_OVERRIDE -+ void createDynamicVertexBuffer(VertexBufferHandle /*_handle*/, uint32_t /*_size*/, uint16_t /*_flags*/) BX_OVERRIDE - { - } - diff --git a/emulators/mame/patches/patch-3rdparty_bx_include_bx_os.h b/emulators/mame/patches/patch-3rdparty_bx_include_bx_os.h deleted file mode 100644 index 98eca702bc3..00000000000 --- a/emulators/mame/patches/patch-3rdparty_bx_include_bx_os.h +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-3rdparty_bx_include_bx_os.h,v 1.1 2015/07/14 20:14:49 wiz Exp $ - -Add NetBSD support. - ---- 3rdparty/bx/include/bx/os.h.orig 2015-06-24 09:53:24.000000000 +0000 -+++ 3rdparty/bx/include/bx/os.h -@@ -17,11 +17,12 @@ - || BX_PLATFORM_IOS \ - || BX_PLATFORM_LINUX \ - || BX_PLATFORM_NACL \ -+ || BX_PLATFORM_NETBSD \ - || BX_PLATFORM_OSX \ - || BX_PLATFORM_RPI - - # include <sched.h> // sched_yield --# if BX_PLATFORM_FREEBSD || BX_PLATFORM_IOS || BX_PLATFORM_NACL || BX_PLATFORM_OSX -+# if BX_PLATFORM_FREEBSD || BX_PLATFORM_IOS || BX_PLATFORM_NACL || BX_PLATFORM_NETBSD || BX_PLATFORM_OSX - # include <pthread.h> // mach_port_t - # endif // BX_PLATFORM_IOS || BX_PLATFORM_OSX || BX_PLATFORM_NACL - -@@ -93,7 +94,7 @@ namespace bx - return (pid_t)::syscall(SYS_gettid); - #elif BX_PLATFORM_IOS || BX_PLATFORM_OSX - return (mach_port_t)::pthread_mach_thread_np(pthread_self() ); --#elif BX_PLATFORM_FREEBSD || BX_PLATFORM_NACL -+#elif BX_PLATFORM_FREEBSD || BX_PLATFORM_NACL || BX_PLATFORM_NETBSD - // Casting __nc_basic_thread_data*... need better way to do this. - return *(uint32_t*)::pthread_self(); - #else 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 8036913cab3..00000000000 --- a/emulators/mame/patches/patch-3rdparty_bx_include_bx_platform.h +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-3rdparty_bx_include_bx_platform.h,v 1.1 2015/07/14 20:14:49 wiz Exp $ - -Add NetBSD support. - ---- 3rdparty/bx/include/bx/platform.h.orig 2015-06-24 09:53:24.000000000 +0000 -+++ 3rdparty/bx/include/bx/platform.h -@@ -18,6 +18,7 @@ - #define BX_PLATFORM_IOS 0 - #define BX_PLATFORM_LINUX 0 - #define BX_PLATFORM_NACL 0 -+#define BX_PLATFORM_NETBSD 0 - #define BX_PLATFORM_OSX 0 - #define BX_PLATFORM_PS4 0 - #define BX_PLATFORM_QNX 0 -@@ -187,6 +188,9 @@ - #elif defined(__FreeBSD__) - # undef BX_PLATFORM_FREEBSD - # define BX_PLATFORM_FREEBSD 1 -+#elif defined(__NetBSD__) -+# undef BX_PLATFORM_NETBSD -+# define BX_PLATFORM_NETBSD 1 - #else - # error "BX_PLATFORM_* is not defined!" - #endif // -@@ -198,6 +202,7 @@ - || BX_PLATFORM_IOS \ - || BX_PLATFORM_LINUX \ - || BX_PLATFORM_NACL \ -+ || BX_PLATFORM_NETBSD \ - || BX_PLATFORM_OSX \ - || BX_PLATFORM_QNX \ - || BX_PLATFORM_RPI \ -@@ -250,6 +255,8 @@ - #elif BX_PLATFORM_NACL - # define BX_PLATFORM_NAME "NaCl " \ - BX_STRINGIZE(BX_PLATFORM_NACL) -+#elif BX_PLATFORM_NETBSD -+# define BX_PLATFORM_NAME "NetBSD" - #elif BX_PLATFORM_OSX - # define BX_PLATFORM_NAME "OSX" - #elif BX_PLATFORM_PS4 diff --git a/emulators/mame/patches/patch-3rdparty_mongoose_mongoose.h b/emulators/mame/patches/patch-3rdparty_mongoose_mongoose.h new file mode 100644 index 00000000000..633b5ab3b03 --- /dev/null +++ b/emulators/mame/patches/patch-3rdparty_mongoose_mongoose.h @@ -0,0 +1,14 @@ +$NetBSD: patch-3rdparty_mongoose_mongoose.h,v 1.1 2015/07/29 12:03:40 wiz Exp $ + +Add missing header for va_list. + +--- 3rdparty/mongoose/mongoose.h.orig 2015-07-29 06:34:21.000000000 +0000 ++++ 3rdparty/mongoose/mongoose.h +@@ -20,6 +20,7 @@ + + #define MONGOOSE_VERSION "5.6" + ++#include <stdarg.h> // required for va_list + #include <stdio.h> // required for FILE + #include <stddef.h> // required for size_t + #include <sys/types.h> // required for time_t diff --git a/emulators/mame/patches/patch-3rdparty_portmidi_porttime_ptlinux.c b/emulators/mame/patches/patch-3rdparty_portmidi_porttime_ptlinux.c deleted file mode 100644 index 7027f6952b1..00000000000 --- a/emulators/mame/patches/patch-3rdparty_portmidi_porttime_ptlinux.c +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-3rdparty_portmidi_porttime_ptlinux.c,v 1.1 2015/07/14 20:14:49 wiz Exp $ - -ftime() is obsolete. - ---- 3rdparty/portmidi/porttime/ptlinux.c.orig 2015-06-24 09:53:30.000000000 +0000 -+++ 3rdparty/portmidi/porttime/ptlinux.c -@@ -38,7 +38,7 @@ CHANGE LOG - #define FALSE 0 - - static int time_started_flag = FALSE; --static struct timeb time_offset = {0, 0, 0, 0}; -+static struct timeval time_offset = {0, 0}; - static pthread_t pt_thread_pid; - static int pt_thread_created = FALSE; - -@@ -79,7 +79,7 @@ static void *Pt_CallbackProc(void *p) - PtError Pt_Start(int resolution, PtCallback *callback, void *userData) - { - if (time_started_flag) return ptNoError; -- ftime(&time_offset); /* need this set before process runs */ -+ gettimeofday(&time_offset, NULL); /* need this set before process runs */ - if (callback) { - int res; - pt_callback_parameters *parms = (pt_callback_parameters *) -@@ -121,10 +121,10 @@ int Pt_Started() - PtTimestamp Pt_Time() - { - long seconds, milliseconds; -- struct timeb now; -- ftime(&now); -- seconds = now.time - time_offset.time; -- milliseconds = now.millitm - time_offset.millitm; -+ struct timeval now; -+ gettimeofday(&now, NULL); -+ seconds = now.tv_sec - time_offset.tv_sec; -+ milliseconds = now.tv_usec - time_offset.tv_usec; - return seconds * 1000 + milliseconds; - } - diff --git a/emulators/mame/patches/patch-makefile b/emulators/mame/patches/patch-makefile deleted file mode 100644 index fc6c37bbe8a..00000000000 --- a/emulators/mame/patches/patch-makefile +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-makefile,v 1.12 2015/07/14 20:14:49 wiz Exp $ - -Add NetBSD support. - ---- makefile.orig 2015-07-14 19:04:56.000000000 +0000 -+++ makefile -@@ -295,6 +295,10 @@ ifeq ($(TARGETOS),freebsd) - OSD := sdl - endif - -+ifeq ($(TARGETOS),netbsd) -+OSD := sdl -+endif -+ - ifeq ($(TARGETOS),solaris) - OSD := sdl - endif -@@ -1000,6 +1004,26 @@ freebsd_x86: generate $(PROJECTDIR)/gmak - - - #------------------------------------------------- -+# gmake-netbsd -+#------------------------------------------------- -+ -+ -+$(PROJECTDIR)/gmake-netbsd/Makefile: makefile $(SCRIPTS) $(GENIE) -+ $(SILENT) $(GENIE) $(PARAMS) --gcc=netbsd --gcc_version=$(GCC_VERSION) gmake -+ -+.PHONY: netbsd_x64 -+netbsd_x64: generate $(PROJECTDIR)/gmake-netbsd/Makefile -+ $(SILENT) $(MAKE) -C $(PROJECTDIR)/gmake-netbsd config=$(CONFIG)64 -+ -+.PHONY: netbsd -+netbsd: netbsd_x86 -+ -+.PHONY: netbsd_x86 -+netbsd_x86: generate $(PROJECTDIR)/gmake-netbsd/Makefile -+ $(SILENT) $(MAKE) -C $(PROJECTDIR)/gmake-netbsd config=$(CONFIG)32 -+ -+ -+#------------------------------------------------- - # Clean/bootstrap - #------------------------------------------------- - 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 d17b37c8c3f..00000000000 --- a/emulators/mame/patches/patch-scripts_src_3rdparty.lua +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-scripts_src_3rdparty.lua,v 1.1 2015/07/14 20:14:49 wiz Exp $ - -Add NetBSD "support" for portmidi. - ---- scripts/src/3rdparty.lua.orig 2015-06-24 09:53:30.000000000 +0000 -+++ scripts/src/3rdparty.lua -@@ -534,6 +534,13 @@ project "portmidi" - MAME_DIR .. "3rdparty/portmidi/porttime/ptlinux.c", - } - end -+ if _OPTIONS["targetos"]=="netbsd" then -+ files { -+ MAME_DIR .. "3rdparty/portmidi/pm_linux/pmlinux.c", -+ MAME_DIR .. "3rdparty/portmidi/pm_linux/finddefault.c", -+ MAME_DIR .. "3rdparty/portmidi/porttime/ptlinux.c", -+ } -+ end - if _OPTIONS["targetos"]=="macosx" then - files { - MAME_DIR .. "3rdparty/portmidi/pm_mac/pmmac.c", -@@ -591,6 +598,11 @@ project "bgfx" - MAME_DIR .. "3rdparty/bx/include/compat/freebsd", - } - -+ configuration { "netbsd" } -+ includedirs { -+ MAME_DIR .. "3rdparty/bx/include/compat/freebsd", -+ } -+ - configuration { "gmake" } - buildoptions { - "-Wno-uninitialized", diff --git a/emulators/mame/patches/patch-scripts_toolchain.lua b/emulators/mame/patches/patch-scripts_toolchain.lua deleted file mode 100644 index 03ad8486577..00000000000 --- a/emulators/mame/patches/patch-scripts_toolchain.lua +++ /dev/null @@ -1,56 +0,0 @@ -$NetBSD: patch-scripts_toolchain.lua,v 1.1 2015/07/14 20:14:49 wiz Exp $ - -Add NetBSD support. - ---- scripts/toolchain.lua.orig 2015-06-24 09:53:32.000000000 +0000 -+++ scripts/toolchain.lua -@@ -24,6 +24,7 @@ newoption { - { "mingw-clang", "MinGW (clang compiler)" }, - { "nacl", "Native Client" }, - { "nacl-arm", "Native Client - ARM" }, -+ { "netbsd", "NetBSD" }, - { "osx", "OSX (GCC compiler)" }, - { "osx-clang", "OSX (Clang compiler)" }, - { "pnacl", "Native Client - PNaCl" }, -@@ -147,6 +148,10 @@ function toolchain(_buildDir, _subDir) - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-freebsd") - end - -+ if "netbsd" == _OPTIONS["gcc"] then -+ location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-netbsd") -+ end -+ - if "ios-arm" == _OPTIONS["gcc"] then - premake.gcc.cc = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang" - premake.gcc.cxx = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++" -@@ -590,7 +595,30 @@ function toolchain(_buildDir, _subDir) - - configuration { "freebsd", "x64", "Debug" } - targetdir (_buildDir .. "freebsd" .. "/bin/x64/Debug") -+ -+ configuration { "netbsd", "x32" } -+ objdir (_buildDir .. "netbsd" .. "/obj") -+ buildoptions { -+ "-m32", -+ } - -+ configuration { "netbsd", "x32", "Release" } -+ targetdir (_buildDir .. "netbsd" .. "/bin/x32/Release") -+ -+ configuration { "netbsd", "x32", "Debug" } -+ targetdir (_buildDir .. "netbsd" .. "/bin/x32/Debug") -+ -+ configuration { "netbsd", "x64" } -+ objdir (_buildDir .. "netbsd" .. "/obj") -+ buildoptions { -+ "-m64", -+ } -+ configuration { "netbsd", "x64", "Release" } -+ targetdir (_buildDir .. "netbsd" .. "/bin/x64/Release") -+ -+ configuration { "netbsd", "x64", "Debug" } -+ targetdir (_buildDir .. "netbsd" .. "/bin/x64/Debug") -+ - configuration { "android-*" } - includedirs { - "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/include", diff --git a/emulators/mame/patches/patch-src_osd_osdmini_minifile.c b/emulators/mame/patches/patch-src_osd_osdmini_minifile.c deleted file mode 100644 index d4dbe660533..00000000000 --- a/emulators/mame/patches/patch-src_osd_osdmini_minifile.c +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-src_osd_osdmini_minifile.c,v 1.2 2015/07/14 21:44:55 wiz Exp $ - -Implement missing osd_truncate() function. - ---- src/osd/osdmini/minifile.c.orig 2015-06-24 09:53:46.000000000 +0000 -+++ src/osd/osdmini/minifile.c -@@ -102,6 +102,25 @@ file_error osd_write(osd_file *file, con - - - //============================================================ -+// osd_truncate -+//============================================================ -+ -+file_error osd_truncate(osd_file *file, UINT64 offset) -+{ -+ UINT32 result; -+ -+ if (!file) -+ return FILERR_FAILURE; -+ -+ result = ftruncate(fileno((FILE *)file), offset); -+ if (result) -+ return FILERR_FAILURE; -+ -+ return FILERR_NONE; -+} -+ -+ -+//============================================================ - // osd_rmfile - //============================================================ - |