Merge pull request #1690 from fewtarius/dev

beetle_psx isn't available on RK3566 or RK3326.

packages/jelos/sources/post-update

@@ -167,3 +167,6 @@ fi
 
 ### Revert the recent ES PowerSavingMode change.
 sed -i 's#<string name="PowerSaverMode".*$#<string name="PowerSaverMode" value="default"/>#g' /storage/.config/emulationstation/es_settings.cfg
+
+### Remove properties containing "auto" from the system config.
+sed -i "/^.*=auto/d" /storage/.config/system/configs/system.cfg

packages/jelos/sources/scripts/runemu.sh

@@ -165,9 +165,9 @@ function log() {
 		then
 			mkdir -p "$LOGSDIR"
 		fi
-		echo "${MYNAME}: $1" 2>&1 | tee -a ${LOGSDIR}/${LOGFILE}
+		echo "${MYNAME}: $*" 2>&1 | tee -a ${LOGSDIR}/${LOGFILE}
 	else
-		echo "${MYNAME}: $1"
+		echo "${MYNAME}: $*"
 	fi
 }
 

packages/jelos/sources/scripts/setsettings.sh

@@ -53,7 +53,7 @@ function log() {
 			mkdir -p "$LOGSDIR"
 		fi
 		DATE=$(date +"%b %d %H:%M:%S")
-		echo "${DATE} ${MYNAME}: $1" 2>&1 >> ${LOGSDIR}/${LOGFILE}
+		echo "${DATE} ${MYNAME}: $*" 2>&1 >> ${LOGSDIR}/${LOGFILE}
 	fi
 }
 
@@ -79,23 +79,10 @@ function doexit() {
 
 ## This needs to be killed with fire.
 function get_game_setting() {
-	log $0 "Get Settings function (${1})"
-	#We look for the setting on the ROM first, if not found we search for platform and lastly we search globally
-	escaped_rom_name=$(echo "${ROM}" | sed -E 's|([][])|\\\1|g')
-	PAT="s|^${PLATFORM}\[\"${escaped_rom_name}\"\][\.-]${1}=\(.*\)|\1|p"
-	EES=$(sed -n "${PAT}" "${CONF}" | head -1)
-
-	if [ -z "${EES}" ]; then
-		PAT="s|^${PLATFORM}[\.-]${1}=\(.*\)|\1|p"
-		EES=$(sed -n "${PAT}" "${CONF}" | head -1)
-	fi
-
-	if [ -z "${EES}" ]; then
-		PAT="s|^global[\.-].*${1}=\(.*\)|\1|p"
-		EES=$(sed -n "${PAT}" "${CONF}" | head -1)
-	fi
-
+	log $0 "Get Settings function (\"${1}\" \"${PLATFORM}\" \"${ROM}\")"
+	EES=$(get_setting "${1}" "${PLATFORM}" "${ROM}")
 	( [ -z "${EES}" ] || [ "${EES}" == "auto" ] ) && EES="false"
+	log $0 "Setting: (${EES})"
 }
 
 

packages/ui/emulationstation/package.mk

@@ -3,7 +3,7 @@
 # Copyright (C) 2020-present Fewtarius
 
 PKG_NAME="emulationstation"
-PKG_VERSION="0f2762a3c799a719d2113c9ca65e4b17df20ab77"
+PKG_VERSION="3cc5d25"
 PKG_GIT_CLONE_BRANCH="main"
 PKG_REV="1"
 PKG_ARCH="any"

packages/virtual/emulators/package.mk

@@ -632,12 +632,17 @@ makeinstall_target() {
       add_emu_core psx retroarch beetle_psx false
       add_emu_core psx Duckstation duckstation-sa false
     ;;
-    RK3*)
+    RK3399|RK3588)
       add_emu_core psx retroarch pcsx_rearmed32 true
       add_emu_core psx retroarch pcsx_rearmed false
       add_emu_core psx retroarch beetle_psx false
       add_emu_core psx Duckstation duckstation-sa false
     ;;
+    RK3326|RK3566)
+      add_emu_core psx retroarch pcsx_rearmed32 true
+      add_emu_core psx retroarch pcsx_rearmed false
+      add_emu_core psx Duckstation duckstation-sa false
+    ;;
   esac
   add_emu_core psx retroarch duckstation false
   add_emu_core psx retroarch swanstation false

projects/Rockchip/devices/RK3566-X55/linux/linux.aarch64.conf

@@ -1647,7 +1647,7 @@ CONFIG_MII=y
 CONFIG_NET_CORE=y
 # CONFIG_BONDING is not set
 # CONFIG_DUMMY is not set
-# CONFIG_WIREGUARD is not set
+CONFIG_WIREGUARD=m
 # CONFIG_EQUALIZER is not set
 # CONFIG_NET_FC is not set
 # CONFIG_NET_TEAM is not set