Merge remote-tracking branch 'upstream/main' into cooker-0.7.0b-icenine451

2024-11-25 15:35:38 +00:00 · 2023-04-07 11:54:39 -04:00 · 2023-04-07 11:54:39 -04:00 · 15a7ea90de
parent 93b2c9e534 889b511e9d
commit 15a7ea90de
7 changed files with 50 additions and 27 deletions
--- a/README.md
+++ b/README.md
@ -9,7 +9,7 @@

 # RetroDECK

-**RetroDECK** brings an environment to catalog and play your retro games directly from SteamOS and it's tailored specifically for the **Steam Deck**.
+**RetroDECK** brings an environment to catalog and play your retro games directly on your **Steam Deck**.

 It's inspired by embedded emulation systems like AmberELEC, EmuELEC, CoreELEC, Lakka, and Batocera.

--- a/emu-configs/yuzu/qt-config.ini
+++ b/emu-configs/yuzu/qt-config.ini
@ -892,7 +892,7 @@ fsr_sharpening_slider=25
 fsr_sharpening_slider\default=true
 fullscreen_mode=1
 fullscreen_mode\default=true
-gpu_accuracy=1
+gpu_accuracy=0
 gpu_accuracy\default=true
 max_anisotropy=0
 max_anisotropy\default=true
--- a/es-configs/es_settings.xml
+++ b/es-configs/es_settings.xml
@ -137,7 +137,7 @@
 <string name="StartupSystem" value="" />
 <string name="ThemeAspectRatio" value="" />
 <string name="ThemeColorScheme" value="" />
-<string name="ThemeSet" value="art-book-next-de" />
+<string name="ThemeSet" value="art-book-next-es-de" />
 <string name="ThemeTransitions" value="automatic" />
 <string name="ThemeVariant" value="" />
 <string name="UIMode" value="full" />
--- a/es-configs/es_systems.xml
+++ b/es-configs/es_systems.xml
@ -244,7 +244,7 @@
        <path>%ROMPATH%/atarixe</path>
        <extension>.a52 .A52 .atr .ATR .atx .ATX .bin .BIN .cas .CAS .cdm .CDM .xex .XEX .xfd .XFD .7z .7Z .zip .ZIP</extension>
        <command label="Atari800">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.so %ROM%</command>
-        <command label="Atari800 (Standalone)">%EMULATOR_ATARI800% %ROM%</command>
+        <!-- <command label="Atari800 (Standalone)">%EMULATOR_ATARI800% %ROM%</command> -->
        <platform>atarixe</platform>
        <theme>atarixe</theme>
    </system>
@ -254,7 +254,7 @@
        <path>%ROMPATH%/atomiswave</path>
        <extension>.bin .BIN .cdi .CDI .cue .CUE .dat .DAT .elf .ELF .gdi .GDI .iso .ISO .lst .LST .m3u .M3U .7z .7Z .zip .ZIP</extension>
        <command label="Flycast">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%</command>
-        <command label="Flycast (Standalone)">%EMULATOR_FLYCAST% %ROM%</command>
+        <!-- <command label="Flycast (Standalone)">%EMULATOR_FLYCAST% %ROM%</command> -->
        <platform>arcade</platform>
        <theme>atomiswave</theme>
    </system>
@ -435,6 +435,7 @@
        <theme>crvision</theme>
    </system>
 -->
+<!--
    <system>
        <name>daphne</name>
        <fullname>Daphne Arcade LaserDisc Emulator</fullname>
@ -445,13 +446,14 @@
        <platform>daphne</platform>
        <theme>daphne</theme>
    </system>
+-->
    <system>
        <name>doom</name>
        <fullname>Doom</fullname>
        <path>%ROMPATH%/doom</path>
        <extension>.desktop .iwad .IWAD .pk4 .PK4 .pwad .PWAD .sh .wad .WAD</extension>
        <command label="PrBoom">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prboom_libretro.so %ROM%</command>
-        <command label="PrBoom+ (Standalone)">%EMULATOR_PRBOOM-PLUS% -iwad %ROM%</command>
+        <!-- <command label="PrBoom+ (Standalone)">%EMULATOR_PRBOOM-PLUS% -iwad %ROM%</command> -->
        <command label="Boom 3">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/boom3_libretro.so %ROM%</command>
        <command label="Boom 3 xp">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/boom3_xp_libretro.so %ROM%</command>
        <command label="Shortcut or script">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
@ -489,8 +491,8 @@
        <path>%ROMPATH%/dreamcast</path>
        <extension>.chd .CHD .cdi .CDI .iso .ISO .elf .ELF .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP</extension>
        <command label="Flycast">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%</command>
