Merge branch 'cooker-0.7.0b' of https://github.com/XargonWan/RetroDECK into cooker-0.7.0b

.gitattributes

@@ -0,0 +1 @@
+text eol=lf

automation_tools/sha_update_list.cfg

@@ -1,3 +1,3 @@
 # The proper format for this file is
 # URL^PLACEHOLDERTEXT
-https://buildbot.libretro.com/assets/cores/DOOM/Doom%20%28Shareware%29.zip^DOOMSHAPLACEHOLDER
+https://buildbot.libretro.com/assets/cores/DOOM/Doom%20%28Shareware%29.zip^DOOMSHAPLACEHOLDER

automation_tools/update_sha.sh

@@ -15,7 +15,7 @@ echo
 
 while IFS="^" read -r url placeholder
 do
-  if [[ ! $url == "#"* ]]; then
+  if [[ ! "$url" == "#"* ]] && [[ ! -z "$url" ]]; then
     echo
     echo "Placeholder text: $placeholder"
     echo "URL to hash: $url"
@@ -26,4 +26,4 @@ do
   fi
 done < "$sha_update_list"
 
-echo "Done updating manifest hashes."
+echo "Done updating manifest hashes."

emu-configs/defaults/retrodeck/reference_lists/bios_checklist.cfg

@@ -126,4 +126,4 @@ gluck.rom^fuse/^Unknown^ZX Spectrum^Pentagon 512K/1024 ROM (Required)
 256s-0.rom^fuse/^Unknown^ZX Spectrum^Scorpion 256K ROM (Required)
 256s-1.rom^fuse/^Unknown^ZX Spectrum^Scorpion 256K ROM (Required)
 256s-2.rom^fuse/^Unknown^ZX Spectrum^Scorpion 256K ROM (Required)
-256s-3.rom^fuse/^Unknown^ZX Spectrum^Scorpion 256K ROM (Required)
+256s-3.rom^fuse/^Unknown^ZX Spectrum^Scorpion 256K ROM (Required)

emu-configs/defaults/retrodeck/reference_lists/compression_targets.cfg

@@ -32,4 +32,4 @@ mastersystem
 nds
 nes
 snes
-snesna
+snesna

emu-configs/defaults/retrodeck/reference_lists/input_validation.cfg

@@ -3,4 +3,4 @@ uuddlrlrstart^echo Visit the Configurator to behold your new-found powers.
 uuddlrlrstart^echo But beware, with great power comes great responsibility...
 gameovermangameover^set_setting_value $rd_conf developer_options false retrodeck options
 gameovermangameover^echo You have relinquished your powers in the name of saftey.
-gameovermangameover^echo This was a wise choice.
+gameovermangameover^echo This was a wise choice.

emu-configs/defaults/retrodeck/reference_lists/multi_user_emulator_config_dirs.cfg

@@ -8,4 +8,4 @@ primehack
 rpcs3
 Ryujinx
 xemu
-yuzu
+yuzu

emu-configs/defaults/retrodeck/reference_lists/zip_compressable_extensions.cfg

@@ -57,4 +57,4 @@
 .unf
 .unif
 .xex
-.xfd
+.xfd

emu-configs/defaults/retrodeck/retrodeck.cfg

@@ -23,4 +23,4 @@ cloud_saves=false
 multi_user_mode=false
 ask_default_user=true
 default_user=
-developer_options=false
+developer_options=false

emu-configs/melonDS.ini

