Merge branch 'cooker' into cooker-save_migration

This commit is contained in:
XargonWan 2022-10-01 23:07:13 +02:00 committed by GitHub
commit 367fb0fff9
13 changed files with 297 additions and 405 deletions

View file

@ -2809,7 +2809,7 @@ menu_mouse_enable = "true"
menu_navigation_browser_filter_supported_extensions_enable = "true" menu_navigation_browser_filter_supported_extensions_enable = "true"
menu_navigation_wraparound_enable = "true" menu_navigation_wraparound_enable = "true"
menu_pause_libretro = "true" menu_pause_libretro = "true"
menu_pointer_enable = "false" menu_pointer_enable = "true"
menu_rgui_full_width_layout = "true" menu_rgui_full_width_layout = "true"
menu_rgui_shadows = "false" menu_rgui_shadows = "false"
menu_rgui_transparency = "true" menu_rgui_transparency = "true"
@ -2821,7 +2821,7 @@ menu_screensaver_timeout = "0"
menu_scroll_delay = "256" menu_scroll_delay = "256"
menu_scroll_fast = "false" menu_scroll_fast = "false"
menu_shader_pipeline = "2" menu_shader_pipeline = "2"
menu_show_advanced_settings = "false" menu_show_advanced_settings = "true"
menu_show_configurations = "true" menu_show_configurations = "true"
menu_show_core_updater = "false" menu_show_core_updater = "false"
menu_show_dump_disc = "true" menu_show_dump_disc = "true"

View file

@ -11,18 +11,21 @@ Core:
Thread Scheduler Mode: Operating System Thread Scheduler Mode: Operating System
Set DAZ and FTZ: false Set DAZ and FTZ: false
SPU Decoder: Recompiler (LLVM) SPU Decoder: Recompiler (LLVM)
SPU GETLLAR polling detection: false SPU Reservation Busy Waiting Percentage: 0
SPU GETLLAR Busy Waiting Percentage: 100
SPU Debug: false SPU Debug: false
MFC Debug: false MFC Debug: false
Preferred SPU Threads: 0 Preferred SPU Threads: 1
SPU delay penalty: 3 SPU delay penalty: 3
SPU loop detection: false SPU loop detection: false
Max SPURS Threads: 6 Max SPURS Threads: 6
SPU Block Size: Safe SPU Block Size: Mega
Accurate GETLLAR: false Accurate GETLLAR: false
Accurate SPU DMA: false Accurate SPU DMA: false
Accurate SPU Reservations: true
Accurate Cache Line Stores: false Accurate Cache Line Stores: false
Accurate RSX reservation access: false Accurate RSX reservation access: false
RSX FIFO Accuracy: Fast
SPU Verification: true SPU Verification: true
SPU Cache: true SPU Cache: true
SPU Profiler: false SPU Profiler: false
@ -53,6 +56,10 @@ Core:
TSX Transaction First Limit: 800 TSX Transaction First Limit: 800
TSX Transaction Second Limit: 2000 TSX Transaction Second Limit: 2000
Clocks scale: 100 Clocks scale: 100
SPU Wake-Up Delay: 0
SPU Wake-Up Delay Thread Mask: 63
Max CPU Preempt Count: 0
Allow RSX CPU Preemptions: true
Sleep Timers Accuracy: As Host Sleep Timers Accuracy: As Host
Performance Report Threshold: 500 Performance Report Threshold: 500
Enable Performance Report: false Enable Performance Report: false
@ -62,6 +69,7 @@ VFS:
Initialize Directories: true Initialize Directories: true
Limit disk cache size: false Limit disk cache size: false
Disk cache maximum size (MB): 5120 Disk cache maximum size (MB): 5120
Empty /dev_hdd0/tmp/: true
Video: Video:
Renderer: Vulkan Renderer: Vulkan
Resolution: 1280x720 Resolution: 1280x720
@ -83,6 +91,7 @@ Video:
Force High Precision Z buffer: false Force High Precision Z buffer: false
Strict Rendering Mode: false Strict Rendering Mode: false
Disable ZCull Occlusion Queries: false Disable ZCull Occlusion Queries: false
Disable Video Output: false
Disable Vertex Cache: false Disable Vertex Cache: false
Disable FIFO Reordering: false Disable FIFO Reordering: false
Enable Frame Skip: false Enable Frame Skip: false
@ -91,7 +100,7 @@ Video:
Disable Vulkan Memory Allocator: false Disable Vulkan Memory Allocator: false
Use full RGB output range: true Use full RGB output range: true
Strict Texture Flushing: false Strict Texture Flushing: false
Disable native float16 support: false Disable native float16 support: true
Multithreaded RSX: false Multithreaded RSX: false
Relaxed ZCULL Sync: false Relaxed ZCULL Sync: false
Enable 3D: false Enable 3D: false
@ -120,7 +129,7 @@ Video:
Asynchronous Texture Streaming 2: false Asynchronous Texture Streaming 2: false
Enable FidelityFX Super Resolution Upscaling: false Enable FidelityFX Super Resolution Upscaling: false
FidelityFX CAS Sharpening Intensity: 50 FidelityFX CAS Sharpening Intensity: 50
Asynchronous Queue Scheduler: Safe Asynchronous Queue Scheduler: Fast
Performance Overlay: Performance Overlay:
Enabled: false Enabled: false
Enable Framerate Graph: false Enable Framerate Graph: false
@ -159,7 +168,7 @@ Audio:
Master Volume: 100 Master Volume: 100
Enable Buffering: true Enable Buffering: true
Desired Audio Buffer Duration: 100 Desired Audio Buffer Duration: 100
Enable Time Stretching: false Enable Time Stretching: true
Time Stretching Threshold: 75 Time Stretching Threshold: 75
Microphone Type: "Null" Microphone Type: "Null"
Microphone Devices: "@@@@@@@@@@@@" Microphone Devices: "@@@@@@@@@@@@"
@ -189,15 +198,19 @@ Net:
DNS address: 8.8.8.8 DNS address: 8.8.8.8
IP swap list: "" IP swap list: ""
PSN status: Disconnected PSN status: Disconnected
Savestate:
Start Paused: false
Suspend Emulation Savestate Mode: true
Inspection Mode Savestates: false
Save Disc Game Data: false
Miscellaneous: Miscellaneous:
Automatically start games after boot: true Automatically start games after boot: true
Exit RPCS3 when process finishes: false Exit RPCS3 when process finishes: true
Start games in fullscreen mode: false Start games in fullscreen mode: true
Prevent display sleep while running games: true Prevent display sleep while running games: true
Show trophy popups: true Show trophy popups: true
Show shader compilation hint: true Show shader compilation hint: true
Use native user interface: true Use native user interface: true
GDB Server: 127.0.0.1:2345 GDB Server: 127.0.0.1:2345
Silence All Logs: false Silence All Logs: false
Window Title Format: "FPS: %F | %R | %V | %T [%t]" Window Title Format: "FPS: %F | %R | %V | %T [%t]"
Log: {}

