<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/69d9a23dd17c6811310f4761265943fe3e6665fd">https://github.com/macports/macports-ports/commit/69d9a23dd17c6811310f4761265943fe3e6665fd</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 69d9a23dd17 dosbox-x: update to version 0.83.22, add sdl1 variant
</span>69d9a23dd17 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 69d9a23dd17c6811310f4761265943fe3e6665fd
</span>Author: Sriranga Veeraraghavan <srirangav@users.noreply.github.com>
AuthorDate: Wed Feb 16 19:01:47 2022 -0800
<span style='display:block; white-space:pre;color:#404040;'> dosbox-x: update to version 0.83.22, add sdl1 variant
</span>---
emulators/dosbox-x/Portfile | 29 ++++++++++++++++++++----
emulators/dosbox-x/files/patch-build-macosx.diff | 18 +++++++++++++++
emulators/dosbox-x/files/patch-futimens.diff | 12 +++++-----
3 files changed, 49 insertions(+), 10 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 eb7547c6a73..e6cfede0ae0 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;'>@@ -7,12 +7,12 @@ PortGroup app 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup joncampbell123 dosbox-x 0.83.21 dosbox-x-v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup joncampbell123 dosbox-x 0.83.22 dosbox-x-v
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2ea3e59d95bd6e1f0e570fe76e889da37bb89a60 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ec13bf16a9761c755df25f8b780aee589e328bcd490ac372538f8a87846456a2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 64428183
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 653142e839326ce5deefa1fb7e60d42fd7cfa5b0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 75c5c1eb3b78701a80ad816f414640894cb0b5998a1a4d7f2af064b47a57b8c9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 64487045
</span>
categories emulators
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,6 +55,27 @@ autoreconf.args -fvi
</span>
configure.args-append --enable-sdl2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# add a SDL v1.x variant because when SDL2 is used dosbox-x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# may have display issues in high color and true color modes:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/joncampbell123/dosbox-x/issues/1431
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant sdl1 description {Use the SDL v1.x library} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --enable-sdl2 --disable-sdl2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-sdl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:libsdl2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:libsdl2_net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-build-macosx.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_autoreconf no
</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;'>+if {[variant_isset sdl1]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W "${workpath}/${name}-${version}/" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "PREFIX=${prefix} ./build-macosx"
</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;'>+
</span> # needs "___cpu_model" in compiler.rt
compiler.blacklist-append {clang < 900}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/dosbox-x/files/patch-build-macosx.diff b/emulators/dosbox-x/files/patch-build-macosx.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..feac36b3b51
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/dosbox-x/files/patch-build-macosx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build-macosx.orig 2022-02-15 11:48:33.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build-macosx 2022-02-15 11:52:21.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -72,9 +72,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$brew/lib/pkgconfig"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if [ X"$PREFIX" == "X" ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PREFIX=/usr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ export PREFIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # now compile ourself
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo Compiling DOSBox-X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chmod +x configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-./configure --enable-core-inline --enable-debug=heavy --prefix=/usr $opts "$@" || exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++./configure --enable-core-inline --enable-debug=heavy --prefix="$PREFIX" $opts "$@" || exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make -j3 || exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><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 e1af3f6a4d0..e4359670030 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 2021-10-12 22:39:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/dos/drive_local.cpp 2021-10-12 22:41:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -107,6 +107,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/dos/drive_local.cpp.orig 2022-01-31 18:05:19.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/dos/drive_local.cpp 2022-02-14 14:11:35.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,6 +92,16 @@
</span> #define MAX_PATH PATH_MAX
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,6 +14,6 @@
</span> +}
+#endif
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Windows: Use UTF-16 (wide char)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // TODO: Offer an option to NOT use wide char on Windows if directed by config.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint16_t ldid[256];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string ldir[256];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static host_cnv_char_t cpcnv_temp[4096];
</span></pre><pre style='margin:0'>
</pre>