diff --git a/games-emulation/mame/mame-0.276.recipe b/games-emulation/mame/mame-0.277.recipe similarity index 98% rename from games-emulation/mame/mame-0.276.recipe rename to games-emulation/mame/mame-0.277.recipe index fc33b6403..bd167ce74 100644 --- a/games-emulation/mame/mame-0.276.recipe +++ b/games-emulation/mame/mame-0.277.recipe @@ -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="965dfc33d720b4c3c6e425d5959540bd0bac88e96b878a8560678c2f5b43c44f" +CHECKSUM_SHA256="60055b19fc96306927257c5ffc265ecebcbe5c944cf98113d4d78f6304556c67" SOURCE_FILENAME="mame-$portVersion.tar.gz" SOURCE_DIR="mame-mame${portVersion/./}" PATCHES="mame-$portVersion.patchset" diff --git a/games-emulation/mame/patches/mame-0.276.patchset b/games-emulation/mame/patches/mame-0.277.patchset similarity index 96% rename from games-emulation/mame/patches/mame-0.276.patchset rename to games-emulation/mame/patches/mame-0.277.patchset index 2993cb178..62f4773ea 100644 --- a/games-emulation/mame/patches/mame-0.276.patchset +++ b/games-emulation/mame/patches/mame-0.277.patchset @@ -1,4 +1,4 @@ -From 10dd29c70b56de76f9ed761024a68569e86f363d Mon Sep 17 00:00:00 2001 +From 8750f4b58380e36b325ed359fc206e9279d5a397 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,29 +676,29 @@ index f0782db..5a3a636 100644 #define PLATFORM_WINDOWS (1) #define PLATFORM_STRING "windows" diff --git a/makefile b/makefile -index 5aa597e..0076c4c 100644 +index 78351e7..08ae8de 100644 --- a/makefile +++ b/makefile -@@ -223,6 +223,7 @@ GENIEOS := darwin - endif - ifeq ($(firstword $(filter Haiku,$(UNAME))),Haiku) +@@ -230,6 +230,7 @@ OS := macosx + GENIEOS := darwin + else ifeq ($(firstword $(filter Haiku,$(UNAME))),Haiku) OS := haiku +GENIEOS := haiku endif + ifndef OS - $(error Unable to detect OS from uname -a: $(UNAME)) -@@ -494,6 +495,10 @@ endif - ifeq ($(TARGETOS),asmjs) - OSD := sdl +@@ -532,6 +533,10 @@ PARAMS += --CC='$(OVERRIDE_CC)' + ifndef CROSS_BUILD + CC := $(OVERRIDE_CC) endif + +ifeq ($(TARGETOS),haiku) +OSD := sdl +endif endif - - #------------------------------------------------- -@@ -1515,6 +1520,28 @@ openbsd_x86_clang: generate $(PROJECTDIR)/$(MAKETYPE)-openbsd-clang/Makefile + ifdef OVERRIDE_CXX + PARAMS += --CXX='$(OVERRIDE_CXX)' +@@ -1466,6 +1471,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 @@ -728,7 +728,7 @@ index 5aa597e..0076c4c 100644 # Clean/bootstrap #------------------------------------------------- diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua -index 3181d25..6c0af7e 100644 +index 59e8bdb..c730cd7 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -34,6 +34,7 @@ newoption { @@ -739,7 +739,7 @@ index 3181d25..6c0af7e 100644 }, } -@@ -162,6 +163,10 @@ function toolchain(_buildDir, _subDir) +@@ -157,6 +158,10 @@ function toolchain(_buildDir, _subDir) location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-linux-clang") end @@ -748,9 +748,9 @@ index 3181d25..6c0af7e 100644 + end + if "mingw32-gcc" == _OPTIONS["gcc"] then - if not os.getenv("MINGW32") then - print("Set MINGW32 envrionment variable.") -@@ -211,6 +216,10 @@ function toolchain(_buildDir, _subDir) + if toolchainPrefix == nil or toolchainPrefix == "" then + if not os.getenv("MINGW32") then +@@ -206,6 +211,10 @@ function toolchain(_buildDir, _subDir) premake.gcc.ar = toolchainPrefix .. "ar" location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-osx-clang") end @@ -799,10 +799,10 @@ index 57ff069..e0ff74e 100644 #include #include -- -2.45.2 +2.48.1 -From f3503458fabb420563a87537dacd758678c4394b Mon Sep 17 00:00:00 2001 +From d5e923e7c1ba3c8e16599c45a2ac932da073a52a 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 @@ -840,10 +840,10 @@ index dab8620..ceb2263 100644 _out.type = FileType::File; _out.size = UINT64_MAX; -- -2.45.2 +2.48.1 -From d977802f8be05829bd2886149cc711f88f453578 Mon Sep 17 00:00:00 2001 +From 0488c4a5961b38cacfaaf50be669877ed9b66afd 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 @@ -863,17 +863,17 @@ index e0ff74e..39a0a5a 100644 #else // defined(__ANDROID__) // TODO: handling of the slave path is insecure - should use ptsname_r/ttyname_r in a loop -- -2.45.2 +2.48.1 -From 3b62a99e664720a3a8c16e4b70c064e852d48da0 Mon Sep 17 00:00:00 2001 +From 05f9b98fd6e385f2eb1044bfbb006ce787868f72 Mon Sep 17 00:00:00 2001 From: PulkoMandy 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 3115c4d..91389aa 100644 +index 93dba9a..79a69f1 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -259,14 +259,16 @@ if BASE_TARGETOS=="unix" then @@ -902,17 +902,17 @@ index 3115c4d..91389aa 100644 local str = backtick(sdlconfigcmd() .. " --libs") addlibfromstring(str) -- -2.45.2 +2.48.1 -From 5f2043102e59e1ff604bba7af5da70400d8b7964 Mon Sep 17 00:00:00 2001 +From 2bc790bed38750d54cd6f7c084e6d8ff0cdc6cb4 Mon Sep 17 00:00:00 2001 From: Alex Brown Date: Sat, 14 Oct 2023 11:26:57 +0100 Subject: toolchain.lua: set targetdir for Haiku diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua -index 6c0af7e..5042979 100644 +index c730cd7..5069f04 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -61,7 +61,8 @@ function androidToolchainRoot() @@ -925,7 +925,7 @@ index 6c0af7e..5042979 100644 } android.toolchainRoot = (os.getenv("ANDROID_NDK_HOME") or "") .. "/toolchains/llvm/prebuilt/" .. hostTags[os.get()] end -@@ -609,6 +610,30 @@ function toolchain(_buildDir, _subDir) +@@ -604,6 +605,30 @@ function toolchain(_buildDir, _subDir) configuration { "osx*", "arm64", "Release" } targetdir (_buildDir .. "osx_clang" .. "/bin/x64/Release") @@ -957,20 +957,20 @@ index 6c0af7e..5042979 100644 targetdir (_buildDir .. "osx_clang" .. "/bin/x64/Debug") -- -2.45.2 +2.48.1 -From 402435ef9a45d1e010b24114fda9cf287c491634 Mon Sep 17 00:00:00 2001 +From 636f530628959f4ef15efcc5ab22cbed1259c2c3 Mon Sep 17 00:00:00 2001 From: Alex Brown 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 fab53da..6c863f0 100644 +index 819b753..926b60e 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua -@@ -1241,6 +1241,11 @@ configuration { "freebsd or netbsd" } +@@ -1183,6 +1183,11 @@ configuration { "freebsd or netbsd" } "LinkSupportCircularDependencies", } @@ -983,5 +983,5 @@ index fab53da..6c863f0 100644 links { "pthread", -- -2.45.2 +2.48.1