@@ -1,135 +1,135 @@
-Key_A=-1
+Key_A=-1
-Key_B=-1
+Key_B=-1
-Key_Select=-1
+Key_Select=-1
-Key_Start=-1
+Key_Start=-1
-Key_Right=-1
+Key_Right=-1
-Key_Left=-1
+Key_Left=-1
-Key_Up=-1
+Key_Up=-1
-Key_Down=-1
+Key_Down=-1
-Key_R=-1
+Key_R=-1
-Key_L=-1
+Key_L=-1
-Key_X=-1
+Key_X=-1
-Key_Y=-1
+Key_Y=-1
-Joy_A=0
+Joy_A=0
-Joy_B=1
+Joy_B=1
-Joy_Select=6
+Joy_Select=6
-Joy_Start=7
+Joy_Start=7
-Joy_Right=258
+Joy_Right=258
-Joy_Left=264
+Joy_Left=264
-Joy_Up=257
+Joy_Up=257
-Joy_Down=260
+Joy_Down=260
-Joy_R=5
+Joy_R=5
-Joy_L=4
+Joy_L=4
-Joy_X=2
+Joy_X=2
-Joy_Y=3
+Joy_Y=3
-HKKey_Lid=-1
+HKKey_Lid=-1
-HKKey_Mic=-1
+HKKey_Mic=-1
-HKKey_Pause=82
+HKKey_Pause=82
-HKKey_Reset=-1
+HKKey_Reset=-1
-HKKey_FastForward=76
+HKKey_FastForward=76
-HKKey_FastForwardToggle=-1
+HKKey_FastForwardToggle=-1
-HKKey_FullscreenToggle=-1
+HKKey_FullscreenToggle=-1
-HKKey_SwapScreens=89
+HKKey_SwapScreens=89
-HKKey_SolarSensorDecrease=-1
+HKKey_SolarSensorDecrease=-1
-HKKey_SolarSensorIncrease=-1
+HKKey_SolarSensorIncrease=-1
-HKKey_FrameStep=-1
+HKKey_FrameStep=-1
-HKJoy_Lid=-1
+HKJoy_Lid=-1
-HKJoy_Mic=-1
+HKJoy_Mic=-1
-HKJoy_Pause=-1
+HKJoy_Pause=-1
-HKJoy_Reset=-1
+HKJoy_Reset=-1
-HKJoy_FastForward=-1
+HKJoy_FastForward=-1
-HKJoy_FastForwardToggle=-1
+HKJoy_FastForwardToggle=-1
-HKJoy_FullscreenToggle=-1
+HKJoy_FullscreenToggle=-1
-HKJoy_SwapScreens=-1
+HKJoy_SwapScreens=-1
-HKJoy_SolarSensorDecrease=-1
+HKJoy_SolarSensorDecrease=-1
-HKJoy_SolarSensorIncrease=-1
+HKJoy_SolarSensorIncrease=-1
-HKJoy_FrameStep=-1
+HKJoy_FrameStep=-1
-JoystickID=0
+JoystickID=0
-WindowWidth=768
+WindowWidth=768
-WindowHeight=418
+WindowHeight=418
-WindowMax=1
+WindowMax=1
-ScreenRotation=0
+ScreenRotation=0
-ScreenGap=0
+ScreenGap=0
-ScreenLayout=3
+ScreenLayout=3
-ScreenSwap=0
+ScreenSwap=0
-ScreenSizing=3
+ScreenSizing=3
-IntegerScaling=1
+IntegerScaling=1
-ScreenAspectTop=0
+ScreenAspectTop=0
-ScreenAspectBot=0
+ScreenAspectBot=0
-ScreenFilter=1
+ScreenFilter=1
-ScreenUseGL=0
+ScreenUseGL=0
-ScreenVSync=0
+ScreenVSync=0
-ScreenVSyncInterval=1
+ScreenVSyncInterval=1
-3DRenderer=1
+3DRenderer=1
-Threaded3D=1
+Threaded3D=1
-GL_ScaleFactor=1
+GL_ScaleFactor=1
-GL_BetterPolygons=0
+GL_BetterPolygons=0
-LimitFPS=1
+LimitFPS=1
-AudioSync=0
+AudioSync=0
-ShowOSD=1
+ShowOSD=1
-ConsoleType=0
+ConsoleType=0
-DirectBoot=1
+DirectBoot=1
-JIT_Enable=0
+JIT_Enable=0
-JIT_MaxBlockSize=32
+JIT_MaxBlockSize=32
-JIT_BranchOptimisations=1
+JIT_BranchOptimisations=1
-JIT_LiteralOptimisations=1
+JIT_LiteralOptimisations=1
-JIT_FastMemory=1
+JIT_FastMemory=1
-ExternalBIOSEnable=1
+ExternalBIOSEnable=1
-BIOS9Path=RETRODECKHOMEDIR/bios/bios9.bin
+BIOS9Path=RETRODECKHOMEDIR/bios/bios9.bin
-BIOS7Path=RETRODECKHOMEDIR/bios/bios7.bin
+BIOS7Path=RETRODECKHOMEDIR/bios/bios7.bin
-FirmwarePath=RETRODECKHOMEDIR/bios/firmware.bin
+FirmwarePath=RETRODECKHOMEDIR/bios/firmware.bin
-DSiBIOS9Path=
+DSiBIOS9Path=
-DSiBIOS7Path=
+DSiBIOS7Path=
-DSiFirmwarePath=
+DSiFirmwarePath=
-DSiNANDPath=
+DSiNANDPath=
-DLDIEnable=0
+DLDIEnable=0
-DLDISDPath=dldi.bin
+DLDISDPath=dldi.bin
-DLDISize=0
+DLDISize=0
-DLDIReadOnly=0
+DLDIReadOnly=0
-DLDIFolderSync=0
+DLDIFolderSync=0
-DLDIFolderPath=
+DLDIFolderPath=
-DSiSDEnable=0
+DSiSDEnable=0
-DSiSDPath=dsisd.bin
+DSiSDPath=dsisd.bin
-DSiSDSize=0
+DSiSDSize=0
-DSiSDReadOnly=0
+DSiSDReadOnly=0
-DSiSDFolderSync=0
+DSiSDFolderSync=0
-DSiSDFolderPath=
+DSiSDFolderPath=
-FirmwareOverrideSettings=0
+FirmwareOverrideSettings=0
-FirmwareUsername=RetroDECK
+FirmwareUsername=RetroDECK
-FirmwareLanguage=1
+FirmwareLanguage=1
-FirmwareBirthdayMonth=3
+FirmwareBirthdayMonth=3
-FirmwareBirthdayDay=4
+FirmwareBirthdayDay=4
-FirmwareFavouriteColour=0
+FirmwareFavouriteColour=0
-FirmwareMessage=
+FirmwareMessage=
-FirmwareMAC=
+FirmwareMAC=
-RandomizeMAC=0
+RandomizeMAC=0
-SockBindAnyAddr=0
+SockBindAnyAddr=0
-LANDevice=
+LANDevice=
-DirectLAN=0
+DirectLAN=0
-SavStaRelocSRAM=0
+SavStaRelocSRAM=0
-AudioInterp=0
+AudioInterp=0
-AudioBitrate=0
+AudioBitrate=0
-AudioVolume=256
+AudioVolume=256
-MicInputType=1
+MicInputType=1
-MicWavPath=
+MicWavPath=
-LastROMFolder=
+LastROMFolder=
-RecentROM_0=
+RecentROM_0=
-RecentROM_1=
+RecentROM_1=
-RecentROM_2=
+RecentROM_2=
-RecentROM_3=
+RecentROM_3=
-RecentROM_4=
+RecentROM_4=
-RecentROM_5=
+RecentROM_5=
-RecentROM_6=
+RecentROM_6=
-RecentROM_7=
+RecentROM_7=
-RecentROM_8=
+RecentROM_8=
-RecentROM_9=
+RecentROM_9=
-SaveFilePath=RETRODECKHOMEDIR/saves/nds/melonds
+SaveFilePath=RETRODECKHOMEDIR/saves/nds/melonds
-SavestatePath=RETRODECKHOMEDIR/states/nds/melonds
+SavestatePath=RETRODECKHOMEDIR/states/nds/melonds
-CheatFilePath=
+CheatFilePath=
-EnableCheats=0
+EnableCheats=0
-MouseHide=0
+MouseHide=0
-MouseHideSeconds=5
+MouseHideSeconds=5
-PauseLostFocus=1
+PauseLostFocus=1
-DSBatteryLevelOkay=1
+DSBatteryLevelOkay=1
-DSiBatteryLevel=15
+DSiBatteryLevel=15
 DSiBatteryCharging=1

