mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
mame: bump to 0.278 (#12538)
This commit is contained in:
@@ -13,9 +13,9 @@ calculators, in addition to the arcade video games that were its initial focus."
|
||||
HOMEPAGE="https://www.mamedev.org/"
|
||||
COPYRIGHT="1997-2024 MAMEDev and contributors"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/mamedev/mame/archive/mame${portVersion/./}.tar.gz"
|
||||
CHECKSUM_SHA256="60055b19fc96306927257c5ffc265ecebcbe5c944cf98113d4d78f6304556c67"
|
||||
CHECKSUM_SHA256="ca5f44a0ed834875f8420a75587706af210ff8c5922942509bc5bfef7d45c360"
|
||||
SOURCE_FILENAME="mame-$portVersion.tar.gz"
|
||||
SOURCE_DIR="mame-mame${portVersion/./}"
|
||||
PATCHES="mame-$portVersion.patchset"
|
||||
@@ -1,4 +1,4 @@
|
||||
From 86ea8891c3aae13a69702c458383443b6c4c8abc Mon Sep 17 00:00:00 2001
|
||||
From b2595df8b9656625eaab54002e6f632c94ffdcaa 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 78351e7..08ae8de 100644
|
||||
index 44bc6ab..e1f0206 100644
|
||||
--- a/makefile
|
||||
+++ b/makefile
|
||||
@@ -230,6 +230,7 @@ OS := macosx
|
||||
@@ -231,6 +231,7 @@ OS := macosx
|
||||
GENIEOS := darwin
|
||||
else ifeq ($(firstword $(filter Haiku,$(UNAME))),Haiku)
|
||||
OS := haiku
|
||||
@@ -687,7 +687,7 @@ index 78351e7..08ae8de 100644
|
||||
endif
|
||||
|
||||
ifndef OS
|
||||
@@ -532,6 +533,10 @@ PARAMS += --CC='$(OVERRIDE_CC)'
|
||||
@@ -533,6 +534,10 @@ PARAMS += --CC='$(OVERRIDE_CC)'
|
||||
ifndef CROSS_BUILD
|
||||
CC := $(OVERRIDE_CC)
|
||||
endif
|
||||
@@ -698,7 +698,7 @@ index 78351e7..08ae8de 100644
|
||||
endif
|
||||
ifdef OVERRIDE_CXX
|
||||
PARAMS += --CXX='$(OVERRIDE_CXX)'
|
||||
@@ -1466,6 +1471,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
|
||||
|
||||
@@ -762,7 +762,7 @@ index 59e8bdb..c730cd7 100644
|
||||
|
||||
if "clangcl" == _OPTIONS["vs"] then
|
||||
diff --git a/src/osd/modules/file/posixfile.cpp b/src/osd/modules/file/posixfile.cpp
|
||||
index 8aebde2..d38a0dc 100644
|
||||
index f5dc2e9..3098b25 100644
|
||||
--- a/src/osd/modules/file/posixfile.cpp
|
||||
+++ b/src/osd/modules/file/posixfile.cpp
|
||||
@@ -100,7 +100,7 @@ public:
|
||||
@@ -784,7 +784,7 @@ index 8aebde2..d38a0dc 100644
|
||||
#elif defined(_WIN32) || defined(SDLMAME_NO64BITIO)
|
||||
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
|
||||
index 57ff069..e0ff74e 100644
|
||||
index 31604a1..73adde1 100644
|
||||
--- a/src/osd/modules/file/posixptty.cpp
|
||||
+++ b/src/osd/modules/file/posixptty.cpp
|
||||
@@ -19,6 +19,10 @@
|
||||
@@ -802,7 +802,7 @@ index 57ff069..e0ff74e 100644
|
||||
2.48.1
|
||||
|
||||
|
||||
From 3cb6a7191c1fdba3fa5b4dccdd1a3325c5c47aa1 Mon Sep 17 00:00:00 2001
|
||||
From dda7606a829c72341df7bd83247e98861d029c06 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,17 +843,17 @@ index dab8620..ceb2263 100644
|
||||
2.48.1
|
||||
|
||||
|
||||
From 55b8109ab4b808a558dfd2a7bb6129b56c7ddfd5 Mon Sep 17 00:00:00 2001
|
||||
From 726a041c1b4de4b916517eb00c80bbd9938156f6 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
|
||||
|
||||
|
||||
diff --git a/src/osd/modules/file/posixptty.cpp b/src/osd/modules/file/posixptty.cpp
|
||||
index e0ff74e..39a0a5a 100644
|
||||
index 73adde1..91a399c 100644
|
||||
--- a/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) noexcept
|
||||
@@ -114,7 +114,7 @@ bool posix_check_ptty_path(std::string const &path) noexcept
|
||||
|
||||
std::error_condition posix_open_ptty(std::uint32_t openflags, osd_file::ptr &file, std::uint64_t &filesize, std::string &name) noexcept
|
||||
{
|
||||
@@ -866,17 +866,17 @@ index e0ff74e..39a0a5a 100644
|
||||
2.48.1
|
||||
|
||||
|
||||
From 000e4647455661e12aea143854d5c77f54917221 Mon Sep 17 00:00:00 2001
|
||||
From 03f478e6c591b8c46a662ee649f4f2ab7a2e2868 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 93dba9a..79a69f1 100644
|
||||
index 86a7272..d79abe7 100644
|
||||
--- a/scripts/src/osd/sdl.lua
|
||||
+++ b/scripts/src/osd/sdl.lua
|
||||
@@ -259,14 +259,16 @@ if BASE_TARGETOS=="unix" then
|
||||
@@ -254,14 +254,16 @@ if BASE_TARGETOS=="unix" then
|
||||
addoptionsfromstring(str)
|
||||
end
|
||||
else
|
||||
@@ -905,7 +905,7 @@ index 93dba9a..79a69f1 100644
|
||||
2.48.1
|
||||
|
||||
|
||||
From e278d52a6565324af2f2c915e6d4b0d5bbfa5feb Mon Sep 17 00:00:00 2001
|
||||
From 08c1b6726c3c67116cb7324ac506aeed846fc574 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 c730cd7..5069f04 100644
|
||||
2.48.1
|
||||
|
||||
|
||||
From c6b586aa344b1ff9dccdc68604a9b25667ed14f7 Mon Sep 17 00:00:00 2001
|
||||
From 82d5654831145ed941647717dc24c0c08ff3d78e 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 819b753..926b60e 100644
|
||||
index 40368c1..fe959d6 100644
|
||||
--- a/scripts/genie.lua
|
||||
+++ b/scripts/genie.lua
|
||||
@@ -1183,6 +1183,11 @@ configuration { "freebsd or netbsd" }
|
||||
@@ -1174,6 +1174,11 @@ configuration { "freebsd or netbsd" }
|
||||
"LinkSupportCircularDependencies",
|
||||
}
|
||||
|
||||
@@ -986,7 +986,7 @@ index 819b753..926b60e 100644
|
||||
2.48.1
|
||||
|
||||
|
||||
From 839886e0047cf3182463bb54a0e0992396c11399 Mon Sep 17 00:00:00 2001
|
||||
From e0324d938e63ce5ac7d3a4bd185cae5a7086a51d 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 ca49a26..4919d85 100644
|
||||
index 7010d3c..c0efe58 100644
|
||||
--- a/scripts/src/osd/modules.lua
|
||||
+++ b/scripts/src/osd/modules.lua
|
||||
@@ -384,7 +384,7 @@ function qtdebuggerbuild()
|
||||
@@ -407,7 +407,7 @@ function qtdebuggerbuild()
|
||||
if _OPTIONS["QT_HOME"]~=nil then
|
||||
MOCTST = backtick(_OPTIONS["QT_HOME"] .. "/bin/moc --version 2>/dev/null")
|
||||
if (MOCTST=='') then
|
||||
@@ -1007,7 +1007,7 @@ index ca49a26..4919d85 100644
|
||||
if not string.starts(qt_host_libexecs,"/") then
|
||||
qt_host_libexecs = _OPTIONS["QT_HOME"] .. "/libexec"
|
||||
end
|
||||
@@ -438,7 +438,7 @@ function qtdebuggerbuild()
|
||||
@@ -461,7 +461,7 @@ function qtdebuggerbuild()
|
||||
else
|
||||
if _OPTIONS["QT_HOME"]~=nil then
|
||||
buildoptions {
|
||||
@@ -1016,7 +1016,7 @@ index ca49a26..4919d85 100644
|
||||
}
|
||||
else
|
||||
buildoptions {
|
||||
@@ -517,9 +517,9 @@ function osdmodulestargetconf()
|
||||
@@ -540,9 +540,9 @@ function osdmodulestargetconf()
|
||||
end
|
||||
else
|
||||
if _OPTIONS["QT_HOME"]~=nil then
|
||||
Reference in New Issue
Block a user