Merge remote-tracking branch 'upstream/main' into push

PortsMaster · Dec 17, 2024 · 2b8afc3 · 2b8afc3
2 parents 14bfd04 + 5873003
commit 2b8afc3
Show file tree

Hide file tree

Showing 119 changed files with 3,035 additions and 31 deletions.
diff --git a/ports/alephone-marathon/Marathon.sh b/ports/alephone-marathon/Marathon.sh
@@ -13,7 +13,6 @@ else
 fi
 
 source $controlfolder/control.txt
-source $controlfolder/device_info.txt
 [ -f "${controlfolder}/mod_${CFW_NAME}.txt" ] && source "${controlfolder}/mod_${CFW_NAME}.txt"
 
 get_controls
@@ -23,8 +22,7 @@ GAMEDIR="/$directory/ports/alephone-marathon"
 
 cd $GAMEDIR
 
-$ESUDO rm -rf ~/.alephone
-$ESUDO ln -s $GAMEDIR/conf/.alephone ~/
+bind_directories ~/.alephone $GAMEDIR/conf/.alephone
 
 export DEVICE_ARCH="${DEVICE_ARCH:-aarch64}"
 
@@ -39,9 +37,10 @@ export SDL_GAMECONTROLLERCONFIG="$sdl_controllerconfig"
 
 $ESUDO chmod 666 /dev/tty1
 $ESUDO chmod 666 /dev/uinput
+
 $GPTOKEYB "alephone" &
 ./alephone $GAMEDIR"/gamedata/Marathon"
 
 $ESUDO kill -9 $(pidof gptokeyb)
 $ESUDO systemctl restart oga_events &
-printf "\033c" >> /dev/tty1
+printf "\033c" >> /dev/tty1
diff --git a/ports/alephone-marathon2/Marathon 2.sh b/ports/alephone-marathon2/Marathon 2.sh
@@ -13,7 +13,6 @@ else
 fi
 
 source $controlfolder/control.txt
-source $controlfolder/device_info.txt
 [ -f "${controlfolder}/mod_${CFW_NAME}.txt" ] && source "${controlfolder}/mod_${CFW_NAME}.txt"
 
 get_controls
@@ -23,8 +22,7 @@ GAMEDIR="/$directory/ports/alephone-marathon2"
 
 cd $GAMEDIR
 
-$ESUDO rm -rf ~/.alephone
-$ESUDO ln -s $GAMEDIR/conf/.alephone ~/
+bind_directories ~/.alephone $GAMEDIR/conf/.alephone
 
 export DEVICE_ARCH="${DEVICE_ARCH:-aarch64}"
 
@@ -47,3 +45,4 @@ $ESUDO kill -9 $(pidof gptokeyb)
 $ESUDO systemctl restart oga_events &
 printf "\033c" >> /dev/tty1
 
+
diff --git a/ports/alephone-marathoninfinity/Marathon Infinity.sh b/ports/alephone-marathoninfinity/Marathon Infinity.sh
@@ -13,7 +13,6 @@ else
 fi
 
 source $controlfolder/control.txt
-source $controlfolder/device_info.txt
 [ -f "${controlfolder}/mod_${CFW_NAME}.txt" ] && source "${controlfolder}/mod_${CFW_NAME}.txt"
 
 get_controls
@@ -23,8 +22,7 @@ GAMEDIR="/$directory/ports/alephone-marathoninfinity"
 
 cd $GAMEDIR
 
-$ESUDO rm -rf ~/.alephone
-$ESUDO ln -s $GAMEDIR/conf/.alephone ~/
+bind_directories ~/.alephone $GAMEDIR/conf/.alephone
 
 export DEVICE_ARCH="${DEVICE_ARCH:-aarch64}"
 
@@ -45,4 +43,4 @@ $GPTOKEYB "alephone" &
 
 $ESUDO kill -9 $(pidof gptokeyb)
 $ESUDO systemctl restart oga_events &
-printf "\033c" >> /dev/tty1
+printf "\033c" >> /dev/tty1
diff --git a/ports/axiom.verge/Axiom Verge.sh b/ports/axiom.verge/Axiom Verge.sh
@@ -14,7 +14,7 @@ fi
 
 source $controlfolder/control.txt
 source $controlfolder/tasksetter