49
emu-configs/rpcs3/vfs.yml Normal file
View file

@ -0,0 +1,49 @@
$(EmulatorDir): "/home/deck/retrodeck/roms/ps3/emudir"
/dev_hdd0/: $(EmulatorDir)dev_hdd0/
/dev_hdd1/: $(EmulatorDir)dev_hdd1/
/dev_flash/: $(EmulatorDir)dev_flash/
/dev_flash2/: $(EmulatorDir)dev_flash2/
/dev_flash3/: $(EmulatorDir)dev_flash3/
/dev_bdvd/: $(EmulatorDir)dev_bdvd/
/app_home/: ""
/dev_usb***/:
/dev_usb000:
Path: $(EmulatorDir)dev_usb000/
Serial: ""
VID: ""
PID: ""
/dev_usb001:
Path: ""
Serial: ""
VID: ""
PID: ""
/dev_usb002:
Path: ""
Serial: ""
VID: ""
PID: ""
/dev_usb003:
Path: ""
Serial: ""
VID: ""
PID: ""
/dev_usb004:
Path: ""
Serial: ""
VID: ""
PID: ""
/dev_usb005:
Path: ""
Serial: ""
VID: ""
PID: ""
/dev_usb006:
Path: ""
Serial: ""
VID: ""
PID: ""
/dev_usb007:
Path: ""
Serial: ""
VID: ""
PID: ""

View file

@ -55,7 +55,7 @@
<bool name="ScrapeTitleScreens" value="false" /> <bool name="ScrapeTitleScreens" value="false" />
<bool name="ScrapeVideos" value="true" /> <bool name="ScrapeVideos" value="true" />
<bool name="ScraperExcludeRecursively" value="true" /> <bool name="ScraperExcludeRecursively" value="true" />
<bool name="ScraperHaltOnInvalidMedia" value="true" /> <bool name="ScraperHaltOnInvalidMedia" value="false" />
<bool name="ScraperIncludeFolders" value="false" /> <bool name="ScraperIncludeFolders" value="false" />
<bool name="ScraperInteractive" value="false" /> <bool name="ScraperInteractive" value="false" />
<bool name="ScraperOverwriteData" value="false" /> <bool name="ScraperOverwriteData" value="false" />

View file

@ -1612,7 +1612,7 @@
<theme>zxspectrum</theme> <theme>zxspectrum</theme>
</system> </system>
<system> <system>
<name>zzztools</name> <name>tools</name>
<fullname>RetroDECK Tools</fullname> <fullname>RetroDECK Tools</fullname>
<path>/var/config/retrodeck/tools</path> <path>/var/config/retrodeck/tools</path>
<extension>.sh .SH</extension> <extension>.sh .SH</extension>

View file

