summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--emulators/mame/Makefile4
-rw-r--r--emulators/mame/PLIST4
-rw-r--r--emulators/mame/distinfo15
-rw-r--r--emulators/mame/patches/patch-3rdparty_bx_include_bx_os.h32
-rw-r--r--emulators/mame/patches/patch-3rdparty_bx_include_bx_platform.h42
-rw-r--r--emulators/mame/patches/patch-3rdparty_genie_build_gmake.bsd_genie.make34
-rw-r--r--emulators/mame/patches/patch-3rdparty_genie_build_gmake.solaris_genie.make34
-rw-r--r--emulators/mame/patches/patch-src_osd_sdl_sdlptty__unix.c14
8 files changed, 10 insertions, 169 deletions
diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index 0dbc4da9488..a565514bd73 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2015/11/13 14:11:49 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2015/11/25 12:34:36 wiz Exp $
-DISTNAME= mame-0.167
+DISTNAME= mame-0.168
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_GITHUB:=mamedev/}
GITHUB_TAG= ${DISTNAME:S/-//S/.//}
diff --git a/emulators/mame/PLIST b/emulators/mame/PLIST
index 26aad9a9f44..53202bb6531 100644
--- a/emulators/mame/PLIST
+++ b/emulators/mame/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2015/11/13 14:11:49 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2015/11/25 12:34:36 wiz Exp $
bin/castool
bin/chdman
bin/floptool
@@ -97,6 +97,7 @@ share/mame/hash/attache.xml
share/mame/hash/b2m.xml
share/mame/hash/bbc_32016_flop.xml
share/mame/hash/bbc_65c102_flop.xml
+share/mame/hash/bbc_68000_flop.xml
share/mame/hash/bbc_80186_flop.xml
share/mame/hash/bbc_arm_flop.xml
share/mame/hash/bbc_z80_flop.xml
@@ -104,6 +105,7 @@ share/mame/hash/bbca_cass.xml
share/mame/hash/bbcb_cass.xml
share/mame/hash/bbcb_de_cass.xml
share/mame/hash/bbcb_flop.xml
+share/mame/hash/bbcb_orig_flop.xml
share/mame/hash/bbcb_us_flop.xml
share/mame/hash/bbcbc.xml
share/mame/hash/bbcm_cart.xml
diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo
index 14f4d72e446..f8877edcf9a 100644
--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.43 2015/11/13 14:11:49 wiz Exp $
+$NetBSD: distinfo,v 1.44 2015/11/25 12:34:36 wiz Exp $
-SHA1 (mame-0.167.tar.gz) = b8f6671d9220c8a4187e48dd1d9598f179f5b302
-RMD160 (mame-0.167.tar.gz) = 6ea27945a6070e29856f55d2402b9b782ad82ddb
-SHA512 (mame-0.167.tar.gz) = dcfc328477203ebc766661da35b9ee830a202fa5a74800d95dd6c69b1e17a740aae70d791fbadfd6749d726534c77e8e3a85feec54aad5e0107832c754a23af9
-Size (mame-0.167.tar.gz) = 88620865 bytes
-SHA1 (patch-3rdparty_bx_include_bx_os.h) = a67e187ae42e1b8c7c753b16e8f6d90439953eeb
-SHA1 (patch-3rdparty_bx_include_bx_platform.h) = cfe106f747caa0309098afef06b553a16147c48e
-SHA1 (patch-3rdparty_genie_build_gmake.bsd_genie.make) = c8ed2193baf5df90b387c463bdd5e9a3b3e44ab8
-SHA1 (patch-3rdparty_genie_build_gmake.solaris_genie.make) = 8ba3c9dc2ab2bc5f4775f91afce8d7fb15f30d9d
-SHA1 (patch-src_osd_sdl_sdlptty__unix.c) = 4edffc93e6ba9d4b97adc0be848f5aadf84d3272
+SHA1 (mame-0.168.tar.gz) = aa71ca6911749cb5d6bf5d8148866ccff0e649af
+RMD160 (mame-0.168.tar.gz) = 677a398c2854c7bd7e3f007a6846cfd7ff9007cc
+SHA512 (mame-0.168.tar.gz) = e0895bbf8152c00c4ef3da8a3beddb191203c4be3d7b30da7a35ffe2931def9bcaef08ec7cf28651a2ae9adad6d3731f5444691ed07a4516c2e84c3092f312c2
+Size (mame-0.168.tar.gz) = 88471983 bytes
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 9c9109004eb..00000000000
--- a/emulators/mame/patches/patch-3rdparty_bx_include_bx_os.h
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-3rdparty_bx_include_bx_os.h,v 1.4 2015/11/13 14:11:49 wiz Exp $
-
-Add NetBSD support.
-https://github.com/mamedev/mame/pull/464
-
---- 3rdparty/bx/include/bx/os.h.orig 2015-09-30 06:29:01.000000000 +0000
-+++ 3rdparty/bx/include/bx/os.h
-@@ -15,6 +15,7 @@
- #elif BX_PLATFORM_ANDROID \
- || BX_PLATFORM_EMSCRIPTEN \
- || BX_PLATFORM_FREEBSD \
-+ || BX_PLATFORM_NETBSD \
- || BX_PLATFORM_IOS \
- || BX_PLATFORM_LINUX \
- || BX_PLATFORM_NACL \
-@@ -24,6 +25,7 @@
-
- # include <sched.h> // sched_yield
- # if BX_PLATFORM_FREEBSD \
-+ || BX_PLATFORM_NETBSD \
- || BX_PLATFORM_IOS \
- || BX_PLATFORM_NACL \
- || BX_PLATFORM_OSX \
-@@ -103,7 +105,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 ec8f5145315..00000000000
--- a/emulators/mame/patches/patch-3rdparty_bx_include_bx_platform.h
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-3rdparty_bx_include_bx_platform.h,v 1.4 2015/11/13 14:11:49 wiz Exp $
-
-Add NetBSD support.
-https://github.com/mamedev/mame/pull/464
-
---- 3rdparty/bx/include/bx/platform.h.orig 2015-09-30 06:29:01.000000000 +0000
-+++ 3rdparty/bx/include/bx/platform.h
-@@ -15,6 +15,7 @@
- #define BX_PLATFORM_ANDROID 0
- #define BX_PLATFORM_EMSCRIPTEN 0
- #define BX_PLATFORM_FREEBSD 0
-+#define BX_PLATFORM_NETBSD 0
- #define BX_PLATFORM_IOS 0
- #define BX_PLATFORM_LINUX 0
- #define BX_PLATFORM_NACL 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 //
-@@ -195,6 +199,7 @@
- || BX_PLATFORM_ANDROID \
- || BX_PLATFORM_EMSCRIPTEN \
- || BX_PLATFORM_FREEBSD \
-+ || BX_PLATFORM_NETBSD \
- || BX_PLATFORM_IOS \
- || BX_PLATFORM_LINUX \
- || BX_PLATFORM_NACL \
-@@ -244,6 +249,8 @@
- BX_STRINGIZE(__EMSCRIPTEN_tiny__)
- #elif BX_PLATFORM_FREEBSD
- # define BX_PLATFORM_NAME "FreeBSD"
-+#elif BX_PLATFORM_NETBSD
-+# define BX_PLATFORM_NAME "NetBSD"
- #elif BX_PLATFORM_IOS
- # define BX_PLATFORM_NAME "iOS"
- #elif BX_PLATFORM_LINUX
diff --git a/emulators/mame/patches/patch-3rdparty_genie_build_gmake.bsd_genie.make b/emulators/mame/patches/patch-3rdparty_genie_build_gmake.bsd_genie.make
deleted file mode 100644
index a45ea3986b6..00000000000
--- a/emulators/mame/patches/patch-3rdparty_genie_build_gmake.bsd_genie.make
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-3rdparty_genie_build_gmake.bsd_genie.make,v 1.1 2015/11/13 14:11:49 wiz Exp $
-
-Remove reference to non-existing file.
-https://github.com/mamedev/mame/pull/464
-
---- 3rdparty/genie/build/gmake.bsd/genie.make.orig 2015-10-28 07:06:12.000000000 +0000
-+++ 3rdparty/genie/build/gmake.bsd/genie.make
-@@ -56,7 +56,6 @@ ifeq ($(config),release)
- $(OBJDIR)/src/host/os_chdir.o \
- $(OBJDIR)/src/host/os_copyfile.o \
- $(OBJDIR)/src/host/os_getcwd.o \
-- $(OBJDIR)/src/host/os_getversion.o \
- $(OBJDIR)/src/host/os_is64bit.o \
- $(OBJDIR)/src/host/os_isdir.o \
- $(OBJDIR)/src/host/os_isfile.o \
-@@ -134,7 +133,6 @@ ifeq ($(config),debug)
- $(OBJDIR)/src/host/os_chdir.o \
- $(OBJDIR)/src/host/os_copyfile.o \
- $(OBJDIR)/src/host/os_getcwd.o \
-- $(OBJDIR)/src/host/os_getversion.o \
- $(OBJDIR)/src/host/os_is64bit.o \
- $(OBJDIR)/src/host/os_isdir.o \
- $(OBJDIR)/src/host/os_isfile.o \
-@@ -252,10 +250,6 @@ $(OBJDIR)/src/host/os_getcwd.o: ../../sr
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
--$(OBJDIR)/src/host/os_getversion.o: ../../src/host/os_getversion.c
-- @echo $(notdir $<)
-- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
--
- $(OBJDIR)/src/host/os_is64bit.o: ../../src/host/os_is64bit.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
diff --git a/emulators/mame/patches/patch-3rdparty_genie_build_gmake.solaris_genie.make b/emulators/mame/patches/patch-3rdparty_genie_build_gmake.solaris_genie.make
deleted file mode 100644
index 28fbd900992..00000000000
--- a/emulators/mame/patches/patch-3rdparty_genie_build_gmake.solaris_genie.make
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-3rdparty_genie_build_gmake.solaris_genie.make,v 1.1 2015/11/13 14:11:49 wiz Exp $
-
-Remove reference to non-existing file.
-https://github.com/mamedev/mame/pull/464
-
---- 3rdparty/genie/build/gmake.solaris/genie.make.orig 2015-10-28 07:06:12.000000000 +0000
-+++ 3rdparty/genie/build/gmake.solaris/genie.make
-@@ -56,7 +56,6 @@ ifeq ($(config),release)
- $(OBJDIR)/src/host/os_chdir.o \
- $(OBJDIR)/src/host/os_copyfile.o \
- $(OBJDIR)/src/host/os_getcwd.o \
-- $(OBJDIR)/src/host/os_getversion.o \
- $(OBJDIR)/src/host/os_is64bit.o \
- $(OBJDIR)/src/host/os_isdir.o \
- $(OBJDIR)/src/host/os_isfile.o \
-@@ -134,7 +133,6 @@ ifeq ($(config),debug)
- $(OBJDIR)/src/host/os_chdir.o \
- $(OBJDIR)/src/host/os_copyfile.o \
- $(OBJDIR)/src/host/os_getcwd.o \
-- $(OBJDIR)/src/host/os_getversion.o \
- $(OBJDIR)/src/host/os_is64bit.o \
- $(OBJDIR)/src/host/os_isdir.o \
- $(OBJDIR)/src/host/os_isfile.o \
-@@ -252,10 +250,6 @@ $(OBJDIR)/src/host/os_getcwd.o: ../../sr
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
--$(OBJDIR)/src/host/os_getversion.o: ../../src/host/os_getversion.c
-- @echo $(notdir $<)
-- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
--
- $(OBJDIR)/src/host/os_is64bit.o: ../../src/host/os_is64bit.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
diff --git a/emulators/mame/patches/patch-src_osd_sdl_sdlptty__unix.c b/emulators/mame/patches/patch-src_osd_sdl_sdlptty__unix.c
deleted file mode 100644
index b0451afb489..00000000000
--- a/emulators/mame/patches/patch-src_osd_sdl_sdlptty__unix.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_osd_sdl_sdlptty__unix.c,v 1.1 2015/11/13 14:11:49 wiz Exp $
-
-https://github.com/mamedev/mame/pull/464
-
---- src/osd/sdl/sdlptty_unix.c.orig 2015-10-28 07:06:12.000000000 +0000
-+++ src/osd/sdl/sdlptty_unix.c
-@@ -19,6 +19,7 @@
- # include <termios.h>
- # include <libutil.h>
- #elif defined(SDLMAME_NETBSD) || defined(SDLMAME_MACOSX)
-+# include <termios.h>
- # include <util.h>
- #elif defined(SDLMAME_OPENBSD)
- # include <termios.h>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-26 07:57:06 +0000