mame: Update to 0.261 (#9807)

- Removed ASIO patch as it's now upstream Co-authored-by: Alex Brown <mail@alexbrown.info>
haikuports · Dec 1, 2023 · 4af25ce · 4af25ce
1 parent 5dd56c6
commit 4af25ce
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 32 deletions.
diff --git a/games-emulation/mame/mame-0.260.recipe → games-emulation/mame/mame-0.261.recipe b/games-emulation/mame/mame-0.260.recipe → games-emulation/mame/mame-0.261.recipe
@@ -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="104ca8daab3ce7bb9637e19f1dc60a08ac6856db730ab544275567addb9541cd"
+CHECKSUM_SHA256="51d5ce1563897709ceb7a924c31a70cc5ff2bec466aab8d0cc9ff3cc72b38899"
 SOURCE_FILENAME="mame-$portVersion.tar.gz"
 SOURCE_DIR="mame-mame${portVersion/./}"
 PATCHES="mame-$portVersion.patchset"

diff --git a/...mulation/mame/patches/mame-0.260.patchset → ...mulation/mame/patches/mame-0.261.patchset b/...mulation/mame/patches/mame-0.260.patchset → ...mulation/mame/patches/mame-0.261.patchset
@@ -1,4 +1,4 @@
-From 6851d4f5e4f6a80f53edd957618a12b0e8122823 Mon Sep 17 00:00:00 2001
+From 6620c8e03eb2f41412fa4862e51c478f1d0af31f 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 dcd274b..4d07cd3 100644
+index 26e9f65..7849283 100644
 --- a/makefile
 +++ b/makefile
 @@ -222,6 +222,7 @@ GENIEOS := darwin
@@ -802,7 +802,7 @@ index 57ff069..e0ff74e 100644
 2.42.0
 
 
-From 1487e237bd1ae488c24d443e0d4f7ed71c275bf0 Mon Sep 17 00:00:00 2001
+From 1da2611683c94e4f8c6eac59e4637235a871cda0 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 7ed9e4eead93c4ad476c20e27d4eec6f9097973d Mon Sep 17 00:00:00 2001
+From 5922f0145f6fa413525f11920c24eaaef09d7f81 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.42.0
 
 
-From f59344c9c0d5bf335911d7a84571850dc4c45501 Mon Sep 17 00:00:00 2001
+From 8d69f32864c14d56a20018e0e8039b253abab5e2 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
@@ -905,7 +905,7 @@ index cc31fa5..2727ce7 100644
 2.42.0
 
 
-From f23111e5c0ca852c6a07315f3ee6dc50a3d797af Mon Sep 17 00:00:00 2001
+From fe3451743dc21be2e74dc8fec98a55cd58864c86 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,37 +960,14 @@ index 52d5146..0b67b44 100644
 2.42.0
 
 
-From e58a9e6354bef0cfb1dcb5778bd08af4238dd3e4 Mon Sep 17 00:00:00 2001
+From e434f83007fadad2b19a6e484ae50d233014d1a5 Mon Sep 17 00:00:00 2001
 From: Alex Brown <mail@alexbrown.info>
 Date: Sat, 14 Oct 2023 09:14:19 +0100
-Subject: Fix for asio from upstream
-
-
-diff --git a/3rdparty/asio/include/asio/detail/impl/socket_ops.ipp b/3rdparty/asio/include/asio/detail/impl/socket_ops.ipp
-index 77edf9e..3403f1c 100644
---- a/3rdparty/asio/include/asio/detail/impl/socket_ops.ipp
-+++ b/3rdparty/asio/include/asio/detail/impl/socket_ops.ipp
-@@ -641,7 +641,7 @@ bool sockatmark(socket_type s, asio::error_code& ec)
- # endif // defined(ENOTTY)
- #else // defined(SIOCATMARK)
-   int value = ::sockatmark(s);
--  get_last_error(ec, result < 0);
-+  get_last_error(ec, value < 0);
- #endif // defined(SIOCATMARK)
-
-   return ec ? false : value != 0;
--- 
-2.42.0
-
-
-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
 
 
 diff --git a/scripts/genie.lua b/scripts/genie.lua
-index a98ea44..05b4d85 100644
+index 9bf68e1..b072bfe 100644
 --- a/scripts/genie.lua
 +++ b/scripts/genie.lua
 @@ -1243,6 +1243,11 @@ configuration { "freebsd or netbsd" }