<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/4ac2bfff6605549313958916562a4e787a565f98">https://github.com/macports/macports-ports/commit/4ac2bfff6605549313958916562a4e787a565f98</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 4ac2bfff660 uxn: update to 20221211
</span>4ac2bfff660 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 4ac2bfff6605549313958916562a4e787a565f98
</span>Author: aeiouaeiouaeiouaeiouaeiouaeiou <aeioudev@outlook.com>
AuthorDate: Mon Dec 19 11:12:12 2022 +0300

<span style='display:block; white-space:pre;color:#404040;'>    uxn: update to 20221211
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * update patch-uxn-build.diff
</span><span style='display:block; white-space:pre;color:#404040;'>    * use MacPorts CFLAGS
</span><span style='display:block; white-space:pre;color:#404040;'>    * workaround for a failing patch due to a missing directory
</span>---
 emulators/uxn/Portfile                   | 19 +++++++++++++------
 emulators/uxn/files/patch-uxn-build.diff | 27 +++++++++++++++++----------
 2 files changed, 30 insertions(+), 16 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 aa20758baf6..7e20cc0a2df 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 42aab23dc17679b1eebd29eacd11bdb3e3215e7b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version                 20221120
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+sourcehut.setup         rabbits uxn 6317b5cf181e56253da10e0e5051ac75bbb5c4b2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version                 20221211
</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  1a36768c0d82d5820c8e20f29a182f79bbbef2b3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256  658dc9f02ca8231da89b4d79ab5462711baaf8a59c78fb40891e9ff11e5f8d3e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        size    284824
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums               rmd160  c6ff9fdf861eee1dbe21681bb4f7aac7fd8eef12 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256  d3ca3e372a6d28e258d59fa7e2f86fe0424b52b0d0a770c16138fc7a8200aa56 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        size    284943
</span> 
 depends_lib             port:libsdl2
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,9 +41,16 @@ use_configure           no
</span> compiler.blacklist-append \
                         *gcc* {clang < 500}
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/macports/macports-ports/commit/78b16a0314a94191e926aae69a88c540a088011d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# For some reason MacPorts is not detecting worksrcdir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# correctly; needs to investigate later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir              uxn-6317b5cf181e56253da10e0e5051ac75bbb5c4b2
</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:#ffe0e0;'>-build.env               CC=${configure.cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env               CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span> 
 destroot {
     set demos_dir       ${destroot}${prefix}/share/examples/${name}/demos
<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 bdf9d8b9efe..8653a8fb68f 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,38 +17,45 @@
</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;'>-@@ -68,7 +68,6 @@ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,8 +68,6 @@ then
</span>  fi
  
  mkdir -p bin
 -CC="${CC:-cc}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${CFLAGS:--std=c89 -Wall -Wno-unknown-pragmas}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS="${CFLAGS:--std=c89 -Wall -Wno-unknown-pragmas}"
</span>  case "$(uname -s 2>/dev/null)" in
  MSYS_NT*|MINGW*) # MSYS2 on Windows
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -81,7 +80,7 @@ MSYS_NT*|MINGW*) # MSYS2 on Windows
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if [ $console = 1 ];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -80,8 +78,7 @@ MSYS_NT*|MINGW*) # MSYS2 on Windows
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   fi
</span>   ;;
  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"
</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;'>-@@ -94,11 +93,11 @@ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -94,14 +91,13 @@ then
</span>   CFLAGS="${CFLAGS} -DDEBUG -Wpedantic -Wshadow -Wextra -Werror=implicit-int -Werror=incompatible-pointer-types -Werror=int-conversion -Wvla -g -Og -fsanitize=address -fsanitize=undefined"
        CORE='src/uxn.c'
  else
 -      CFLAGS="${CFLAGS} -DNDEBUG -Os -g0 -s"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+       CFLAGS="${CFLAGS} -DNDEBUG -Os -g0"
</span>   CORE='src/uxn.c'
  fi
  
 -echo "Building.."
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-${CC} ${CFLAGS} src/uxnasm.c -o bin/uxnasm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-${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
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-${CC} ${CFLAGS} ${CORE} src/devices/system.c src/devices/file.c src/devices/datetime.c src/uxncli.c -o bin/uxncli
</span> +echo "Building"
<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} -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 -o bin/uxncli
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -109,19 +108,17 @@ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++${CC} ${CFLAGS} ${LDFLAGS} -std=c89 src/uxnasm.c -o bin/uxnasm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++${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} -o bin/uxnemu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++${CC} ${CFLAGS} ${CORE} ${LDFLAGS} -std=c89 src/devices/system.c src/devices/file.c src/devices/datetime.c src/uxncli.c -o bin/uxncli
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ $install = 1 ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -109,19 +105,17 @@ then
</span>   cp bin/uxnemu bin/uxnasm bin/uxncli $HOME/bin/
  fi
  
</pre><pre style='margin:0'>

</pre>