dosbox-x: update to 2026.07.02

This commit is contained in:
Nils Breunese
2026-07-04 01:54:10 +02:00
committed by Herby Gillot
parent c2d1e785e2
commit cefa830725
4 changed files with 4 additions and 68 deletions
+4 -6
View File
@@ -6,13 +6,13 @@ PortGroup legacysupport 1.0
PortGroup app 1.0
PortGroup muniversal 1.0
github.setup joncampbell123 dosbox-x 2026.03.29 dosbox-x-v
github.setup joncampbell123 dosbox-x 2026.07.02 dosbox-x-v
github.tarball_from archive
revision 0
checksums rmd160 150a2bffb1ec04155f2d2cfd31facaf4355f9df2 \
sha256 c244c1910444a0ad886d9bae05cc72b3ef036e340d5e2fc33edf364c0dce344e \
size 132971542
checksums rmd160 b69edbe1cd2b868e77c8473343e83f381db9f25f \
sha256 ca380ea617ce2d9165f379e6d01a481ec5a26fcf4fa31490e1e04ffdb4030730 \
size 133051734
categories emulators
license GPL-2+
@@ -29,8 +29,6 @@ long_description DOSBox is a DOS emulator supporting 286/386 realmode, direct
homepage https://dosbox-x.com
patchfiles patch-configure-metal-link.diff
supported_archs i386 x86_64 arm64
set ffmpeg_ver 7
@@ -1,26 +0,0 @@
--- configure.ac.orig 2025-03-28 00:00:00.000000000 +0000
+++ configure.ac 2025-03-28 00:00:00.000000000 +0000
@@ -674,18 +674,23 @@ AC_MSG_CHECKING([for Metal support])
case "$host_os" in
darwin*)
AC_LANG_PUSH([Objective C++])
+ saved_LIBS="$LIBS"
+ LIBS="$LIBS -framework Metal -framework QuartzCore"
+
AC_LINK_IFELSE(
[AC_LANG_PROGRAM([[
#import <Metal/Metal.h>
]], [[
id<MTLDevice> device = MTLCreateSystemDefaultDevice();
return (device == nil);
]])],
[have_metal=yes],
[have_metal=no]
)
+
+ LIBS="$saved_LIBS"
AC_LANG_POP
;;
esac
@@ -1,25 +0,0 @@
work around no convertRectToScreen on < 10.7
Of note, it looks a lot like the new convertPointToScreen is just the old convertBaseToScreen
in new clothes... what goes around comes around, I guess
--- src/gui/menu_osx.mm.orig 2020-09-02 12:14:28.000000000 -0700
+++ src/gui/menu_osx.mm 2020-09-02 12:16:38.000000000 -0700
@@ -511,7 +511,16 @@
// NTS: This did not appear until Mojave, and some followers on Github prefer to compile for somewhat older versions of OS X
// NSPoint pt = [wnd convertPointToScreen:NSMakePoint(rct.size.width / 2, rct.size.height / 2)];
// NTS: convertRectToScreen however is documented to exist since 10.7, unless Apple got that wrong too...
- NSPoint pt = [wnd convertRectToScreen:NSMakeRect(rct.size.width / 2, rct.size.height / 2, 0, 0)].origin; /* x,y,w,h */
+ NSPoint pt = {0,0};
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
+ if ([wnd respondsToSelector:@selector(convertRectToScreen:)]) {
+ pt = [wnd convertRectToScreen:NSMakeRect(rct.size.width / 2, rct.size.height / 2, 0, 0)].origin; /* x,y,w,h */
+ } else {
+ pt = [wnd convertBaseToScreen:NSMakeRect(rct.size.width / 2, rct.size.height / 2, 0, 0).origin]; /* x,y,w,h */
+ }
+#else
+ pt = [wnd convertBaseToScreen:NSMakeRect(rct.size.width / 2, rct.size.height / 2, 0, 0).origin]; /* x,y,w,h */
+#endif
{
/* Eugh this ugliness wouldn't be necessary if we didn't have to fudge relative to primary display. */
@@ -1,11 +0,0 @@
--- ./src/gui/menu_osx.mm.orig 2020-09-02 23:45:46.000000000 -0700
+++ ./src/gui/menu_osx.mm 2020-09-02 23:46:11.000000000 -0700
@@ -517,7 +517,7 @@
pt.y = (prct.origin.y + prct.size.height) - pt.y;
}
- err = CGGetDisplaysWithPoint(pt,1,&did,&cnt);
+ err = CGGetDisplaysWithPoint(CGPointMake(pt.x,pt.y),1,&did,&cnt);
/* This might happen if our window is so far off the screen that the center point does not match any monitor */
if (err != kCGErrorSuccess) {