From a3f4e43e3f2ac653ea9df83aead2ba8355b7a5e1 Mon Sep 17 00:00:00 2001 From: ajmandourah Date: Thu, 27 Jun 2024 19:39:00 +0300 Subject: [PATCH] fix: where some retroarch global setting messes the save state manager in batocera. Additional: revert to use v1.19.1 Retroarch --- .../usr/share/batocera/datainit/system/batocera.conf | 5 +++-- .../batocera-configgen/configs/configgen-defaults-h700.yml | 1 - package/batocera/emulators/retroarch/retroarch/retroarch.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/batocera/allwinner/h700/rg28xx/fsoverlay/usr/share/batocera/datainit/system/batocera.conf b/board/batocera/allwinner/h700/rg28xx/fsoverlay/usr/share/batocera/datainit/system/batocera.conf index 46127898275..3f09b2a2a22 100644 --- a/board/batocera/allwinner/h700/rg28xx/fsoverlay/usr/share/batocera/datainit/system/batocera.conf +++ b/board/batocera/allwinner/h700/rg28xx/fsoverlay/usr/share/batocera/datainit/system/batocera.conf @@ -16,13 +16,14 @@ ## 3 -> Rotate 270 degrees clockwise. #display.rotate=0 # -#Retroarch + +# Settings for resume game on start. DO NOT CHANGE global.retroarch.menu_driver=rgui global.retroarch.menu_enable_widgets=true global.retroarch.savestate_auto_save=true -global.retroarch.savestate_auto_load=false global.retroarch.network_cmd_enable=true global.retroarch.config_save_on_exit=true + ## Power button behavior ## Change what the power button does when pressed. ## shutdown -> Immediately shutdown the system. diff --git a/package/batocera/core/batocera-configgen/configs/configgen-defaults-h700.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-h700.yml index 0643df9d402..9f6bfa2ac3e 100644 --- a/package/batocera/core/batocera-configgen/configs/configgen-defaults-h700.yml +++ b/package/batocera/core/batocera-configgen/configs/configgen-defaults-h700.yml @@ -11,7 +11,6 @@ default: retroarch.audio_driver: alsathread retroarch.config_save_on_exit: true retroarch.savestate_auto_save: true - retroarch.savestate_auto_load: false retroarch.network_cmd_enable: true retroarch.input_menu_toggle_btn: 14 retroarch.input_load_state_btn: 7 diff --git a/package/batocera/emulators/retroarch/retroarch/retroarch.mk b/package/batocera/emulators/retroarch/retroarch/retroarch.mk index 6d752a18e35..9e471570142 100644 --- a/package/batocera/emulators/retroarch/retroarch/retroarch.mk +++ b/package/batocera/emulators/retroarch/retroarch/retroarch.mk @@ -4,7 +4,7 @@ # ################################################################################ # Version: Commits on June 4, 2024 (v1.19.1 that reverts savestates issue) -RETROARCH_VERSION = 06fa5325f8b3cd42e6fba3d57835d5924c9ea2e7 +RETROARCH_VERSION = 75c647d3caf4f2470cd30ccfcd5fc47b531a3a6c RETROARCH_SITE = $(call github,libretro,RetroArch,$(RETROARCH_VERSION)) RETROARCH_LICENSE = GPLv3+ RETROARCH_DEPENDENCIES = host-pkgconf dejavu retroarch-assets flac noto-cjk-fonts