<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/3b36d721c4afec2e3c0940c9aee3545b20fa17ef">https://github.com/macports/macports-ports/commit/3b36d721c4afec2e3c0940c9aee3545b20fa17ef</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 3b36d721c4a uxn: update to 20230814
</span>3b36d721c4a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3b36d721c4afec2e3c0940c9aee3545b20fa17ef
</span>Author: aeiouaeiouaeiouaeiouaeiouaeiou <aeioudev@outlook.com>
AuthorDate: Mon Aug 14 14:26:01 2023 +0300
<span style='display:block; white-space:pre;color:#404040;'> uxn: update to 20230814
</span>---
emulators/uxn/Portfile | 11 +++---
emulators/uxn/files/patch-uxn-build.diff | 67 +++++---------------------------
2 files changed, 15 insertions(+), 63 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 2b799eb5ccc..a6e2293e000 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;'>@@ -5,8 +5,8 @@ PortGroup sourcehut 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name uxn
<span style='display:block; white-space:pre;background:#ffe0e0;'>-sourcehut.setup rabbits uxn f07775a9a2e9c8f7dd0b78a1404ac67aaa3d697a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20230217
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+sourcehut.setup rabbits uxn a77434a67108cddf05d1c76f415c7f180d3707b4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20230814
</span> revision 0
categories emulators
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,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 859c5a4503d9519f39ea51231b3aafc9eff25eba \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1ad8913c583162a9ab4a5d36a48cc27e4d68912c876e48d81e5cf8b177bf81ae \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 285968
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0c1411a64883f371bb950486d3c4888ea5327825 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2e80fe31befee58237bbab8a0e71017d3ae4a040ae4440208f5aa7d6cddb53f4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 298524
</span>
depends_lib port:libsdl2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +40,7 @@ use_configure no
</span>
compiler.blacklist-append \
*gcc* {clang < 500}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append -std=c89 -D_C99_SOURCE
</span>
build.cmd ${worksrcpath}/build.sh
build.args --no-run
<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 ca776fd862e..9c824151a96 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;'>@@ -6,24 +6,7 @@
</span>
format=0
console=0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,14 +38,14 @@ while [ $# -gt 0 ]; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo "Cleaning.."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo "Cleaning"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f ./bin/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # When clang-format is present
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ $format = 1 ];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo "Formatting.."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo "Formatting"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clang-format -i src/devices/system.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clang-format -i src/devices/system.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clang-format -i src/devices/screen.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,8 +66,6 @@ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,8 +51,6 @@ then
</span> fi
mkdir -p bin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,54 +15,22 @@
</span> case "$(uname -s 2>/dev/null)" in
MSYS_NT*|MINGW*) # MSYS2 on Windows
FILE_LDFLAGS="-liberty"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -79,8 +77,7 @@ MSYS_NT*|MINGW*) # MSYS2 on Windows
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,8 +62,7 @@ MSYS_NT*|MINGW*) # MSYS2 on Windows
</span> fi
;;
Darwin) # macOS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS="${CFLAGS} -Wno-typedef-redefinition"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS="${CFLAGS} -Wno-typedef-redefinition -D_C99_SOURCE"
</span> - UXNEMU_LDFLAGS="$(brew --prefix)/lib/libSDL2.a $(sdl2-config --cflags --static-libs | sed -e 's/-lSDL2 //')"
+ UXNEMU_LDFLAGS="-L@PREFIX@/lib/ $(sdl2-config --cflags --libs)"
;;
Linux|*)
UXNEMU_LDFLAGS="-L/usr/local/lib $(sdl2-config --cflags --libs)"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -93,14 +90,13 @@ then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>- CORE='src/uxn.c'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS="${CFLAGS} -DNDEBUG -Os -g0 -s"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CORE='src/uxn.c'
</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;'>--echo "Building.."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--${CC} ${CFLAGS} src/uxnasm.c -o bin/uxnasm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--${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} ${FILE_LDFLAGS} -o bin/uxnemu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--${CC} ${CFLAGS} ${CORE} src/devices/system.c src/devices/file.c src/devices/datetime.c src/uxncli.c ${FILE_LDFLAGS} -o bin/uxncli
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo "Building"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+${CC} ${CFLAGS} ${LDFLAGS} -std=c89 src/uxnasm.c -o bin/uxnasm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+${CC} ${CFLAGS} ${CORE} ${LDFLAGS} -std=c89 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} ${FILE_LDFLAGS} -o bin/uxnemu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+${CC} ${CFLAGS} ${CORE} ${LDFLAGS} -std=c89 src/devices/system.c src/devices/file.c src/devices/datetime.c src/uxncli.c ${FILE_LDFLAGS} -o bin/uxncli
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ $install = 1 ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -76,8 +73,6 @@ if [ $debug = 1 ];
</span> then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,17 +104,15 @@ then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp bin/uxnemu bin/uxnasm bin/uxncli $HOME/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "[debug]"
</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;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS="${CFLAGS} -DNDEBUG -O2 -g0 -s"
</span> fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>--echo "Assembling(launcher).."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo "Assembling(launcher)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ./bin/uxnasm projects/software/launcher.tal bin/launcher.rom
</span><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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ $norun = 1 ]; then exit; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo "Assembling(piano).."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo "Assembling(piano)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ./bin/uxnasm projects/software/piano.tal bin/piano.rom
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo "Running.."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo "Running"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ./bin/uxnemu bin/piano.rom
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo "Done."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo "Done"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CC} ${CFLAGS} src/uxnasm.c -o bin/uxnasm
</span></pre><pre style='margin:0'>
</pre>