From dbd017f952dd7247f184e191e42a0d7202a31c85 Mon Sep 17 00:00:00 2001
From: rocknix <macebrooks@gmail.com>
Date: Tue, 30 Sep 2025 22:20:27 +0000
Subject: [PATCH] Various emulator fixes

---
 .../dolphin-sa/scripts/start_dolphin_gc.sh        |  4 +++-
 .../dolphin-sa/scripts/start_dolphin_wii.sh       |  3 ++-
 .../mappings/SDL_Retroid Pocket Gamepad.cfg       | 10 +++++-----
 .../emulators/standalone/flycast-sa/package.mk    |  6 ++++++
 .../flycast-sa/scripts/start_flycast.sh           | 15 +++++++--------
 .../emulators/standalone/ppsspp-sa/package.mk     |  6 ++++++
 .../standalone/ppsspp-sa/scripts/start_ppsspp.sh  | 11 +++++------
 .../emulators/standalone/xemu-sa/package.mk       |  2 +-
 8 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/projects/ROCKNIX/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_gc.sh b/projects/ROCKNIX/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_gc.sh
index be5014bb97..1a3d233cf8 100644
--- a/projects/ROCKNIX/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_gc.sh
+++ b/projects/ROCKNIX/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_gc.sh
@@ -366,6 +366,8 @@ fi
 rm -rf /storage/.local/share/dolphin-emu
 ln -sf /storage/.config/dolphin-emu /storage/.local/share/dolphin-emu
 
+@EXPORTS@
+
 # Retroachievements
   /usr/bin/cheevos_dolphin.sh
 
@@ -386,6 +388,7 @@ fi
   echo "AUDIOBE set to: ${AUDIOBE}"
   echo "ASWAPDISCS set to: ${ASWAPDISCS}"
   echo "CLOCK set to: ${CLOCK}"
+  echo "DOLPHIN_BACKEND set to: ${DOLPHIN_BACKEND}"
   echo "ENBCHEATS set to: ${ENBCHEATS}"
   echo "GRENDERER set to: ${GRENDERER}"
   echo "IRES set to: ${IRES}"
@@ -408,7 +411,6 @@ fi
   echo "Launching /usr/bin/${DOLPHIN_CORE} ${CMD} -e ${1}"
 
 # Run Dolphin emulator
-  @EXPORTS@
   ${GPTOKEYB} ${DOLPHIN_CORE} xbox360 &
   ${EMUPERF} /usr/bin/${DOLPHIN_CORE} ${CMD} -e "${1}"
   kill -9 "$(pidof gptokeyb)"
diff --git a/projects/ROCKNIX/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_wii.sh b/projects/ROCKNIX/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_wii.sh
index bb4fa47333..8cccc29ad5 100755
--- a/projects/ROCKNIX/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_wii.sh
+++ b/projects/ROCKNIX/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_wii.sh
@@ -352,6 +352,8 @@ sed -i '/SkipIPL/c\SkipIPL = True' ${CONF_DIR}/${DOLPHIN_INI}
 rm -rf /storage/.local/share/dolphin-emu
 ln -sf /storage/.config/dolphin-emu /storage/.local/share/dolphin-emu
 
+@EXPORTS@
+
 # Retroachievements
   /usr/bin/cheevos_dolphin.sh
 
@@ -390,7 +392,6 @@ fi
   echo "Launching /usr/bin/${DOLPHIN_CORE} ${CMD} -e ${1}"
 
 # Run Dolphin emulator
-  @EXPORTS@
   ${GPTOKEYB} ${DOLPHIN_CORE} xbox360 &
   ${EMUPERF} /usr/bin/${DOLPHIN_CORE} ${CMD} -e "${1}"
   kill -9 "$(pidof gptokeyb)"
diff --git a/projects/ROCKNIX/packages/emulators/standalone/flycast-sa/config/SM8250/mappings/SDL_Retroid Pocket Gamepad.cfg b/projects/ROCKNIX/packages/emulators/standalone/flycast-sa/config/SM8250/mappings/SDL_Retroid Pocket Gamepad.cfg
index 525bf67474..db4023be3b 100644
--- a/projects/ROCKNIX/packages/emulators/standalone/flycast-sa/config/SM8250/mappings/SDL_Retroid Pocket Gamepad.cfg	
+++ b/projects/ROCKNIX/packages/emulators/standalone/flycast-sa/config/SM8250/mappings/SDL_Retroid Pocket Gamepad.cfg	
@@ -13,17 +13,17 @@ bind9 = 7+:btn_trigger_right
 [digital]
 bind0 = 0:btn_a
 bind1 = 1:btn_b
