MAME: bump (#5365)

* MAME: bump

* Add TEST()
This commit is contained in:
extrowerk
2020-11-05 07:55:30 +01:00
committed by GitHub
parent 49ce381e7f
commit 34b2f30565
2 changed files with 42 additions and 14 deletions

View File

@@ -15,7 +15,7 @@ COPYRIGHT="1997-2020 MAMEDev and contributors"
LICENSE="GNU GPL v2" LICENSE="GNU GPL v2"
REVISION="1" REVISION="1"
SOURCE_URI="https://github.com/mamedev/mame/archive/mame${portVersion/./}.tar.gz" SOURCE_URI="https://github.com/mamedev/mame/archive/mame${portVersion/./}.tar.gz"
CHECKSUM_SHA256="8ead65f2585fc1330215e42db1d691f18497ff6d9e561d3cced54af599da4ac0" CHECKSUM_SHA256="7c4c9ec232ba988e65fd29665c9b8e40b5ac3aa9f561eeb107cebbf08ba94baf"
SOURCE_FILENAME="mame-$portVersion.tar.gz" SOURCE_FILENAME="mame-$portVersion.tar.gz"
SOURCE_DIR="mame-mame${portVersion/./}" SOURCE_DIR="mame-mame${portVersion/./}"
PATCHES="mame-$portVersion.patchset" PATCHES="mame-$portVersion.patchset"
@@ -217,3 +217,8 @@ INSTALL()
install -m644 docs/man/*.1* "$manDir"/man1 install -m644 docs/man/*.1* "$manDir"/man1
install -m644 docs/man/*.6* "$manDir"/man6 install -m644 docs/man/*.6* "$manDir"/man6
} }
TEST()
{
make tests
}

View File

@@ -1,4 +1,4 @@
From 7a53a630ae5505b90d6455ddfa593f3926461ca3 Mon Sep 17 00:00:00 2001 From 3cd4c88bb5cc2eabf23568a1b8ff556c8ff8bd2a Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com> From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 10 Jun 2020 22:35:16 +1000 Date: Wed, 10 Jun 2020 22:35:16 +1000
Subject: Haiku patches Subject: Haiku patches
@@ -773,7 +773,7 @@ index f0782db..5a3a636 100644
#define PLATFORM_WINDOWS (1) #define PLATFORM_WINDOWS (1)
#define PLATFORM_STRING "windows" #define PLATFORM_STRING "windows"
diff --git a/makefile b/makefile diff --git a/makefile b/makefile
index 2a4c4a1..46d87b5 100644 index 4e0182d..1543f17 100644
--- a/makefile --- a/makefile
+++ b/makefile +++ b/makefile
@@ -216,6 +216,7 @@ GENIEOS := darwin @@ -216,6 +216,7 @@ GENIEOS := darwin
@@ -784,7 +784,7 @@ index 2a4c4a1..46d87b5 100644
endif endif
ifndef OS ifndef OS
$(error Unable to detect OS from uname -a: $(UNAME)) $(error Unable to detect OS from uname -a: $(UNAME))
@@ -461,6 +462,10 @@ endif @@ -471,6 +472,10 @@ endif
ifeq ($(TARGETOS),asmjs) ifeq ($(TARGETOS),asmjs)
OSD := sdl OSD := sdl
endif endif
@@ -795,7 +795,7 @@ index 2a4c4a1..46d87b5 100644
endif endif
#------------------------------------------------- #-------------------------------------------------
@@ -1628,6 +1633,28 @@ endif @@ -1643,6 +1648,28 @@ endif
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/$(MAKETYPE)-ci20 config=$(CONFIG) precompile $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/$(MAKETYPE)-ci20 config=$(CONFIG) precompile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/$(MAKETYPE)-ci20 config=$(CONFIG) $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/$(MAKETYPE)-ci20 config=$(CONFIG)
@@ -881,7 +881,7 @@ index 4f56a84..6b0c3a0 100644
#elif defined(WIN32) || defined(SDLMAME_NO64BITIO) #elif defined(WIN32) || defined(SDLMAME_NO64BITIO)
if (lseek(m_fd, off_t(std::make_unsigned_t<off_t>(offset)), SEEK_SET) < 0) if (lseek(m_fd, off_t(std::make_unsigned_t<off_t>(offset)), SEEK_SET) < 0)
diff --git a/src/osd/modules/file/posixptty.cpp b/src/osd/modules/file/posixptty.cpp diff --git a/src/osd/modules/file/posixptty.cpp b/src/osd/modules/file/posixptty.cpp
index 5b38acc..89442f6 100644 index 5ecb370..a960e80 100644
--- a/src/osd/modules/file/posixptty.cpp --- a/src/osd/modules/file/posixptty.cpp
+++ b/src/osd/modules/file/posixptty.cpp +++ b/src/osd/modules/file/posixptty.cpp
@@ -19,6 +19,10 @@ @@ -19,6 +19,10 @@
@@ -892,11 +892,11 @@ index 5b38acc..89442f6 100644
+#define _BSD_SOURCE +#define _BSD_SOURCE
+#endif +#endif
+ +
#if defined(__FreeBSD_kernel__) || defined(__DragonFly__) #if defined(__FreeBSD__) || defined(__DragonFly__)
#include <termios.h> #include <termios.h>
#include <libutil.h> #include <libutil.h>
diff --git a/src/osd/modules/render/drawbgfx.cpp b/src/osd/modules/render/drawbgfx.cpp diff --git a/src/osd/modules/render/drawbgfx.cpp b/src/osd/modules/render/drawbgfx.cpp
index e9ca64e..b1b1cf5 100644 index 39f11a2..61c4baa 100644
--- a/src/osd/modules/render/drawbgfx.cpp --- a/src/osd/modules/render/drawbgfx.cpp
+++ b/src/osd/modules/render/drawbgfx.cpp +++ b/src/osd/modules/render/drawbgfx.cpp
@@ -176,7 +176,7 @@ static void* sdlNativeWindowHandle(SDL_Window* _window) @@ -176,7 +176,7 @@ static void* sdlNativeWindowHandle(SDL_Window* _window)
@@ -909,10 +909,10 @@ index e9ca64e..b1b1cf5 100644
# endif // BX_PLATFORM_ # endif // BX_PLATFORM_
} }
-- --
2.26.0 2.28.0
From 98d0df9123729b1f5b0a0e9a7cee6136c52ac522 Mon Sep 17 00:00:00 2001 From 22fff4a338284fe1bca14b61db9111e3a8ad1b5a Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com> From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 11 Jun 2020 08:59:34 +1000 Date: Thu, 11 Jun 2020 08:59:34 +1000
Subject: Use stat Haiku Subject: Use stat Haiku
@@ -950,17 +950,17 @@ index c158af0..2d6aa3e 100644
_out.type = FileType::File; _out.type = FileType::File;
_out.size = UINT64_MAX; _out.size = UINT64_MAX;
-- --
2.26.0 2.28.0
From 614ce521d7ba9b4ef512653b478d1930e70f199d Mon Sep 17 00:00:00 2001 From 6db75a40c1da45e0a95484c894b37a708867b961 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com> From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 11 Jun 2020 09:00:11 +1000 Date: Thu, 11 Jun 2020 09:00:11 +1000
Subject: Disable ptty Subject: Disable ptty
diff --git a/src/osd/modules/file/posixptty.cpp b/src/osd/modules/file/posixptty.cpp diff --git a/src/osd/modules/file/posixptty.cpp b/src/osd/modules/file/posixptty.cpp
index 89442f6..f012e7b 100644 index a960e80..76cae4c 100644
--- a/src/osd/modules/file/posixptty.cpp --- a/src/osd/modules/file/posixptty.cpp
+++ b/src/osd/modules/file/posixptty.cpp +++ b/src/osd/modules/file/posixptty.cpp
@@ -113,7 +113,7 @@ bool posix_check_ptty_path(std::string const &path) @@ -113,7 +113,7 @@ bool posix_check_ptty_path(std::string const &path)
@@ -973,5 +973,28 @@ index 89442f6..f012e7b 100644
#else // defined(__ANDROID__) #else // defined(__ANDROID__)
#if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__)) #if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__))
-- --
2.26.0 2.28.0
From f0d45284a7b0c006ead6494f3b629c6413d4c2c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Thu, 29 Oct 2020 07:05:28 +0100
Subject: Build fix
diff --git a/src/lib/netlist/plib/palloc.h b/src/lib/netlist/plib/palloc.h
index 9243645..00fe44e 100644
--- a/src/lib/netlist/plib/palloc.h
+++ b/src/lib/netlist/plib/palloc.h
@@ -422,7 +422,7 @@ namespace plib {
#if (PUSE_ALIGNED_ALLOCATION)
#if defined(_WIN32) || defined(_WIN64) || defined(_MSC_VER)
return _aligned_malloc(size, alignment);
- #elif defined(__APPLE__) || defined(__ANDROID__)
+ #elif defined(__APPLE__) || defined(__ANDROID__) || defined(__HAIKU__)
void* p;
if (::posix_memalign(&p, alignment, size) != 0) {
p = nullptr;
--
2.28.0