net.retrodeck.retrodeck.yml

@@ -425,15 +425,15 @@ modules:
         url: https://buildbot.libretro.com/stable/1.15.0/linux/x86_64/RetroArch_cores.7z
         sha256: 2230bc38eaf87406efd0c2b7bdd1cf9e813ba113505600f14a7ef9eb06f8c7c0
 
-  # - name: doom-shareware
+  - name: doom-shareware
-  #   buildsystem: simple
+    buildsystem: simple
-  #   build-commands:
+    build-commands:
-  #   - mkdir -p ${FLATPAK_DEST}/retrodeck/extras
+    - mkdir -p ${FLATPAK_DEST}/retrodeck/extras
-  #   - cp doom1.wad ${FLATPAK_DEST}/retrodeck/extras/
+    - cp doom1.wad ${FLATPAK_DEST}/retrodeck/extras/
-  #   sources:
+    sources:
-  #     - type: archive
+      - type: archive
-  #       url: https://buildbot.libretro.com/assets/cores/DOOM/Doom%20%28Shareware%29.zip
+        url: https://buildbot.libretro.com/assets/cores/DOOM/Doom%20%28Shareware%29.zip
-  #       sha256: DOOMSHAPLACEHOLDER
+        sha256: DOOMSHAPLACEHOLDER
 
   # PPSSPP - START
   # https://github.com/flathub/org.ppsspp.PPSSPP
@@ -1236,4 +1236,4 @@ modules:
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git
-        branch: cooker-0.7.0b
+        branch: cooker-0.7.0b

rd-submodules/es-de/es-de-retrodeck-mods.patch

@@ -4,9 +4,9 @@ diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de-p
 @@ -10,2 +10,3 @@
  #include "guis/GuiMenu.h"
 +#include "utils/PlatformUtil.h"
- 
+
 @@ -66,2 +67,4 @@
- 
+
 +    addEntry("RETRODECK CONFIGURATOR", 0x777777FF, false, [this] { openRetroDeckConfigurator(); });
 +
      if (!Settings::getInstance()->getBool("ForceKiosk") &&
@@ -21,7 +21,7 @@ diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de-p
 +            addEntry("QUIT RETRODECK", 0x777777FF, false, [this] { openQuitMenu(); });
  #endif
 @@ -1704,2 +1707,15 @@
- 
+
 +void GuiMenu::openRetroDeckConfigurator()
 +{
 +    // Launch the configurator.sh script

rd-submodules/retroarch

@@ -1 +1 @@
-Subproject commit 717b78093797270877ec416e58082f1c71d435d8
+Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409

retrodeck.sh

@@ -129,6 +129,7 @@ then
       fi
     else # If newly-installed version is a normal build.
       post_update       # Executing post update script
+    fi
   fi
 # Else, LOCKFILE IS NOT EXISTING (WAS REMOVED)
 # if the lock file doesn't exist at all means that it's a fresh install or a triggered reset
@@ -157,4 +158,4 @@ fi
 
 # Normal Startup
 
-start_retrodeck
+start_retrodeck