-        <command label="Flycast (Standalone)">%EMULATOR_FLYCAST% %ROM%</command>
-        <command label="Redream (Standalone)">%EMULATOR_REDREAM% %ROM%</command>
+        <!-- <command label="Flycast (Standalone)">%EMULATOR_FLYCAST% %ROM%</command> -->
+        <!-- <command label="Redream (Standalone)">%EMULATOR_REDREAM% %ROM%</command> -->
        <platform>dreamcast</platform>
        <theme>dreamcast</theme>
    </system>
@ -570,6 +572,7 @@
        <theme>flash</theme>
    </system>
 -->
+<!--
    <system>
        <name>fmtowns</name>
        <fullname>Fujitsu FM Towns</fullname>
@ -629,9 +632,9 @@
        <command label="Mesen-S">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%</command>
        <command label="bsnes">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%</command>
        <command label="mGBA">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mgba_libretro.so %ROM%</command>
-        <command label="mGBA (Standalone)">%EMULATOR_MGBA% -f %ROM%</command>
+        <!-- <command label="mGBA (Standalone)">%EMULATOR_MGBA% -f %ROM%</command> -->
        <command label="VBA-M">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vbam_libretro.so %ROM%</command>
-        <command label="VBA-M (Standalone)">%EMULATOR_VBA-M% -f %ROM%</command>
+        <!-- <command label="VBA-M (Standalone)">%EMULATOR_VBA-M% -f %ROM%</command> -->
        <platform>gb</platform>
        <theme>gb</theme>
    </system>
@ -641,9 +644,9 @@
        <path>%ROMPATH%/gba</path>
        <extension>.agb .AGB .bin .BIN .cgb .CGB .dmg .DMG .gb .GB .gba .GBA .gbc .GBC .sgb .SGB .7z .7Z .zip .ZIP</extension>
        <command label="mGBA">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mgba_libretro.so %ROM%</command>
-        <command label="mGBA (Standalone)">%EMULATOR_MGBA% -f %ROM%</command>
+        <!-- <command label="mGBA (Standalone)">%EMULATOR_MGBA% -f %ROM%</command> -->
        <command label="VBA-M">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vbam_libretro.so %ROM%</command>
-        <command label="VBA-M (Standalone)">%EMULATOR_VBA-M% -f %ROM%</command>
+        <!-- <command label="VBA-M (Standalone)">%EMULATOR_VBA-M% -f %ROM%</command> -->
        <command label="VBA Next">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vba_next_libretro.so %ROM%</command>
        <command label="gpSP">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gpsp_libretro.so %ROM%</command>
        <platform>gba</platform>
@ -663,9 +666,9 @@
        <command label="Mesen-S">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%</command>
        <command label="bsnes">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%</command>
        <command label="mGBA">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mgba_libretro.so %ROM%</command>
-        <command label="mGBA (Standalone)">%EMULATOR_MGBA% -f %ROM%</command>
+        <!-- <command label="mGBA (Standalone)">%EMULATOR_MGBA% -f %ROM%</command> -->
        <command label="VBA-M">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vbam_libretro.so %ROM%</command>
-        <command label="VBA-M (Standalone)">%EMULATOR_VBA-M% -f %ROM%</command>
+        <!-- <command label="VBA-M (Standalone)">%EMULATOR_VBA-M% -f %ROM%</command> -->
        <platform>gbc</platform>
        <theme>gbc</theme>
    </system>
@ -1017,7 +1020,7 @@
        <path>%ROMPATH%/naomi</path>
        <extension>.cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP</extension>
        <command label="Flycast">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%</command>
-        <command label="Flycast (Standalone)">%EMULATOR_FLYCAST% %ROM%</command>
+        <!--  <command label="Flycast (Standalone)">%EMULATOR_FLYCAST% %ROM%</command> -->
        <platform>arcade</platform>
        <theme>naomi</theme>
    </system>
@ -1027,7 +1030,7 @@
        <path>%ROMPATH%/naomigd</path>
        <extension>.cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP</extension>
        <command label="Flycast">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%</command>
-        <command label="Flycast (Standalone)">%EMULATOR_FLYCAST% %ROM%</command>
+        <!-- <command label="Flycast (Standalone)">%EMULATOR_FLYCAST% %ROM%</command> -->
        <platform>arcade</platform>
        <theme>naomigd</theme>
    </system>
@ -1086,7 +1089,7 @@
        <extension>.fds .FDS .nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP</extension>
        <command label="Mesen">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM%</command>
        <command label="Nestopia UE">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM%</command>
-        <command label="Nestopia UE (Standalone)">%EMULATOR_NESTOPIA-UE% --fullscreen %ROM%</command>
+        <!-- <command label="Nestopia UE (Standalone)">%EMULATOR_NESTOPIA-UE% &ndash;&ndashfullscreen %ROM%</command> -->
        <command label="FCEUmm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM%</command>
        <command label="QuickNES">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quicknes_libretro.so %ROM%</command>
        <!-- <command label="puNES (Standalone)">%EMULATOR_PUNES% -u yes %ROM%</command> -->
