haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

mame: Update to 0.260 (#9687)

Browse Source 
Co-authored-by: Alex Brown <mail@alexbrown.info>
This commit is contained in:
Alex Brown
2023-10-25 19:22:29 +01:00
committed by GitHub
parent 212a0d35ba
commit 6d5732fb61
2 changed files with 16 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
games-emulation/mame/mame-0.259.recipe → games-emulation/mame/mame-0.260.recipe
View File

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

67
games-emulation/mame/patches/mame-0.259.patchset → games-emulation/mame/patches/mame-0.260.patchset
View File

@@ -1,4 +1,4 @@
From 41eb3a9049489acd62679b1f93091b4acd6ee831 Mon Sep 17 00:00:00 2001
From 6851d4f5e4f6a80f53edd957618a12b0e8122823 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,10 +676,10 @@ index f0782db..5a3a636 100644
#define PLATFORM_WINDOWS (1)
#define PLATFORM_STRING "windows"
diff --git a/makefile b/makefile
index 5b75438..8044628 100644
index dcd274b..4d07cd3 100644
--- a/makefile
+++ b/makefile
@@ -221,6 +221,7 @@ GENIEOS := darwin
@@ -222,6 +222,7 @@ GENIEOS := darwin
endif
ifeq ($(firstword $(filter Haiku,$(UNAME))),Haiku)
OS := haiku
@@ -687,7 +687,7 @@ index 5b75438..8044628 100644
endif
ifndef OS
$(error Unable to detect OS from uname -a: $(UNAME))
@@ -493,6 +494,10 @@ endif
@@ -494,6 +495,10 @@ endif
ifeq ($(TARGETOS),asmjs)
OSD := sdl
endif
@@ -698,7 +698,7 @@ index 5b75438..8044628 100644
endif
#-------------------------------------------------
@@ -1504,6 +1509,28 @@ openbsd_x86_clang: generate $(PROJECTDIR)/$(MAKETYPE)-openbsd-clang/Makefile
@@ -1507,6 +1512,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 57ff069..e0ff74e 100644
2.42.0
From c280f26e99a0928ef270170eb4126f9339e26c7a Mon Sep 17 00:00:00 2001
From 1487e237bd1ae488c24d443e0d4f7ed71c275bf0 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.42.0
From cc45915060f2db673f8ef2af775b01ccfb974385 Mon Sep 17 00:00:00 2001
From 7ed9e4eead93c4ad476c20e27d4eec6f9097973d 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,19 +866,17 @@ index e0ff74e..39a0a5a 100644
2.42.0
From 9b00c17d6112b15d3d92a466b0f3af5dc1a74c65 Mon Sep 17 00:00:00 2001
From f59344c9c0d5bf335911d7a84571850dc4c45501 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
It is normally tied to X11, but we want Qt and no X11, so introduce a
special case.
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index abf4a90..4f06d1a 100644
index cc31fa5..2727ce7 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -258,14 +258,16 @@ if BASE_TARGETOS=="unix" then
@@ -274,14 +274,16 @@ if BASE_TARGETOS=="unix" then
addoptionsfromstring(str)
end
else
@@ -907,9 +905,9 @@ index abf4a90..4f06d1a 100644
2.42.0
From 8e332ff22f6cb8b19a44ba8f6a3d9daa07b6ccd3 Mon Sep 17 00:00:00 2001
From f23111e5c0ca852c6a07315f3ee6dc50a3d797af Mon Sep 17 00:00:00 2001
From: Alex Brown <mail@alexbrown.info>
Date: Sat, 14 Oct 2023 12:26:57 +0200
Date: Sat, 14 Oct 2023 11:26:57 +0100
Subject: toolchain.lua: set targetdir for Haiku
@@ -962,9 +960,9 @@ index 52d5146..0b67b44 100644
2.42.0
From 1ce9aa530282c952f9e17cf630db8e738ff13946 Mon Sep 17 00:00:00 2001
From e58a9e6354bef0cfb1dcb5778bd08af4238dd3e4 Mon Sep 17 00:00:00 2001
From: Alex Brown <mail@alexbrown.info>
Date: Sat, 14 Oct 2023 10:14:19 +0200
Date: Sat, 14 Oct 2023 09:14:19 +0100
Subject: Fix for asio from upstream
@@ -985,7 +983,7 @@ index 77edf9e..3403f1c 100644
2.42.0
From cfa4c2d158b92b4346680c83ed3f08917ab66964 Mon Sep 17 00:00:00 2001
From 095ccf75a32ce284e19a598adbbb64b1169e7bf1 Mon Sep 17 00:00:00 2001
From: Alex Brown <mail@alexbrown.info>
Date: Sun, 15 Oct 2023 07:04:21 +0100
Subject: Set LinkSupportCircularDependencies for Haiku
@@ -1010,38 +1008,3 @@ index a98ea44..05b4d85 100644
--
2.42.0
From f10abefe051bdffc2522940fb58e0fb1fff6a1ce Mon Sep 17 00:00:00 2001
From: Vas Crabb <vas@vastheman.com>
Date: Tue, 3 Oct 2023 13:48:27 +1100
Subject: [PATCH] cpu/sh: Explicitly #include prefix header (fixes GitHub
#11591).
diff --git a/src/devices/cpu/sh/sh7021.cpp b/src/devices/cpu/sh/sh7021.cpp
index 18aa0c1..458e4ff 100644
--- a/src/devices/cpu/sh/sh7021.cpp
+++ b/src/devices/cpu/sh/sh7021.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Angelo Salese
+#include "emu.h"
#include "sh7021.h"
DEFINE_DEVICE_TYPE(SH2A_SH7021, sh2a_sh7021_device, "sh2a_sh7021", "Hitachi SH-2A (SH7021)")
diff --git a/src/devices/cpu/sh/sh7032.cpp b/src/devices/cpu/sh/sh7032.cpp
index 775e7e7..e65e86c 100644
--- a/src/devices/cpu/sh/sh7032.cpp
+++ b/src/devices/cpu/sh/sh7032.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Angelo Salese
+#include "emu.h"
#include "sh7032.h"
DEFINE_DEVICE_TYPE(SH1_SH7032, sh1_sh7032_device, "sh1_sh7032", "Hitachi SH-1 (SH7032)")
--
2.42.0