diff --git a/projects/ROCKNIX/packages/compat/wine/package.mk b/projects/ROCKNIX/packages/compat/wine/package.mk index 48445f599e7..a4213a8d790 100644 --- a/projects/ROCKNIX/packages/compat/wine/package.mk +++ b/projects/ROCKNIX/packages/compat/wine/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2024-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="wine" -PKG_VERSION="11.11" +PKG_VERSION="11.15" PKG_LICENSE="MIT" PKG_SITE="https://github.com/Kron4ek/Wine-Builds" PKG_URL="${PKG_SITE}/releases/download/${PKG_VERSION}/wine-${PKG_VERSION}-staging-tkg-amd64-wow64.tar.xz" diff --git a/projects/ROCKNIX/packages/emulators/standalone/scummvmsa/sources/start_scummvm.sh b/projects/ROCKNIX/packages/emulators/standalone/scummvmsa/sources/start_scummvm.sh index 9204b95ded0..82775362288 100644 --- a/projects/ROCKNIX/packages/emulators/standalone/scummvmsa/sources/start_scummvm.sh +++ b/projects/ROCKNIX/packages/emulators/standalone/scummvmsa/sources/start_scummvm.sh @@ -13,7 +13,7 @@ RATMPCONF="/storage/.config/retroarch/retroarch.cfg" shopt -s extglob case "$1" in - add|create|libretro|grim) + add|create|libretro) GAME="$2" ;; *) @@ -50,16 +50,6 @@ if [ ! -f "${CONFIG_DIR}/scummvm.ini" ]; then cp -rf /usr/config/scummvm/scummvm.ini ${CONFIG_DIR}/scummvm.ini fi -if [ ! -d "/storage/.config/scummvm-grim/" ]; then - mkdir -p /storage/.config/scummvm-grim - cp -rf /usr/config/scummvm-grim/* /storage/.config/scummvm-grim/ -fi - -if [ ! -f "/storage/.config/scummvm-grim/scummvm.ini" ]; then - mkdir -p /storage/.config/scummvm-grim - cp -rf /usr/config/scummvm-grim/scummvm.ini /storage/.config/scummvm-grim/scummvm.ini -fi - case $1 in "libretro") GAME=$(cat "${GAME}" | awk 'BEGIN {FS="\""}; {print $2}') @@ -80,23 +70,6 @@ case $1 in create_svm ;; - "grim") - set_kill set "-9 scummvm-grim" - GAME=$(cat "${GAME}") - GAME=$(echo "${GAME}" | tr -s ' \n' ' ') - GAMEID=$(echo "${GAME}" | awk '{print $NF}') - GAMEPATH=$(echo "${GAME}" | sed 's/--path="\(.*\)" .*/\1/') - if ! grep -q "^\[${GAMEID}\]" /storage/.config/scummvm-grim/scummvm.ini; then - /usr/bin/scummvm-grim --config=/storage/.config/scummvm-grim/scummvm.ini --add --path="${GAMEPATH}" - fi - - systemctl start fluidsynth - eval /usr/bin/scummvm-grim --config=/storage/.config/scummvm-grim/scummvm.ini \ - --fullscreen --joystick=0 \ - --themepath=/usr/config/scummvm-grim/themes --extrapath=/usr/local/share/scummvm-grim "${GAME}" - systemctl stop fluidsynth - ;; - *) set_kill set "-9 scummvm" GAME=$(cat "${GAME}") diff --git a/projects/ROCKNIX/packages/virtual/emulators/package.mk b/projects/ROCKNIX/packages/virtual/emulators/package.mk index a1dd02bf31a..dd26da6882e 100644 --- a/projects/ROCKNIX/packages/virtual/emulators/package.mk +++ b/projects/ROCKNIX/packages/virtual/emulators/package.mk @@ -1252,7 +1252,6 @@ makeinstall_target() { ### ScummVM add_emu_core scummvm scummvmsa scummvm true - add_emu_core scummvm scummvm-grim scummvm false add_emu_core scummvm retroarch scummvm false add_es_system scummvm add_system_dir /storage/roms/scummvm