@ -1209,7 +1212,7 @@
        <path>%ROMPATH%/pcfx</path>
        <extension>.ccd .CCD .chd .CHD .cue CUE .m3u .M3U .toc .TOC .7z .7Z .zip .ZIP</extension>
        <command label="Beetle PC-FX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pcfx_libretro.so %ROM%</command>
-        <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module pcfx %ROM%</command>
+        <!-- <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module pcfx %ROM%</command> -->
        <platform>pcfx</platform>
        <theme>pcfx</theme>
    </system>
@ -1350,11 +1353,11 @@
        <extension>.bml .BML .bs .BS .fig .FIG .sfc .SFC .smc .SMC .swc .SWC .st .ST .7z .7Z .zip .ZIP</extension>
        <command label="Snes9x - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM%</command>
        <command label="Snes9x 2010">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM%</command>
-        <command label="Snes9x (Standalone)">%EMULATOR_SNES9X% %ROM%</command>
+        <!--<command label="Snes9x (Standalone)">%EMULATOR_SNES9X% %ROM%</command> -->
        <command label="bsnes">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%</command>
        <command label="bsnes-hd">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM%</command>
        <command label="bsnes-mercury Accuracy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM%</command>
-        <command label="bsnes (Standalone)">%EMULATOR_BSNES% --fullscreen %ROM%</command>
+        <!--<command label="bsnes (Standalone)">%EMULATOR_BSNES% &ndash;&ndashfullscreen %ROM%</command> -->
        <command label="Mesen-S">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%</command>
        <platform>satellaview</platform>
        <theme>satellaview</theme>
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/net.retrodeck.retrodeck.appdata.xml
@ -65,17 +65,29 @@
   <project_license>GPL-3.0</project_license>
   <metadata_license>CC0-1.0</metadata_license>
   <releases>
+      <release version="0.6.5b" date="2023-04-07">
+         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.5b</url>
+         <description>
+            <p>Bug fixes and other changes:</p>
+            <ul>
+               <li>Rolled back to latest working Yuzu</li>
+               <li>Improved Yuzu performance by tweaking GPU options</li>
+               <li>Fixed an issue where the default theme was not loaded</li>
+               <li>Removed unavailable emulators entries</li>
+            </ul>
+         </description>
+      </release>
      <release version="0.6.4b" date="2023-04-04">
         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.4b</url>
         <description>
-            <p>New features - General</p>
+            <p>New features - General:</p>
            <ul>
               <li>Updated to ES-DE 2.0</li>
               <li>Added the NSO Menu Interpreted theme</li>
               <li>Updated all included themes</li>
               <li>Updated the Emulators/RetroArch + cores</li>
            </ul>
-            <p>Bug fixes and other changes</p>
+            <p>Bug fixes and other changes:</p>
            <ul>
               <li>Fixed an audio issue in the Primehack configuration</li>
               <li>Various backend fixes</li>
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@ -77,9 +77,11 @@ modules:
    buildsystem: simple
    build-commands:
      - |
+      
+        VERSION="0.6.5b"
+
        git checkout ${GITHUB_REF_NAME}
        mkdir -p ${FLATPAK_DEST}/retrodeck/
-        VERSION="0.6.4b"
        if [[ $VERSION == *"cooker"* ]];
        then
          VERSION="$VERSION-[$(git rev-parse --short HEAD)]"
@ -517,8 +519,8 @@ modules:
      - ln -s "${FLATPAK_DEST}/yuzu/usr/bin/yuzu" "${FLATPAK_DEST}/bin/yuzu"
    sources:
      - type: file
-        url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1388/yuzu-mainline-20230330-03db6543e.AppImage
-        sha256: aca7c691f74b0cf74c1801d9960266bc1ce818bca9c242945b95545d22b04d80
+        url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1369/yuzu-mainline-20230312-54c359d1e.AppImage
+        sha256: 219874f72ea09856c8f1349d7bf744ecbd2823a469bd29f036b386924f5c5a97

  # Yuzu - END

--- a/post_update.sh
+++ b/post_update.sh
@ -61,6 +61,12 @@ post_update() {

    deploy_multi_patch "emu-configs/patches/updates/064b_update.patch"
  fi
+  if [[ $prev_version -le "065" ]]; then
+    # In version 0.6.5b, the following changes were made:
+    # Change Yuzu GPU accuracy to normal for better performance
+
+    set_setting_value $yuzuconf "gpu_accuracy" "0" "yuzu" "Renderer"
+  fi
  if [[ $prev_version -le "070" ]]; then
    # In version 0.7.0b, the following changes were made that required config file updates/reset or other changes to the filesystem:
    # - New ~/retrodeck/mods and ~/retrodeck/texture_packs directories are added and symlinked to multiple different emulators (where supported)