From 4ed1821370339e45359e728a16d523e1f722a925 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Wed, 12 Nov 2025 22:40:42 +0100 Subject: [PATCH 1/3] fix: scummvm extra path --- .../share_init/system/configs/scummvm/libretro-scummvm.ini | 2 +- package/libretro-scummvm/libretro-scummvm.mk | 4 ++++ projects/configgen/configgen/recalboxFiles.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/board/recalbox/fsoverlay/recalbox/share_init/system/configs/scummvm/libretro-scummvm.ini b/board/recalbox/fsoverlay/recalbox/share_init/system/configs/scummvm/libretro-scummvm.ini index f80cd95175..a41ed853b7 100644 --- a/board/recalbox/fsoverlay/recalbox/share_init/system/configs/scummvm/libretro-scummvm.ini +++ b/board/recalbox/fsoverlay/recalbox/share_init/system/configs/scummvm/libretro-scummvm.ini @@ -6,7 +6,7 @@ native_mt32=false mt32_device=fluidsynth talkspeed=60 midi_gain=100 -extrapath=/recalbox/share/bios/scummvm/extra +extrapath=/recalbox/share/bios/scummvm subtitles=true multi_midi=false fullscreen=true diff --git a/package/libretro-scummvm/libretro-scummvm.mk b/package/libretro-scummvm/libretro-scummvm.mk index ecaa26ab7b..6d85b243f9 100644 --- a/package/libretro-scummvm/libretro-scummvm.mk +++ b/package/libretro-scummvm/libretro-scummvm.mk @@ -63,9 +63,13 @@ define LIBRETRO_SCUMMVM_INSTALL_DATAFILES unzip -o $(@D)/backends/platform/libretro/scummvm.zip \ -d $(TARGET_DIR)/recalbox/share_init/bios \ scummvm/extra/* + cp -r $(TARGET_DIR)/recalbox/share_init/bios/scummvm/extra/* $(TARGET_DIR)/recalbox/share_init/bios/scummvm/ + rm -Rf $(TARGET_DIR)/recalbox/share_init/bios/scummvm/extra unzip -o $(@D)/backends/platform/libretro/scummvm.zip \ -d $(TARGET_DIR)/recalbox/share_upgrade/bios \ scummvm/extra/* + cp -r $(TARGET_DIR)/recalbox/share_upgrade/bios/scummvm/extra/* $(TARGET_DIR)/recalbox/share_init/bios/scummvm/ + rm -Rf $(TARGET_DIR)/recalbox/share_upgrade/bios/scummvm/extra endef define LIBRETRO_SCUMMVM_INSTALL_THEMES diff --git a/projects/configgen/configgen/recalboxFiles.py b/projects/configgen/configgen/recalboxFiles.py index 6eea5d7191..a69b9e49d1 100644 --- a/projects/configgen/configgen/recalboxFiles.py +++ b/projects/configgen/configgen/recalboxFiles.py @@ -126,7 +126,7 @@ dosboxConfig = dosboxCustom + '/dosbox.conf' scummvmSaves = SAVES + '/scummvm' libretroScummvmConfig = CONF + '/scummvm/libretro-scummvm.ini' -libretroScummvmBios = BIOS + '/scummvm/extra' +libretroScummvmBios = BIOS + '/scummvm' simcoupeConfig = HOME + '/.simcoupe/SimCoupe.cfg' -- GitLab From 47f44597aaf2d77f785d94e275c7912521f26845 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Fri, 14 Nov 2025 09:48:19 +0100 Subject: [PATCH 2/3] fix: force update assets --- board/recalbox/fsoverlay/etc/init.d/S12populateshare | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/board/recalbox/fsoverlay/etc/init.d/S12populateshare b/board/recalbox/fsoverlay/etc/init.d/S12populateshare index d9e7330e7e..3282e2e3e5 100755 --- a/board/recalbox/fsoverlay/etc/init.d/S12populateshare +++ b/board/recalbox/fsoverlay/etc/init.d/S12populateshare @@ -214,6 +214,11 @@ if [ "$RECALBOX_VERSION" != "$SHARE_VERSION" ] ; then rm -f "${OUT}/roms/ports/${systemName}/.readme.placeholder" done + # Fix assets for SCUMMVM + if [ ! -f $OUT/bios/scummvm/Roland_SC-55.sf2 ];then + rsync -a --delete --exclude MT32_PCM.ROM --exclude MT32_CONTROL.ROM "${IN}/bios/scummvm" "${OUT}/bios" + fi + # Not sure why but there is some .txt file in /roms/ports which should not be here and are a copy of a port - remove them rm -f "${OUT}/roms/ports/_leggime.txt" rm -f "${OUT}/roms/ports/_leiame.txt" -- GitLab From 1e60297c9dcafd832be0ea49a34cdd354bdabf76 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Fri, 12 Dec 2025 10:52:57 +0100 Subject: [PATCH 3/3] fix: remove extra folder in scummvm bios --- board/recalbox/fsoverlay/etc/init.d/S12populateshare | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/recalbox/fsoverlay/etc/init.d/S12populateshare b/board/recalbox/fsoverlay/etc/init.d/S12populateshare index 3282e2e3e5..68ec145f8d 100755 --- a/board/recalbox/fsoverlay/etc/init.d/S12populateshare +++ b/board/recalbox/fsoverlay/etc/init.d/S12populateshare @@ -215,7 +215,7 @@ if [ "$RECALBOX_VERSION" != "$SHARE_VERSION" ] ; then done # Fix assets for SCUMMVM - if [ ! -f $OUT/bios/scummvm/Roland_SC-55.sf2 ];then + if [ -f $OUT/bios/scummvm/extra ];then rsync -a --delete --exclude MT32_PCM.ROM --exclude MT32_CONTROL.ROM "${IN}/bios/scummvm" "${OUT}/bios" fi -- GitLab