diff --git a/emu-configs/retroarch.cfg b/emu-configs/retroarch.cfg index b4da870c..752a0596 100644 --- a/emu-configs/retroarch.cfg +++ b/emu-configs/retroarch.cfg @@ -2809,7 +2809,7 @@ menu_mouse_enable = "true" menu_navigation_browser_filter_supported_extensions_enable = "true" menu_navigation_wraparound_enable = "true" menu_pause_libretro = "true" -menu_pointer_enable = "false" +menu_pointer_enable = "true" menu_rgui_full_width_layout = "true" menu_rgui_shadows = "false" menu_rgui_transparency = "true" @@ -2821,7 +2821,7 @@ menu_screensaver_timeout = "0" menu_scroll_delay = "256" menu_scroll_fast = "false" menu_shader_pipeline = "2" -menu_show_advanced_settings = "false" +menu_show_advanced_settings = "true" menu_show_configurations = "true" menu_show_core_updater = "false" menu_show_dump_disc = "true" diff --git a/emu-configs/config.yml b/emu-configs/rpcs3/config.yml similarity index 87% rename from emu-configs/config.yml rename to emu-configs/rpcs3/config.yml index b57d6713..b8555168 100644 --- a/emu-configs/config.yml +++ b/emu-configs/rpcs3/config.yml @@ -11,18 +11,21 @@ Core: Thread Scheduler Mode: Operating System Set DAZ and FTZ: false SPU Decoder: Recompiler (LLVM) - SPU GETLLAR polling detection: false + SPU Reservation Busy Waiting Percentage: 0 + SPU GETLLAR Busy Waiting Percentage: 100 SPU Debug: false MFC Debug: false - Preferred SPU Threads: 0 + Preferred SPU Threads: 1 SPU delay penalty: 3 SPU loop detection: false Max SPURS Threads: 6 - SPU Block Size: Safe + SPU Block Size: Mega Accurate GETLLAR: false Accurate SPU DMA: false + Accurate SPU Reservations: true Accurate Cache Line Stores: false Accurate RSX reservation access: false + RSX FIFO Accuracy: Fast SPU Verification: true SPU Cache: true SPU Profiler: false @@ -53,6 +56,10 @@ Core: TSX Transaction First Limit: 800 TSX Transaction Second Limit: 2000 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 Performance Report Threshold: 500 Enable Performance Report: false @@ -62,6 +69,7 @@ VFS: Initialize Directories: true Limit disk cache size: false Disk cache maximum size (MB): 5120 + Empty /dev_hdd0/tmp/: true Video: Renderer: Vulkan Resolution: 1280x720 @@ -83,6 +91,7 @@ Video: Force High Precision Z buffer: false Strict Rendering Mode: false Disable ZCull Occlusion Queries: false + Disable Video Output: false Disable Vertex Cache: false Disable FIFO Reordering: false Enable Frame Skip: false @@ -91,7 +100,7 @@ Video: Disable Vulkan Memory Allocator: false Use full RGB output range: true Strict Texture Flushing: false - Disable native float16 support: false + Disable native float16 support: true Multithreaded RSX: false Relaxed ZCULL Sync: false Enable 3D: false @@ -120,7 +129,7 @@ Video: Asynchronous Texture Streaming 2: false Enable FidelityFX Super Resolution Upscaling: false FidelityFX CAS Sharpening Intensity: 50 - Asynchronous Queue Scheduler: Safe + Asynchronous Queue Scheduler: Fast Performance Overlay: Enabled: false Enable Framerate Graph: false @@ -159,7 +168,7 @@ Audio: Master Volume: 100 Enable Buffering: true Desired Audio Buffer Duration: 100 - Enable Time Stretching: false + Enable Time Stretching: true Time Stretching Threshold: 75 Microphone Type: "Null" Microphone Devices: "@@@@@@@@@@@@" @@ -189,15 +198,19 @@ Net: DNS address: 8.8.8.8 IP swap list: "" PSN status: Disconnected +Savestate: + Start Paused: false + Suspend Emulation Savestate Mode: true + Inspection Mode Savestates: false + Save Disc Game Data: false Miscellaneous: Automatically start games after boot: true - Exit RPCS3 when process finishes: false - Start games in fullscreen mode: false + Exit RPCS3 when process finishes: true + Start games in fullscreen mode: true Prevent display sleep while running games: true Show trophy popups: true Show shader compilation hint: true Use native user interface: true GDB Server: 127.0.0.1:2345 Silence All Logs: false - Window Title Format: "FPS: %F | %R | %V | %T [%t]" -Log: {} \ No newline at end of file + Window Title Format: "FPS: %F | %R | %V | %T [%t]" \ No newline at end of file diff --git a/emu-configs/rpcs3/vfs.yml b/emu-configs/rpcs3/vfs.yml new file mode 100644 index 00000000..f5b89a9f --- /dev/null +++ b/emu-configs/rpcs3/vfs.yml @@ -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: "" \ No newline at end of file diff --git a/es-configs/es_settings.xml b/es-configs/es_settings.xml index 599b3987..15a842eb 100644 --- a/es-configs/es_settings.xml +++ b/es-configs/es_settings.xml @@ -55,7 +55,7 @@ - + diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml index 4899e218..07087026 100644 --- a/es-configs/es_systems.xml +++ b/es-configs/es_systems.xml @@ -1612,7 +1612,7 @@ zxspectrum - zzztools + tools RetroDECK Tools /var/config/retrodeck/tools .sh .SH diff --git a/global.sh b/global.sh index f64efebd..60635e28 100755 --- a/global.sh +++ b/global.sh @@ -58,7 +58,6 @@ conf_write() { then sed -i "s%sdcard=.*%sdcard=$sdcard%" "$rd_conf" fi - echo "DEBUG: New contents:" cat "$rd_conf" echo "" @@ -93,6 +92,9 @@ then echo "themes_folder=$themes_folder" >> $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) else echo "Found RetroDECK config file in $rd_conf" diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index c2790b28..c2b9104f 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -66,19 +66,19 @@ https://github.com/XargonWan/RetroDECK/releases/tag/0.5.5b
    -
  • 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
    • +
  • 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
  • Theme revamp and more themes available such as the old one
    • -
  • A custom ROMs folder can be now selected during the first setup.
    • -
  • Updated RetroArch and its cores from 1.10.2 to 1.10.3
    • -
  • Updated all the standalone emulators to their latrest releases
    • -
  • Updated ES-DE to the 1.2.6
    • -
  • Removed the unavailable emualtors fom the ES-DE list to avoid confusion
    • +
  • Updated RetroArch and its cores from 1.10.2 to 1.11.0
    • +
  • Updated all the standalone emulators to their latest releases
    • +
  • Updated ES-DE to 1.2.6
    • +
  • Removed the unavailable emulators from the ES-DE list to avoid confusion
  • Updated XEMU configurations and added its (free) assets
    • -
  • Added assets for RetroArch, PPSSPP and BlueMSX (libretro)
    • -
  • New emulator: PCSX2-QT, it's now the default PS2 emulator. Former PCSX2 emulator is now callerd PCSX2 (Legacy).
    • +
  • Added free assets for RetroArch, PPSSPP and BlueMSX (libretro)
    • +
  • New emulator: PCSX2-QT, it's now the default PS2 emulator. Former PCSX2 emulator is now called PCSX2 (Legacy).
  • New emualtor: Duckstation for PSX.
    • -
  • New varialbes system: now some variables such as game folder location are saved in /app/retrodeck/retrodeck.cfg.
    • -
  • Solved an issue where Dolphin (Standalone) was not save in the intended riectories.
    • +
  • Swanstation (Libretro) is the new PSX default emulator, so if you don't find your saves just switch back to Beetle
    • +
  • New varialbes system: now some variables such as game folder location are saved in /var/config/retrodeck/retrodeck.cfg.
    • +
  • Solved an issue where Dolphin (Standalone) was not saving in the intended directories.
 diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 80ed3587..a8620a46 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -196,7 +196,7 @@ modules: sources: - type: git url: https://github.com/FFmpeg/FFmpeg.git - tag: n5.1 + tag: n5.1.1 - name: freeimage no-autogen: true @@ -289,7 +289,7 @@ modules: sources: - type: git url: https://github.com/libretro/RetroArch.git - branch: 9b282aa742b6c3d2f2925ae5a12e2cd7c6b6ad38 + commit: 9586d679a8b143fbe1880dff7454fd0809262b55 - type: file path: rd-submodules/retroarch/retroarch.cfg post-install: @@ -322,7 +322,7 @@ modules: sources: - type: git url: https://github.com/libretro/RetroArch.git - branch: 9b282aa742b6c3d2f2925ae5a12e2cd7c6b6ad38 + commit: 9586d679a8b143fbe1880dff7454fd0809262b55 - name: retroarch-filers-audio subdir: libretro-common/audio/dsp_filters make-install-args: @@ -330,63 +330,63 @@ modules: sources: - type: git url: https://github.com/libretro/RetroArch.git - branch: 9b282aa742b6c3d2f2925ae5a12e2cd7c6b6ad38 + commit: 9586d679a8b143fbe1880dff7454fd0809262b55 - name: retroarch-assets make-install-args: - PREFIX=${FLATPAK_DEST} sources: - type: git url: https://github.com/libretro/retroarch-assets.git - commit: f45dd1351e6bfb9f01e12bee8d358ad22a2bb8f9 + commit: ee33f8ef693b42a8e23ca3fd48f43f345e7cd087 - name: libretro-database make-install-args: - PREFIX=${FLATPAK_DEST} sources: - type: git url: https://github.com/libretro/libretro-database.git - commit: f3b10ec262fcbd78da3473f46d244270d12a327e + commit: 772011a54392aab6be1302bf1bd8aa1cc0c0c6c2 - name: libretro-core-info make-install-args: - PREFIX=${FLATPAK_DEST} sources: - type: git url: https://github.com/libretro/libretro-core-info.git - commit: 06dac6318c067a6a40e2ea1e1260e74681ada844 + commit: 0cc4912691cd1adb87168ce87b6795bdf57b2fe5 - name: retroarch-joypad-autoconfig make-install-args: - PREFIX=${FLATPAK_DEST} sources: - type: git url: https://github.com/libretro/retroarch-joypad-autoconfig.git - commit: 760b057f1865a827762a54a8a32afda2cdd9e170 + commit: a3b5067b8954f15e8e87eeed71a4262f0ea7fd1c - name: common-shaders make-install-args: - PREFIX=${FLATPAK_DEST} sources: - type: git url: https://github.com/libretro/common-shaders.git - commit: 55e401834b732e62c34411321c4ffd82524345d4 + commit: 86cfa146a8dfddf6377ddb5dbcff552feae2e5bf - name: slang-shaders make-install-args: - PREFIX=${FLATPAK_DEST} sources: - type: git url: https://github.com/libretro/slang-shaders.git - commit: 148c57d9747f5db124135501ac280b5ca129a83f + commit: f8f99ee220edbf2c5df2714a73d46faea43e62e2 - name: glsl-shaders make-install-args: - PREFIX=${FLATPAK_DEST} sources: - type: git url: https://github.com/libretro/glsl-shaders.git - commit: 8f6b2649489760caea8f36ec6099998854059569 + commit: 46a00f15e09ffbd4fba46ab41f0653aeea918fd1 - name: common-overlays make-install-args: - PREFIX=${FLATPAK_DEST} sources: - type: git url: https://github.com/libretro/common-overlays.git - commit: db9744f4e58a740f0f10b04b62af347cd6f01928 + commit: e2ba730083769b45bac62d164115e7dc197c8b63 # RetroArch - END @@ -398,8 +398,8 @@ modules: - mv ./RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/cores/* /app/share/libretro/cores/ sources: - type: archive - url: https://buildbot.libretro.com/stable/1.10.3/linux/x86_64/RetroArch_cores.7z - sha256: 33abf39839687f8faba202ed5dcf3a54c06266a49fad35f0521fa445523d009f + url: https://buildbot.libretro.com/stable/1.11.0/linux/x86_64/RetroArch_cores.7z + sha256: a443c18708b3eda12bdc3419e1aaf9d95370580a38f23d0abfa7868b84ff6fdc # PPSSPP - START # https://github.com/flathub/org.ppsspp.PPSSPP @@ -407,7 +407,7 @@ modules: - name: ppsspp buildsystem: cmake-ninja config-opts: - - -DUSE_SYSTEM_FFMPEG=OFF # turn this on? + - -DUSE_SYSTEM_FFMPEG=OFF # default: off, turn this on? - -DUSE_SYSTEM_LIBZIP=ON - -DUSE_SYSTEM_ZSTD=ON @@ -477,10 +477,10 @@ modules: dest: ext/zstd commit: a488ba114ec17ea1054b9057c26a046fc122b3b6 url: https://github.com/facebook/zstd.git - #- type: git - # dest: ffmpeg - # commit: 3ad7ddb9eb2af898dce8c4b5e9a28b77b3f7ddd7 - # url: https://github.com/hrydgard/ppsspp-ffmpeg.git + - type: git + dest: ffmpeg + commit: 3ad7ddb9eb2af898dce8c4b5e9a28b77b3f7ddd7 + url: https://github.com/hrydgard/ppsspp-ffmpeg.git - type: git dest: pspautotests commit: 682a4303aba63a50c91ae0fa6928c9dac8ca9b92 @@ -635,6 +635,7 @@ modules: - install -Dm755 ../yuzu-launcher.sh /app/bin/yuzu-launcher - install -Dm644 ../dist/yuzu.svg /app/share/icons/hicolor/scalable/apps/yuzu.svg sources: + - disable-submodules: true # FLATHUB WORKAROUND - type: git url: https://github.com/yuzu-emu/yuzu-mainline.git tag: mainline-0-1171 @@ -957,8 +958,8 @@ modules: - ln -s "${FLATPAK_DEST}/pcsx2-qt/usr/bin/pcsx2-qt" "${FLATPAK_DEST}/bin/pcsx2-qt" sources: - type: file - url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.3325/pcsx2-v1.7.3325-linux-AppImage-64bit-AVX2-Qt.AppImage - sha256: 5fa89570fb68b8a729dc0589e568d3a09b2b9243d4d66a5b7086975fb02e95e4 + url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.3357/pcsx2-v1.7.3357-linux-AppImage-64bit-AVX2-Qt.AppImage + sha256: 07f293c1aad832f0a908c18ff94c8b545db0cb56230b4f4574ba75071bd91441 # PCSX2 - END @@ -1386,20 +1387,23 @@ modules: buildsystem: simple 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 - cp es-configs/es_find_rules.xml /app/share/emulationstation/resources/systems/unix/ - rm -rf /app/share/emulationstation/resources/systems/unix/es_systems.xml - 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 - # Logo, res + # Logo, res - rm -f /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 - # Tools + # Tools - mkdir -p ${FLATPAK_DEST}/retrodeck/tools/ - cp tools/* ${FLATPAK_DEST}/retrodeck/tools/ - mv -f es-configs/tools-gamelist.xml ${FLATPAK_DEST}/retrodeck/ @@ -1410,18 +1414,18 @@ modules: - cp global.sh /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 - # 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/ - # Overlays - #- cp -r overlays ${FLATPAK_DEST}/retrodeck/overlays Disabled in 0.4.2b as it will be introduced in 0.5.0b + # Overlays + #- 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 - cp net.retrodeck.retrodeck.appdata.xml ${FLATPAK_DEST}/share/appdata diff --git a/res/icon.svg b/res/icon.svg index d00d28bd..98563325 100644 --- a/res/icon.svg +++ b/res/icon.svg @@ -1,19 +1,18 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/res/logo.png b/res/logo.png old mode 100755 new mode 100644 index 1150e7de..d9fc05e5 Binary files a/res/logo.png and b/res/logo.png differ diff --git a/res/splash.svg b/res/splash.svg old mode 100755 new mode 100644 index f08a7ff3..0a2cfb46 --- a/res/splash.svg +++ b/res/splash.svg @@ -1,277 +1,48 @@ - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/retrodeck.sh b/retrodeck.sh index 8bbdc10a..d7831401 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -108,7 +108,7 @@ standalones_init() { 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.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/.logs" "/var/config/PCSX2/logs" dir_prep "$rdhome/bios" "$rdhome/bios/pcsx2" @@ -144,13 +144,14 @@ standalones_init() { echo "Initializing RPCS3" echo "------------------------" 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 echo "------------------------" echo "Initializing XEMU" echo "------------------------" - mkdir -pv $rdhome/saves/xemu + mkdir -pv $rdhome/saves/xbox/xemu/ cp -fv $emuconfigs/xemu.toml /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 @@ -169,7 +170,7 @@ standalones_init() { cp -fv $emuconfigs/ppssppsdl/* /var/config/ppsspp/PSP/SYSTEM/ sed -i 's#/home/deck/retrodeck#'$rdhome'#g' /var/config/ppsspp/PSP/SYSTEM/ppsspp.ini - # PPSSPPSDL + # DUCKSTATION echo "------------------------" echo "Initializing DUCKSTATION" 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 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 versionwheresaveschanged="0.4.5b" # Hardcoded break point between unsorted and sorted saves @@ -414,40 +417,40 @@ browse(){ done } -advanced(){ - # function to give advanced install options - echo "Advaced choosed" - - choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \ - --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" \ - --ok-label "ROMs" \ - --extra-button "Media" \ - --extra-button "Themes" \ - --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" ) - echo "Choice is $choice" - - case $choice in - - "" ) # Internal (yes) - echo "ROMs" - ;; - - "Media" ) - echo "Media" - ;; - - "Themes" ) - echo "Themes" - ;; - - "Back" ) # Browse + not found fallback - echo "Back" - finit - ;; - - esac -} +#advanced(){ +# # function to give advanced install options +# echo "Advaced choosed" +# +# choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \ +# --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" \ +# --ok-label "ROMs" \ +# --extra-button "Media" \ +# --extra-button "Themes" \ +# --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" ) +# echo "Choice is $choice" +# +# case $choice in +# +# "" ) # Internal (yes) +# echo "ROMs" +# ;; +# +# "Media" ) +# echo "Media" +# ;; +# +# "Themes" ) +# echo "Themes" +# ;; +# +# "Back" ) # Browse + not found fallback +# echo "Back" +# finit +# ;; +# +# esac +#} finit() { # Force/First init, depending on the situation @@ -457,24 +460,24 @@ finit() { # Internal or SD Card? choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \ --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 "Advanced" \ - --extra-button "Cancel" \ + #--extra-button "Advanced" \ --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" case $choice in - "" ) # Internal (yes) - echo "Internal selected" - roms_folder="$rdhome/roms" - ;; - - "Cancel" ) + "" ) # Cancel or X button quits echo "Now quitting" kill $$ - ;; + ;; + + "Internal" ) # Internal + echo "Internal selected" + roms_folder="$rdhome/roms" + ;; "SD Card" ) echo "SD Card selected" @@ -491,16 +494,12 @@ finit() { roms_folder="$sdcard/retrodeck/roms" # sdcard variable is correct as its given by browse function echo "ROMs folder = $roms_folder" fi - ;; + ;; - "Advanced" ) # Browse + not found fallback - echo "Advanced" - advanced - ;; - - 1 ) # X button quits - kill $$ - ;; + #"Advanced" ) # Browse + not found fallback + # echo "Advanced" + # advanced + #;; esac diff --git a/tools/rpcs3-installer.sh.proto b/tools/rpcs3-installer.sh.proto new file mode 100644 index 00000000..62b8885b --- /dev/null +++ b/tools/rpcs3-installer.sh.proto @@ -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 \ No newline at end of file