mame: Bump to 0.286 (#13775)

This commit is contained in:
Alex Brown
2026-02-26 16:38:34 +00:00
committed by GitHub
parent 379a39ae0b
commit 5b8643bf7a
2 changed files with 18 additions and 40 deletions

View File

@@ -15,7 +15,7 @@ COPYRIGHT="1997-2024 MAMEDev and contributors"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://github.com/mamedev/mame/archive/mame${portVersion/./}.tar.gz"
CHECKSUM_SHA256="2b7ed1553ddf434692f62ded87b296931968d55e15f786a8588102880851f41c"
CHECKSUM_SHA256="ef05eb7521c841e7571b57cdd67bb729fb60ea76725a8fe27e74d805bbab9580"
SOURCE_FILENAME="mame-$portVersion.tar.gz"
SOURCE_DIR="mame-mame${portVersion/./}"
PATCHES="mame-$portVersion.patchset"

View File

@@ -1,4 +1,4 @@
From 83f82af71a649492c4e91a87ab4f8528e30ca32f Mon Sep 17 00:00:00 2001
From acd9b2f42c982dbd58d7a043aedcc792b8cbc447 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 10 Jun 2020 22:35:16 +1000
Subject: Haiku patches
@@ -676,7 +676,7 @@ index f0782db..5a3a636 100644
#define PLATFORM_WINDOWS (1)
#define PLATFORM_STRING "windows"
diff --git a/makefile b/makefile
index b689984..6b8ddb9 100644
index a39a8ca..7f08673 100644
--- a/makefile
+++ b/makefile
@@ -232,6 +232,7 @@ OS := macosx
@@ -698,7 +698,7 @@ index b689984..6b8ddb9 100644
endif
ifdef OVERRIDE_CXX
PARAMS += --CXX='$(OVERRIDE_CXX)'
@@ -1480,6 +1485,28 @@ openbsd_x86_clang: generate $(PROJECTDIR)/$(MAKETYPE)-openbsd-clang/Makefile
@@ -1471,6 +1476,28 @@ openbsd_x86_clang: generate $(PROJECTDIR)/$(MAKETYPE)-openbsd-clang/Makefile
$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-openbsd-clang config=$(CONFIG)32 precompile
$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-openbsd-clang config=$(CONFIG)32
@@ -802,7 +802,7 @@ index fa12045..5f8418d 100644
2.52.0
From f88cdfb09f49385983fea4b745fae75a852796cb Mon Sep 17 00:00:00 2001
From 812b87682598fd842e8383fa4aa1a5d366edace3 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 11 Jun 2020 08:59:34 +1000
Subject: Use stat Haiku
@@ -843,7 +843,7 @@ index dab8620..ceb2263 100644
2.52.0
From f39c52b62051f32644cf516dd1b40180c6645f01 Mon Sep 17 00:00:00 2001
From 1fe2e8f3b9eb6c818cbde112fedd929cb4ed86d9 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 11 Jun 2020 09:00:11 +1000
Subject: Disable ptty
@@ -866,14 +866,14 @@ index 5f8418d..8838b2a 100644
2.52.0
From 2d1e0dbb901dcbcd744facc0b7450a828059802f Mon Sep 17 00:00:00 2001
From 9540ee2d5c5919785208ccbc4eec6fa59bb2ab4e Mon Sep 17 00:00:00 2001
From: PulkoMandy <pulkomandy@pulkomandy.tk>
Date: Fri, 5 Aug 2022 19:24:12 +0200
Subject: Allow use of Qt Debugger on Haiku
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 86a7272..d79abe7 100644
index 814bb32..5c05e33 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -254,14 +254,16 @@ if BASE_TARGETOS=="unix" then
@@ -905,7 +905,7 @@ index 86a7272..d79abe7 100644
2.52.0
From 5b6185f21335cee27828a904faa32cabacf4e108 Mon Sep 17 00:00:00 2001
From 849a4bc671dd8794582088c71732b63a353ee388 Mon Sep 17 00:00:00 2001
From: Alex Brown <mail@alexbrown.info>
Date: Sat, 14 Oct 2023 11:26:57 +0100
Subject: toolchain.lua: set targetdir for Haiku
@@ -960,17 +960,17 @@ index 18d4755..4853c15 100644
2.52.0
From e450c575e625a61bc5d6d6fd73540d0394a4b10e Mon Sep 17 00:00:00 2001
From 05f465bb50d2ad1b31273f32cb33dcf9db5cdd8a Mon Sep 17 00:00:00 2001
From: Alex Brown <mail@alexbrown.info>
Date: Sat, 14 Oct 2023 09:14:19 +0100
Subject: Set LinkSupportCircularDependencies for Haiku
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 9cb7ee2..ffe673d 100644
index 291327c..471ad51 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -1194,6 +1194,11 @@ configuration { "freebsd or netbsd" }
@@ -1197,6 +1197,11 @@ configuration { "freebsd or netbsd" }
"LinkSupportCircularDependencies",
}
@@ -986,7 +986,7 @@ index 9cb7ee2..ffe673d 100644
2.52.0
From de2a2696403fc03e77fd9af788b2417447a30d33 Mon Sep 17 00:00:00 2001
From bc21ba482960541fae8159f0209d90c3c1e66008 Mon Sep 17 00:00:00 2001
From: PulkoMandy <pulkomandy@pulkomandy.tk>
Date: Thu, 1 May 2025 09:47:57 +0200
Subject: Fix search for Qt6
@@ -995,10 +995,10 @@ Our Qt6 qmake is located in an unusual place, for some reason not in the bin
directory.
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index 4b796a1..97cc065 100644
index fddf73b..d465ed7 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -407,7 +407,7 @@ function qtdebuggerbuild()
@@ -412,7 +412,7 @@ function qtdebuggerbuild()
if _OPTIONS["QT_HOME"]~=nil then
local MOCTST = backtick(_OPTIONS["QT_HOME"] .. "/bin/moc --version 2>/dev/null")
if MOCTST=='' then
@@ -1007,7 +1007,7 @@ index 4b796a1..97cc065 100644
if not string.starts(qt_host_libexecs,"/") then
qt_host_libexecs = _OPTIONS["QT_HOME"] .. "/libexec"
end
@@ -461,7 +461,7 @@ function qtdebuggerbuild()
@@ -466,7 +466,7 @@ function qtdebuggerbuild()
else
if _OPTIONS["QT_HOME"]~=nil then
buildoptions {
@@ -1016,7 +1016,7 @@ index 4b796a1..97cc065 100644
}
else
buildoptions {
@@ -540,9 +540,9 @@ function osdmodulestargetconf()
@@ -545,9 +545,9 @@ function osdmodulestargetconf()
end
else
if _OPTIONS["QT_HOME"]~=nil then
@@ -1029,7 +1029,7 @@ index 4b796a1..97cc065 100644
if qt_version < 60000 then
links {
diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua
index f3a970c..544d447 100644
index 400a559..5ae71be 100644
--- a/scripts/src/osd/sdl_cfg.lua
+++ b/scripts/src/osd/sdl_cfg.lua
@@ -138,7 +138,7 @@ if _OPTIONS["targetos"]=="windows" then
@@ -1044,25 +1044,3 @@ index f3a970c..544d447 100644
--
2.52.0
From b7525be256ba200f8a809d97dcde6891d95f89db Mon Sep 17 00:00:00 2001
From: Alex Brown <github@alexbrown.info>
Date: Fri, 30 Jan 2026 22:27:03 +0000
Subject: sharcops_table: include emu.h (from upstream by happppp)
diff --git a/src/devices/cpu/sharc/sharcops_table.cpp b/src/devices/cpu/sharc/sharcops_table.cpp
index 6387d3d..5bb4f5c 100644
--- a/src/devices/cpu/sharc/sharcops_table.cpp
+++ b/src/devices/cpu/sharc/sharcops_table.cpp
@@ -1,5 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Ville Linde
+
+#include "emu.h"
#include "sharc.h"
const adsp21062_device::SHARC_OP adsp21062_device::s_sharc_opcode_table[] =
--
2.52.0