From 63174ca26eb7c047add3b642ac3f958ade61f188 Mon Sep 17 00:00:00 2001 From: Alex Brown Date: Fri, 10 Jan 2025 14:12:53 +0000 Subject: [PATCH] mame: bump to 0.273 (#11636) --- .../{mame-0.272.recipe => mame-0.273.recipe} | 2 +- ...ame-0.272.patchset => mame-0.273.patchset} | 32 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) rename games-emulation/mame/{mame-0.272.recipe => mame-0.273.recipe} (98%) rename games-emulation/mame/patches/{mame-0.272.patchset => mame-0.273.patchset} (98%) diff --git a/games-emulation/mame/mame-0.272.recipe b/games-emulation/mame/mame-0.273.recipe similarity index 98% rename from games-emulation/mame/mame-0.272.recipe rename to games-emulation/mame/mame-0.273.recipe index 4a5de1339..b41ee36f9 100644 --- a/games-emulation/mame/mame-0.272.recipe +++ b/games-emulation/mame/mame-0.273.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="cd83bff2f8acf72bdb105ba8e899b49ad09c25cee8a8a063ae27a954fe0dc097" +CHECKSUM_SHA256="37d73e7772bd78ffffabac69a694323f37fd2215f1b5244e05b872c0154785fd" SOURCE_FILENAME="mame-$portVersion.tar.gz" SOURCE_DIR="mame-mame${portVersion/./}" PATCHES="mame-$portVersion.patchset" diff --git a/games-emulation/mame/patches/mame-0.272.patchset b/games-emulation/mame/patches/mame-0.273.patchset similarity index 98% rename from games-emulation/mame/patches/mame-0.272.patchset rename to games-emulation/mame/patches/mame-0.273.patchset index 7f3ece8df..5604019c0 100644 --- a/games-emulation/mame/patches/mame-0.272.patchset +++ b/games-emulation/mame/patches/mame-0.273.patchset @@ -1,4 +1,4 @@ -From 73b72d231b5e46c6de2c0e77e96edcd38c8e7893 Mon Sep 17 00:00:00 2001 +From 92a58a87f95ae2f4733851c18008e747338735e5 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 @@ -559,7 +559,7 @@ index 0000000..73f650c + -include $(OBJDIR)/$(notdir $(PCH))_objc.d +endif diff --git a/3rdparty/genie/makefile b/3rdparty/genie/makefile -index 48f6fb8..b844440 100644 +index 9df2558..0d7c04e 100644 --- a/3rdparty/genie/makefile +++ b/3rdparty/genie/makefile @@ -4,7 +4,7 @@ @@ -596,7 +596,7 @@ index 48f6fb8..b844440 100644 $(SILENT) $(MAKE) -C build/$(PROJECT_TYPE).$(OS) clean all @@ -56,6 +61,7 @@ release-linux: $(GENIE) $(SILENT) $(GENIE) release - $(SILENT) $(MAKE) -C build/$(PROJECT_TYPE).darwin clean all CC=x86_64-apple-darwin15-clang + $(SILENT) $(MAKE) -C build/$(PROJECT_TYPE).darwin clean all CC=x86_64-apple-darwin20.2-clang $(SILENT) $(MAKE) -C build/$(PROJECT_TYPE).linux clean all + $(SILENT) $(MAKE) -C build/$(PROJECT_TYPE).haiku clean all $(SILENT) $(MAKE) -C build/$(PROJECT_TYPE).windows clean all CC=x86_64-w64-mingw32-gcc @@ -608,7 +608,7 @@ index 48f6fb8..b844440 100644 cp bin/darwin/genie ../bx/tools/bin/darwin/ + cp bin/haiku/genie ../bx/tools/bin/haiku/ diff --git a/3rdparty/genie/scripts/genie.lua b/3rdparty/genie/scripts/genie.lua -index de53725..84c6b2b 100644 +index 291dd52..ecf886e 100644 --- a/3rdparty/genie/scripts/genie.lua +++ b/3rdparty/genie/scripts/genie.lua @@ -91,6 +91,11 @@ @@ -636,7 +636,7 @@ index d1173d5..39bcaa5 100644 print("") print( "Finished.") diff --git a/3rdparty/genie/src/base/cmdline.lua b/3rdparty/genie/src/base/cmdline.lua -index c3357b7..dcdc637 100644 +index 0127cef..06aa6c1 100644 --- a/3rdparty/genie/src/base/cmdline.lua +++ b/3rdparty/genie/src/base/cmdline.lua @@ -57,6 +57,7 @@ @@ -648,7 +648,7 @@ index c3357b7..dcdc637 100644 } diff --git a/3rdparty/genie/src/base/os.lua b/3rdparty/genie/src/base/os.lua -index ae88c0a..b2c1cfa 100644 +index 3cddcbb..b533bf1 100644 --- a/3rdparty/genie/src/base/os.lua +++ b/3rdparty/genie/src/base/os.lua @@ -66,6 +66,9 @@ @@ -676,7 +676,7 @@ index f0782db..5a3a636 100644 #define PLATFORM_WINDOWS (1) #define PLATFORM_STRING "windows" diff --git a/makefile b/makefile -index 0276fb0..3b07b4c 100644 +index baad79b..ca12747 100644 --- a/makefile +++ b/makefile @@ -224,6 +224,7 @@ GENIEOS := darwin @@ -728,7 +728,7 @@ index 0276fb0..3b07b4c 100644 # Clean/bootstrap #------------------------------------------------- diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua -index 966d55d..52d5146 100644 +index 3181d25..6c0af7e 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -34,6 +34,7 @@ newoption { @@ -758,7 +758,7 @@ index 966d55d..52d5146 100644 + if "haiku" == _OPTIONS["gcc"] then + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-haiku") + end - elseif _ACTION == "vs2019" then + elseif _ACTION == "vs2022" then if "clangcl" == _OPTIONS["vs"] then diff --git a/src/osd/modules/file/posixfile.cpp b/src/osd/modules/file/posixfile.cpp @@ -802,7 +802,7 @@ index 57ff069..e0ff74e 100644 2.45.2 -From c09439f40d0e088967b1b6395f0d5d48c76ee648 Mon Sep 17 00:00:00 2001 +From 7cb4669e21393b4def05b87b879609171aff16e5 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.45.2 -From e9e6c699151149eaa111b714bd3bf6941bb6f3a5 Mon Sep 17 00:00:00 2001 +From 809e62d0899b118a35e6666133e0e45d795168c8 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,7 +866,7 @@ index e0ff74e..39a0a5a 100644 2.45.2 -From cc430bf17d8b01c0d3ebea680b6f50c2dfd05261 Mon Sep 17 00:00:00 2001 +From 22d570a44ad6914f63ce0045101061101db3202a 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 @@ -905,14 +905,14 @@ index cc31fa5..2727ce7 100644 2.45.2 -From 72f48de46eff24b8f18ce92547f1739b722aafa3 Mon Sep 17 00:00:00 2001 +From 4e161eaeae8f80d529da98d11b55751d4a15a89a 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 52d5146..0b67b44 100644 +index 6c0af7e..5042979 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -61,7 +61,8 @@ function androidToolchainRoot() @@ -960,14 +960,14 @@ index 52d5146..0b67b44 100644 2.45.2 -From 26d3c3f291392ee9f54da70862461bdafcf6eecb Mon Sep 17 00:00:00 2001 +From ebea58d6f396b647331e7e2a7a2204d56e85637f 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 5997782..90de339 100644 +index 481ceb1..743e867 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -1238,6 +1238,11 @@ configuration { "freebsd or netbsd" }