<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/5972859177bf33aaf7cb82d2ab465b8a8bb8ea80">https://github.com/macports/macports-ports/commit/5972859177bf33aaf7cb82d2ab465b8a8bb8ea80</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 5972859177b uxn: update to 20220509
</span>5972859177b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5972859177bf33aaf7cb82d2ab465b8a8bb8ea80
</span>Author: aeiouaeiouaeiouaeiouaeiouaeiou <aeioudev@outlook.com>
AuthorDate: Fri May 13 23:11:07 2022 +0300
<span style='display:block; white-space:pre;color:#404040;'> uxn: update to 20220509
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * fix build on <10.7
</span>---
emulators/uxn/Portfile | 17 +++++++++++------
emulators/uxn/files/patch-uxn-build.diff | 24 ++++++++++++++++++------
2 files changed, 29 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/uxn/Portfile b/emulators/uxn/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9ecb6429bff..6927657c6fd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/uxn/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/uxn/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,10 +2,11 @@
</span>
PortSystem 1.0
PortGroup sourcehut 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span>
name uxn
<span style='display:block; white-space:pre;background:#ffe0e0;'>-sourcehut.setup rabbits uxn fec233db2ab232a1ef3eaba7d954dcf2171337eb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20220418
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+sourcehut.setup rabbits uxn e00e74b9d043fef03a3692251fb792eabfcb4cd9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20220509
</span> revision 0
categories emulators
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +23,9 @@ long_description Uxn is a virtual machine with 32 instructions. \
</span>
homepage https://100r.co/site/uxn.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2ffeb89ae7b776fb0203fa99fae8be078a6ae58c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8f0e2b9467d7c6e987a4ea0cc17962cb38293804a9cf381a0e31aefdc38f4893 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 285647
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5f9a8f78959fd81c35bc25dcf8606a0af16104d6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d4b5a8b269dd587e64de7ef997f92df232c7face1575d117493c4245c4969c85 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 285660
</span>
depends_lib port:libsdl2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,12 +38,16 @@ post-patch {
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *gcc* {clang < 500}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.cmd ${worksrcpath}/build.sh
build.args --no-run
<span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc}
</span>
destroot {
xinstall -d ${destroot}${prefix}/share/examples/${name}/demos
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${worksrcpath}/bin/launcher.rom ${destroot}${prefix}/share/examples/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${build.dir}/bin/launcher.rom ${destroot}${prefix}/share/examples/${name}
</span> xinstall -m 0644 {*}[glob ${worksrcpath}/projects/examples/demos/*.tal] \
${destroot}${prefix}/share/examples/${name}/demos
xinstall -m 0755 ${build.dir}/bin/uxnasm ${build.dir}/bin/uxncli ${build.dir}/bin/uxnemu \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/uxn/files/patch-uxn-build.diff b/emulators/uxn/files/patch-uxn-build.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 224f7a9386f..351dbb5793d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/uxn/files/patch-uxn-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/uxn/files/patch-uxn-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,16 +17,29 @@
</span> clang-format -i src/uxn.h
clang-format -i src/uxn.c
clang-format -i src/devices/system.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -81,7 +81,7 @@ MSYS_NT*|MINGW*) # MSYS2 on Windows
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,7 +68,6 @@ then
</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;'>+ mkdir -p bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CC="${CC:-cc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="${CFLAGS:--std=c89 -Wall -Wno-unknown-pragmas}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "$(uname -s 2>/dev/null)" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MSYS_NT*|MINGW*) # MSYS2 on Windows
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,7 +80,7 @@ MSYS_NT*|MINGW*) # MSYS2 on Windows
</span> ;;
Darwin) # macOS
CFLAGS="${CFLAGS} -Wno-typedef-redefinition"
- UXNEMU_LDFLAGS="$(brew --prefix)/lib/libSDL2.a $(sdl2-config --cflags --static-libs | sed -e 's/-lSDL2 //')"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ UXNEMU_LDFLAGS="-L/@PREFIX@/lib/ $(sdl2-config --cflags --libs)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UXNEMU_LDFLAGS="-L@PREFIX@/lib/ $(sdl2-config --cflags --libs)"
</span> ;;
Linux|*)
UXNEMU_LDFLAGS="-L/usr/local/lib $(sdl2-config --cflags --libs)"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -98,7 +98,7 @@ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -94,11 +93,11 @@ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="${CFLAGS} -DDEBUG -Wpedantic -Wshadow -Wextra -Werror=implicit-int -Werror=incompatible-pointer-types -Werror=int-conversion -Wvla -g -Og -fsanitize=address -fsanitize=undefined"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CORE='src/uxn.c'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS="${CFLAGS} -DNDEBUG -Os -g0 -s"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFLAGS="${CFLAGS} -DNDEBUG -Os -g0"
</span> CORE='src/uxn.c'
fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +48,7 @@
</span> ${CC} ${CFLAGS} src/uxnasm.c -o bin/uxnasm
${CC} ${CFLAGS} ${CORE} src/devices/system.c src/devices/file.c src/devices/datetime.c src/devices/mouse.c src/devices/controller.c src/devices/screen.c src/devices/audio.c src/uxnemu.c ${UXNEMU_LDFLAGS} -o bin/uxnemu
${CC} ${CFLAGS} ${CORE} src/devices/system.c src/devices/file.c src/devices/datetime.c src/uxncli.c -o bin/uxncli
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -109,19 +109,19 @@ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -109,19 +108,17 @@ then
</span> cp bin/uxnemu bin/uxnasm bin/uxncli $HOME/bin/
fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,8 +56,7 @@
</span> +echo "Assembling launcher"
./bin/uxnasm projects/software/launcher.tal bin/launcher.rom
-echo "Assembling(asma).."
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo "Assembling asma"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ./bin/uxnasm projects/software/asma.tal bin/asma.rom
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-./bin/uxnasm projects/software/asma.tal bin/asma.rom
</span>
if [ $norun = 1 ]; then exit; fi
</pre><pre style='margin:0'>
</pre>