-
+[ -f "${controlfolder}/mod_${CFW_NAME}.txt" ] && source "${controlfolder}/mod_${CFW_NAME}.txt"
 get_controls
 
 GAMEDIR="/$directory/ports/axiom-verge"
@@ -32,9 +32,7 @@ $ESUDO umount "$monofile" || true
 $ESUDO mount "$monofile" "$monodir"
 
 # Setup savedir
-$ESUDO rm -rf ~/.local/share/AxiomVerge
-mkdir -p ~/.local/share
-ln -sfv "$GAMEDIR/savedata" ~/.local/share/AxiomVerge
+bind_directories ~/.local/share/AxiomVerge "$GAMEDIR/savedata"
 
 # Remove all the dependencies in favour of system libs - e.g. the included 
 # newer version of FNA with patcher included
@@ -68,3 +66,4 @@ unset LD_LIBRARY_PATH
 printf "\033c" >> /dev/tty1
 printf "\033c" > /dev/tty0
 
+
diff --git a/ports/chasm/Chasm.sh b/ports/chasm/Chasm.sh
@@ -14,7 +14,7 @@ fi
 
 source $controlfolder/control.txt
 source $controlfolder/tasksetter
-
+[ -f "${controlfolder}/mod_${CFW_NAME}.txt" ] && source "${controlfolder}/mod_${CFW_NAME}.txt"
 get_controls
 
 gameassembly="Chasm.exe"
@@ -34,8 +34,7 @@ $ESUDO umount "$monofile" || true
 $ESUDO mount "$monofile" "$monodir"
 
 # Setup savedir
-$ESUDO rm -rf ~/.local/share/Chasm
-ln -sfv "$gamedir/savedata" ~/.local/share/Chasm
+bind_directories ~/.local/share/Chasm "$gamedir/savedata"
 
 # Remove all the dependencies in favour of system libs - e.g. the included 
 # newer version of FNA with patcher included
@@ -60,3 +59,4 @@ $ESUDO umount "$monodir"
 # Disable console
 printf "\033c" >> /dev/tty1
 
