From 31f9d421c1ea604c61c109e48b2450221031dc51 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Fri, 2 Jun 2023 10:12:33 -0400 Subject: [PATCH] Disable packaged DOOM ROM Add shipped Libretro Amiga BIOS --- automation_tools/automation_task_list.cfg | 2 +- functions/post_update.sh | 7 ++++--- functions/prepare_emulator.sh | 6 ++++++ net.retrodeck.retrodeck.yml | 11 ++++++----- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/automation_tools/automation_task_list.cfg b/automation_tools/automation_task_list.cfg index be0c0ca2..f1624f43 100644 --- a/automation_tools/automation_task_list.cfg +++ b/automation_tools/automation_task_list.cfg @@ -1,6 +1,6 @@ # The proper format for this file is # ACTION^PLACEHOLDERTEXT^URL^REPO(Optional) -hash^DOOMSHAPLACEHOLDER^https://buildbot.libretro.com/assets/cores/DOOM/Doom%20%28Shareware%29.zip +# hash^DOOMSHAPLACEHOLDER^https://buildbot.libretro.com/assets/cores/DOOM/Doom%20%28Shareware%29.zip hash^VITASHAPLACEHOLDER^https://github.com/Vita3K/Vita3K/releases/download/continuous/ubuntu-latest.zip hash^DUCKSTATIONSHAPLACEHOLDER^https://github.com/stenzek/duckstation/releases/download/preview/DuckStation-x64.AppImage hash^SAMEDUCKSHAPLACEHOLDER^https://buildbot.libretro.com/nightly/linux/x86_64/latest/sameduck_libretro.so.zip diff --git a/functions/post_update.sh b/functions/post_update.sh index c1642ad5..749c55ac 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -75,6 +75,7 @@ post_update() { # - Expose ES-DE gamelists folder to user at ~/retrodeck/gamelists # - Copy new borders into RA config location # - Copy new RetroArch control remaps into RA config location + # - Add shipped Amiga bios if it doesn't already exist # - Update RPCS3 vfs file contents. migrate from old location if needed # - Disable ESDE update checks for existing installs # - Move Duckstation saves and states to new locations @@ -129,9 +130,9 @@ post_update() { rsync -a --mkpath "$emuconfigs/defaults/retrodeck/presets/remaps/" "/var/config/retroarch/config/remaps/" - # if [[ $(configurator_generic_question_dialog "RetroDECK Starter Pack" "The RetroDECK creators have put together a collection of classic retro games you might enjoy!\n\nWould you like to have them automatically added to your library?\n\nThis can always be done later through the Configurator.") == "true" ]]; then - # install_retrodeck_starterpack - # fi + if [[ ! -f "$bios_folder/capsimg.so" ]]; then + cp -f "/app/retrodeck/extras/Amiga/capsimg.so" "$bios_folder/capsimg.so" + fi cp -f $emuconfigs/rpcs3/vfs.yml /var/config/rpcs3/vfs.yml sed -i 's^\^$(EmulatorDir): .*^$(EmulatorDir): '"$bios_folder/rpcs3/"'^' "$rpcs3vfsconf" diff --git a/functions/prepare_emulator.sh b/functions/prepare_emulator.sh index 8745e131..4ef5fc7d 100644 --- a/functions/prepare_emulator.sh +++ b/functions/prepare_emulator.sh @@ -106,6 +106,12 @@ prepare_emulator() { echo "-----------------------------------------------------------" cp -rf "/app/retrodeck/extras/MSX/Databases" "$bios_folder/Databases" cp -rf "/app/retrodeck/extras/MSX/Machines" "$bios_folder/Machines" + + # AMIGA + echo "-----------------------------------------------------------" + echo "Initializing AMIGA LIBRETRO" + echo "-----------------------------------------------------------" + cp -f "/app/retrodeck/extras/Amiga/capsimg.so" "$bios_folder/capsimg.so" dir_prep "$texture_packs_folder/RetroArch-Mesen" "/var/config/retroarch/system/HdPacks" dir_prep "$texture_packs_folder/RetroArch-Mupen64Plus/cache" "/var/config/retroarch/system/Mupen64plus/cache" diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index bf7d3939..2cb02ed7 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -485,15 +485,16 @@ modules: sha256: MSXBIOSHASHPLACEHOLDER strip-components: 0 - - name: doom-shareware + - name: amiga-bios buildsystem: simple build-commands: - - mkdir -p ${FLATPAK_DEST}/retrodeck/extras - - cp doom1.wad ${FLATPAK_DEST}/retrodeck/extras/ + - mkdir -p ${FLATPAK_DEST}/retrodeck/extras/Amiga + - cp -f Linux/x86-64/capsimg.so ${FLATPAK_DEST}/retrodeck/extras/Amiga/capsimg.so sources: - type: archive - url: https://buildbot.libretro.com/assets/cores/DOOM/Doom%20%28Shareware%29.zip - sha256: DOOMSHAPLACEHOLDER + url: https://github.com/rsn8887/capsimg/releases/download/1.1/Capsimg_for_Retroarch.zip + sha256: 16c1b511b8e1374a2b6461a66bb6f07b7d2627eb4e941fd1497a432330acaad1 + strip-components: 0 # PPSSPP - START # https://github.com/flathub/org.ppsspp.PPSSPP