<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/219f7ba6ccb43897a5820c023b85a90169b62fbd">https://github.com/macports/macports-ports/commit/219f7ba6ccb43897a5820c023b85a90169b62fbd</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 219f7ba6ccb dosbox-x: update to 2023.05.01
</span>219f7ba6ccb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 219f7ba6ccb43897a5820c023b85a90169b62fbd
</span>Author: Sriranga Veeraraghavan <srirangav@users.noreply.github.com>
AuthorDate: Tue May 2 01:26:55 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> dosbox-x: update to 2023.05.01
</span>---
emulators/dosbox-x/Portfile | 24 +++++++++++++++++-------
emulators/dosbox-x/files/patch-build-macos.diff | 19 +++++++++++++++++++
emulators/dosbox-x/files/patch-build-macosx.diff | 18 ------------------
3 files changed, 36 insertions(+), 25 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 7905f84a95e..39d0ba45006 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 2022.08.0 dosbox-x-windows-v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup joncampbell123 dosbox-x 2023.05.01 dosbox-x-v
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a97405c17b9f24c70855d5553f42f9e23122e947 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bac936ee198b607fb0cc55dfc4575e44b700dbc9138904d2e264792a6e6a941c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 67809452
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8d33a075d8ada1150db1cfb3cd0098ef491b7b28 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0aa75b873978aec41ecfee62bb103d8a17fe3566a3ebf5415245cee0dd032ebb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 68071717
</span>
categories emulators
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +53,17 @@ depends_lib path:lib/libavcodec.dylib:ffmpeg \
</span> use_autoreconf yes
autoreconf.args -fvi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append --enable-sdl2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# by default build the SDLv2 version of dosbox-x without
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# slirp (TCP/IP # emulation) support by default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --enable-sdl2 --disable-libslirp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# add a slirp variant if TCP/IP emulation is desired
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant slirp description {Use the libslirp library} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libslirp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-libslirp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# add a SDL v1.x variant because when SDL2 is used dosbox-x
# may have display issues in high color and true color modes:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +74,7 @@ variant sdl1 description {Use the SDL v1.x library} {
</span> configure.args-append --enable-sdl
depends_lib-delete port:libsdl2
depends_lib-delete port:libsdl2_net
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-build-macosx.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-build-macos.diff
</span> use_configure no
use_autoreconf no
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,7 +82,7 @@ variant sdl1 description {Use the SDL v1.x library} {
</span> if {[variant_isset sdl1]} {
build {
system -W "${workpath}/${name}-${version}/" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "PREFIX=${prefix} ./build-macosx"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "PREFIX=${prefix} ./build-macos"
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/dosbox-x/files/patch-build-macos.diff b/emulators/dosbox-x/files/patch-build-macos.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b6ef7ef928a
</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-macos.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build-macos.orig 2023-05-02 00:55:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build-macos 2023-05-02 00:56:35.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -151,10 +151,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opts="${opts} --enable-universal"
</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-debug=heavy --prefix=/usr "${opts}" "${@}" || exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ./configure --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;background:#e0ffe0;'>+ cp src/dosbox-x "src/dosbox-x-${arch}"
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index feac36b3b51..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/dosbox-x/files/patch-build-macosx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build-macosx.orig 2022-02-15 11:48:33.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build-macosx 2022-02-15 11:52:21.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,9 +72,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$brew/lib/pkgconfig"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if [ X"$PREFIX" == "X" ] ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PREFIX=/usr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ export PREFIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # now compile ourself
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo Compiling DOSBox-X
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- chmod +x configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--./configure --enable-core-inline --enable-debug=heavy --prefix=/usr $opts "$@" || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+./configure --enable-core-inline --enable-debug=heavy --prefix="$PREFIX" $opts "$@" || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- make -j3 || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>