+
diff --git a/...s/sonictt16b/sonictt16b/libs/libFLAC.so.8 → ...rkdeity/darkdeity/tools/libs/libFLAC.so.8 b/...s/sonictt16b/sonictt16b/libs/libFLAC.so.8 → ...rkdeity/darkdeity/tools/libs/libFLAC.so.8
diff --git a/ports/sonictt16b/sonictt16b/libs/libogg.so.0 → ...arkdeity/darkdeity/tools/libs/libogg.so.0 b/ports/sonictt16b/sonictt16b/libs/libogg.so.0 → ...arkdeity/darkdeity/tools/libs/libogg.so.0
diff --git a/...sonictt16b/sonictt16b/libs/libvorbis.so.0 → ...deity/darkdeity/tools/libs/libvorbis.so.0 b/...sonictt16b/sonictt16b/libs/libvorbis.so.0 → ...deity/darkdeity/tools/libs/libvorbis.so.0
diff --git a/...ictt16b/sonictt16b/libs/libvorbisenc.so.2 → ...ty/darkdeity/tools/libs/libvorbisenc.so.2 b/...ictt16b/sonictt16b/libs/libvorbisenc.so.2 → ...ty/darkdeity/tools/libs/libvorbisenc.so.2
diff --git a/ports/deltarune/deltarune/tools/libs/libFLAC.so.8 b/ports/deltarune/deltarune/tools/libs/libFLAC.so.8
diff --git a/ports/deltarune/deltarune/tools/libs/libogg.so.0 b/ports/deltarune/deltarune/tools/libs/libogg.so.0
diff --git a/ports/deltarune/deltarune/tools/libs/libvorbis.so.0 b/ports/deltarune/deltarune/tools/libs/libvorbis.so.0
diff --git a/ports/deltarune/deltarune/tools/libs/libvorbisenc.so.2 b/ports/deltarune/deltarune/tools/libs/libvorbisenc.so.2
diff --git a/ports/gravityblocks/Gravity Blocks.sh b/ports/gravityblocks/Gravity Blocks.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+XDG_DATA_HOME=${XDG_DATA_HOME:-$HOME/.local/share}
+
+if [ -d "/opt/system/Tools/PortMaster/" ]; then
+  controlfolder="/opt/system/Tools/PortMaster"
+elif [ -d "/opt/tools/PortMaster/" ]; then
+  controlfolder="/opt/tools/PortMaster"
+elif [ -d "$XDG_DATA_HOME/PortMaster/" ]; then
+  controlfolder="$XDG_DATA_HOME/PortMaster"
+else
+  controlfolder="/roms/ports/PortMaster"
+fi
+
+source $controlfolder/control.txt
+export PORT_32BIT="Y"
+
+get_controls
+[ -f "${controlfolder}/mod_${CFW_NAME}.txt" ] && source "${controlfolder}/mod_${CFW_NAME}.txt"
+
+GAMEDIR="/$directory/ports/gravityblocks"
+
+# We log the execution of the script into log.txt
+> "$GAMEDIR/log.txt" && exec > >(tee "$GAMEDIR/log.txt") 2>&1
+$ESUDO chmod +x $GAMEDIR/gmloader
+
+cd "$GAMEDIR"
+
+# Exports
+export LD_LIBRARY_PATH="/usr/lib32:$GAMEDIR/lib:$LD_LIBRARY_PATH"
+export GMLOADER_DEPTH_DISABLE=0
+export GMLOADER_PLATFORM="os_windows"
+
+$GPTOKEYB "gmloader" -c "gravityblocks.gptk" &
+
+pm_platform_helper "$GAMEDIR/gmloader"
+./gmloader gravityblocks.port
+
+pm_finish
diff --git a/ports/gravityblocks/README.md b/ports/gravityblocks/README.md
@@ -0,0 +1,15 @@
+## Notes
+
+Thanks to Soultie for making this game and allowing us to host it. Check the game's page at [Itch](https://soultie.itch.io/gravity-blocks-ludum-dare-51) 
+
+
+## Controls
+
+| Button | Action |
+|--|--| 
+|DPAD / LEFT STICK|Movement|
+|A/B|Jump|
+|Start|Pause|
+|Select|Quit (on pause menu)|
+
+
diff --git a/ports/gravityblocks/gameinfo.xml b/ports/gravityblocks/gameinfo.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gameList>
+  <game>
+    <path>./Gravity Blocks.sh</path>
+    <name>Gravity Blocks</name>
+    <desc>Arcade style game where you collect coins and don't get smashed.
+Made in only 7 hours for Ludum Dare 51! It wouldn't have taken so long, but I had beer with me.</desc>
+    <releasedate>20221008T000000</releasedate>
+    <developer>Soultie</developer>
+    <publisher>Soultie</publisher>
+    <genre>Arcade</genre>
+    <image>./gravityblocks/screenshot.png</image>
+  </game>
+</gameList>
diff --git a/ports/gravityblocks/gravityblocks/gmloader b/ports/gravityblocks/gravityblocks/gmloader
diff --git a/ports/gravityblocks/gravityblocks/gravityblocks.gptk b/ports/gravityblocks/gravityblocks/gravityblocks.gptk
@@ -0,0 +1,30 @@
+back = esc
+start = enter
+
+a = space
+b = space
+x = \"
+y = \"
+
+r1 = \"
+l1 = \"
+r2 = \"
+l2 = \"
+r3 = \"
+l3 = \"
+
+
+up = w
+down = s
+left = a
+right = d
+
+left_analog_up = w
+left_analog_down = s
+left_analog_left = a
+left_analog_right = d
+
+right_analog_up = \"
+right_analog_down = \"
+right_analog_left = \"
+right_analog_right = \"
diff --git a/ports/gravityblocks/gravityblocks/gravityblocks.port b/ports/gravityblocks/gravityblocks/gravityblocks.port
diff --git a/ports/gravityblocks/gravityblocks/lib/libcrypto.so.1.1 b/ports/gravityblocks/gravityblocks/lib/libcrypto.so.1.1
diff --git a/ports/gravityblocks/gravityblocks/lib/libssl.so.1.1 b/ports/gravityblocks/gravityblocks/lib/libssl.so.1.1
diff --git a/ports/gravityblocks/gravityblocks/lib/libzip.so.4 b/ports/gravityblocks/gravityblocks/lib/libzip.so.4
diff --git a/ports/gravityblocks/gravityblocks/libc++_shared.so b/ports/gravityblocks/gravityblocks/libc++_shared.so