-bind10 = 12:btn_dpad1_down
-bind11 = 13:btn_dpad1_left
-bind12 = 14:btn_dpad1_right
+bind10 = 13:btn_dpad1_left
+bind11 = 14:btn_dpad1_right
+bind12 = 15:btn_menu
 bind2 = 2:btn_y
 bind3 = 3:btn_x
 bind4 = 4:btn_jump_state
 bind5 = 5:btn_quick_save
 bind6 = 6:reload
 bind7 = 7:btn_start
-bind8 = 8:btn_menu
-bind9 = 11:btn_dpad1_up
+bind8 = 11:btn_dpad1_up
+bind9 = 12:btn_dpad1_down
 
 [emulator]
 dead_zone = 10
diff --git a/projects/ROCKNIX/packages/emulators/standalone/flycast-sa/package.mk b/projects/ROCKNIX/packages/emulators/standalone/flycast-sa/package.mk
index 407ad7ec17..c60c86ad13 100644
--- a/projects/ROCKNIX/packages/emulators/standalone/flycast-sa/package.mk
+++ b/projects/ROCKNIX/packages/emulators/standalone/flycast-sa/package.mk
@@ -24,8 +24,10 @@ fi
 if [ "${VULKAN_SUPPORT}" = "yes" ]; then
   PKG_DEPENDS_TARGET+=" ${VULKAN}"
   PKG_CMAKE_OPTS_TARGET+=" -DUSE_VULKAN=ON"
+  GRENDERER="4"
 else
   PKG_CMAKE_OPTS_TARGET+=" -DUSE_VULKAN=OFF"
