<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c6d7aecdb0e9b5e78ad119f88c8853f9c8c33a21">https://github.com/macports/macports-ports/commit/c6d7aecdb0e9b5e78ad119f88c8853f9c8c33a21</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c6d7aecdb0e dosbox-x: update to 0.83.18 and add arm as a supported arch
</span>c6d7aecdb0e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c6d7aecdb0e9b5e78ad119f88c8853f9c8c33a21
</span>Author: Sriranga Veeraraghavan <srirangav@users.noreply.github.com>
AuthorDate: Tue Oct 12 23:01:34 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> dosbox-x: update to 0.83.18 and add arm as a supported arch
</span>---
emulators/dosbox-x/Portfile | 15 +++++++--------
emulators/dosbox-x/files/patch-futimens.diff | 6 +++---
emulators/dosbox-x/files/patch-mactypes.diff | 15 ++++++++++++---
3 files changed, 22 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/dosbox-x/Portfile b/emulators/dosbox-x/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f8da8d2742c..6ef83f9fcab 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/dosbox-x/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/dosbox-x/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,13 +5,14 @@ PortGroup github 1.0
</span> PortGroup legacysupport 1.0
PortGroup app 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup joncampbell123 dosbox-x 0.83.7 dosbox-x-v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup joncampbell123 dosbox-x 0.83.18 dosbox-x-v
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 cd4edafe72c77e00166151c1fcc7d2e772d99db7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9cdfa3267c340a869255d8eb1c4ebf4adde47c22854e1d013da22190350bfbb3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 47403831
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ea6b903cd2cec53139a575b20d0c9ea3311ebfb7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e80d5ad8f79c28422207bba676bc3524c1f94c4df9587cb33d28eb2e8e3792df \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 62659195
</span>
categories emulators
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,11 +32,9 @@ homepage https://dosbox-x.com
</span> github.tarball_from archive
patchfiles patch-futimens.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-mactypes.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-convertbasetorect.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-menu-osx-cgpointfix.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-mactypes.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs i386 x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs i386 x86_64 arm64
</span>
# build also looks for nasm, but doesn't use it even if it is found
depends_build-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/dosbox-x/files/patch-futimens.diff b/emulators/dosbox-x/files/patch-futimens.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9af6e1172ba..e1af3f6a4d0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/dosbox-x/files/patch-futimens.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/dosbox-x/files/patch-futimens.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/dos/drive_local.cpp.orig 2020-08-28 17:21:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/dos/drive_local.cpp 2020-08-28 17:28:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,6 +59,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/dos/drive_local.cpp.orig 2021-10-12 22:39:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/dos/drive_local.cpp 2021-10-12 22:41:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -107,6 +107,16 @@
</span> #define MAX_PATH PATH_MAX
#endif
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/dosbox-x/files/patch-mactypes.diff b/emulators/dosbox-x/files/patch-mactypes.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d1cd08294b6..2021385bf38 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/dosbox-x/files/patch-mactypes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/dosbox-x/files/patch-mactypes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/menu_osx.mm.orig 2020-08-28 22:30:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/menu_osx.mm 2020-08-28 22:31:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9,7 +9,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/menu_macos.mm.orig 2021-10-12 22:35:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/menu_macos.mm 2021-10-12 22:44:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,7 +10,9 @@
</span> #include "SDL_syswm.h"
#if DOSBOXMENU_TYPE == DOSBOXMENU_NSMENU /* Mac OS X NSMenu / NSMenuItem handle */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,3 +10,12 @@
</span> # include <Cocoa/Cocoa.h>
# include <Foundation/NSString.h>
# include <ApplicationServices/ApplicationServices.h>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -587,7 +589,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pt.y = (prct.origin.y + prct.size.height) - pt.y;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- err = CGGetDisplaysWithPoint(pt,1,&did,&cnt);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err = CGGetDisplaysWithPoint(CGPointMake(pt.x,pt.y),1,&did,&cnt);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* This might happen if our window is so far off the screen that the center point does not match any monitor */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (err != kCGErrorSuccess) {
</span></pre><pre style='margin:0'>
</pre>