@ -58,7 +58,6 @@ conf_write() {
then then
sed -i "s%sdcard=.*%sdcard=$sdcard%" "$rd_conf" sed -i "s%sdcard=.*%sdcard=$sdcard%" "$rd_conf"
fi fi
echo "DEBUG: New contents:" echo "DEBUG: New contents:"
cat "$rd_conf" cat "$rd_conf"
echo "" echo ""
@ -93,6 +92,9 @@ then
echo "themes_folder=$themes_folder" >> $rd_conf echo "themes_folder=$themes_folder" >> $rd_conf
echo "sdcard=$sdcard" >> $rd_conf echo "sdcard=$sdcard" >> $rd_conf
echo "Setting config file permissions"
chmod +rwx $rd_conf
# If the config file is existing i just read the variables (source it) # If the config file is existing i just read the variables (source it)
else else
echo "Found RetroDECK config file in $rd_conf" echo "Found RetroDECK config file in $rd_conf"

View file

@ -66,19 +66,19 @@
<url>https://github.com/XargonWan/RetroDECK/releases/tag/0.5.5b</url> <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.5.5b</url>
<description> <description>
<ul> <ul>
<li>IMPORTANT: Started saves migration, the saves are being moved to retrodeck/saves/systemname/emulator, so if the emulator cannot load your saves you have to move them to the new path</li> <li>IMPORTANT: Started saves migration, the saves are being moved to retrodeck/saves/systemname/emulator upon update, however if some emulators cannot load your saves you have to move them manually to the new path</li>
<li>Theme revamp and more themes available such as the old one</li> <li>Theme revamp and more themes available such as the old one</li>
<li>A custom ROMs folder can be now selected during the first setup.</li> <li>Updated RetroArch and its cores from 1.10.2 to 1.11.0</li>
<li>Updated RetroArch and its cores from 1.10.2 to 1.10.3</li> <li>Updated all the standalone emulators to their latest releases</li>
<li>Updated all the standalone emulators to their latrest releases</li> <li>Updated ES-DE to 1.2.6</li>
<li>Updated ES-DE to the 1.2.6</li> <li>Removed the unavailable emulators from the ES-DE list to avoid confusion</li>
<li>Removed the unavailable emualtors fom the ES-DE list to avoid confusion</li>
<li>Updated XEMU configurations and added its (free) assets</li> <li>Updated XEMU configurations and added its (free) assets</li>
<li>Added assets for RetroArch, PPSSPP and BlueMSX (libretro)</li> <li>Added free assets for RetroArch, PPSSPP and BlueMSX (libretro)</li>
<li>New emulator: PCSX2-QT, it's now the default PS2 emulator. Former PCSX2 emulator is now callerd PCSX2 (Legacy).</li> <li>New emulator: PCSX2-QT, it's now the default PS2 emulator. Former PCSX2 emulator is now called PCSX2 (Legacy).</li>
<li>New emualtor: Duckstation for PSX.</li> <li>New emualtor: Duckstation for PSX.</li>
<li>New varialbes system: now some variables such as game folder location are saved in /app/retrodeck/retrodeck.cfg.</li> <li>Swanstation (Libretro) is the new PSX default emulator, so if you don't find your saves just switch back to Beetle</li>
<li>Solved an issue where Dolphin (Standalone) was not save in the intended riectories.</li> <li>New varialbes system: now some variables such as game folder location are saved in /var/config/retrodeck/retrodeck.cfg.</li>
<li>Solved an issue where Dolphin (Standalone) was not saving in the intended directories.</li>
</ul> </ul>
</description> </description>

View file

@ -196,7 +196,7 @@ modules:
sources: sources:
- type: git - type: git
url: https://github.com/FFmpeg/FFmpeg.git url: https://github.com/FFmpeg/FFmpeg.git
tag: n5.1 tag: n5.1.1
- name: freeimage - name: freeimage
no-autogen: true no-autogen: true
@ -289,7 +289,7 @@ modules:
sources: sources:
- type: git - type: git
url: https://github.com/libretro/RetroArch.git url: https://github.com/libretro/RetroArch.git
branch: 9b282aa742b6c3d2f2925ae5a12e2cd7c6b6ad38 commit: 9586d679a8b143fbe1880dff7454fd0809262b55
- type: file - type: file
path: rd-submodules/retroarch/retroarch.cfg path: rd-submodules/retroarch/retroarch.cfg
post-install: post-install:
@ -322,7 +322,7 @@ modules:
sources: sources:
- type: git - type: git
url: https://github.com/libretro/RetroArch.git url: https://github.com/libretro/RetroArch.git
branch: 9b282aa742b6c3d2f2925ae5a12e2cd7c6b6ad38 commit: 9586d679a8b143fbe1880dff7454fd0809262b55
- name: retroarch-filers-audio - name: retroarch-filers-audio
subdir: libretro-common/audio/dsp_filters subdir: libretro-common/audio/dsp_filters
make-install-args: make-install-args:
@ -330,63 +330,63 @@ modules:
sources: sources:
- type: git - type: git
url: https://github.com/libretro/RetroArch.git url: https://github.com/libretro/RetroArch.git
branch: 9b282aa742b6c3d2f2925ae5a12e2cd7c6b6ad38 commit: 9586d679a8b143fbe1880dff7454fd0809262b55
- name: retroarch-assets - name: retroarch-assets
make-install-args: make-install-args:
- PREFIX=${FLATPAK_DEST} - PREFIX=${FLATPAK_DEST}
sources: sources:
- type: git - type: git
url: https://github.com/libretro/retroarch-assets.git url: https://github.com/libretro/retroarch-assets.git
commit: f45dd1351e6bfb9f01e12bee8d358ad22a2bb8f9 commit: ee33f8ef693b42a8e23ca3fd48f43f345e7cd087
- name: libretro-database - name: libretro-database
make-install-args: make-install-args:
- PREFIX=${FLATPAK_DEST} - PREFIX=${FLATPAK_DEST}
sources: sources:
- type: git - type: git
url: https://github.com/libretro/libretro-database.git url: https://github.com/libretro/libretro-database.git
commit: f3b10ec262fcbd78da3473f46d244270d12a327e commit: 772011a54392aab6be1302bf1bd8aa1cc0c0c6c2
- name: libretro-core-info - name: libretro-core-info
make-install-args: make-install-args:
- PREFIX=${FLATPAK_DEST} - PREFIX=${FLATPAK_DEST}
sources: sources:
- type: git - type: git
url: https://github.com/libretro/libretro-core-info.git url: https://github.com/libretro/libretro-core-info.git
commit: 06dac6318c067a6a40e2ea1e1260e74681ada844 commit: 0cc4912691cd1adb87168ce87b6795bdf57b2fe5
- name: retroarch-joypad-autoconfig - name: retroarch-joypad-autoconfig
make-install-args: make-install-args:
- PREFIX=${FLATPAK_DEST} - PREFIX=${FLATPAK_DEST}
sources: sources:
- type: git - type: git
url: https://github.com/libretro/retroarch-joypad-autoconfig.git url: https://github.com/libretro/retroarch-joypad-autoconfig.git
commit: 760b057f1865a827762a54a8a32afda2cdd9e170 commit: a3b5067b8954f15e8e87eeed71a4262f0ea7fd1c
- name: common-shaders - name: common-shaders
make-install-args: make-install-args:
- PREFIX=${FLATPAK_DEST} - PREFIX=${FLATPAK_DEST}
sources: sources:
- type: git - type: git
url: https://github.com/libretro/common-shaders.git url: https://github.com/libretro/common-shaders.git
commit: 55e401834b732e62c34411321c4ffd82524345d4 commit: 86cfa146a8dfddf6377ddb5dbcff552feae2e5bf
- name: slang-shaders - name: slang-shaders
make-install-args: make-install-args:
- PREFIX=${FLATPAK_DEST} - PREFIX=${FLATPAK_DEST}
sources: sources:
- type: git - type: git
url: https://github.com/libretro/slang-shaders.git url: https://github.com/libretro/slang-shaders.git
commit: 148c57d9747f5db124135501ac280b5ca129a83f commit: f8f99ee220edbf2c5df2714a73d46faea43e62e2
- name: glsl-shaders - name: glsl-shaders
make-install-args: make-install-args:
- PREFIX=${FLATPAK_DEST} - PREFIX=${FLATPAK_DEST}
sources: sources:
- type: git - type: git
url: https://github.com/libretro/glsl-shaders.git url: https://github.com/libretro/glsl-shaders.git
commit: 8f6b2649489760caea8f36ec6099998854059569 commit: 46a00f15e09ffbd4fba46ab41f0653aeea918fd1
- name: common-overlays - name: common-overlays
make-install-args: make-install-args:
- PREFIX=${FLATPAK_DEST} - PREFIX=${FLATPAK_DEST}
sources: sources:
- type: git - type: git
url: https://github.com/libretro/common-overlays.git url: https://github.com/libretro/common-overlays.git
commit: db9744f4e58a740f0f10b04b62af347cd6f01928 commit: e2ba730083769b45bac62d164115e7dc197c8b63
# RetroArch - END # RetroArch - END
@ -398,8 +398,8 @@ modules:
- mv ./RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/cores/* /app/share/libretro/cores/ - mv ./RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/cores/* /app/share/libretro/cores/
sources: sources:
- type: archive - type: archive
url: https://buildbot.libretro.com/stable/1.10.3/linux/x86_64/RetroArch_cores.7z url: https://buildbot.libretro.com/stable/1.11.0/linux/x86_64/RetroArch_cores.7z
sha256: 33abf39839687f8faba202ed5dcf3a54c06266a49fad35f0521fa445523d009f sha256: a443c18708b3eda12bdc3419e1aaf9d95370580a38f23d0abfa7868b84ff6fdc
# PPSSPP - START # PPSSPP - START
# https://github.com/flathub/org.ppsspp.PPSSPP # https://github.com/flathub/org.ppsspp.PPSSPP
@ -407,7 +407,7 @@ modules:
- name: ppsspp - name: ppsspp
buildsystem: cmake-ninja buildsystem: cmake-ninja
config-opts: config-opts:
- -DUSE_SYSTEM_FFMPEG=OFF # turn this on? - -DUSE_SYSTEM_FFMPEG=OFF # default: off, turn this on?
- -DUSE_SYSTEM_LIBZIP=ON - -DUSE_SYSTEM_LIBZIP=ON
- -DUSE_SYSTEM_ZSTD=ON - -DUSE_SYSTEM_ZSTD=ON
@ -477,10 +477,10 @@ modules:
dest: ext/zstd dest: ext/zstd
commit: a488ba114ec17ea1054b9057c26a046fc122b3b6 commit: a488ba114ec17ea1054b9057c26a046fc122b3b6
url: https://github.com/facebook/zstd.git url: https://github.com/facebook/zstd.git
#- type: git - type: git
# dest: ffmpeg dest: ffmpeg
# commit: 3ad7ddb9eb2af898dce8c4b5e9a28b77b3f7ddd7 commit: 3ad7ddb9eb2af898dce8c4b5e9a28b77b3f7ddd7
# url: https://github.com/hrydgard/ppsspp-ffmpeg.git url: https://github.com/hrydgard/ppsspp-ffmpeg.git
- type: git - type: git
dest: pspautotests dest: pspautotests
commit: 682a4303aba63a50c91ae0fa6928c9dac8ca9b92 commit: 682a4303aba63a50c91ae0fa6928c9dac8ca9b92
@ -635,6 +635,7 @@ modules:
- install -Dm755 ../yuzu-launcher.sh /app/bin/yuzu-launcher - install -Dm755 ../yuzu-launcher.sh /app/bin/yuzu-launcher
- install -Dm644 ../dist/yuzu.svg /app/share/icons/hicolor/scalable/apps/yuzu.svg - install -Dm644 ../dist/yuzu.svg /app/share/icons/hicolor/scalable/apps/yuzu.svg
sources: sources:
- disable-submodules: true # FLATHUB WORKAROUND
- type: git - type: git
url: https://github.com/yuzu-emu/yuzu-mainline.git url: https://github.com/yuzu-emu/yuzu-mainline.git
tag: mainline-0-1171 tag: mainline-0-1171
@ -957,8 +958,8 @@ modules:
- ln -s "${FLATPAK_DEST}/pcsx2-qt/usr/bin/pcsx2-qt" "${FLATPAK_DEST}/bin/pcsx2-qt" - ln -s "${FLATPAK_DEST}/pcsx2-qt/usr/bin/pcsx2-qt" "${FLATPAK_DEST}/bin/pcsx2-qt"
sources: sources:
- type: file - type: file
url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.3325/pcsx2-v1.7.3325-linux-AppImage-64bit-AVX2-Qt.AppImage url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.3357/pcsx2-v1.7.3357-linux-AppImage-64bit-AVX2-Qt.AppImage
sha256: 5fa89570fb68b8a729dc0589e568d3a09b2b9243d4d66a5b7086975fb02e95e4 sha256: 07f293c1aad832f0a908c18ff94c8b545db0cb56230b4f4574ba75071bd91441
# PCSX2 - END # PCSX2 - END
@ -1386,20 +1387,23 @@ modules:
buildsystem: simple buildsystem: simple
build-commands: build-commands:
# Prep the ES-DE and RetroArch config files - I will have to SED/XMLSTARLET them soon # Initializing retrodeck config folder
- mkdir -p /var/config/retrodeck
# Prep the ES-DE and RetroArch config files - I will have to SED/XMLSTARLET them soon
- rm -rf /app/share/emulationstation/resources/systems/unix/es_find_rules.xml - rm -rf /app/share/emulationstation/resources/systems/unix/es_find_rules.xml
- cp es-configs/es_find_rules.xml /app/share/emulationstation/resources/systems/unix/ - cp es-configs/es_find_rules.xml /app/share/emulationstation/resources/systems/unix/
- rm -rf /app/share/emulationstation/resources/systems/unix/es_systems.xml - rm -rf /app/share/emulationstation/resources/systems/unix/es_systems.xml
- cp es-configs/es_systems.xml /app/share/emulationstation/resources/systems/unix/ - cp es-configs/es_systems.xml /app/share/emulationstation/resources/systems/unix/
# These must be put in home folder, managed by retrodeck.sh # These must be put in home folder, managed by retrodeck.sh
- cp es-configs/es_settings.xml ${FLATPAK_DEST}/retrodeck/es_settings.xml - cp es-configs/es_settings.xml ${FLATPAK_DEST}/retrodeck/es_settings.xml
# Logo, res # Logo, res
- rm -f /app/share/emulationstation/resources/graphics/splash.svg - rm -f /app/share/emulationstation/resources/graphics/splash.svg
- cp res/splash.svg /app/share/emulationstation/resources/graphics/splash.svg - cp res/splash.svg /app/share/emulationstation/resources/graphics/splash.svg
- cp res/icon.svg /app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg - cp res/icon.svg /app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg
# Tools # Tools
- mkdir -p ${FLATPAK_DEST}/retrodeck/tools/ - mkdir -p ${FLATPAK_DEST}/retrodeck/tools/
- cp tools/* ${FLATPAK_DEST}/retrodeck/tools/ - cp tools/* ${FLATPAK_DEST}/retrodeck/tools/
- mv -f es-configs/tools-gamelist.xml ${FLATPAK_DEST}/retrodeck/ - mv -f es-configs/tools-gamelist.xml ${FLATPAK_DEST}/retrodeck/
@ -1410,18 +1414,18 @@ modules:
- cp global.sh /app/bin/global.sh - cp global.sh /app/bin/global.sh
- chmod +x /app/bin/global.sh - chmod +x /app/bin/global.sh
# Desktop entry # Desktop entry
- cp net.retrodeck.retrodeck.desktop /app/share/applications/net.retrodeck.retrodeck.desktop - cp net.retrodeck.retrodeck.desktop /app/share/applications/net.retrodeck.retrodeck.desktop
# TODO: group the configs per-emu and optimize the following cps, like already done with Dolphin. Please not that some files may be renamed, check retrodeck.sh to know how (and fix it after the edit) # TODO: group the configs per-emu and optimize the following cps, like already done with Dolphin. Please not that some files may be renamed, check retrodeck.sh to know how (and fix it after the edit)
# Initializing default emulator configs # Initializing default emulator configs
- cp -r emu-configs ${FLATPAK_DEST}/retrodeck/emu-configs/ - cp -r emu-configs ${FLATPAK_DEST}/retrodeck/emu-configs/
# Overlays # Overlays
#- cp -r overlays ${FLATPAK_DEST}/retrodeck/overlays Disabled in 0.4.2b as it will be introduced in 0.5.0b #- cp -r overlays ${FLATPAK_DEST}/retrodeck/overlays Disabled in 0.4.2b as it will be introduced in 0.5.0b
# Placing appdata # Placing appdata
- mkdir -p ${FLATPAK_DEST}/share/appdata - mkdir -p ${FLATPAK_DEST}/share/appdata
- cp net.retrodeck.retrodeck.appdata.xml ${FLATPAK_DEST}/share/appdata - cp net.retrodeck.retrodeck.appdata.xml ${FLATPAK_DEST}/share/appdata

View file

@ -1,19 +1,18 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 25.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" <svg width="100%" height="100%" viewBox="0 0 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
viewBox="0 0 37.22 37.22" style="enable-background:new 0 0 37.22 37.22;" xml:space="preserve"> <g transform="matrix(1.88235,0,0,1.86861,-7.52941,-5.60584)">
<style type="text/css"> <path d="M140,37.25C140,18.347 124.765,3 106,3L38,3C19.235,3 4,18.347 4,37.25L4,105.75C4,124.653 19.235,140 38,140L106,140C124.765,140 140,124.653 140,105.75L140,37.25Z" style="fill:rgb(17,17,17);"/>
.st0{fill:#FFFFFF;} </g>
.st1{fill:url(#SVGID_1_);} <g transform="matrix(2.02105,0,0,2.02105,-13.4737,-13.4737)">
</style> <g id="D" transform="matrix(-0.674885,8.26495e-17,-8.26495e-17,-0.674885,223.747,109.037)">
<circle cx="18.61" cy="18.61" r="18.61"/> <path d="M172.54,-2.511C175.786,-5.757 179.378,-8.24 183.315,-9.96C187.251,-11.68 191.533,-12.54 196.16,-12.54L271.855,-12.54L271.855,6.901L196.16,6.901C194.44,6.901 192.823,7.222 191.309,7.864C189.795,8.506 188.475,9.39 187.348,10.517C186.222,11.643 185.337,12.964 184.695,14.478C184.053,15.992 183.732,17.609 183.732,19.329L183.732,96.355C183.732,97.954 184.084,99.498 184.786,100.988C185.489,102.478 186.416,103.798 187.566,104.949C188.717,106.1 190.037,107.027 191.527,107.729C193.017,108.432 194.562,108.783 196.16,108.783L271.855,108.783L271.855,128.224L196.16,128.224C193.859,128.224 191.624,127.982 189.456,127.498C187.288,127.013 185.204,126.329 183.206,125.444C181.207,124.56 179.311,123.5 177.518,122.265C175.726,121.029 174.066,119.673 172.54,118.195C169.366,115.118 166.901,111.575 165.145,107.566C163.389,103.556 162.51,99.226 162.51,94.574L162.51,21.11C162.51,16.458 163.37,12.17 165.09,8.246C166.811,4.321 169.294,0.736 172.54,-2.511Z" style="fill:white;fill-rule:nonzero;"/>
<path class="st0" d="M18.56,3.51v5.43c5.39,0,9.75,4.37,9.75,9.75s-4.37,9.75-9.75,9.75v5.43c8.39,0,15.19-6.8,15.19-15.19 </g>
S26.94,3.51,18.56,3.51z"/> <g id="Left-Symbol" serif:id="Left Symbol" transform="matrix(0.494792,-0,-0,0.494792,6.66667,6.66667)">
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.074" y1="18.2778" x2="25.5185" y2="18.2778"> <use xlink:href="#_Image1" x="39.093" y="89.764" width="103.568px" height="78.228px" transform="matrix(0.995844,0,0,0.990223,0,0)"/>
<stop offset="0" style="stop-color:#906DEC"/> </g>
<stop offset="1" style="stop-color:#1D9EFE"/> </g>
</linearGradient> <defs>
<path class="st1" d="M22.32,19.61c1.78-0.1,3.19-1.56,3.19-3.37c0-1.87-1.52-3.39-3.39-3.39h-9.8c-0.7,0-1.26,0.56-1.26,1.26v9.59 <image id="_Image1" width="104px" height="79px" xlink:href="data:image/png;base64,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"/>
h2.7v-4.07h5.11l3.03,4.07h3.38l-2.93-4.08L22.32,19.61z M21.69,17.3h-7.87v-2.19h7.87c0.6,0,1.09,0.49,1.09,1.09 </defs>
C22.78,16.81,22.29,17.3,21.69,17.3z"/>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
res/logo.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 103 KiB

After

Width:  |  Height:  |  Size: 31 KiB

319
res/splash.svg Executable file → Normal file

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 194 KiB

View file

@ -108,7 +108,7 @@ standalones_init() {
cp -fvr $emuconfigs/PCSX2/* /var/config/PCSX2/inis/ cp -fvr $emuconfigs/PCSX2/* /var/config/PCSX2/inis/
sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/PCSX2/inis/PCSX2_ui.ini sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/PCSX2/inis/PCSX2_ui.ini
sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/PCSX2/inis/PCSX2.ini sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/PCSX2/inis/PCSX2.ini
dir_prep "$rdhome/states" "/var/config/PCSX2/sstates" dir_prep "$rdhome/states/ps2/pcsx2" "/var/config/PCSX2/sstates"
dir_prep "$rdhome/screenshots" "/var/config/PCSX2/snaps" dir_prep "$rdhome/screenshots" "/var/config/PCSX2/snaps"
dir_prep "$rdhome/.logs" "/var/config/PCSX2/logs" dir_prep "$rdhome/.logs" "/var/config/PCSX2/logs"
dir_prep "$rdhome/bios" "$rdhome/bios/pcsx2" dir_prep "$rdhome/bios" "$rdhome/bios/pcsx2"
@ -144,13 +144,14 @@ standalones_init() {
echo "Initializing RPCS3" echo "Initializing RPCS3"
echo "------------------------" echo "------------------------"
mkdir -pv /var/config/rpcs3/ mkdir -pv /var/config/rpcs3/
cp -fvr $emuconfigs/config.yml /var/config/rpcs3/ cp -fvr $emuconfigs/rpcs3/* /var/config/rpcs3/
sed -i 's#/home/deck/retrodeck#'$rdhome'#g' /var/config/rpcs3/vfs.yml
# XEMU # XEMU
echo "------------------------" echo "------------------------"
echo "Initializing XEMU" echo "Initializing XEMU"
echo "------------------------" echo "------------------------"
mkdir -pv $rdhome/saves/xemu mkdir -pv $rdhome/saves/xbox/xemu/
cp -fv $emuconfigs/xemu.toml /var/data/xemu/xemu.toml cp -fv $emuconfigs/xemu.toml /var/data/xemu/xemu.toml
sed -i 's#/home/deck/retrodeck#'$rdhome'#g' /var/data/xemu/xemu.toml sed -i 's#/home/deck/retrodeck#'$rdhome'#g' /var/data/xemu/xemu.toml
# Preparing HD dummy Image if the image is not found # Preparing HD dummy Image if the image is not found
@ -169,7 +170,7 @@ standalones_init() {
cp -fv $emuconfigs/ppssppsdl/* /var/config/ppsspp/PSP/SYSTEM/ cp -fv $emuconfigs/ppssppsdl/* /var/config/ppsspp/PSP/SYSTEM/
sed -i 's#/home/deck/retrodeck#'$rdhome'#g' /var/config/ppsspp/PSP/SYSTEM/ppsspp.ini sed -i 's#/home/deck/retrodeck#'$rdhome'#g' /var/config/ppsspp/PSP/SYSTEM/ppsspp.ini
# PPSSPPSDL # DUCKSTATION
echo "------------------------" echo "------------------------"
echo "Initializing DUCKSTATION" echo "Initializing DUCKSTATION"
echo "------------------------" echo "------------------------"
@ -260,6 +261,8 @@ post_update() {
# Resetting es_systems, now we need it but in the future I should think a better solution, maybe with sed # Resetting es_systems, now we need it but in the future I should think a better solution, maybe with sed
cp -fv /app/retrodeck/es_settings.xml /var/config/emulationstation/.emulationstation/es_settings.xml cp -fv /app/retrodeck/es_settings.xml /var/config/emulationstation/.emulationstation/es_settings.xml
# 0.4 -> 0.5
# Perform save and state migration if needed # Perform save and state migration if needed
versionwheresaveschanged="0.4.5b" # Hardcoded break point between unsorted and sorted saves versionwheresaveschanged="0.4.5b" # Hardcoded break point between unsorted and sorted saves
@ -414,40 +417,40 @@ browse(){
done done
} }
advanced(){ #advanced(){
# function to give advanced install options # # function to give advanced install options
echo "Advaced choosed" # echo "Advaced choosed"
#
choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \ # choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" \ # --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" \
--ok-label "ROMs" \ # --ok-label "ROMs" \
--extra-button "Media" \ # --extra-button "Media" \
--extra-button "Themes" \ # --extra-button "Themes" \
--extra-button "Back" \ # --extra-button "Back" \
--text="What do you want to change?\n\nROMS folder = $roms_folder\nMedia folder (scraped data) = $media_folder\nThemes folder=$themes_folder" ) # --text="What do you want to change?\n\nROMS folder = $roms_folder\nMedia folder (scraped data) = $media_folder\nThemes folder=$themes_folder" )
echo "Choice is $choice" # echo "Choice is $choice"
#
case $choice in # case $choice in
#
"" ) # Internal (yes) # "" ) # Internal (yes)
echo "ROMs" # echo "ROMs"
;; # ;;
#
"Media" ) # "Media" )
echo "Media" # echo "Media"
;; # ;;
#
"Themes" ) # "Themes" )
echo "Themes" # echo "Themes"
;; # ;;
#
"Back" ) # Browse + not found fallback # "Back" ) # Browse + not found fallback
echo "Back" # echo "Back"
finit # finit
;; # ;;
#
esac # esac
} #}
finit() { finit() {
# Force/First init, depending on the situation # Force/First init, depending on the situation
@ -457,24 +460,24 @@ finit() {
# Internal or SD Card? # Internal or SD Card?
choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \ choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" \
--ok-label "Internal" \ --ok-label "Cancel" \
--extra-button "Internal" \
--extra-button "SD Card" \ --extra-button "SD Card" \
--extra-button "Advanced" \ #--extra-button "Advanced" \
--extra-button "Cancel" \
--text="Welcome to the first configuration of RetroDECK.\nThe setup will be quick but please READ CAREFULLY each message in order to avoid misconfigurations.\n\nWhere do you want your roms folder to be located?" ) --text="Welcome to the first configuration of RetroDECK.\nThe setup will be quick but please READ CAREFULLY each message in order to avoid misconfigurations.\n\nWhere do you want your roms folder to be located?" )
echo "Choice is $choice" echo "Choice is $choice"
case $choice in case $choice in
"" ) # Internal (yes) "" ) # Cancel or X button quits
echo "Internal selected"
roms_folder="$rdhome/roms"
;;
"Cancel" )
echo "Now quitting" echo "Now quitting"
kill $$ kill $$
;; ;;
"Internal" ) # Internal
echo "Internal selected"
roms_folder="$rdhome/roms"
;;
"SD Card" ) "SD Card" )
echo "SD Card selected" echo "SD Card selected"
@ -491,16 +494,12 @@ finit() {
roms_folder="$sdcard/retrodeck/roms" # sdcard variable is correct as its given by browse function roms_folder="$sdcard/retrodeck/roms" # sdcard variable is correct as its given by browse function
echo "ROMs folder = $roms_folder" echo "ROMs folder = $roms_folder"
fi fi
;; ;;
"Advanced" ) # Browse + not found fallback #"Advanced" ) # Browse + not found fallback
echo "Advanced" # echo "Advanced"
advanced # advanced
;; #;;
1 ) # X button quits
kill $$
;;
esac esac

View file

@ -0,0 +1,55 @@
#!/bin/bash
THIS MUST BE PUT IN RETRODECK.SH
mkdir -p $rdhome/roms/ps3/emudir
#mkdir -p $rdhome/roms/ps3/dump cannot install in nogui
#user must install via emulator
source global.sh
install_ps3_fw(){
# Implement a check to see if the firmware is already installed then call this function
mkdir -p $rdhome/roms/ps3/.emudir
mkdir -p $rdhome/roms/ps3/tmp
chmod 777 $rdhome/roms/ps3/tmp
wget http://dus01.ps3.update.playstation.net/update/ps3/image/us/2022_0510_95307e1b51d3bcc33a274db91488d29f/PS3UPDAT.PUP -P $rdhome/roms/ps3/tmp/
rpcs3 --installfw $rdhome/roms/ps3/tmp/PS3UPDAT.PUP
rm -rf $rdhome/roms/ps3/tmp
}
zenity: "Hey I will destroy everything in $rdhome/roms/ps3/dump"
zenity: this will take a while, have a coffee
# this seems not to be working as rpcs3 doesn't support installation in --no-gui mode
rpcs3 --installpkg $rdhome/roms/ps3/dump/*
for each folder in $rdhome/roms/ps3/emudir/dev_hdd0/game/
gameid=foldername
if gamename.desktop doesnt exist
gamename=we need a file with ID - names
echo in $rdhome/roms/ps3/$gamname.desktop EOF<<
[Desktop Entry]
Encoding=UTF-8
Version=1.0
Type=Application
Terminal=false
Name=$gamename
Exec=rpcs3 --no-gui $rdhome/roms/ps3/emudir/dev_hdd0/game/$gameid
Icon=$rdhome/roms/ps3/emudir/dev_hdd0/game/$gameid/ICON0.PNG
EOF
fi
done
rm -rf $rdhome/roms/ps3/dump/*
zenity: done, restart retrodeck please