+  GRENDERER="0"
 fi
 
 pre_configure_target() {
@@ -43,3 +45,7 @@ makeinstall_target() {
 
   chmod +x ${INSTALL}/usr/bin/*
 }
+
+post_install() {
+  sed -e "s/@GRENDERER@/${GRENDERER}/g" -i ${INSTALL}/usr/bin/start_flycast.sh
+}
diff --git a/projects/ROCKNIX/packages/emulators/standalone/flycast-sa/scripts/start_flycast.sh b/projects/ROCKNIX/packages/emulators/standalone/flycast-sa/scripts/start_flycast.sh
index 15992321a9..49a518532b 100644
--- a/projects/ROCKNIX/packages/emulators/standalone/flycast-sa/scripts/start_flycast.sh
+++ b/projects/ROCKNIX/packages/emulators/standalone/flycast-sa/scripts/start_flycast.sh
@@ -32,7 +32,7 @@ ASPECT=$(get_setting aspect_ratio "${PLATFORM}" "${GAME}")
 ASKIP=$(get_setting auto_frame_skip "${PLATFORM}" "${GAME}")
 FPS=$(get_setting show_fps "${PLATFORM}" "${GAME}")
 IRES=$(get_setting internal_resolution "${PLATFORM}" "${GAME}")
-RENDERER=$(get_setting graphics_backend "${PLATFORM}" "${GAME}")
+GRENDERER=$(get_setting graphics_backend "${PLATFORM}" "${GAME}")
 VSYNC=$(get_setting vsync "${PLATFORM}" "${GAME}")
 CHEEVOS=$(get_setting retroachievements "${PLATFORM}" "${GAME}")
 
@@ -95,15 +95,14 @@ fi
                 sed -i '/rend.Resolution =/c\rend.Resolution = 480' /storage/.config/flycast/emu.cfg
         fi
 
-  #Renderer
-        if [ "$RENDERER" = "opengl" ]
-        then
+  #Graphics Renderer
+        if [ "$GRENDERER" = "opengl" ]; then
                 sed -i '/^pvr.rend =/c\pvr.rend = 0' /storage/.config/flycast/emu.cfg
-        fi
-        if [ "$RENDERER" = "vulkan" ]
-        then
+        elif [ "$GRENDERER" = "vulkan" ]; then
                 sed -i '/^pvr.rend =/c\pvr.rend = 4' /storage/.config/flycast/emu.cfg
-        fi
+        else
+		sed -i '/^pvr.rend =/c\pvr.rend = @GRENDERER@' /storage/.config/flycast/emu.cfg
+	fi
 
   #ShowFPS
 	if [ "$FPS" = "0" ]
diff --git a/projects/ROCKNIX/packages/emulators/standalone/ppsspp-sa/package.mk b/projects/ROCKNIX/packages/emulators/standalone/ppsspp-sa/package.mk
index 71b26ceafc..f0e8f9f454 100644
--- a/projects/ROCKNIX/packages/emulators/standalone/ppsspp-sa/package.mk
+++ b/projects/ROCKNIX/packages/emulators/standalone/ppsspp-sa/package.mk
@@ -54,10 +54,12 @@ then
                            -DVULKAN=ON \
                            -DEGL_NO_X11=1 \
                            -DMESA_EGL_NO_X11_HEADERS=1"
+  GRENDERER="3 (VULKAN)"
 else
   PKG_CMAKE_OPTS_TARGET+=" -DVULKAN=OFF \
                            -DUSE_VULKAN_DISPLAY_KHR=OFF \
                            -DUSING_X11_VULKAN=OFF"
+  GRENDERER="0 (OPENGL)"
 fi
 
 if [ "${DISPLAYSERVER}" = "wl" ]; then
@@ -98,3 +100,7 @@ makeinstall_target() {
   ln -sf NotoSansJP-Regular.ttf ${INSTALL}/usr/config/ppsspp/assets/Roboto-Condensed.ttf
   curl -Lo ${INSTALL}/usr/config/ppsspp/PSP/Cheats/cheat.db https://raw.githubusercontent.com/Saramagrean/CWCheat-Database-Plus-/${CHEAT_DB_VERSION}/cheat.db
 }
+
+post_install() {
+  sed -e "s/@GRENDERER@/${GRENDERER}/g" -i ${INSTALL}/usr/bin/start_ppsspp.sh
+}
diff --git a/projects/ROCKNIX/packages/emulators/standalone/ppsspp-sa/scripts/start_ppsspp.sh b/projects/ROCKNIX/packages/emulators/standalone/ppsspp-sa/scripts/start_ppsspp.sh
index 2f984d4783..93f2c8a0e6 100755
--- a/projects/ROCKNIX/packages/emulators/standalone/ppsspp-sa/scripts/start_ppsspp.sh
+++ b/projects/ROCKNIX/packages/emulators/standalone/ppsspp-sa/scripts/start_ppsspp.sh
@@ -71,14 +71,13 @@ fi
         #Default to OpenGL / GLES if no option is set.
         sed -i '/^GraphicsBackend =/c\GraphicsBackend = 0 (OPENGL)' ${CONF_DIR}/${PPSSPP_INI}
 
-        if [ "${GRENDERER}" = "opengl" ]
-        then
+        if [ "${GRENDERER}" = "opengl" ]; then
                 sed -i '/^GraphicsBackend =/c\GraphicsBackend = 0 (OPENGL)' ${CONF_DIR}/${PPSSPP_INI}
-        fi
-        if [ "${GRENDERER}" = "vulkan" ]
-        then
+        elif [ "${GRENDERER}" = "vulkan" ]; then
                 sed -i '/^GraphicsBackend =/c\GraphicsBackend = 3 (VULKAN)' ${CONF_DIR}/${PPSSPP_INI}
-        fi
+        else
+		sed -i '/^GraphicsBackend =/c\GraphicsBackend = @GRENDERER@' ${CONF_DIR}/${PPSSPP_INI}
+	fi
 
   #Internal Resolution
         if [ "${IRES}" = "1" ]
diff --git a/projects/ROCKNIX/packages/emulators/standalone/xemu-sa/package.mk b/projects/ROCKNIX/packages/emulators/standalone/xemu-sa/package.mk
index a6727fcaf3..793f609c50 100644
--- a/projects/ROCKNIX/packages/emulators/standalone/xemu-sa/package.mk
+++ b/projects/ROCKNIX/packages/emulators/standalone/xemu-sa/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2024-present ROCKNIX (https://github.com/ROCKNIX)
 
 PKG_NAME="xemu-sa"
-PKG_VERSION="59626b1f5dc038c69e0044d87d7bd1cd6a1dce05"
+PKG_VERSION="1973482781c120ceae88e2e0d89fa522b35b9639"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/xemu-project/xemu"
 PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"