From b5055ff6cbd6917ecae32c3a5b70922a2ab36064 Mon Sep 17 00:00:00 2001 From: xargon Date: Thu, 9 Jun 2022 10:25:20 +0200 Subject: [PATCH 001/393] NEW VARIABLES SYSTEM --- global.sh | 23 +++++++++++++++++++++++ net.retrodeck.retrodeck.yml | 7 ++++++- retrodeck.sh | 17 +++++++++++++---- tools/move-roms.sh | 33 +++++++++++++++++---------------- 4 files changed, 59 insertions(+), 21 deletions(-) create mode 100755 global.sh diff --git a/global.sh b/global.sh new file mode 100755 index 00000000..363c2ecf --- /dev/null +++ b/global.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +# This file is containing some global function needed for the script such as the config file tools + +conf_init() { + # initializing and reading the retrodeck config file + if [ ! -f $rd_conf ] + then # I have to initialize the variables as they cannot be red from an empty config file + touch $rd_conf + version="$(cat /app/retrodeck/version)" # version info taken from the version file + rdhome="$HOME/retrodeck" # the retrodeck home, aka ~/retrodeck + roms_folder="$rdhome/roms" # default roms folder location (intenral) + else # i just read the variables + source $rd_conf + fi +} + +conf_write() { + # writes the variables in the retrodeck config file + sed -i "s%version=.*%version=$version%" $rd_conf + sed -i "s%rdhome=.*%rdhome=$rdhome%" $rd_conf + sed -i "s%rdhome=.*%rdhome=$roms_folder" $rd_conf +} \ No newline at end of file diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 65f03b92..be45244f 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1018,6 +1018,9 @@ modules: - cp retrodeck.sh /app/bin/retrodeck.sh - chmod +x /app/bin/retrodeck.sh + + - cp global.sh /app/bin/global.sh + - chmod +x /app/bin/global.sh # Desktop entry - cp net.retrodeck.retrodeck.desktop /app/share/applications/net.retrodeck.retrodeck.desktop @@ -1073,4 +1076,6 @@ modules: - type: file path: net.retrodeck.retrodeck.desktop - type: file - path: net.retrodeck.retrodeck.appdata.xml \ No newline at end of file + path: net.retrodeck.retrodeck.appdata.xml + - type: file + path: global.sh \ No newline at end of file diff --git a/retrodeck.sh b/retrodeck.sh index 7f9ce114..05f8f6e7 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -1,10 +1,15 @@ #!/bin/bash +# Init default values, this may be overwritten by retrodeck.cfg as it sourced later with global.sh + lockfile="$HOME/retrodeck/.lock" # where the lockfile is located -version="$(cat /app/retrodeck/version)" # version info taken from the version file -rdhome="$HOME/retrodeck" # the retrodeck home, aka ~/retrodecck emuconfigs="/app/retrodeck/emu-configs" # folder with all the default emulator configs sdcard="/run/media/mmcblk0p1" # Steam Deck SD default path +rd_conf="/app/retrodeck/retrodeck.cfg" # RetroDECK config file path +version="$(cat /app/retrodeck/version)" # version info taken from the version file +rdhome="$HOME/retrodeck" # the retrodeck home, aka ~/retrodeck + +source global.sh # Functions area @@ -325,7 +330,9 @@ done if [ -f "$lockfile" ] && [ "$(cat "$lockfile")" != "$version" ]; then echo "Lockfile version is "$(cat "$lockfile")" but the actual version is $version" - post_update + conf_init # Initializing/reading the config file (sourced from global.sh) + post_update # Executing post update script + conf_write # Writing variables in the config file (sourced from global.sh) start_retrodeck exit 0 fi @@ -335,7 +342,9 @@ fi if [ ! -f "$lockfile" ]; then echo "Lockfile not found" - finit + conf_init # Initializing/reading the config file (sourced from global.sh) + finit # Executing First/Force init + conf_write # Writing variables in the config file (sourced from global.sh) exit 0 fi diff --git a/tools/move-roms.sh b/tools/move-roms.sh index a6bfafce..eca4bbb9 100644 --- a/tools/move-roms.sh +++ b/tools/move-roms.sh @@ -1,29 +1,30 @@ #!/bin/bash -if [ -d ~/retrodeck/roms ] && [ -d /run/media/mmcblk0p1/retrodeck/roms ] -then # found both internal and sd folders - zenity --title "RetroDECK" --warning --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="I found a roms folder both in internal and SD Card,\nin order to make this tool useful you should remove one of the two or merge them." +source global.sh + +zenity --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --cancel-label="Quit" --ok-label "Continue" --text="WARNING: this script is experimental\nplease be sure you back up your data before continuing.\n\nDo you want to continue?" +if [ $? == 1 ] #cancel +then exit 0 fi -if [ -d ~/retrodeck/roms ] && [ ! -d /run/media/mmcblk0p1/retrodeck/roms ] -then # found internal folder and not the external - roms_path=~/retrodeck - new_roms_path=/run/media/mmcblk0p1/retrodeck +zenity --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --cancel-label="Cancel" --ok-label "Browse" --text="The roms folder is now: $roms_folder\nplease select the new location.\nA retrodeck/roms folder will be created starting from the directory that you selected." +if [ $? == 1 ] #cancel +then + exit 0 fi -if [ ! -d ~/retrodeck/roms ] && [ -d /run/media/mmcblk0p1/retrodeck/roms ] -then # found external folder and not the internal - roms_path=/run/media/mmcblk0p1/retrodeck - new_roms_path=~/retrodeck -fi +new_roms_path="$(zenity --file-selection --title="Choose a new roms folder location" --directory)"/retrodeck/roms -zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Should I move the roms from\n\n$roms_path/roms\n\nto\n\n$new_roms_path/roms?" +zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Should I move the roms from\n\n$roms_folder\n\nto\n\n$new_roms_path?" if [ $? == 0 ] #yes then mkdir -p $new_roms_path - mv -f $roms_path/roms $new_roms_path/roms + mv -f $roms_folder $new_roms_path rm -f /var/config/emulationstation/ROMs - ln -s $new_roms_path/roms /var/config/emulationstation/ROMs - rm -f $roms_path/roms + ln -s $new_roms_path /var/config/emulationstation/ROMs + rm -f $roms_folder + zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="Done\nYour roms are now located in:\n\n$roms_folder\n\nPress OK to continue." + $roms_folder=$new_roms_path # Updating variable + conf_write # Writing variables in the config file (sourced from global.sh) fi From 7b6b1cfb124ea08d52dd2649e209764ca7291af7 Mon Sep 17 00:00:00 2001 From: xargon Date: Sat, 11 Jun 2022 09:30:13 +0200 Subject: [PATCH 002/393] WORKFLOW: restored the cooker-selfhosted.yml from the branch cooker --- .github/workflows/cooker-selfhosted.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 834c7e77..b1b2c982 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -41,15 +41,14 @@ jobs: flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13 - # for main remember to change ~ into ${GITHUB_WORKSPACE} + # for main remember to change ${HOME} into ${GITHUB_WORKSPACE} - name: Build flatpak run: | - flatpak-builder --build-only --user --force-clean --repo=~/local ~/retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + flatpak-builder --user --force-clean --keep-build-dirs --repo=${HOME}/local ${HOME}/retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Create Bundle run: | - flatpak-builder --user --force-clean --repo=~/local ~/retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - flatpak build-bundle $GITHUB_WORKSPACE/local RetroDECK.flatpak net.retrodeck.retrodeck + flatpak build-bundle ${HOME}/local RetroDECK.flatpak net.retrodeck.retrodeck - name: Read version from version file id: version From 672fad50aec918e3fec94d4a8be81de9fc1822aa Mon Sep 17 00:00:00 2001 From: xargon Date: Sat, 11 Jun 2022 10:34:46 +0200 Subject: [PATCH 003/393] WORKFLOW: restored the cooker-selfhosted.yml from the branch cooker --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index be45244f..c60829b7 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -210,7 +210,7 @@ modules: - >- mv ${FLATPAK_DEST}/share/pixmaps/retroarch.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/ - - rmdir --ignore-fail-on-non-empty ${FLATPAK_DEST}/share/pixmaps/ + - rm -rf ${FLATPAK_DEST}/share/pixmaps/ - mkdir -p ${FLATPAK_DEST}/etc - >- sed s:@prefix@:${FLATPAK_DEST}:g retroarch.cfg > From c12ed8e9407a334fedef4c02e00ba15bc72521e5 Mon Sep 17 00:00:00 2001 From: xargon Date: Sat, 11 Jun 2022 10:41:10 +0200 Subject: [PATCH 004/393] RETROARCH: folder deletion was maybe wrong --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index c60829b7..be45244f 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -210,7 +210,7 @@ modules: - >- mv ${FLATPAK_DEST}/share/pixmaps/retroarch.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/ - - rm -rf ${FLATPAK_DEST}/share/pixmaps/ + - rmdir --ignore-fail-on-non-empty ${FLATPAK_DEST}/share/pixmaps/ - mkdir -p ${FLATPAK_DEST}/etc - >- sed s:@prefix@:${FLATPAK_DEST}:g retroarch.cfg > From 0900a7c744f7510220e2894a8ac7852d978ae140 Mon Sep 17 00:00:00 2001 From: Steam Deck User Date: Sun, 3 Jul 2022 17:27:36 +0200 Subject: [PATCH 005/393] THEME: Updated Art-Book --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index e2125d79..a10da6af 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -216,7 +216,7 @@ modules: sources: - type: git url: https://github.com/anthonycaccese/art-book-next-de.git - commit: 10ff82143af870d5a5edcfb0da97c7d54bcbc317 + commit: 9c5312084bb4b906da5b610fd50bab2afe697cac # External manifests start From da1a96f79fc152a9c133418b4ac2f7da412e5dbf Mon Sep 17 00:00:00 2001 From: xargon Date: Sun, 3 Jul 2022 20:40:57 +0200 Subject: [PATCH 006/393] THEME: Updated Art-Book - fix --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index a10da6af..8d5ebd5c 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -215,7 +215,7 @@ modules: - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-de/ sources: - type: git - url: https://github.com/anthonycaccese/art-book-next-de.git + url: https://github.com/anthonycaccese/art-book-next-retropie.git commit: 9c5312084bb4b906da5b610fd50bab2afe697cac From 4216708a0964b7c374bc79f4f62979cd120ef032 Mon Sep 17 00:00:00 2001 From: xargon Date: Tue, 5 Jul 2022 10:33:15 +0200 Subject: [PATCH 007/393] First steps into 0.5.0b -fix1 --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 0226f630..04d5074a 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1196,4 +1196,4 @@ modules: sources: - type: git url: https://github.com/XargonWan/RetroDECK.git - branch: main + branch: cooker-main-vars From dae7d63b5fdc09adb4a9dadf4bfe5ed4f15fa352 Mon Sep 17 00:00:00 2001 From: xargon Date: Tue, 5 Jul 2022 10:37:53 +0200 Subject: [PATCH 008/393] THEME: updated Art-Book and enhanced the theme-fix tool to support it --- net.retrodeck.retrodeck.yml | 2 +- tools/theme-fix.sh | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 04d5074a..ae48a084 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -218,7 +218,7 @@ modules: sources: - type: git url: https://github.com/anthonycaccese/art-book-next-retropie.git - commit: 9c5312084bb4b906da5b610fd50bab2afe697cac + commit: ca380c9e97f7b720eb6e2d50bbd42f97bcafcb3a # External manifests start diff --git a/tools/theme-fix.sh b/tools/theme-fix.sh index b3712e9f..66c71254 100644 --- a/tools/theme-fix.sh +++ b/tools/theme-fix.sh @@ -8,7 +8,7 @@ zenity \ --title "RetroDECK" \ --ok-label "Yes" \ --cancel-label "No" \ ---text="This tool is will clean some unuseful scraped data in order to beautify the theme.\nDo you want to delete them?" +--text="This tool is will clean some unuseful scraped data in order to beautify the theme.\nDo you want to delete and fix it?" if [ $? == 0 ] #yes - Internal then @@ -18,6 +18,8 @@ then find ~/retrodeck/.downloaded_media -name backcovers -type d -print0|xargs -0 rm -rfv -- find ~/retrodeck/.downloaded_media -namephysicalmedia -type d -print0|xargs -0 rm -rfv -- find ~/retrodeck/.downloaded_media -namescreenshots -type d -print0|xargs -0 rm -rfv -- + rm -rf ~/retrodeck/.downloaded_media/thumbnails + ln -s ~/retrodeck/.downloaded_media/covers ~/retrodeck/.downloaded_media/thumbnails fi zenity \ @@ -26,4 +28,4 @@ zenity \ --no-wrap \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --title "RetroDECK" \ ---text="Scraped data is now cleaned, please restart RetroDECK to reload the games list." \ No newline at end of file +--text="Scraped data is now cleaned and fixed, please restart RetroDECK to reload the games list." \ No newline at end of file From fc436f5809d39db3b3235c87bf1c714ae5bd23b8 Mon Sep 17 00:00:00 2001 From: xargon Date: Tue, 5 Jul 2022 19:44:08 +0200 Subject: [PATCH 009/393] THEME: hotfix --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index ae48a084..5357b846 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -218,7 +218,7 @@ modules: sources: - type: git url: https://github.com/anthonycaccese/art-book-next-retropie.git - commit: ca380c9e97f7b720eb6e2d50bbd42f97bcafcb3a + commit: 53ef4aa8a23ebac7c2c473d32b189d58533429ec # External manifests start From b0b254cfd920f5b077331d0b263720da55f7a370 Mon Sep 17 00:00:00 2001 From: Steam Deck User Date: Mon, 18 Jul 2022 10:13:35 +0200 Subject: [PATCH 010/393] Updated ArtBook and added the no meta one --- es-configs/es_settings.xml | 2 +- net.retrodeck.retrodeck.yml | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/es-configs/es_settings.xml b/es-configs/es_settings.xml index bf0cf3c6..8feeb468 100644 --- a/es-configs/es_settings.xml +++ b/es-configs/es_settings.xml @@ -115,7 +115,7 @@ - + \ No newline at end of file diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index b937b95c..fa455589 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -215,13 +215,22 @@ modules: - name: art-book-next buildsystem: simple build-commands: - - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-de/ - - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-de/ + - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next/ + - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next/ sources: - type: git url: https://github.com/anthonycaccese/art-book-next-retropie.git - commit: 53ef4aa8a23ebac7c2c473d32b189d58533429ec + commit: 6197b224b330deee5e78f9c9d9383472fd226544 + - name: art-book-next-no-meta + buildsystem: simple + build-commands: + - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-no-meta/ + - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-no-meta/ + sources: + - type: git + url: https://github.com/anthonycaccese/art-book-next-retropie.git + commit: eefefb1b9f60c8b2892c5e7b1e487669974672d1 # External manifests start @@ -1179,4 +1188,4 @@ modules: sources: - type: git url: https://github.com/XargonWan/RetroDECK.git - branch: cooker + branch: cooker \ No newline at end of file From e73b6c26ac4cade8c0b853f645cc55482d3916af Mon Sep 17 00:00:00 2001 From: Steam Deck User Date: Mon, 18 Jul 2022 10:47:51 +0200 Subject: [PATCH 011/393] Added XEMU config - controllers missing --- emu-configs/xemu.toml | 30 ++++++++++++++++++++++++++++++ retrodeck.sh | 8 ++++++++ tools/configure-emulators.sh | 4 ++++ 3 files changed, 42 insertions(+) create mode 100644 emu-configs/xemu.toml diff --git a/emu-configs/xemu.toml b/emu-configs/xemu.toml new file mode 100644 index 00000000..d3f7ae1b --- /dev/null +++ b/emu-configs/xemu.toml @@ -0,0 +1,30 @@ +[general] +show_welcome = false +screenshot_dir = '/home/deck/retrodeck/screenshots' + +[input.bindings] +port1 = '03000000de280000ff11000001000000' + +[display.quality] +surface_scale = 2 + +[display.window] +fullscreen_on_startup = true +startup_size = '1280x800' +last_width = 1620 +last_height = 738 + +[display.ui] +fit = 'scale_16_9' +scale = 2 +auto_scale = false + +[sys] +mem_limit = '128' + +[sys.files] +bootrom_path = '/home/deck/retrodeck/bios/mcpx_1.0.bin' +flashrom_path = '/home/deck/retrodeck/bios/Complex.bin' +eeprom_path = '/home/deck/retrodeck/saves/xemu/eeprom.bin' +hdd_path = '/home/deck/retrodeck/bios/xbox_harddisk.qcow2' + diff --git a/retrodeck.sh b/retrodeck.sh index 160f7f57..b3f8510f 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -144,6 +144,14 @@ standalones_init() { mkdir -pv /var/config/rpcs3/ cp -fvr $emuconfigs/config.yml /var/config/rpcs3/ + # XEMU + echo "----------------------" + echo "Initializing XEMU" + echo "----------------------" + mkdir -pv $rdhome/saves/xemu + cp -fv $emuconfigs/xemu.toml /var/data/xemu/xemu.toml + sed -i 's#/home/deck/retrodeck#'$rdhome'#g' /var/data/xemu/xemu.toml + # PICO-8 # Moved PICO-8 stuff in the finit as only it knows here roms folders is diff --git a/tools/configure-emulators.sh b/tools/configure-emulators.sh index f1722182..25f5be7b 100644 --- a/tools/configure-emulators.sh +++ b/tools/configure-emulators.sh @@ -19,6 +19,7 @@ emulator="$(zenity --list \ "PCSX2" \ "PPSSPP" \ "RPCS3" \ +"XEMU" \ "Yuzu")" if [ $emulator == "RetroArch" ] @@ -45,4 +46,7 @@ then elif [ $emulator == "Yuzu" ] then yuzu +elif [ $emulator == "XEMU" ] +then + xemu fi \ No newline at end of file From 1f8e368f29316462ed13c5bf730b23d7a93619cf Mon Sep 17 00:00:00 2001 From: xargon Date: Mon, 18 Jul 2022 13:00:33 +0200 Subject: [PATCH 012/393] Fixed Xemu bios files and integrated the download of the free hd image --- emu-configs/xemu.toml | 4 ++-- retrodeck.sh | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/emu-configs/xemu.toml b/emu-configs/xemu.toml index d3f7ae1b..7e804f0e 100644 --- a/emu-configs/xemu.toml +++ b/emu-configs/xemu.toml @@ -25,6 +25,6 @@ mem_limit = '128' [sys.files] bootrom_path = '/home/deck/retrodeck/bios/mcpx_1.0.bin' flashrom_path = '/home/deck/retrodeck/bios/Complex.bin' -eeprom_path = '/home/deck/retrodeck/saves/xemu/eeprom.bin' -hdd_path = '/home/deck/retrodeck/bios/xbox_harddisk.qcow2' +eeprom_path = '/home/deck/retrodeck/saves/xbox-eeprom.bin' +hdd_path = '/home/deck/retrodeck/bios/xbox_hdd.qcow2' diff --git a/retrodeck.sh b/retrodeck.sh index b3f8510f..b388b684 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -151,6 +151,10 @@ standalones_init() { mkdir -pv $rdhome/saves/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 + wget "https://github.com/mborgerson/xemu-hdd-image/releases/latest/download/xbox_hdd.qcow2.zip" -P $rdhome/bios/ + unzip $rdhome/bios/xbox_hdd.qcow2.zip $rdhome/bios/ + rm -rfv $rdhome/bios/xbox_hdd.qcow2.zip # PICO-8 # Moved PICO-8 stuff in the finit as only it knows here roms folders is From 0ef7762c7d917ceae1351f452d7e2e59d7869efd Mon Sep 17 00:00:00 2001 From: xargon Date: Mon, 18 Jul 2022 19:15:14 +0200 Subject: [PATCH 013/393] APPDATA: Moved and edited known issues and important notes outside the single version changelog --- net.retrodeck.retrodeck.appdata.xml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 0a7eb616..6f83a9d0 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -38,6 +38,7 @@ No other software is needed as everything it's already included!

NOTE: Albeit RetroDECK could possibily work on every distro, it's supported only on Steam Deck.

+

INSTALLATION INSTRUCTIONS:

  • Start RetroDECK from the Desktop mode (first time only)
    • @@ -47,6 +48,15 @@
  • Always start RetroDECK from Steam Library

For a better experience is suggested to use the official Steam Controller Config available under community configs in Steam

+ +

Known Issues:

+
    +
  • PCSX2: due to its limitation, the standalone PCSX2 doesn't have any way to set the hotkeys, so no save and load state, no quit button. In order to quit press: STEAM -> PCSX2 -> (X) CLOSE WINDOW, be aware that the state is not automatically saved
    • +
  • As of this moment external controllers, local multiplayer in gamemode are not supported. Neither is running RetroDECK in desktop mode, we plan on adding the functionality in the future
    • +
+ + IMPORTANT NOTE: + At the moment the emulator configs are reset during every update, this was made because every version they may bring new configurations, please back them up if you did some manual configs. GPL-3.0 CC0-1.0 @@ -62,14 +72,6 @@
  • New varialbes system: now some variables such as game folder location are saved in /app/retrodeck/retrodeck.cfg.
    • -

    Known Issues:

    -
      -
    • PCSX2: due to its limitation, the standalone PCSX2 doesn't have any way to set the hotkeys, so no save and load state, no quit button. In order to quit press: STEAM -> PCSX2 -> (X) CLOSE WINDOW, be aware that the state is not automatically saved
      • -
    • Due to a Steam limitation, external controllers and keyboard seems not to be working, expecially in the desktop mode
      • -
    - - IMPORTANT NOTE: - At the moment the emulator configs are reset during every update, this was made because every version they may bring new configurations, please back them up if you did some manual configs. From 4edeac2dc13aba7a4dd36a473dbf3e712bd75137 Mon Sep 17 00:00:00 2001 From: xargon Date: Mon, 18 Jul 2022 19:32:05 +0200 Subject: [PATCH 014/393] XEMU: preparing the image only if is missing --- retrodeck.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/retrodeck.sh b/retrodeck.sh index b388b684..26b8fdca 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -151,10 +151,13 @@ standalones_init() { mkdir -pv $rdhome/saves/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 - wget "https://github.com/mborgerson/xemu-hdd-image/releases/latest/download/xbox_hdd.qcow2.zip" -P $rdhome/bios/ - unzip $rdhome/bios/xbox_hdd.qcow2.zip $rdhome/bios/ - rm -rfv $rdhome/bios/xbox_hdd.qcow2.zip + # Preparing HD dummy Image if the image is not found + if [ ! -f $rdhome/bios/xbox_hdd.qcow2 ] + then + wget "https://github.com/mborgerson/xemu-hdd-image/releases/latest/download/xbox_hdd.qcow2.zip" -P $rdhome/bios/ + unzip $rdhome/bios/xbox_hdd.qcow2.zip $rdhome/bios/ + rm -rfv $rdhome/bios/xbox_hdd.qcow2.zip + fi # PICO-8 # Moved PICO-8 stuff in the finit as only it knows here roms folders is From 412649c04798dd8f6285d8cf65a1dcb27dac9282 Mon Sep 17 00:00:00 2001 From: xargon Date: Mon, 18 Jul 2022 19:36:05 +0200 Subject: [PATCH 015/393] RETROARCH: all players can control the menu, max player raised to 8, was 5 --- emu-configs/retroarch.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/emu-configs/retroarch.cfg b/emu-configs/retroarch.cfg index 66317ccd..1eb1b6db 100644 --- a/emu-configs/retroarch.cfg +++ b/emu-configs/retroarch.cfg @@ -6,7 +6,7 @@ ai_service_pause = "false" ai_service_source_lang = "0" ai_service_target_lang = "0" ai_service_url = "http://localhost:4404/" -all_users_control_menu = "false" +all_users_control_menu = "true" apply_cheats_after_load = "false" apply_cheats_after_toggle = "false" aspect_ratio_index = "22" @@ -256,7 +256,7 @@ input_load_state = "f4" input_load_state_axis = "nul" input_load_state_btn = "9" input_load_state_mbtn = "nul" -input_max_users = "5" +input_max_users = "8" input_menu_toggle = "f1" input_menu_toggle_axis = "nul" input_menu_toggle_btn = "3" @@ -3184,4 +3184,4 @@ xmb_menu_color_theme = "4" xmb_shadows_enable = "true" xmb_theme = "0" xmb_vertical_thumbnails = "false" -youtube_stream_key = "" +youtube_stream_key = "" \ No newline at end of file From 2d128b4f0c61c965c7508b57a91a0ef101c1048a Mon Sep 17 00:00:00 2001 From: anthonycaccese Date: Thu, 21 Jul 2022 11:27:33 -0400 Subject: [PATCH 016/393] Update Art-Book-Next Versions Changed color scheme to match steam-os Added navigation sounds to match steam-os Various layout and style updates throughout --- net.retrodeck.retrodeck.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index fa455589..5b2ebba5 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -220,7 +220,7 @@ modules: sources: - type: git url: https://github.com/anthonycaccese/art-book-next-retropie.git - commit: 6197b224b330deee5e78f9c9d9383472fd226544 + commit: b9a846dcfc1811e811e2eed7853bfeddbb3ef153 - name: art-book-next-no-meta buildsystem: simple @@ -230,7 +230,7 @@ modules: sources: - type: git url: https://github.com/anthonycaccese/art-book-next-retropie.git - commit: eefefb1b9f60c8b2892c5e7b1e487669974672d1 + commit: bd4414ffcc83b5b145c3971451a04e6e7a1cbb73 # External manifests start @@ -1188,4 +1188,4 @@ modules: sources: - type: git url: https://github.com/XargonWan/RetroDECK.git - branch: cooker \ No newline at end of file + branch: cooker From 319b5180aaee0c1e93a41c54275e0a8d2983aa66 Mon Sep 17 00:00:00 2001 From: Steam Deck User Date: Thu, 21 Jul 2022 20:40:44 +0200 Subject: [PATCH 017/393] Configured both PPSSPP libretro and SDL, missing hotkeys for SDL --- emu-configs/ppssppsdl/ppsspp.ini | 456 +++++++++++++++++++++++++++++++ retrodeck.sh | 37 ++- 2 files changed, 487 insertions(+), 6 deletions(-) create mode 100644 emu-configs/ppssppsdl/ppsspp.ini diff --git a/emu-configs/ppssppsdl/ppsspp.ini b/emu-configs/ppssppsdl/ppsspp.ini new file mode 100644 index 00000000..375b84ff --- /dev/null +++ b/emu-configs/ppssppsdl/ppsspp.ini @@ -0,0 +1,456 @@ +[General] +FirstRun = False +RunCount = 2 +Enable Logging = True +AutoRun = True +Browse = False +IgnoreBadMemAccess = True +CurrentDirectory = /home/deck/retrodeck/roms/psp +ShowDebuggerOnLoad = False +CheckForNewVersion = False +Language = en_US +ForceLagSync2 = False +DiscordPresence = True +UISound = False +AutoLoadSaveState = 2 +EnableCheats = False +CwCheatRefreshRate = 77 +CwCheatScrollPosition = 0.000000 +GameListScrollPosition = 0.000000 +ScreenshotsAsPNG = False +UseFFV1 = False +DumpFrames = False +DumpVideoOutput = False +DumpAudio = False +SaveLoadResetsAVdumping = False +StateSlot = 0 +EnableStateUndo = True +StateLoadUndoGame = NA +StateUndoLastSaveGame = NA +StateUndoLastSaveSlot = -5 +RewindFlipFrequency = 0 +ShowOnScreenMessage = True +ShowRegionOnGameIcon = False +ShowIDOnGameIcon = False +GameGridScale = 1.000000 +GridView1 = True +GridView2 = True +GridView3 = False +RightAnalogUp = 0 +RightAnalogDown = 0 +RightAnalogLeft = 0 +RightAnalogRight = 0 +RightAnalogPress = 0 +RightAnalogCustom = False +RightAnalogDisableDiagonal = False +SwipeUp = 0 +SwipeDown = 0 +SwipeLeft = 0 +SwipeRight = 0 +SwipeSensitivity = 1.000000 +SwipeSmoothing = 0.300000 +DoubleTapGesture = 0 +GestureControlEnabled = False +ReportingHost = default +AutoSaveSymbolMap = False +CacheFullIsoInRam = False +RemoteISOPort = 0 +LastRemoteISOServer = +LastRemoteISOPort = 0 +RemoteISOManualConfig = False +RemoteShareOnStartup = False +RemoteISOSubdir = / +RemoteDebuggerOnStartup = False +InternalScreenRotation = 1 +BackgroundAnimation = 1 +PauseWhenMinimized = False +DumpDecryptedEboots = False +MemStickInserted = True +EnablePlugins = True +[CPU] +CPUCore = 1 +SeparateSASThread = True +SeparateIOThread = True +IOTimingMethod = 0 +FastMemoryAccess = True +FunctionReplacements = True +HideSlowWarnings = False +HideStateWarnings = False +PreloadFunctions = False +JitDisableFlags = 0x00000000 +CPUSpeed = 0 +[Graphics] +EnableCardboardVR = False +CardboardScreenSize = 50 +CardboardXShift = 0 +CardboardYShift = 0 +ShowFPSCounter = 0 +GraphicsBackend = 3 (VULKAN) +FailedGraphicsBackends = +DisabledGraphicsBackends = +VulkanDevice = +CameraDevice = +RenderingMode = 1 +SoftwareRenderer = False +HardwareTransform = True +SoftwareSkinning = True +TextureFiltering = 1 +BufferFiltering = 1 +InternalResolution = 1 +AndroidHwScale = 1 +HighQualityDepth = 1 +FrameSkip = 0 +FrameSkipType = 0 +AutoFrameSkip = False +FrameRate = 0 +FrameRate2 = -1 +UnthrottlingMode = CONTINUOUS +AnisotropyLevel = 4 +VertexDecCache = False +TextureBackoffCache = False +TextureSecondaryCache = False +FullScreen = False +FullScreenMulti = False +SmallDisplayZoomType = 2 +SmallDisplayOffsetX = 0.500000 +SmallDisplayOffsetY = 0.500000 +SmallDisplayZoomLevel = 1.000000 +ImmersiveMode = True +SustainedPerformanceMode = False +IgnoreScreenInsets = True +ReplaceTextures = True +SaveNewTextures = False +IgnoreTextureFilenames = False +TexScalingLevel = 1 +TexScalingType = 0 +TexDeposterize = False +TexHardwareScaling = False +VSyncInterval = False +BloomHack = 0 +SplineBezierQuality = 2 +HardwareTessellation = False +TextureShader = Off +ShaderChainRequires60FPS = False +MemBlockTransferGPU = True +DisableSlowFramebufEffects = False +FragmentTestCache = True +LogFrameDrops = False +InflightFrames = 2 +RenderDuplicateFrames = False +[Sound] +Enable = True +AudioBackend = 0 +ExtraAudioBuffering = False +GlobalVolume = 10 +ReverbVolume = 10 +AltSpeedVolume = -1 +AudioDevice = +AutoAudioDevice = True +[Control] +HapticFeedback = False +ShowTouchCross = True +ShowTouchCircle = True +ShowTouchSquare = True +ShowTouchTriangle = True +Custom0Mapping = 0x0000000000000000 +Custom0Image = 0 +Custom0Shape = 0 +Custom0Toggle = False +Custom1Mapping = 0x0000000000000000 +Custom1Image = 1 +Custom1Shape = 0 +Custom1Toggle = False +Custom2Mapping = 0x0000000000000000 +Custom2Image = 2 +Custom2Shape = 0 +Custom2Toggle = False +Custom3Mapping = 0x0000000000000000 +Custom3Image = 3 +Custom3Shape = 0 +Custom3Toggle = False +Custom4Mapping = 0x0000000000000000 +Custom4Image = 4 +Custom4Shape = 0 +Custom4Toggle = False +Custom5Mapping = 0x0000000000000000 +Custom5Image = 0 +Custom5Shape = 1 +Custom5Toggle = False +Custom6Mapping = 0x0000000000000000 +Custom6Image = 1 +Custom6Shape = 1 +Custom6Toggle = False +Custom7Mapping = 0x0000000000000000 +Custom7Image = 2 +Custom7Shape = 1 +Custom7Toggle = False +Custom8Mapping = 0x0000000000000000 +Custom8Image = 3 +Custom8Shape = 1 +Custom8Toggle = False +Custom9Mapping = 0x0000000000000000 +Custom9Image = 4 +Custom9Shape = 1 +Custom9Toggle = False +ShowTouchPause = False +ShowTouchControls = False +DisableDpadDiagonals = False +GamepadOnlyFocused = False +TouchButtonStyle = 1 +TouchButtonOpacity = 65 +TouchButtonHideSeconds = 20 +AutoCenterTouchAnalog = False +AnalogAutoRotSpeed = 8.000000 +TouchSnapToGrid = False +TouchSnapGridSize = 64 +ActionButtonSpacing2 = 1.000000 +ActionButtonCenterX = -1.000000 +ActionButtonCenterY = -1.000000 +ActionButtonScale = 1.150000 +DPadX = -1.000000 +DPadY = -1.000000 +DPadScale = 1.150000 +ShowTouchDpad = True +DPadSpacing = 1.000000 +StartKeyX = -1.000000 +StartKeyY = -1.000000 +StartKeyScale = 1.150000 +ShowTouchStart = True +SelectKeyX = -1.000000 +SelectKeyY = -1.000000 +SelectKeyScale = 1.150000 +ShowTouchSelect = True +UnthrottleKeyX = -1.000000 +UnthrottleKeyY = -1.000000 +UnthrottleKeyScale = 1.150000 +ShowTouchUnthrottle = True +LKeyX = -1.000000 +LKeyY = -1.000000 +LKeyScale = 1.150000 +ShowTouchLTrigger = True +RKeyX = -1.000000 +RKeyY = -1.000000 +RKeyScale = 1.150000 +ShowTouchRTrigger = True +AnalogStickX = -1.000000 +AnalogStickY = -1.000000 +AnalogStickScale = 1.150000 +ShowAnalogStick = True +RightAnalogStickX = -1.000000 +RightAnalogStickY = -1.000000 +RightAnalogStickScale = 1.150000 +ShowRightAnalogStick = False +fcombo0X = -1.000000 +fcombo0Y = -1.000000 +comboKeyScale0 = 1.150000 +ShowComboKey0 = False +fcombo1X = -1.000000 +fcombo1Y = -1.000000 +comboKeyScale1 = 1.150000 +ShowComboKey1 = False +fcombo2X = -1.000000 +fcombo2Y = -1.000000 +comboKeyScale2 = 1.150000 +ShowComboKey2 = False +fcombo3X = -1.000000 +fcombo3Y = -1.000000 +comboKeyScale3 = 1.150000 +ShowComboKey3 = False +fcombo4X = -1.000000 +fcombo4Y = -1.000000 +comboKeyScale4 = 1.150000 +ShowComboKey4 = False +fcombo5X = -1.000000 +fcombo5Y = -1.000000 +comboKeyScale5 = 1.150000 +ShowComboKey5 = False +fcombo6X = -1.000000 +fcombo6Y = -1.000000 +comboKeyScale6 = 1.150000 +ShowComboKey6 = False +fcombo7X = -1.000000 +fcombo7Y = -1.000000 +comboKeyScale7 = 1.150000 +ShowComboKey7 = False +fcombo8X = -1.000000 +fcombo8Y = -1.000000 +comboKeyScale8 = 1.150000 +ShowComboKey8 = False +fcombo9X = -1.000000 +fcombo9Y = -1.000000 +comboKeyScale9 = 1.150000 +ShowComboKey9 = False +AnalogDeadzone = 0.150000 +AnalogInverseDeadzone = 0.000000 +AnalogSensitivity = 1.100000 +AnalogIsCircular = False +AnalogLimiterDeadzone = 0.600000 +LeftStickHeadScale = 1.000000 +RightStickHeadScale = 1.000000 +HideStickBackground = False +UseMouse = False +MapMouse = False +ConfineMap = False +MouseSensitivity = 0.100000 +MouseSmoothing = 0.900000 +SystemControls = True +[Network] +EnableWlan = False +EnableAdhocServer = False +proAdhocServer = socom.cc +PortOffset = 10000 +MinTimeout = 0 +ForcedFirstConnect = False +EnableUPnP = False +UPnPUseOriginalPort = False +EnableNetworkChat = False +ChatButtonPosition = 0 +ChatScreenPosition = 0 +EnableQuickChat = True +QuickChat1 = Quick Chat 1 +QuickChat2 = Quick Chat 2 +QuickChat3 = Quick Chat 3 +QuickChat4 = Quick Chat 4 +QuickChat5 = Quick Chat 5 +[SystemParam] +PSPModel = 1 +PSPFirmwareVersion = 660 +NickName = RetroDECK +MacAddress = 24:4c:79:2b:9d:0c +Language = 1 +ParamTimeFormat = 0 +ParamDateFormat = 2 +TimeZone = 0 +DayLightSavings = False +ButtonPreference = 1 +LockParentalLevel = 0 +WlanAdhocChannel = 0 +WlanPowerSave = False +EncryptSave = True +SavedataUpgradeVersion = True +MemStickSize = 16 +[Debugger] +DisasmWindowX = -1 +DisasmWindowY = -1 +DisasmWindowW = -1 +DisasmWindowH = -1 +GEWindowX = -1 +GEWindowY = -1 +GEWindowW = -1 +GEWindowH = -1 +ConsoleWindowX = -1 +ConsoleWindowY = -1 +FontWidth = 8 +FontHeight = 12 +DisplayStatusBar = True +ShowBottomTabTitles = True +ShowDeveloperMenu = False +SkipDeadbeefFilling = False +FuncHashMap = False +MemInfoDetailed = False +DrawFrameGraph = False +[Upgrade] +UpgradeMessage = +UpgradeVersion = +DismissedVersion = +[Theme] +ItemStyleFg = 0xffffffff +ItemStyleBg = 0x55000000 +ItemFocusedStyleFg = 0xffffffff +ItemFocusedStyleBg = 0xffedc24c +ItemDownStyleFg = 0xffffffff +ItemDownStyleBg = 0xffbd9939 +ItemDisabledStyleFg = 0x80eeeeee +ItemDisabledStyleBg = 0x55e0d4af +ItemHighlightedStyleFg = 0xffffffff +ItemHighlightedStyleBg = 0x55bdbb39 +ButtonStyleFg = 0xffffffff +ButtonStyleBg = 0x55000000 +ButtonFocusedStyleFg = 0xffffffff +ButtonFocusedStyleBg = 0xffedc24c +ButtonDownStyleFg = 0xffffffff +ButtonDownStyleBg = 0xffbd9939 +ButtonDisabledStyleFg = 0x80eeeeee +ButtonDisabledStyleBg = 0x55e0d4af +ButtonHighlightedStyleFg = 0xffffffff +ButtonHighlightedStyleBg = 0x55bdbb39 +HeaderStyleFg = 0xffffffff +InfoStyleFg = 0xffffffff +InfoStyleBg = 0x00000000 +PopupTitleStyleFg = 0xffe3be59 +PopupStyleFg = 0xffffffff +PopupStyleBg = 0xff303030 +[Recent] +MaxRecent = 60 +[Log] +SYSTEMEnabled = True +SYSTEMLevel = 2 +BOOTEnabled = True +BOOTLevel = 2 +COMMONEnabled = True +COMMONLevel = 2 +CPUEnabled = True +CPULevel = 2 +FILESYSEnabled = True +FILESYSLevel = 2 +G3DEnabled = True +G3DLevel = 2 +HLEEnabled = True +HLELevel = 2 +JITEnabled = True +JITLevel = 2 +LOADEREnabled = True +LOADERLevel = 2 +MEEnabled = True +MELevel = 2 +MEMMAPEnabled = True +MEMMAPLevel = 2 +SASMIXEnabled = True +SASMIXLevel = 2 +SAVESTATEEnabled = True +SAVESTATELevel = 2 +FRAMEBUFEnabled = True +FRAMEBUFLevel = 2 +AUDIOEnabled = True +AUDIOLevel = 2 +IOEnabled = True +IOLevel = 2 +SCEAUDIOEnabled = True +SCEAUDIOLevel = 2 +SCECTRLEnabled = True +SCECTRLLevel = 2 +SCEDISPEnabled = True +SCEDISPLevel = 2 +SCEFONTEnabled = True +SCEFONTLevel = 2 +SCEGEEnabled = True +SCEGELevel = 2 +SCEINTCEnabled = True +SCEINTCLevel = 2 +SCEIOEnabled = True +SCEIOLevel = 2 +SCEKERNELEnabled = True +SCEKERNELLevel = 2 +SCEMODULEEnabled = True +SCEMODULELevel = 2 +SCENETEnabled = True +SCENETLevel = 2 +SCERTCEnabled = True +SCERTCLevel = 2 +SCESASEnabled = True +SCESASLevel = 2 +SCEUTILEnabled = True +SCEUTILLevel = 2 +SCEMISCEnabled = True +SCEMISCLevel = 2 +[PostShaderSetting] +BloomSettingValue1 = 0.600000 +BloomSettingValue2 = 0.500000 +CartoonSettingValue1 = 0.500000 +ColorCorrectionSettingValue1 = 1.000000 +ColorCorrectionSettingValue2 = 1.000000 +ColorCorrectionSettingValue3 = 1.000000 +ColorCorrectionSettingValue4 = 1.000000 +ScanlinesSettingValue1 = 1.000000 +ScanlinesSettingValue2 = 0.500000 +SharpenSettingValue1 = 1.500000 diff --git a/retrodeck.sh b/retrodeck.sh index 26b8fdca..790c6713 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -127,9 +127,9 @@ standalones_init() { sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/melonDS/melonDS.ini # CITRA - echo "----------------------" + echo "------------------------" echo "Initializing CITRA" - echo "----------------------" + echo "------------------------" mkdir -pv /var/config/citra-emu/ cp -fv $emuconfigs/citra-qt-config.ini /var/config/citra-emu/qt-config.ini sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/citra-emu/qt-config.ini @@ -138,16 +138,16 @@ standalones_init() { #sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/citra-emu/qt-config.ini # RPCS3 - echo "----------------------" + echo "------------------------" echo "Initializing RPCS3" - echo "----------------------" + echo "------------------------" mkdir -pv /var/config/rpcs3/ cp -fvr $emuconfigs/config.yml /var/config/rpcs3/ # XEMU - echo "----------------------" + echo "------------------------" echo "Initializing XEMU" - echo "----------------------" + echo "------------------------" mkdir -pv $rdhome/saves/xemu cp -fv $emuconfigs/xemu.toml /var/data/xemu/xemu.toml sed -i 's#/home/deck/retrodeck#'$rdhome'#g' /var/data/xemu/xemu.toml @@ -159,6 +159,14 @@ standalones_init() { rm -rfv $rdhome/bios/xbox_hdd.qcow2.zip fi + # PPSSPPSDL + echo "------------------------" + echo "Initializing PPSSPPSDL" + echo "------------------------" + mkdir -p /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 + # PICO-8 # Moved PICO-8 stuff in the finit as only it knows here roms folders is @@ -172,6 +180,23 @@ ra_init() { cp -f $emuconfigs/retroarch-core-options.cfg /var/config/retroarch/ #rm -rf $rdhome/bios/bios # in some situations a double bios symlink is created sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/retroarch/retroarch.cfg + + # PPSSPP + echo "--------------------------------" + echo "Initializing PPSSPP_LIBRETRO" + echo "--------------------------------" + if [ -d $rdhome/bios/PPSSPP/flash0/font ] + then + mv -f $rdhome/bios/PPSSPP/flash0/font $rdhome/bios/PPSSPP/flash0/font.bak + fi + wget "https://github.com/hrydgard/ppsspp/archive/refs/heads/master.zip" -P $rdhome/bios/PPSSPP + unzip "$rdhome/bios/PPSSPP/master.zip" $rdhome/bios/PPSSPP/ + rm -f "$rdhome/bios/PPSSPP/master.zip" + if [ -d $rdhome/bios/PPSSPP/flash0/font.bak ] + then + mv -f $rdhome/bios/PPSSPP/flash0/font.bak $rdhome/bios/PPSSPP/flash0/font + fi + } create_lock() { From 03fb912da4b084abcfb2d726089c904ea95432c9 Mon Sep 17 00:00:00 2001 From: Steam Deck User Date: Thu, 21 Jul 2022 20:52:53 +0200 Subject: [PATCH 018/393] Preapred MSX bios --- retrodeck.sh | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/retrodeck.sh b/retrodeck.sh index 790c6713..500a97d1 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -167,6 +167,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 + # PICO-8 # Moved PICO-8 stuff in the finit as only it knows here roms folders is @@ -176,8 +177,8 @@ ra_init() { dir_prep "$rdhome/bios" "/var/config/retroarch/system" mkdir -pv /var/config/retroarch/cores/ cp /app/share/libretro/cores/* /var/config/retroarch/cores/ - cp -f $emuconfigs/retroarch.cfg /var/config/retroarch/ - cp -f $emuconfigs/retroarch-core-options.cfg /var/config/retroarch/ + cp -fv $emuconfigs/retroarch.cfg /var/config/retroarch/ + cp -fv $emuconfigs/retroarch-core-options.cfg /var/config/retroarch/ #rm -rf $rdhome/bios/bios # in some situations a double bios symlink is created sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/retroarch/retroarch.cfg @@ -187,16 +188,27 @@ ra_init() { echo "--------------------------------" if [ -d $rdhome/bios/PPSSPP/flash0/font ] then - mv -f $rdhome/bios/PPSSPP/flash0/font $rdhome/bios/PPSSPP/flash0/font.bak + mv -fv $rdhome/bios/PPSSPP/flash0/font $rdhome/bios/PPSSPP/flash0/font.bak fi + mkdir -p $rdhome/bios/PPSSPP wget "https://github.com/hrydgard/ppsspp/archive/refs/heads/master.zip" -P $rdhome/bios/PPSSPP unzip "$rdhome/bios/PPSSPP/master.zip" $rdhome/bios/PPSSPP/ - rm -f "$rdhome/bios/PPSSPP/master.zip" + rm -fv "$rdhome/bios/PPSSPP/master.zip" if [ -d $rdhome/bios/PPSSPP/flash0/font.bak ] then - mv -f $rdhome/bios/PPSSPP/flash0/font.bak $rdhome/bios/PPSSPP/flash0/font + mv -fv $rdhome/bios/PPSSPP/flash0/font.bak $rdhome/bios/PPSSPP/flash0/font fi + # MSX / SVI / ColecoVision / SG-1000 + echo "-----------------------------------------------------------" + echo "Initializing MSX / SVI / ColecoVision / SG-1000 LIBRETRO" + echo "-----------------------------------------------------------" + wget "http://bluemsx.msxblue.com/rel_download/blueMSXv282full.zip" -P $rdhome/bios/MSX + unzip "$rdhome/bios/MSX/blueMSXv282full.zip" $rdhome/bios/MSX + mv -rfv $rdhome/bios/MSX/Databases $rdhome/bios/Databases + mv -rfv $rdhome/bios/MSX/Machines $rdhome/bios/Machines + rm -rfv $rdhome/bios/MSX + } create_lock() { From 47807efbc3adb17a65adc7a126d8553f4df510c8 Mon Sep 17 00:00:00 2001 From: Steam Deck User Date: Thu, 21 Jul 2022 21:31:22 +0200 Subject: [PATCH 019/393] PPSSPPSDL: added hotkeys --- emu-configs/ppssppsdl/controls.ini | 26 ++++++++++++++++++++++++++ emu-configs/ppssppsdl/ppsspp.ini | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 emu-configs/ppssppsdl/controls.ini diff --git a/emu-configs/ppssppsdl/controls.ini b/emu-configs/ppssppsdl/controls.ini new file mode 100644 index 00000000..010c77da --- /dev/null +++ b/emu-configs/ppssppsdl/controls.ini @@ -0,0 +1,26 @@ +[ControlMapping] +Up = 1-19,10-19 +Down = 1-20,10-20 +Left = 1-21,10-21 +Right = 1-22,10-22 +Circle = 1-52,10-190 +Cross = 1-54,10-189 +Square = 1-29,10-191 +Triangle = 1-47,10-188 +Start = 1-62,10-197 +Select = 1-66,10-196 +L = 1-45,10-194 +R = 1-51,10-195 +An.Up = 1-37,10-4003 +An.Down = 1-39,10-4002 +An.Left = 1-38,10-4001 +An.Right = 1-40,10-4000 +Analog limiter = 1-60 +RapidFire = 1-59 +Fast-forward = 10-4010 +SpeedToggle = 1-68 +Pause = 1-40 +Rewind = 10-4008 +Save State = 1-53 +Load State = 1-48 +Screenshot = 1-46 diff --git a/emu-configs/ppssppsdl/ppsspp.ini b/emu-configs/ppssppsdl/ppsspp.ini index 375b84ff..b4aac34d 100644 --- a/emu-configs/ppssppsdl/ppsspp.ini +++ b/emu-configs/ppssppsdl/ppsspp.ini @@ -1,6 +1,6 @@ [General] FirstRun = False -RunCount = 2 +RunCount = 0 Enable Logging = True AutoRun = True Browse = False From 44267a7ec10586a0c3698e2e554242a6ff75d69a Mon Sep 17 00:00:00 2001 From: xargon Date: Fri, 22 Jul 2022 19:08:10 +0200 Subject: [PATCH 020/393] Added the option to browse for roms folder --- retrodeck.sh | 137 ++++++++++++++++++++++++++------------------------- 1 file changed, 71 insertions(+), 66 deletions(-) diff --git a/retrodeck.sh b/retrodeck.sh index 26b8fdca..e4f33f3f 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -1,15 +1,10 @@ #!/bin/bash -# Init default values, this may be overwritten by retrodeck.cfg as it sourced later with global.sh - -lockfile=lockfile="/var/config/retrodeck/.lock" # where the lockfile is located -emuconfigs="/app/retrodeck/emu-configs" # folder with all the default emulator configs -sdcard="/run/media/mmcblk0p1" # Steam Deck SD default path -rd_conf="/app/retrodeck/retrodeck.cfg" # RetroDECK config file path -version="$(cat /app/retrodeck/version)" # version info taken from the version file -rdhome="$HOME/retrodeck" # the retrodeck home, aka ~/retrodeck - -source global.sh +lockfile="/var/config/retrodeck/.lock" # where the lockfile is located +version="$(cat /app/retrodeck/version)" # version info taken from the version file +rdhome="$HOME/retrodeck" # the retrodeck home, aka ~/retrodecck +emuconfigs="/app/retrodeck/emu-configs" # folder with all the default emulator configs +sdcard="/run/media/mmcblk0p1" # Steam Deck SD default path # We moved the lockfile in /var/config/retrodeck in order to solve issue #53 - Remove in a few versions if [ -f "$HOME/retrodeck/.lock" ] @@ -46,7 +41,7 @@ dir_prep() { # creating the symlink echo "linking $real in $symlink" #DEBUG mkdir -pv "$(dirname "$symlink")" # creating the full path except the last folder - ln -sv "$real" "$symlink" + ln -svf "$real" "$symlink" # moving everything from the old folder to the new one, delete the old one if [ -d "$symlink.old" ]; @@ -144,21 +139,6 @@ standalones_init() { mkdir -pv /var/config/rpcs3/ cp -fvr $emuconfigs/config.yml /var/config/rpcs3/ - # XEMU - echo "----------------------" - echo "Initializing XEMU" - echo "----------------------" - mkdir -pv $rdhome/saves/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 - if [ ! -f $rdhome/bios/xbox_hdd.qcow2 ] - then - wget "https://github.com/mborgerson/xemu-hdd-image/releases/latest/download/xbox_hdd.qcow2.zip" -P $rdhome/bios/ - unzip $rdhome/bios/xbox_hdd.qcow2.zip $rdhome/bios/ - rm -rfv $rdhome/bios/xbox_hdd.qcow2.zip - fi - # PICO-8 # Moved PICO-8 stuff in the finit as only it knows here roms folders is @@ -222,41 +202,71 @@ finit() { echo "Executing finit" # Internal or SD Card? - zenity --icon-name=net.retrodeck.retrodeck --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --ok-label "Internal" --cancel-label "SD Card" --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?" - if [ $? == 0 ] #yes - Internal - then - roms_folder="$rdhome/roms" - else #no - SD Card - if [ -d "$sdcard" ]; + 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" \ + --extra-button "SD Card" \ + --extra-button "Browse" \ + --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?" ) + echo "Choice is $choice" + + case $choice in + + "" ) # Internal (yes) + echo "Internal selected" + roms_folder="$rdhome/roms" + ;; + + "Cancel" ) + echo "Now quitting" + kill $$ + ;; + + "SD Card" ) + echo "SD Card selected" + if [ ! -d "$sdcard" ] # SD Card path is not existing + then + echo "Error: SD card not found" + zenity --question --no-wrap \ + --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ + --title "RetroDECK" --cancel-label="Cancel" \ + --ok-label "Browse" \ + --text="SD Card was not find in the default location.\nPlease choose the SD Card root.\nA retrodeck/roms folder will be created starting from the directory that you selected." + else + roms_folder="$sdcard/retrodeck/roms" + echo "ROMs folder = $roms_folder" + exit 0 + fi + ;; + + "Browse" ) # Browse + not found fallback + echo "Browse" + path_selected=false + while [ $path_selected == false ] + do + sdcard="$(zenity --file-selection --title="Choose retrodeck folder location" --directory)" + echo "Path choosed: $sdcard, answer=$?" + zenity --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" \ + --cancel-label="No" \ + --ok-label "Yes" \ + --text="Your rom folder will be:\n\n$sdcard/retrodeck/roms\n\nis that ok?" + if [ $? == 0 ] #yes then - roms_folder="$sdcard/retrodeck/roms" + sdselected == true + roms_folder="$sdcard/retrodeck/roms" + break else - sdselected=false - zenity --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --cancel-label="Cancel" --ok-label "Browse" --text="SD Card was not find in the default location.\nPlease choose the SD Card root.\nA retrodeck/roms folder will be created starting from the directory that you selected." - if [ $? == 1 ] #cancel - then - exit 0 - fi - while [ $sdselected == false ] - do - sdcard="$(zenity --file-selection --title="Choose SD Card root" --directory)" - echo "DEBUG: sdcard=$sdcard, answer=$?" - zenity --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --cancel-label="No" --ok-label "Yes" --text="Your rom folder will be:\n\n$sdcard/retrodeck/roms\n\nis that ok?" - if [ $? == 0 ] #yes - then - sdselected == true - roms_folder="$sdcard/retrodeck/roms" - break - else - zenity --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --cancel-label="No" --ok-label "Yes" --text="Do you want to quit?" - if [ $? == 0 ] # yes, quit - then - exit 0 - fi - fi - done + zenity --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --cancel-label="No" --ok-label "Yes" --text="Do you want to quit?" + if [ $? == 0 ] # yes, quit + then + exit 0 + fi fi - fi + done + ;; + + esac mkdir -pv $roms_folder @@ -330,8 +340,7 @@ https://retrodeck.net exit ;; --version*|-v*) - conf_init - echo $version + cat /var/config/retrodeck/version exit ;; --reset-ra*) @@ -364,9 +373,7 @@ done if [ -f "$lockfile" ] && [ "$(cat "$lockfile")" != "$version" ]; then echo "Lockfile version is "$(cat "$lockfile")" but the actual version is $version" - conf_init # Initializing/reading the config file (sourced from global.sh) - post_update # Executing post update script - conf_write # Writing variables in the config file (sourced from global.sh) + post_update start_retrodeck exit 0 fi @@ -376,9 +383,7 @@ fi if [ ! -f "$lockfile" ]; then echo "Lockfile not found" - conf_init # Initializing/reading the config file (sourced from global.sh) - finit # Executing First/Force init - conf_write # Writing variables in the config file (sourced from global.sh) + finit exit 0 fi From da6f832a7cc4e24eec9a880d1bb13e6d2558612a Mon Sep 17 00:00:00 2001 From: xargon Date: Fri, 22 Jul 2022 19:19:53 +0200 Subject: [PATCH 021/393] Revert "PPSSPPSDL: added hotkeys" This reverts commit f537459e61e88d10947dbf470bd8340b07fd20aa. --- emu-configs/ppssppsdl/controls.ini | 26 -------------------------- emu-configs/ppssppsdl/ppsspp.ini | 2 +- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 emu-configs/ppssppsdl/controls.ini diff --git a/emu-configs/ppssppsdl/controls.ini b/emu-configs/ppssppsdl/controls.ini deleted file mode 100644 index 010c77da..00000000 --- a/emu-configs/ppssppsdl/controls.ini +++ /dev/null @@ -1,26 +0,0 @@ -[ControlMapping] -Up = 1-19,10-19 -Down = 1-20,10-20 -Left = 1-21,10-21 -Right = 1-22,10-22 -Circle = 1-52,10-190 -Cross = 1-54,10-189 -Square = 1-29,10-191 -Triangle = 1-47,10-188 -Start = 1-62,10-197 -Select = 1-66,10-196 -L = 1-45,10-194 -R = 1-51,10-195 -An.Up = 1-37,10-4003 -An.Down = 1-39,10-4002 -An.Left = 1-38,10-4001 -An.Right = 1-40,10-4000 -Analog limiter = 1-60 -RapidFire = 1-59 -Fast-forward = 10-4010 -SpeedToggle = 1-68 -Pause = 1-40 -Rewind = 10-4008 -Save State = 1-53 -Load State = 1-48 -Screenshot = 1-46 diff --git a/emu-configs/ppssppsdl/ppsspp.ini b/emu-configs/ppssppsdl/ppsspp.ini index b4aac34d..375b84ff 100644 --- a/emu-configs/ppssppsdl/ppsspp.ini +++ b/emu-configs/ppssppsdl/ppsspp.ini @@ -1,6 +1,6 @@ [General] FirstRun = False -RunCount = 0 +RunCount = 2 Enable Logging = True AutoRun = True Browse = False From 925ab52284918eee93cca08346a86419b40fd516 Mon Sep 17 00:00:00 2001 From: xargon Date: Fri, 22 Jul 2022 19:23:38 +0200 Subject: [PATCH 022/393] Added the option to browse for roms folder --- emu-configs/ppssppsdl/controls.ini | 26 +++++++++++++++ emu-configs/ppssppsdl/ppsspp.ini | 2 +- retrodeck.sh | 52 ++++++++++++++++++++++++------ 3 files changed, 70 insertions(+), 10 deletions(-) create mode 100644 emu-configs/ppssppsdl/controls.ini diff --git a/emu-configs/ppssppsdl/controls.ini b/emu-configs/ppssppsdl/controls.ini new file mode 100644 index 00000000..010c77da --- /dev/null +++ b/emu-configs/ppssppsdl/controls.ini @@ -0,0 +1,26 @@ +[ControlMapping] +Up = 1-19,10-19 +Down = 1-20,10-20 +Left = 1-21,10-21 +Right = 1-22,10-22 +Circle = 1-52,10-190 +Cross = 1-54,10-189 +Square = 1-29,10-191 +Triangle = 1-47,10-188 +Start = 1-62,10-197 +Select = 1-66,10-196 +L = 1-45,10-194 +R = 1-51,10-195 +An.Up = 1-37,10-4003 +An.Down = 1-39,10-4002 +An.Left = 1-38,10-4001 +An.Right = 1-40,10-4000 +Analog limiter = 1-60 +RapidFire = 1-59 +Fast-forward = 10-4010 +SpeedToggle = 1-68 +Pause = 1-40 +Rewind = 10-4008 +Save State = 1-53 +Load State = 1-48 +Screenshot = 1-46 diff --git a/emu-configs/ppssppsdl/ppsspp.ini b/emu-configs/ppssppsdl/ppsspp.ini index 375b84ff..b4aac34d 100644 --- a/emu-configs/ppssppsdl/ppsspp.ini +++ b/emu-configs/ppssppsdl/ppsspp.ini @@ -1,6 +1,6 @@ [General] FirstRun = False -RunCount = 2 +RunCount = 0 Enable Logging = True AutoRun = True Browse = False diff --git a/retrodeck.sh b/retrodeck.sh index ec294444..b6036987 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -1,10 +1,15 @@ #!/bin/bash -lockfile="/var/config/retrodeck/.lock" # where the lockfile is located -version="$(cat /app/retrodeck/version)" # version info taken from the version file -rdhome="$HOME/retrodeck" # the retrodeck home, aka ~/retrodecck -emuconfigs="/app/retrodeck/emu-configs" # folder with all the default emulator configs -sdcard="/run/media/mmcblk0p1" # Steam Deck SD default path +# Init default values, this may be overwritten by retrodeck.cfg as it sourced later with global.sh + +lockfile=lockfile="/var/config/retrodeck/.lock" # where the lockfile is located +emuconfigs="/app/retrodeck/emu-configs" # folder with all the default emulator configs +sdcard="/run/media/mmcblk0p1" # Steam Deck SD default path +rd_conf="/app/retrodeck/retrodeck.cfg" # RetroDECK config file path +version="$(cat /app/retrodeck/version)" # version info taken from the version file +rdhome="$HOME/retrodeck" # the retrodeck home, aka ~/retrodeck + +source global.sh # We moved the lockfile in /var/config/retrodeck in order to solve issue #53 - Remove in a few versions if [ -f "$HOME/retrodeck/.lock" ] @@ -41,7 +46,7 @@ dir_prep() { # creating the symlink echo "linking $real in $symlink" #DEBUG mkdir -pv "$(dirname "$symlink")" # creating the full path except the last folder - ln -svf "$real" "$symlink" + ln -sv "$real" "$symlink" # moving everything from the old folder to the new one, delete the old one if [ -d "$symlink.old" ]; @@ -139,6 +144,30 @@ standalones_init() { mkdir -pv /var/config/rpcs3/ cp -fvr $emuconfigs/config.yml /var/config/rpcs3/ + # XEMU + echo "------------------------" + echo "Initializing XEMU" + echo "------------------------" + mkdir -pv $rdhome/saves/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 + if [ ! -f $rdhome/bios/xbox_hdd.qcow2 ] + then + wget "https://github.com/mborgerson/xemu-hdd-image/releases/latest/download/xbox_hdd.qcow2.zip" -P $rdhome/bios/ + unzip $rdhome/bios/xbox_hdd.qcow2.zip $rdhome/bios/ + rm -rfv $rdhome/bios/xbox_hdd.qcow2.zip + fi + + # PPSSPPSDL + echo "------------------------" + echo "Initializing PPSSPPSDL" + echo "------------------------" + mkdir -p /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 + + # PICO-8 # Moved PICO-8 stuff in the finit as only it knows here roms folders is @@ -368,7 +397,8 @@ https://retrodeck.net exit ;; --version*|-v*) - cat /var/config/retrodeck/version + conf_init + echo $version exit ;; --reset-ra*) @@ -401,7 +431,9 @@ done if [ -f "$lockfile" ] && [ "$(cat "$lockfile")" != "$version" ]; then echo "Lockfile version is "$(cat "$lockfile")" but the actual version is $version" - post_update + conf_init # Initializing/reading the config file (sourced from global.sh) + post_update # Executing post update script + conf_write # Writing variables in the config file (sourced from global.sh) start_retrodeck exit 0 fi @@ -411,7 +443,9 @@ fi if [ ! -f "$lockfile" ]; then echo "Lockfile not found" - finit + conf_init # Initializing/reading the config file (sourced from global.sh) + finit # Executing First/Force init + conf_write # Writing variables in the config file (sourced from global.sh) exit 0 fi From c51ecfefb537fd1e20370cf879ce68564285b33c Mon Sep 17 00:00:00 2001 From: xargon Date: Sat, 23 Jul 2022 11:19:26 +0200 Subject: [PATCH 023/393] Fixed a typo --- retrodeck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retrodeck.sh b/retrodeck.sh index b6036987..a6b1b9e2 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -2,7 +2,7 @@ # Init default values, this may be overwritten by retrodeck.cfg as it sourced later with global.sh -lockfile=lockfile="/var/config/retrodeck/.lock" # where the lockfile is located +lockfile="/var/config/retrodeck/.lock" # where the lockfile is located emuconfigs="/app/retrodeck/emu-configs" # folder with all the default emulator configs sdcard="/run/media/mmcblk0p1" # Steam Deck SD default path rd_conf="/app/retrodeck/retrodeck.cfg" # RetroDECK config file path From 635c3dcdf3e2f6c7abac318fc32f9f9158353932 Mon Sep 17 00:00:00 2001 From: xargon Date: Sat, 23 Jul 2022 11:36:57 +0200 Subject: [PATCH 024/393] fixed rd config location, ppsspp: inserted a debug line --- global.sh | 2 +- retrodeck.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/global.sh b/global.sh index 280344a8..c3bcfc1e 100755 --- a/global.sh +++ b/global.sh @@ -2,7 +2,7 @@ # This file is containing some global function needed for the script such as the config file tools -rd_conf="/app/retrodeck/retrodeck.cfg" +rd_conf="/var/config/retrodeck/retrodeck.cfg" conf_init() { # initializing and reading the retrodeck config file diff --git a/retrodeck.sh b/retrodeck.sh index a6b1b9e2..127d742b 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -198,6 +198,8 @@ ra_init() { then mv -fv $rdhome/bios/PPSSPP/flash0/font.bak $rdhome/bios/PPSSPP/flash0/font fi + read -p "Press enter to continue" # DEBUG + # MSX / SVI / ColecoVision / SG-1000 echo "-----------------------------------------------------------" From e23e591bda87b7b775cd0ebe2ad1cf7db5bd8114 Mon Sep 17 00:00:00 2001 From: Steam Deck User Date: Sat, 23 Jul 2022 17:20:10 +0200 Subject: [PATCH 025/393] PPSSPP assets downloader: fixed --- retrodeck.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/retrodeck.sh b/retrodeck.sh index 127d742b..16390c75 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -192,13 +192,14 @@ ra_init() { fi mkdir -p $rdhome/bios/PPSSPP wget "https://github.com/hrydgard/ppsspp/archive/refs/heads/master.zip" -P $rdhome/bios/PPSSPP - unzip "$rdhome/bios/PPSSPP/master.zip" $rdhome/bios/PPSSPP/ - rm -fv "$rdhome/bios/PPSSPP/master.zip" + unzip "$rdhome/bios/PPSSPP/master.zip" -d $rdhome/bios/PPSSPP/ + mv "$rdhome/bios/PPSSPP/ppsspp-master/"* "$rdhome/bios/PPSSPP/" + rm -rfv "$rdhome/bios/PPSSPP/master.zip" + rm -rfv "$rdhome/bios/PPSSPP/ppsspp-master" if [ -d $rdhome/bios/PPSSPP/flash0/font.bak ] then mv -fv $rdhome/bios/PPSSPP/flash0/font.bak $rdhome/bios/PPSSPP/flash0/font fi - read -p "Press enter to continue" # DEBUG # MSX / SVI / ColecoVision / SG-1000 From c803fbdee25efda550cfd25c1b072cfebb1b216a Mon Sep 17 00:00:00 2001 From: Steam Deck User Date: Sat, 23 Jul 2022 19:28:56 +0200 Subject: [PATCH 026/393] Fixed retrodeck.cfg path --- global.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.sh b/global.sh index c3bcfc1e..280344a8 100755 --- a/global.sh +++ b/global.sh @@ -2,7 +2,7 @@ # This file is containing some global function needed for the script such as the config file tools -rd_conf="/var/config/retrodeck/retrodeck.cfg" +rd_conf="/app/retrodeck/retrodeck.cfg" conf_init() { # initializing and reading the retrodeck config file From 353ad896c5b9a53ed903ae49bcfa5ebbafcb6760 Mon Sep 17 00:00:00 2001 From: Steam Deck User Date: Sat, 23 Jul 2022 20:19:03 +0200 Subject: [PATCH 027/393] Updated scripts, bufgix needed --- global.sh | 37 ++++++++++++++++++++++------- retrodeck.sh | 67 +++++++++++++++++++++++++++++----------------------- 2 files changed, 67 insertions(+), 37 deletions(-) diff --git a/global.sh b/global.sh index 280344a8..9083f5d5 100755 --- a/global.sh +++ b/global.sh @@ -2,20 +2,36 @@ # This file is containing some global function needed for the script such as the config file tools -rd_conf="/app/retrodeck/retrodeck.cfg" +rd_conf="/var/config/retrodeck/retrodeck.cfg" conf_init() { # initializing and reading the retrodeck config file if [ ! -f $rd_conf ] then # I have to initialize the variables as they cannot be red from an empty config file + echo "RetroDECK config file not found in $rd_conf" + echo "Initializing" touch $rd_conf + read -p "Press enter to continue" #DEBUG # Variables to manage: adding a variable here means adding it to conf_write() - version="$(cat /app/retrodeck/version)" # version info taken from the version file - rdhome="$HOME/retrodeck" # the retrodeck home, aka ~/retrodeck - roms_folder="$rdhome/roms" # default roms folder location (intenral) + echo "#!/bin/bash" >> $rd_conf + + # version info taken from the version file + version="$(cat /app/retrodeck/version)" + echo "version=$version" >> $rd_conf + + # the retrodeck home, aka ~/retrodeck + rdhome="$HOME/retrodeck" + echo "rdhome=$rdhome" >> $rd_conf + + # default roms folder location (internal) + roms_folder="$rdhome/roms" + echo "roms_folder=$roms_folder" >> $rd_conf + else # i just read the variables + echo "Found RetroDECK config file in $rd_conf" + echo "Loading it" source $rd_conf fi } @@ -23,17 +39,22 @@ conf_init() { conf_write() { # writes the variables in the retrodeck config file + echo "Writing the config file" + # TODO: this can be optimized with a while and a list of variables to check - if [ ! -z "$version" ] then #if the variable is not null then I update it + if [ ! -z "$version" ] #if the variable is not null then I update it + then sed -i "s%version=.*%version=$version%" $rd_conf fi - if [ ! -z "$rdhome" ] then + if [ ! -z "$rdhome" ] + then sed -i "s%rdhome=.*%rdhome=$rdhome%" $rd_conf fi - if [ ! -z "$roms_folder" ] then - sed -i "s%rdhome=.*%rdhome=$roms_folder" $rd_conf + if [ ! -z "$roms_folder" ] + then + sed -i "s%rdhome=.*%rdhome=$roms_folder%" $rd_conf fi } \ No newline at end of file diff --git a/retrodeck.sh b/retrodeck.sh index 16390c75..17fb6a2e 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -5,11 +5,11 @@ lockfile="/var/config/retrodeck/.lock" # where the lockfile is located emuconfigs="/app/retrodeck/emu-configs" # folder with all the default emulator configs sdcard="/run/media/mmcblk0p1" # Steam Deck SD default path -rd_conf="/app/retrodeck/retrodeck.cfg" # RetroDECK config file path +rd_conf="/var/config/retrodeck/retrodeck.cfg" # RetroDECK config file path version="$(cat /app/retrodeck/version)" # version info taken from the version file rdhome="$HOME/retrodeck" # the retrodeck home, aka ~/retrodeck -source global.sh +source /app/bin/global.sh # We moved the lockfile in /var/config/retrodeck in order to solve issue #53 - Remove in a few versions if [ -f "$HOME/retrodeck/.lock" ] @@ -191,11 +191,14 @@ ra_init() { mv -fv $rdhome/bios/PPSSPP/flash0/font $rdhome/bios/PPSSPP/flash0/font.bak fi mkdir -p $rdhome/bios/PPSSPP - wget "https://github.com/hrydgard/ppsspp/archive/refs/heads/master.zip" -P $rdhome/bios/PPSSPP - unzip "$rdhome/bios/PPSSPP/master.zip" -d $rdhome/bios/PPSSPP/ - mv "$rdhome/bios/PPSSPP/ppsspp-master/"* "$rdhome/bios/PPSSPP/" - rm -rfv "$rdhome/bios/PPSSPP/master.zip" - rm -rfv "$rdhome/bios/PPSSPP/ppsspp-master" + if [ ! -f "$rdhome/bios/PPSSPP/ppge_atlas.zim" ] + then + wget "https://github.com/hrydgard/ppsspp/archive/refs/heads/master.zip" -P $rdhome/bios/PPSSPP + unzip "$rdhome/bios/PPSSPP/master.zip" -d $rdhome/bios/PPSSPP/ + mv "$rdhome/bios/PPSSPP/ppsspp-master/assets"* "$rdhome/bios/PPSSPP/" + rm -rfv "$rdhome/bios/PPSSPP/master.zip" + rm -rfv "$rdhome/bios/PPSSPP/ppsspp-master" + fi if [ -d $rdhome/bios/PPSSPP/flash0/font.bak ] then mv -fv $rdhome/bios/PPSSPP/flash0/font.bak $rdhome/bios/PPSSPP/flash0/font @@ -256,6 +259,32 @@ start_retrodeck() { emulationstation --home /var/config/emulationstation } +browse(){ + # Function fro browsing the sd card or [ath] + path_selected=false + while [ $path_selected == false ] + do + sdcard="$(zenity --file-selection --title="Choose retrodeck folder location" --directory)" + echo "Path choosed: $sdcard, answer=$?" + zenity --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" \ + --cancel-label="No" \ + --ok-label "Yes" \ + --text="Your rom folder will be:\n\n$sdcard/retrodeck/roms\n\nis that ok?" + if [ $? == 0 ] #yes + then + sdselected == true + roms_folder="$sdcard/retrodeck/roms" + break + else + zenity --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --cancel-label="No" --ok-label "Yes" --text="Do you want to quit?" + if [ $? == 0 ] # yes, quit + then + exit 0 + fi + fi + done +} + finit() { # Force/First init, depending on the situation @@ -293,6 +322,7 @@ finit() { --title "RetroDECK" --cancel-label="Cancel" \ --ok-label "Browse" \ --text="SD Card was not find in the default location.\nPlease choose the SD Card root.\nA retrodeck/roms folder will be created starting from the directory that you selected." + browse else roms_folder="$sdcard/retrodeck/roms" echo "ROMs folder = $roms_folder" @@ -302,28 +332,7 @@ finit() { "Browse" ) # Browse + not found fallback echo "Browse" - path_selected=false - while [ $path_selected == false ] - do - sdcard="$(zenity --file-selection --title="Choose retrodeck folder location" --directory)" - echo "Path choosed: $sdcard, answer=$?" - zenity --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" \ - --cancel-label="No" \ - --ok-label "Yes" \ - --text="Your rom folder will be:\n\n$sdcard/retrodeck/roms\n\nis that ok?" - if [ $? == 0 ] #yes - then - sdselected == true - roms_folder="$sdcard/retrodeck/roms" - break - else - zenity --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --cancel-label="No" --ok-label "Yes" --text="Do you want to quit?" - if [ $? == 0 ] # yes, quit - then - exit 0 - fi - fi - done + browse ;; esac From 699ddc208f2f982c7bc008fbc21135b7dfedfbf0 Mon Sep 17 00:00:00 2001 From: xargon Date: Mon, 25 Jul 2022 21:01:45 +0200 Subject: [PATCH 028/393] Fixed a bug in the variables writing --- global.sh | 7 +++---- retrodeck.sh | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/global.sh b/global.sh index 9083f5d5..5068bd14 100755 --- a/global.sh +++ b/global.sh @@ -11,7 +11,6 @@ conf_init() { echo "RetroDECK config file not found in $rd_conf" echo "Initializing" touch $rd_conf - read -p "Press enter to continue" #DEBUG # Variables to manage: adding a variable here means adding it to conf_write() echo "#!/bin/bash" >> $rd_conf @@ -25,7 +24,7 @@ conf_init() { echo "rdhome=$rdhome" >> $rd_conf # default roms folder location (internal) - roms_folder="$rdhome/roms" + roms_folder="$roms_folder" echo "roms_folder=$roms_folder" >> $rd_conf @@ -39,7 +38,7 @@ conf_init() { conf_write() { # writes the variables in the retrodeck config file - echo "Writing the config file" + echo "Writing the config file: $rd_conf" # TODO: this can be optimized with a while and a list of variables to check if [ ! -z "$version" ] #if the variable is not null then I update it @@ -54,7 +53,7 @@ conf_write() { if [ ! -z "$roms_folder" ] then - sed -i "s%rdhome=.*%rdhome=$roms_folder%" $rd_conf + sed -i "s%roms_folder=.*%roms_folder=$roms_folder%" $rd_conf fi } \ No newline at end of file diff --git a/retrodeck.sh b/retrodeck.sh index 17fb6a2e..0d8f9dbb 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -191,14 +191,14 @@ ra_init() { mv -fv $rdhome/bios/PPSSPP/flash0/font $rdhome/bios/PPSSPP/flash0/font.bak fi mkdir -p $rdhome/bios/PPSSPP - if [ ! -f "$rdhome/bios/PPSSPP/ppge_atlas.zim" ] - then + #if [ ! -f "$rdhome/bios/PPSSPP/ppge_atlas.zim" ] + #then wget "https://github.com/hrydgard/ppsspp/archive/refs/heads/master.zip" -P $rdhome/bios/PPSSPP unzip "$rdhome/bios/PPSSPP/master.zip" -d $rdhome/bios/PPSSPP/ - mv "$rdhome/bios/PPSSPP/ppsspp-master/assets"* "$rdhome/bios/PPSSPP/" + mv "$rdhome/bios/PPSSPP/ppsspp-master/assets/"* "$rdhome/bios/PPSSPP/" rm -rfv "$rdhome/bios/PPSSPP/master.zip" rm -rfv "$rdhome/bios/PPSSPP/ppsspp-master" - fi + #fi if [ -d $rdhome/bios/PPSSPP/flash0/font.bak ] then mv -fv $rdhome/bios/PPSSPP/flash0/font.bak $rdhome/bios/PPSSPP/flash0/font From 7d53771fd444849123c67333e555d0f63cca3e59 Mon Sep 17 00:00:00 2001 From: xargon Date: Wed, 27 Jul 2022 11:20:38 +0200 Subject: [PATCH 029/393] Wrapper: first steps into Advanced (unfinished) --- global.sh | 20 +++++++++++++++++- retrodeck.sh | 57 +++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 66 insertions(+), 11 deletions(-) diff --git a/global.sh b/global.sh index 5068bd14..6f69a74e 100755 --- a/global.sh +++ b/global.sh @@ -25,7 +25,15 @@ conf_init() { # default roms folder location (internal) roms_folder="$roms_folder" - echo "roms_folder=$roms_folder" >> $rd_conf + echo "roms_folder=$roms_folder" >> $rd_conf + + # default media folder location (internal) + media_folder="$media_folder" + echo "media_folder=$media_folder" >> $rd_conf + + # default themes folder location (internal) + themes_folder="$themes_folder" + echo "themes_folder=$themes_folder" >> $rd_conf else # i just read the variables @@ -56,4 +64,14 @@ conf_write() { sed -i "s%roms_folder=.*%roms_folder=$roms_folder%" $rd_conf fi + if [ ! -z "$media_folder" ] + then + sed -i "s%media_folder=.*%media_folder=$media_folder%" $rd_conf + fi + + if [ ! -z "$themes_folder" ] + then + sed -i "s%themes_folder=.*%themes_folder=$themes_folder%" $rd_conf + fi + } \ No newline at end of file diff --git a/retrodeck.sh b/retrodeck.sh index 0d8f9dbb..993fdb3c 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -8,6 +8,8 @@ sdcard="/run/media/mmcblk0p1" # Steam Deck SD defau rd_conf="/var/config/retrodeck/retrodeck.cfg" # RetroDECK config file path version="$(cat /app/retrodeck/version)" # version info taken from the version file rdhome="$HOME/retrodeck" # the retrodeck home, aka ~/retrodeck +media_folder="$HOME/retrodeck/downloaded_media" # the media folder, where all the scraped data is downloaded into +themes_folder="$HOME/retrodeck/themes" # the themes folder source /app/bin/global.sh @@ -229,18 +231,18 @@ post_update() { # Unhiding downloaded media from the previous versions if [ -d "$rdhome/.downloaded_media" ] then - mv -fv "$rdhome/.downloaded_media" "$rdhome/downloaded_media" + mv -fv "$rdhome/.downloaded_media" "$media_folder" fi # Unhiding themes folder from the previous versions if [ -d "$rdhome/.themes" ] then - mv -fv "$rdhome/.themes" "$rdhome/themes" + mv -fv "$rdhome/.themes" "$themes_folder" fi - # Doing the dir prep as we don't know from which version we came - Remove in a few versions - dir_prep "$rdhome/downloaded_media" "/var/config/emulationstation/.emulationstation/downloaded_media" - dir_prep "$rdhome/themes" "/var/config/emulationstation/.emulationstation/themes" + # Doing the dir prep as we don't know from which version we came + dir_prep "$media_folder" "/var/config/emulationstation/.emulationstation/downloaded_media" + dir_prep "$themes_folder" "/var/config/emulationstation/.emulationstation/themes" mkdir -pv $rdhome/.logs #this was added later, maybe safe to remove in a few versions # Resetting es_systems, now we need it but in the future I should think a better solution, maybe with sed @@ -260,7 +262,7 @@ start_retrodeck() { } browse(){ - # Function fro browsing the sd card or [ath] + # Function for browsing the sd card path_selected=false while [ $path_selected == false ] do @@ -285,6 +287,41 @@ 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 +} + finit() { # Force/First init, depending on the situation @@ -295,7 +332,7 @@ finit() { --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" \ --ok-label "Internal" \ --extra-button "SD Card" \ - --extra-button "Browse" \ + --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?" ) echo "Choice is $choice" @@ -330,9 +367,9 @@ finit() { fi ;; - "Browse" ) # Browse + not found fallback - echo "Browse" - browse + "Advanced" ) # Browse + not found fallback + echo "Advanced" + advanced ;; esac From 66b1de0f359c4edc2db4bed9dfda7667841b3c3b Mon Sep 17 00:00:00 2001 From: xargon Date: Thu, 28 Jul 2022 16:35:13 +0200 Subject: [PATCH 030/393] Improved installation finish message --- retrodeck.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/retrodeck.sh b/retrodeck.sh index 993fdb3c..c0bf447b 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -417,7 +417,10 @@ finit() { tools_init create_lock - zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="Initialization completed.\nplease put your roms in:\n\n$roms_folder\n\nand your bioses in\n\n$rdhome/bios\n\nThen start the program again.\nIf you wish to change the roms location, you may use the tool located the tools section of RetroDECK.\n\nIMPORTANT NOTE:\nRetroDECK must be manually added and launched from your Steam Library in order to work correctly.\nMoreover is suggested to use BoilR to automatically add the SteamGridDB images to Steam (this will be automated soon).\nhttps://github.com/PhilipK/BoilR" + zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \ + --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ + --title "RetroDECK" \ + --text="Initialization completed.\nplease put your roms in:\n\n$roms_folder\n\nand your bioses in\n\n$rdhome/bios\n\nThen start the program again.\nIf you wish to change the roms location, you may use the tool located the tools section of RetroDECK.\n\nIMPORTANT NOTES:\n- RetroDECK must be manually added and launched from your Steam Library in order to work correctly.\n- It's recommended to use the 'RetroDECK Offical Controller Config' from Steam (under community layouts).\n- It's suggested to use BoilR to automatically add the SteamGridDB images to Steam (this will be automated soon).\nhttps://github.com/PhilipK/BoilR" # TODO: Replace the stuff above with BoilR code when ready } From e2e48a989c56db6e323160248ce85ec29ff0881b Mon Sep 17 00:00:00 2001 From: anthonycaccese Date: Sat, 30 Jul 2022 19:02:06 -0400 Subject: [PATCH 031/393] Updated Art-Book to latest versions Removed the zoom on no-meta version based on user feedback --- net.retrodeck.retrodeck.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 5b2ebba5..73dce058 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -220,7 +220,7 @@ modules: sources: - type: git url: https://github.com/anthonycaccese/art-book-next-retropie.git - commit: b9a846dcfc1811e811e2eed7853bfeddbb3ef153 + commit: 783b53f3939e037ab20f1a53101ff673f3a45bfc - name: art-book-next-no-meta buildsystem: simple @@ -230,7 +230,7 @@ modules: sources: - type: git url: https://github.com/anthonycaccese/art-book-next-retropie.git - commit: bd4414ffcc83b5b145c3971451a04e6e7a1cbb73 + commit: cdef6cd1469e9aa6cf1bbe77d07c2100c9f1947d # External manifests start From 4ae5a2e562b80fa8ff75fedc4cf6f88aa50c9d34 Mon Sep 17 00:00:00 2001 From: anthonycaccese Date: Mon, 1 Aug 2022 12:51:30 -0400 Subject: [PATCH 032/393] Updated Art-Book-Next Versions Updated existing metadata and no-metadata versions Added a version that supports miximages for users that prefer that type of artwork --- net.retrodeck.retrodeck.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 73dce058..86170275 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -220,7 +220,7 @@ modules: sources: - type: git url: https://github.com/anthonycaccese/art-book-next-retropie.git - commit: 783b53f3939e037ab20f1a53101ff673f3a45bfc + commit: 5b953838424e029e7ad534d2a20a7c7f7f5b9e8a - name: art-book-next-no-meta buildsystem: simple @@ -230,7 +230,17 @@ modules: sources: - type: git url: https://github.com/anthonycaccese/art-book-next-retropie.git - commit: cdef6cd1469e9aa6cf1bbe77d07c2100c9f1947d + commit: 3b93a8e2bea9d65aee5b0d07f07f56e76653a265 + + - name: art-book-next-miximage + buildsystem: simple + build-commands: + - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-miximage/ + - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-miximage/ + sources: + - type: git + url: https://github.com/anthonycaccese/art-book-next-retropie.git + commit: 87b580aceabcf53149e1398039377416bdbd056c # External manifests start From 22c003065643a5b84940a57a2b210131cac60fa9 Mon Sep 17 00:00:00 2001 From: xargon Date: Thu, 4 Aug 2022 21:40:04 +0200 Subject: [PATCH 033/393] Added --info-msg --- retrodeck.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/retrodeck.sh b/retrodeck.sh index c0bf447b..c00608a9 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -420,7 +420,7 @@ finit() { zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --title "RetroDECK" \ - --text="Initialization completed.\nplease put your roms in:\n\n$roms_folder\n\nand your bioses in\n\n$rdhome/bios\n\nThen start the program again.\nIf you wish to change the roms location, you may use the tool located the tools section of RetroDECK.\n\nIMPORTANT NOTES:\n- RetroDECK must be manually added and launched from your Steam Library in order to work correctly.\n- It's recommended to use the 'RetroDECK Offical Controller Config' from Steam (under community layouts).\n- It's suggested to use BoilR to automatically add the SteamGridDB images to Steam (this will be automated soon).\nhttps://github.com/PhilipK/BoilR" + --text="Installation completed.\nPlease put your roms in:\n\n$roms_folder\n\nand your bioses in\n\n$rdhome/bios\n\nThen start the program again.\nIf you wish to change the roms location, you may use the tool located the tools section of RetroDECK.\n\nIMPORTANT NOTES:\n- RetroDECK must be manually added and launched from your Steam Library in order to work correctly.\n- It's recommended to use the 'RetroDECK Offical Controller Config' from Steam (under community layouts).\n- It's suggested to use BoilR to automatically add the SteamGridDB images to Steam (this will be automated soon).\nhttps://github.com/PhilipK/BoilR" # TODO: Replace the stuff above with BoilR code when ready } @@ -437,6 +437,7 @@ flatpak run [FLATPAK-RUN-OPTION] net.retrodeck-retrodeck [ARGUMENTS] Arguments: -h, --help Print this help -v, --version Print RetroDECK version + --info-msg Print paths and config informations --reset Starts the initial RetroDECK installer (backup your data first!) --reset-ra Resets RetroArch's config to the default values --reset-sa Reset standalone emulator configs to the default values @@ -450,7 +451,15 @@ https://retrodeck.net ;; --version*|-v*) conf_init - echo $version + echo "RetroDECK v$version" + exit + ;; + --info-msg*) + conf_init + echo "RetroDECK v$version" + echo "RetroDECK config file is in: $rd_conf" + echo "Contents:" + cat $rd_conf exit ;; --reset-ra*) From bd919579d49b65bdd2bf60a46f00900df6f01d4d Mon Sep 17 00:00:00 2001 From: xargon Date: Wed, 10 Aug 2022 22:37:16 +0200 Subject: [PATCH 034/393] Re-enabled ReatroArch resources --- net.retrodeck.retrodeck.yml | 56 ++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 86170275..ec0127ac 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -325,34 +325,34 @@ modules: - type: git url: https://github.com/libretro/retroarch-joypad-autoconfig.git commit: 760b057f1865a827762a54a8a32afda2cdd9e170 - # - name: common-shaders - # make-install-args: - # - PREFIX=${FLATPAK_DEST} - # sources: - # - type: git - # url: https://github.com/libretro/common-shaders.git - # commit: 55e401834b732e62c34411321c4ffd82524345d4 - # - name: slang-shaders - # make-install-args: - # - PREFIX=${FLATPAK_DEST} - # sources: - # - type: git - # url: https://github.com/libretro/slang-shaders.git - # commit: 148c57d9747f5db124135501ac280b5ca129a83f - # - name: glsl-shaders - # make-install-args: - # - PREFIX=${FLATPAK_DEST} - # sources: - # - type: git - # url: https://github.com/libretro/glsl-shaders.git - # commit: 8f6b2649489760caea8f36ec6099998854059569 - # - name: common-overlays - # make-install-args: - # - PREFIX=${FLATPAK_DEST} - # sources: - # - type: git - # url: https://github.com/libretro/common-overlays.git - # commit: db9744f4e58a740f0f10b04b62af347cd6f01928 + - name: common-shaders + make-install-args: + - PREFIX=${FLATPAK_DEST} + sources: + - type: git + url: https://github.com/libretro/common-shaders.git + commit: 55e401834b732e62c34411321c4ffd82524345d4 + - name: slang-shaders + make-install-args: + - PREFIX=${FLATPAK_DEST} + sources: + - type: git + url: https://github.com/libretro/slang-shaders.git + commit: 148c57d9747f5db124135501ac280b5ca129a83f + - name: glsl-shaders + make-install-args: + - PREFIX=${FLATPAK_DEST} + sources: + - type: git + url: https://github.com/libretro/glsl-shaders.git + commit: 8f6b2649489760caea8f36ec6099998854059569 + - name: common-overlays + make-install-args: + - PREFIX=${FLATPAK_DEST} + sources: + - type: git + url: https://github.com/libretro/common-overlays.git + commit: db9744f4e58a740f0f10b04b62af347cd6f01928 # RetroArch - END From e107d1f66e1ba3b5a624522571f58f23c2c8ea4a Mon Sep 17 00:00:00 2001 From: xargon Date: Wed, 10 Aug 2022 22:43:09 +0200 Subject: [PATCH 035/393] Added Duckstation (SA) - Needs to be configured --- net.retrodeck.retrodeck.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index ec0127ac..e9da38bf 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1023,6 +1023,7 @@ modules: commit: e9570d1a0045926f63ec8ea9af68f81743d4f365 # RPCS3 - END + # PRIMEHACK - START # https://github.com/flathub/io.github.shiiion.primehack # Disabled because it's overwriting Dolphin @@ -1150,6 +1151,35 @@ modules: # PPSSPP Flathub Workaround - END # PPSSPP - END + # Duckstation - START + # https://github.com/flathub/org.duckstation.DuckStation + + - name: duckstation + buildsystem: cmake-ninja + no-make-install: true + builddir: true + config-opts: + - -DCMAKE_BUILD_TYPE=Release + - -DUSE_EGL=ON + - -DUSE_SDL2=ON + - -DUSE_WAYLAND=ON + - -DUSE_X11=ON + - -DUSE_DRMKMS=ON + - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON + post-install: + - install -m 755 -t /app/bin/ bin/duckstation-nogui bin/duckstation-qt + - |- + for px in 16 32 48 64 128 256; do + install -Dm644 ../extras/icons/icon-${px}px.png /app/share/icons/hicolor/${px}x${px}/apps/org.duckstation.DuckStation.png + done + - cp -r ../data/* bin/translations /app/bin + sources: + - type: git + url: https://github.com/stenzek/duckstation.git + commit: 3fb61865e505ba639609fbf16cb8bdf5c66e020c + + # Duckstation - END + # External manifests end - name: retrodeck From 7f3273d1a7223b77544d413117dd83671562c067 Mon Sep 17 00:00:00 2001 From: xargon Date: Wed, 10 Aug 2022 22:50:52 +0200 Subject: [PATCH 036/393] Updated wxWidgets to 3.2.0 --- net.retrodeck.retrodeck.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index e9da38bf..b02f0461 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -577,8 +577,8 @@ modules: sources: - type: git url: https://github.com/wxWidgets/wxWidgets.git - tag: v3.1.7 - commit: 7ad1bffa875f7a38db58b6069ea3ff0c49c211d2 + tag: v3.2.0 + commit: 5b5ec3804a31a3765d60ff351bbdf79eddb1e1f9 x-checker-data: type: git tag-pattern: ^v([\d.]+)$ From 5dfe98922bf1ff8fc781484738f28a85eb03ab6c Mon Sep 17 00:00:00 2001 From: xargon Date: Wed, 10 Aug 2022 23:01:44 +0200 Subject: [PATCH 037/393] Updated PCSX2 and added the QT version --- net.retrodeck.retrodeck.yml | 38 ++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index b02f0461..4f13daf1 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -582,7 +582,7 @@ modules: x-checker-data: type: git tag-pattern: ^v([\d.]+)$ - modules: + - name: libaio no-autogen: true make-install-args: @@ -598,6 +598,7 @@ modules: cleanup: - /include - /lib/*.a + - name: portaudio buildsystem: cmake-ninja config-opts: @@ -616,6 +617,7 @@ modules: x-checker-data: type: git tag-pattern: ^v([\d.]+)$ + - name: soundtouch buildsystem: cmake-ninja sources: @@ -633,6 +635,7 @@ modules: - /lib/pkgconfig - /share/doc - /lib/*.a + - name: png++ disabled: true buildsystem: simple @@ -644,6 +647,7 @@ modules: url: >- https://download.savannah.nongnu.org/releases/pngpp/png++-0.2.10.tar.gz sha256: 998af216ab16ebb88543fbaa2dbb9175855e944775b66f2996fc945c8444eee1 + - name: libpcap buildsystem: cmake-ninja sources: @@ -660,6 +664,7 @@ modules: - /share/man - /lib/pkgconfig - /lib/*.a + - name: pcsx2 buildsystem: cmake-ninja builddir: true @@ -678,8 +683,9 @@ modules: sources: - type: git url: https://github.com/PCSX2/pcsx2.git - tag: v1.7.2889 - commit: a6649b2d6b558806fbe7cbaf6296014e3c5c192e + tag: v1.7.3172 + commit: 7a5f63e0f5925ff29f589883e04d3c66779f4f17 + # PCSX2 Flathub Workaround - START # This workaround disables the PCSX2 libraries (disable-submodules: true) and install them separately # This is only to make it buildable by the flathub builder as normaly it seems not to be needed @@ -738,6 +744,32 @@ modules: commit: e47e674cd09583ff0503f0f6defd6d23d8b718d3 # PCSX2 Flathub Workaround - END + - name: pcsx2-qt + buildsystem: cmake-ninja + builddir: true + config-opts: + - '-DCMAKE_BUILD_TYPE=Release' + - '-DPACKAGE_MODE=TRUE' + - '-DXDG_STD=TRUE' + - '-DDISABLE_BUILD_DATE=TRUE' + - '-DDISABLE_PCSX2_WRAPPER=TRUE' + - '-DDISABLE_ADVANCE_SIMD=TRUE' + - '-DSDL2_API=TRUE' + - '-DQT_BUILD=TRUE' + cleanup: + - /share/pixmaps + - /share/man + - /share/doc + post-install: + - >- + ln -s ${FLATPAK_DEST}/share/PCSX2/resources + ${FLATPAK_DEST}/bin/resources + sources: + - type: git + url: https://github.com/PCSX2/pcsx2.git + tag: v1.7.3172 + commit: 7a5f63e0f5925ff29f589883e04d3c66779f4f17 + # PCSX2 - END # Dolphin - START From 82ce57056d6b2d4e88a2ba959e53df0301ef08c9 Mon Sep 17 00:00:00 2001 From: xargon Date: Wed, 10 Aug 2022 23:13:55 +0200 Subject: [PATCH 038/393] Added Ryujinx --- net.retrodeck.retrodeck.yml | 59 ++++++++++++++++++++++++++++++++----- 1 file changed, 52 insertions(+), 7 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 4f13daf1..626fc866 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -2,14 +2,11 @@ app-id: net.retrodeck.retrodeck runtime: org.kde.Platform runtime-version: 5.15-21.08 sdk: org.kde.Sdk -# Needed for rpcs3 sdk-extensions: - - org.freedesktop.Sdk.Extension.llvm13 -# /Needed for rpcs3 -# Needed for Yuzu -base: io.qt.qtwebengine.BaseApp -base-version: 5.15-21.08 -# /Needed for Yuzu + - org.freedesktop.Sdk.Extension.llvm13 # Needed for rpcs3 + - org.freedesktop.Sdk.Extension.dotnet6 # Needed for Ryujinx +base: io.qt.qtwebengine.BaseApp # Needed for Yuzu +base-version: 5.15-21.08 # Needed for Yuzu command: retrodeck.sh finish-args: @@ -528,6 +525,54 @@ modules: # Yuzu - END + # Ryujinx - START + # https://github.com/flathub/org.ryujinx.Ryujinx + + - name: Ryujinx + buildsystem: simple + build-options: + append-path: /usr/lib/sdk/dotnet6/bin + append-ld-library-path: /usr/lib/sdk/dotnet6/lib + arch: + x86_64: + env: + RUNTIME: linux-x64 + env: + PKG_CONFIG_PATH: /app/lib/pkgconfig:/app/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/lib/sdk/dotnet6/lib/pkgconfig + DOTNET_CLI_TELEMETRY_OPTOUT: 'true' + DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 'true' + RYUJINX_VERSION: 1.1.209 + RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: flathub + RYUJINX_TARGET_RELEASE_CHANNEL_REPO: org.ryujinx.Ryujinx + RYUJINX_TARGET_RELEASE_CHANNEL_NAME: master + build-commands: + - | + export RYUJINX_GIT_SHORT_HASH=$(git rev-parse --short HEAD) + sed -r --in-place "s/\%\%RYUJINX_BUILD_VERSION\%\%/$RYUJINX_VERSION/g;" Ryujinx.Common/ReleaseInformations.cs + sed -r --in-place "s/\%\%RYUJINX_BUILD_GIT_HASH\%\%/$RYUJINX_GIT_SHORT_HASH/g;" Ryujinx.Common/ReleaseInformations.cs + sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_NAME/g;" Ryujinx.Common/ReleaseInformations.cs + sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_OWNER/g;" Ryujinx.Common/ReleaseInformations.cs + sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_REPO\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_REPO/g;" Ryujinx.Common/ReleaseInformations.cs + mkdir -p /app/bin + dotnet publish -c Release -r $RUNTIME /p:DebugType=embedded Ryujinx /p:Version=$RYUJINX_VERSION /p:SourceRevisionId=$RYUJINX_GIT_SHORT_HASH /p:ExtraDefineConstants=DISABLE_UPDATER --self-contained --source nuget-sources + if [ $? -ne 0 ]; then + exit 1; + fi; + cp -r --remove-destination /run/build/Ryujinx/Ryujinx/bin/Release/net6.0/$RUNTIME/publish/* /app/bin/ + mkdir -p /app/lib/ffmpeg + ln -s /usr/lib/x86_64-linux-gnu/libX11.so.6 /app/lib/libX11.so + wget https://raw.githubusercontent.com/flathub/org.ryujinx.Ryujinx/master/ryujinx-wrapper + install -Dm755 ryujinx-wrapper /app/bin/ryujinx-wrapper + install -Dm644 distribution/linux/ryujinx-logo.svg /app/share/icons/hicolor/scalable/apps/ryujinx.svg + install -Dm644 distribution/linux/ryujinx-mime.xml /app/share/mime/packages/$FLATPAK_ID.mime.xml + sources: + - rd-submodules/ryujinx/nuget_sources.json + - type: git + url: https://github.com/Ryujinx/Ryujinx.git + commit: 66e7fdb8710ff24bfb80c9c638ce2e6fa9563068 + + # Ryujinx - END + # CITRA - START - name: citra From ec69583c3ead5c6f2e05eebbc3a7ab2951101cf4 Mon Sep 17 00:00:00 2001 From: xargon Date: Wed, 10 Aug 2022 23:14:50 +0200 Subject: [PATCH 039/393] Updated ffmpeg to n5.1 --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 626fc866..67086156 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -163,7 +163,7 @@ modules: sources: - type: git url: https://github.com/FFmpeg/FFmpeg.git - tag: n5.0 + tag: n5.1 - name: freeimage no-autogen: true From f0da045c0d7d67ff42fb21554f4cc1ab11766670 Mon Sep 17 00:00:00 2001 From: xargon Date: Tue, 23 Aug 2022 20:27:53 +0200 Subject: [PATCH 040/393] PCSX2-QT: disabled submodules --- net.retrodeck.retrodeck.yml | 2 + rd-submodules/ryujinx/nuget_sources.json | 1521 ++++++++++++++++++++++ 2 files changed, 1523 insertions(+) create mode 100644 rd-submodules/ryujinx/nuget_sources.json diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 67086156..b0c22dff 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -814,6 +814,8 @@ modules: url: https://github.com/PCSX2/pcsx2.git tag: v1.7.3172 commit: 7a5f63e0f5925ff29f589883e04d3c66779f4f17 + # same as above + disable-submodules: true # PCSX2 - END diff --git a/rd-submodules/ryujinx/nuget_sources.json b/rd-submodules/ryujinx/nuget_sources.json new file mode 100644 index 00000000..8cfac612 --- /dev/null +++ b/rd-submodules/ryujinx/nuget_sources.json @@ -0,0 +1,1521 @@ +[ + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection.extensions/4.3.0/runtime.any.system.reflection.extensions.4.3.0.nupkg", + "sha512": "8de7a4c53fc0324e766bfec360342ee4a4b99a5975a9d61faab0a715ef71ff97aa83383a5a8affb354c02a4e2fbbb91e1b4ae6b282d2880108cb489f06aba500", + "dest": "nuget-sources", + "dest-filename": "runtime.any.system.reflection.extensions.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices/4.1.0/system.runtime.interopservices.4.1.0.nupkg", + "sha512": "e8511e6a4cd40f3c603df4ffbbf6a4aac4d10be79bcfd0249a9af90d55cf2a02543ad9b82e607a4665d58f28c7ce9bdb0f7f3ff9bc8ded8a252213916a771bd2", + "dest": "nuget-sources", + "dest-filename": "system.runtime.interopservices.4.1.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg", + "sha512": "650799c3e654efbb9ad67157c9c60ce46f288a81597be37ce2a0bf5d4835044065ef3f65b997328cbbbbfb81f4c89b8d7e7d61380880019deee6eb3f963f70d9", + "dest": "nuget-sources", + "dest-filename": "system.runtime.interopservices.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.io/4.1.0/system.io.4.1.0.nupkg", + "sha512": "e01b432f3d715f3c88d5d7f3e7cc1ceee78caf99407a11c3306f9103aee78963f818417f14eec52f0096fa247900a31e53bd3226e06f0c0f93870db0b2b78331", + "dest": "nuget-sources", + "dest-filename": "system.io.4.1.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.io/4.3.0/system.io.4.3.0.nupkg", + "sha512": "bfca5a21e3e1986b9765b13dc6fbcd6f8b89e4c1383855d1d7ef256bf1bf2f51889769db5365859dd7606fbf6454add4daeb3bab56994ffb98fd1d03fe8bc1e6", + "dest": "nuget-sources", + "dest-filename": "system.io.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.any.system.io/4.3.0/runtime.any.system.io.4.3.0.nupkg", + "sha512": "7e0d4a238322d434a19afc79ea988d3727c1687fdd5bcd1c4c39cb6201073caabb924cc201c70545d60acf8b94cde8b783d0c268743e040c357d100677e4c5ed", + "dest": "nuget-sources", + "dest-filename": "runtime.any.system.io.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/sixlabors.fonts/1.0.0-beta0013/sixlabors.fonts.1.0.0-beta0013.nupkg", + "sha512": "4e51c75fff6601c787ced1d6ac8e955ac4c0fe4a24355099f8925705127c322f8d09a66ea38cce7db7b21b680223ae0b5d80417ad2eafc1291f37f4bab7e31b5", + "dest": "nuget-sources", + "dest-filename": "sixlabors.fonts.1.0.0-beta0013.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.console/4.0.0/system.console.4.0.0.nupkg", + "sha512": "44937dfe632127d3a7c89ca77502eeb6f66201ef135384e04b570a90a3eee3d72497869344c759c35295d6a4b46afd561ba19562dfff9896ecf2d4b07e96fb9b", + "dest": "nuget-sources", + "dest-filename": "system.console.4.0.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.win.system.io.filesystem/4.3.0/runtime.win.system.io.filesystem.4.3.0.nupkg", + "sha512": "17b4a6725a2e10e9d413a803130cdbbd6abd2bf94596e68c02b15e2500fe2d4bbbc34c50f1bb9576fd91d16ae11b219eab9f470df711a03e0972d3e9162893f9", + "dest": "nuget-sources", + "dest-filename": "runtime.win.system.io.filesystem.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.any.system.diagnostics.tracing/4.3.0/runtime.any.system.diagnostics.tracing.4.3.0.nupkg", + "sha512": "0b480d21e23c38965222be7fa1e1a0c7e444cebdf400d1db8d3ac609f893b82d78c5d8b271da61808b7b179dd6466a0090bd807fc2d35020f93a00f0213bb436", + "dest": "nuget-sources", + "dest-filename": "runtime.any.system.diagnostics.tracing.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg", + "sha512": "c9f219515e268cf40e16b135bd64cba95c35e866dd9bc34954159562314d01d2f9ea7eb8b0db94acf6bdac83d651d90bad7890cb657ffe40fa3440ec662c9944", + "dest": "nuget-sources", + "dest-filename": "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.win32.systemevents/6.0.0/microsoft.win32.systemevents.6.0.0.nupkg", + "sha512": "5e274ace996c3eba63099ed5116f9dc39f69f684f7c1e7623c28c3c73988b75c67dfcc929a50a761f0222df243dd540720a6e588e91dfa784f81bfce7a893875", + "dest": "nuget-sources", + "dest-filename": "microsoft.win32.systemevents.6.0.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.diagnostics.tracing/4.1.0/system.diagnostics.tracing.4.1.0.nupkg", + "sha512": "0c64f255836cb629587b117bd8de5e70bfe7e4c6d7d138bff10b9e85f4883fba250ae07118c21d5e9130ba3cf120a9a2bf581a17577d3a7ec09260933c7b4d47", + "dest": "nuget-sources", + "dest-filename": "system.diagnostics.tracing.4.1.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg", + "sha512": "d0a5d30e261cd45b7dfab02b7ffbd76b64e0c9b892ed826ea61481c983c0208b05b69981cd79e91cd4e5811e1cd4c3cea06a1afce05811ece58be5e4c20169ea", + "dest": "nuget-sources", + "dest-filename": "system.diagnostics.tracing.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.threading.overlapped/4.3.0/system.threading.overlapped.4.3.0.nupkg", + "sha512": "25612d588a18047ccc9a0b7623fd5ee05146eaf7832f8cb303563b8ae118d86f86c99cabceac7f19094cf7633e77cd43d5c1f6769d8a4616d975079b9fc43e44", + "dest": "nuget-sources", + "dest-filename": "system.threading.overlapped.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/libhac/0.16.1/libhac.0.16.1.nupkg", + "sha512": "af3479a904bf494abb1e82a77873bb0c361b63537ce12cd7ff277e8e76f714d677964bf5dbe204f4aad3be105eca21c5484e4b5ca94ceab9414a38c482b1e828", + "dest": "nuget-sources", + "dest-filename": "libhac.0.16.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/giosharp/3.22.25.128/giosharp.3.22.25.128.nupkg", + "sha512": "575bef7f1d64b71715b15b8913ad2268e8cdbaa8d1061c6940719a2905eb9fb51eb7a21b054e1e3b4d9be67192799fa0435707bad27672307be27821329ee28c", + "dest": "nuget-sources", + "dest-filename": "giosharp.3.22.25.128.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-x64/6.0.7/microsoft.netcore.app.runtime.linux-x64.6.0.7.nupkg", + "sha512": "990e3041fdd9def8309b77d30a1ad940a8741603a53bab0b07f38d28f31dd41ee6e426db18e0076272aae05040b7df1bc4f5dcd74ce0bce607430d1402a3b479", + "dest": "nuget-sources", + "dest-filename": "microsoft.netcore.app.runtime.linux-x64.6.0.7.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.any.system.collections/4.3.0/runtime.any.system.collections.4.3.0.nupkg", + "sha512": "9f8833176c139b71a58694ae401c5aec209a63227be07c7ab559bef772082bd1f6cc38ba2949cb1c8e5c5514ad9f4ff51859838dc2f28191f8bb7ae611a50239", + "dest": "nuget-sources", + "dest-filename": "runtime.any.system.collections.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.win-x64/6.0.7/microsoft.aspnetcore.app.runtime.win-x64.6.0.7.nupkg", + "sha512": "372058854c51609f6f68fd0f357e69188270badc1ec29be9d527de1ef21f09efe0790fa4a880c51dbf47cf863cfc6011d48efe3b4721430eac256a70ae3ea977", + "dest": "nuget-sources", + "dest-filename": "microsoft.aspnetcore.app.runtime.win-x64.6.0.7.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.io.compression.zipfile/4.0.1/system.io.compression.zipfile.4.0.1.nupkg", + "sha512": "49322ce411efafb4b55d43b0d7a52bc334990e1e45b321d01f0f394cf1aaba15845603d6f08a12c8f09454a03518e6c0ab7996ba73b1116c5c7f685d768bc62c", + "dest": "nuget-sources", + "dest-filename": "system.io.compression.zipfile.4.0.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.native.system.security.cryptography.openssl/4.3.0/runtime.native.system.security.cryptography.openssl.4.3.0.nupkg", + "sha512": "ee5d047908b99b776ff9bb54856454b24b09a0f9271b127239543b1f5faa3381a032d9eeb4d813d01b5a4b7d183b6a16250f159fdc450d5314a7eace1550bea3", + "dest": "nuget-sources", + "dest-filename": "runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.algorithms/4.2.0/system.security.cryptography.algorithms.4.2.0.nupkg", + "sha512": "93d1e6394afc506b58bd26a9b3ccd64901bc2d48dbb8825ba1f927c17311cad607e6f8a9794cc41aee83b98eed08a23a7c58390b9b852f894735392342f37a3d", + "dest": "nuget-sources", + "dest-filename": "system.security.cryptography.algorithms.4.2.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.any.system.text.encoding.extensions/4.3.0/runtime.any.system.text.encoding.extensions.4.3.0.nupkg", + "sha512": "656aa8bd9d7e19534964ac7b8405615f00359779e322d4cfe1f18c132fec4a4f52c5588bfe61cec9966a9142a73315f5d2b9e5a7c524b418364f0322b20961c3", + "dest": "nuget-sources", + "dest-filename": "runtime.any.system.text.encoding.extensions.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.win7-x64.runtime.native.system.io.compression/4.3.0/runtime.win7-x64.runtime.native.system.io.compression.4.3.0.nupkg", + "sha512": "892d1791458f9a3901a72630af8a2aa3ffad827da90abca8cca9c972d202f809e6249eb8e06a4b79bf61a09fb60589e923c52a8a5300274de04557aa2992b2ac", + "dest": "nuget-sources", + "dest-filename": "runtime.win7-x64.runtime.native.system.io.compression.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime.interopservices/4.3.0/runtime.any.system.runtime.interopservices.4.3.0.nupkg", + "sha512": "70eeb2469726d092bb95568e51ba5cfdd1cc07a9e65077e2b6dd5b7c8b164d4b45c749ef4a52f45928f63a27e8accdb83b861ea73c9ad3d42dc38e6afdbd0e8c", + "dest": "nuget-sources", + "dest-filename": "runtime.any.system.runtime.interopservices.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.win-x64/6.0.7/microsoft.netcore.app.runtime.win-x64.6.0.7.nupkg", + "sha512": "4f1a32c90ccf33b3dbc8f2866a152afd7954e81701e3f76ba2fcb6c19d3debb4eee666f90eef5dc7bc15700a67e8e8cdae2c1ddb5437413397d068942ddb9749", + "dest": "nuget-sources", + "dest-filename": "microsoft.netcore.app.runtime.win-x64.6.0.7.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.osx-x64/6.0.7/microsoft.netcore.app.host.osx-x64.6.0.7.nupkg", + "sha512": "59d99148642cd2b6b6509d7728ac323054f973554a49e8087f25ea6d21f7c7a400b23c27822f54e686f5f7658fbb5916efa14cdad3a26f8fe031673b65044537", + "dest": "nuget-sources", + "dest-filename": "microsoft.netcore.app.host.osx-x64.6.0.7.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/gdksharp/3.22.25.128/gdksharp.3.22.25.128.nupkg", + "sha512": "c081968df5c14e78f0c31bf39e9cbc32efb966406f143e930e367b5f7325e39ff7efe8e2e04b28d1fcf8abe4aa81b2a5f094fdd2c86ac9e5561283c7acf709c2", + "dest": "nuget-sources", + "dest-filename": "gdksharp.3.22.25.128.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.collections/4.0.11/system.collections.4.0.11.nupkg", + "sha512": "f61b75329ba5d7c0e688aa9d110b2200c8934c3a1888f6b1b5f198baa7ab93f23835e8380853e8c046f257172b5060578ed86df26e5fe0ef34d8c4408a02c33f", + "dest": "nuget-sources", + "dest-filename": "system.collections.4.0.11.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.collections/4.3.0/system.collections.4.3.0.nupkg", + "sha512": "ca7b952d30da1487ca4e43aa522817b5ee26e7e10537062810112fc67a7512766c39d402f394bb0426d1108bbcf9bbb64e9ce1f5af736ef215a51a35e55f051b", + "dest": "nuget-sources", + "dest-filename": "system.collections.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.threading/4.0.11/system.threading.4.0.11.nupkg", + "sha512": "05c0dd1bbcfcedb6fc6c5f311c41920a4775f8a28a61ca246b6c65ad8afd9b04881d3357880af000ac056fd121fc5c3ec0b56d6fd607e0c27e7a639157c85e3e", + "dest": "nuget-sources", + "dest-filename": "system.threading.4.0.11.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.threading/4.3.0/system.threading.4.3.0.nupkg", + "sha512": "97a2751bdce69faaf9c54f834a9fd5c60c7a786faa52f420769828dbc9b5804c1f3721ba1ea945ea1d844835d909810f9e782c9a44d0faaecccb230c4cd95a88", + "dest": "nuget-sources", + "dest-filename": "system.threading.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg", + "sha512": "e65a6a1f1928cfb760c395a399542dc7f9087399c53874376604504ae60abd2da24ed735ebd148d335000a5e35c8108ea55404685e902df392eac2e8d38fb665", + "dest": "nuget-sources", + "dest-filename": "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.management/6.0.0/system.management.6.0.0.nupkg", + "sha512": "d98847c56d026a1cb6bac6b2dfb34aa9976b86754217eb80063cda76c391dee54a0f1accf19e1a76dedb7e1c63f815bcbb6c81380a76f8bd4c58680773601a43", + "dest": "nuget-sources", + "dest-filename": "system.management.6.0.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.unix.system.runtime.extensions/4.3.0/runtime.unix.system.runtime.extensions.4.3.0.nupkg", + "sha512": "54b81784c08e934389c59e6e155af6b1855e4bbc41678b01a702c94e6daba87c6ddfd16fe9e2cb61f3097bfa4950dbc37781454d027ce5ba6c50a393cc91b888", + "dest": "nuget-sources", + "dest-filename": "runtime.unix.system.runtime.extensions.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.runtimeinformation/4.0.0/system.runtime.interopservices.runtimeinformation.4.0.0.nupkg", + "sha512": "462d35e66cbdd21dc007f06c6ef129ab57e810fa0f0416bd2fc6fb7eed55138780d4d31e31ee6267a82e2e3a1607e5c642bd6efeb130b57a1baa87e3141b0080", + "dest": "nuget-sources", + "dest-filename": "system.runtime.interopservices.runtimeinformation.4.0.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.io.filesystem/4.0.1/system.io.filesystem.4.0.1.nupkg", + "sha512": "a6478b17f5d52fc5b9517458e93e1a69b92575c170f44046b3f4e25c7e67c9d4126ab486f5a3c51abcb279d05a057bd53aa8f49a1e51eae69563ae39214b72d3", + "dest": "nuget-sources", + "dest-filename": "system.io.filesystem.4.0.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.osx-x64/6.0.7/microsoft.aspnetcore.app.runtime.osx-x64.6.0.7.nupkg", + "sha512": "a8706be74be0982d76d85c6ee359d16f08e4d79d65ead54a22be8c1cd1ec4ed510da35288e49abea460d4fd9267bd8dd9ca825c40cb8f5b6584a92af4d0ce1df", + "dest": "nuget-sources", + "dest-filename": "microsoft.aspnetcore.app.runtime.osx-x64.6.0.7.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime/4.3.0/runtime.any.system.runtime.4.3.0.nupkg", + "sha512": "bfee3c68312296860e5459af5e770c2e9fcd4ac134361fd569a9ce1e6574b9ae3978aad403f89639a4b5bac8ee5bb0ee1b8edb819e9a60f13ca5bd1812889bbd", + "dest": "nuget-sources", + "dest-filename": "runtime.any.system.runtime.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg", + "sha512": "4afac5cc1734330a6103880e790d639e825bfb1b34dbd42083762c47db5e5dab6c03efd16049ac03861d7d87746caed09c7534241d51b7341d47ba6af7e8dd31", + "dest": "nuget-sources", + "dest-filename": "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.5.0/system.security.principal.windows.4.5.0.nupkg", + "sha512": "86cdb3178b4e437578890b6d5672eb9d1fe2f003abac082ed869a9e3f8cd684ffee618995838f6d052bf9bf396dc8b5d8bd5c3bea7f9e56cc7922598b4e49436", + "dest": "nuget-sources", + "dest-filename": "system.security.principal.windows.4.5.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.3.0/system.security.principal.windows.4.3.0.nupkg", + "sha512": "66c1d5a9d649b964e1653fa2cd41d8f80515b7cd727fcd7f0890552070da1099ecd1032560f259a108e0d1d6a6da23fa07bc5c922f426a91f33b667f7c004019", + "dest": "nuget-sources", + "dest-filename": "system.security.principal.windows.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime.handles/4.3.0/runtime.any.system.runtime.handles.4.3.0.nupkg", + "sha512": "95cdae2867a2182535bd0f4d01dc3eff70319dff044b070ab7791fa2bf8688a69b00a279ed569b7f0c5f3e26bf705303dc344ecf7d1ea014c579436d8e7b7389", + "dest": "nuget-sources", + "dest-filename": "runtime.any.system.runtime.handles.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.drawing.common/6.0.0/system.drawing.common.6.0.0.nupkg", + "sha512": "d61f0a3e01c3eac15f13fc1ba04a2c7ce4eac956400b2faa361fecabd3836d49d5bd344f3985ee3d94cdc3f6a72b8e07e423cdb2965b4f5ca2222b5de32988e4", + "dest": "nuget-sources", + "dest-filename": "system.drawing.common.6.0.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.win.microsoft.win32.primitives/4.3.0/runtime.win.microsoft.win32.primitives.4.3.0.nupkg", + "sha512": "36576acaafa80dcdf3dad082e37ccfbbd3175cd622992b0dd1c690d1cb575a1f7aef44894dccd2e89d34c6027a26de502843128982adcb7150644f51f1480935", + "dest": "nuget-sources", + "dest-filename": "runtime.win.microsoft.win32.primitives.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.x509certificates/4.1.0/system.security.cryptography.x509certificates.4.1.0.nupkg", + "sha512": "6171106ffefaea916a72abf17af038e0203b4e779b7bb75f6fe6cec04c6de3316a7ad4eda8fd3ce7dc0bd8375a0f5e45387456499b24ba22224538cf08a0cae6", + "dest": "nuget-sources", + "dest-filename": "system.security.cryptography.x509certificates.4.1.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/ryujinx.graphics.nvdec.dependencies/5.0.1-build10/ryujinx.graphics.nvdec.dependencies.5.0.1-build10.nupkg", + "sha512": "b3899cd05981053998ee14a9ade58617d0302e1151bd566fc9e6809638fd5079fd7b95a0db95c25d5047be2740646a95231931f293cc7ce7c3d6c2a06f3aa442", + "dest": "nuget-sources", + "dest-filename": "ryujinx.graphics.nvdec.dependencies.5.0.1-build10.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/opentk.redist.glfw/3.3.7.25/opentk.redist.glfw.3.3.7.25.nupkg", + "sha512": "b650bff89b652c563d083ab6e8518717bae6be168d988da484180a91bd894105346e7d199d5e9d0d9f962f571efe2fe8dba8a59929bd68d856847a72a11b89ed", + "dest": "nuget-sources", + "dest-filename": "opentk.redist.glfw.3.3.7.25.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg", + "sha512": "61da1667a5dd1e53a5d19fbe90abbfe332d84fe755fb811a080668a47d41a97db44539e3174fd1d2a0770ff1bd83afa68c82ce06df5775da65a6054ccc12c4be", + "dest": "nuget-sources", + "dest-filename": "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.common/4.2.0/microsoft.codeanalysis.common.4.2.0.nupkg", + "sha512": "579adf4d1f1ecb6461788bc29184c09e6f9bf1de047bfa234160fb0b95a931061f89e3bbebaf13d89faafd65b9bad31bcbb3db755de5e20ae8b5e7b9e7a2507c", + "dest": "nuget-sources", + "dest-filename": "microsoft.codeanalysis.common.4.2.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.any.system.threading.timer/4.3.0/runtime.any.system.threading.timer.4.3.0.nupkg", + "sha512": "c0a1fc3661b4e21f329f88a8d2cbf7152698427778add9f850476fc9abe7cdf9b86df79362d6df025f7e15d53f5eb7937d8ac49bdef13fd9eca973a284929fcf", + "dest": "nuget-sources", + "dest-filename": "runtime.any.system.threading.timer.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.win.system.runtime.extensions/4.3.0/runtime.win.system.runtime.extensions.4.3.0.nupkg", + "sha512": "f8ddce885541079b78ad27c1d4d53df5b78c976d6395a52cca6777606f0b8327dae6caa617e269034fb8100ab8964f60117708a25def4191e5c6c7c18e043b25", + "dest": "nuget-sources", + "dest-filename": "runtime.win.system.runtime.extensions.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/opentk.openal/4.7.2/opentk.openal.4.7.2.nupkg", + "sha512": "854219abd8c1873f20a35677c5c61828ae1d4aca79e8cb1c3cf1ce1b5a4075320234d8b6e4cd853d59b911c52a31939022952462b69339733a43073a7e8c41dd", + "dest": "nuget-sources", + "dest-filename": "opentk.openal.4.7.2.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.globalization.calendars/4.0.1/system.globalization.calendars.4.0.1.nupkg", + "sha512": "e6f3f0fc443c52cbe754ccfe6c7752206557db7603187b0f1ab7e21fcb466248ee20844d9ce9f5f114e6daa5944a3293cca47f3c02a2e735a7b494f29f2278c0", + "dest": "nuget-sources", + "dest-filename": "system.globalization.calendars.4.0.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.linq/4.1.0/system.linq.4.1.0.nupkg", + "sha512": "53e53220e5fdd6ad44f498e4657503780bca1f73be646009134150f06a76b0873753db3aae97398054bd1e8cc0c1c4cdd2db773f65a26874ab94110edb0cddb1", + "dest": "nuget-sources", + "dest-filename": "system.linq.4.1.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/silk.net.vulkan.extensions.ext/2.10.1/silk.net.vulkan.extensions.ext.2.10.1.nupkg", + "sha512": "470b2423d725545fa305d1a42d07e2c5e05e86f68c094fe02b44413e954df3b0cc38322224cf64b3954db46c54b4f314be6d0ca6686ba37bf0082ed551873fef", + "dest": "nuget-sources", + "dest-filename": "silk.net.vulkan.extensions.ext.2.10.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.unix.microsoft.win32.primitives/4.3.0/runtime.unix.microsoft.win32.primitives.4.3.0.nupkg", + "sha512": "93e6d3db61f9c2ca2048f25990dda92acd5ec74561e0c776d2c6dd8d1d55128f2c953f33d6832fb6a72bd9edca304a2551085bdeafe6e18af87619c9ba943c32", + "dest": "nuget-sources", + "dest-filename": "runtime.unix.microsoft.win32.primitives.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/sharpziplib/1.3.3/sharpziplib.1.3.3.nupkg", + "sha512": "5f6996e38a31861449a493b9387e91097abe06f3ca936e618e6b914091699b7319bda7e392a532a96c06287e9b3c28786183c5fbc212ac2bbdd10809151e6dbb", + "dest": "nuget-sources", + "dest-filename": "sharpziplib.1.3.3.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/msgpack.cli/1.0.1/msgpack.cli.1.0.1.nupkg", + "sha512": "8d024b49d44c94b98914f064c5196ae4d497be44f4eb2f54354e9f6c01134a11d14cd08351864720fcd8b398908da4bd62623b379323fa9d88bbe251c9dbc665", + "dest": "nuget-sources", + "dest-filename": "msgpack.cli.1.0.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/4.0.0/system.diagnostics.diagnosticsource.4.0.0.nupkg", + "sha512": "199e2a85b5cb0ea6c2ce13e12444af61e80da7625c4f7d0dcc97dcc363b21f2bee48c7bcfd85d99d0a23aeb1ea35f94dd7ff8fd22ab50f2481e472a749765471", + "dest": "nuget-sources", + "dest-filename": "system.diagnostics.diagnosticsource.4.0.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.unix.system.io.filesystem/4.3.0/runtime.unix.system.io.filesystem.4.3.0.nupkg", + "sha512": "6d4c80aceffac60e1560fda34c5984bbfa2e1bd106bde2c6d3540905cc30c58e6f5f2eaf5703cef5e68e3d25a4b97982193b2db8130a50c622a498e43eb9bdca", + "dest": "nuget-sources", + "dest-filename": "runtime.unix.system.io.filesystem.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.win.system.net.sockets/4.3.0/runtime.win.system.net.sockets.4.3.0.nupkg", + "sha512": "d70b564d53be12665bd4ddb4ce64e60fef42d17c68368a6c7877e059f41f3218bbb72867162b740bf3bd363304397eacbda8c48ea4f83d2d3ec958c11d23493d", + "dest": "nuget-sources", + "dest-filename": "runtime.win.system.net.sockets.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-x64/6.0.7/microsoft.aspnetcore.app.runtime.linux-x64.6.0.7.nupkg", + "sha512": "ed363dcbbec09e62dbfcfccab6b0c2dcc7ad6603d2ff84f82928bd86b02b5c1ef13511bf6964a7afb3e58c2e1e46726c750121e4d48d02357b608fbeba274d01", + "dest": "nuget-sources", + "dest-filename": "microsoft.aspnetcore.app.runtime.linux-x64.6.0.7.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.dotnet.platformabstractions/3.1.6/microsoft.dotnet.platformabstractions.3.1.6.nupkg", + "sha512": "55b87f544874686bed96889953b7e99e43426b79b0fac31cc452e0f4a27ca5cc08522c0ac967bf9df649f7c04137a5e2553d134ad79d5c1e69578367c2b4b4c6", + "dest": "nuget-sources", + "dest-filename": "microsoft.dotnet.platformabstractions.3.1.6.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.any.system.resources.resourcemanager/4.3.0/runtime.any.system.resources.resourcemanager.4.3.0.nupkg", + "sha512": "39fab03cbade2b3848d62e137313530c06b37216e24cd58c70ed6ae54bdaf9d9613a3b410375ee167c87ff935a558b1f8766ee016b8b244fde99c38fcf42a49b", + "dest": "nuget-sources", + "dest-filename": "runtime.any.system.resources.resourcemanager.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/gtksharp/3.22.25.128/gtksharp.3.22.25.128.nupkg", + "sha512": "aedc50ef1d59135004a79e3dd4f00be2c86b5d47979322e23a33490cf81d2c6e086c61ff4123dfab43b1d1e849e5003221cb920f28fac40e4fbc069984c2a396", + "dest": "nuget-sources", + "dest-filename": "gtksharp.3.22.25.128.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.collections.immutable/5.0.0/system.collections.immutable.5.0.0.nupkg", + "sha512": "726f8db7d179714cf0efeb0fc02fcebe7b4755762902e391e77cf78671dd5d5f364c7cf4ce3545b51cc7f37327d12d1500ba19f4b934f0e8bb69a6a347c0bbfd", + "dest": "nuget-sources", + "dest-filename": "system.collections.immutable.5.0.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/spb/0.0.4-build24/spb.0.0.4-build24.nupkg", + "sha512": "fb62ab52e148c966d10847a28b2c3e1c24deeab27039aacdb4ad53c2cf360ea605755fd43bb8e8f169ceb329eb3be1f53d4d1321130b1e372bb7a6513e3a4f04", + "dest": "nuget-sources", + "dest-filename": "spb.0.0.4-build24.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.linq.expressions/4.1.0/system.linq.expressions.4.1.0.nupkg", + "sha512": "04605a091d3aea404bc97cb7ffc154708b3bec886562d9e36aecd4d2ed130afbb45f54cd16a3f714f0ccb3f27c5bc7707e55fbc3e81681a783e9396930058acc", + "dest": "nuget-sources", + "dest-filename": "system.linq.expressions.4.1.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.native.system.io.compression/4.1.0/runtime.native.system.io.compression.4.1.0.nupkg", + "sha512": "453e16348b435b0d8bc5c4db85d77c99f6e4a79f62e8168eb91c972d6e788c8f1f965ba6e46c1b42f71dee4618373ac70499024f6a4d1462c040fe4989f68283", + "dest": "nuget-sources", + "dest-filename": "runtime.native.system.io.compression.4.1.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.numerics.vectors/4.5.0/system.numerics.vectors.4.5.0.nupkg", + "sha512": "9c04ec0530f608aaf801837a791b33857e2ca6d2265a6049c01fd4e972825967e709cad3070f174829b7400f608e9a641d3afc3a45d4636d4c47dd43dd0657b3", + "dest": "nuget-sources", + "dest-filename": "system.numerics.vectors.4.5.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.numerics.vectors/4.4.0/system.numerics.vectors.4.4.0.nupkg", + "sha512": "81d46b509b3546b8d6dc9079a7cda162303aef1a1e14bbe1d127522168d388df2a13195b16dfd1b57c1560d73906e909fdff4e2b34104ba81a9336c97874ea1e", + "dest": "nuget-sources", + "dest-filename": "system.numerics.vectors.4.4.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.numerics.vectors/4.3.0/system.numerics.vectors.4.3.0.nupkg", + "sha512": "1defa2bb3a3791c3a150cb972b39f5f227dd582e31b42110259fd9cd58a51e0325c309c44fd0152d38c29b90397ce9a1d9b3362b24437a0e0fda53d3a354831c", + "dest": "nuget-sources", + "dest-filename": "system.numerics.vectors.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.win32.primitives/4.0.1/microsoft.win32.primitives.4.0.1.nupkg", + "sha512": "382bd3a66349e077fdf622a69a2d9e2a07d15143cf238f4fa21c74f2c1e5592f8ba97e6fb956c1c69ca0cf4eba91ca4a7d3c8ef195289c5a0e95bcac52e794be", + "dest": "nuget-sources", + "dest-filename": "microsoft.win32.primitives.4.0.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg", + "sha512": "366f07a79d72f6d61c2b7c43eaa938dd68dfb6b83599d1f6e02089b136fa82bec74b6d54d6e03e08a3c612d51c5596e3535cbc2b29f39b97a827b3e7c79826f0", + "dest": "nuget-sources", + "dest-filename": "microsoft.win32.primitives.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.analyzers/3.3.3/microsoft.codeanalysis.analyzers.3.3.3.nupkg", + "sha512": "0d4896db8aff9d731c5b1c8f73a4b37460c3f08080fbeac0ecf169abf5bdff9c9a994778f453816b888e939d9d0d615245c91a2e4ba31f85d2ea8de222767104", + "dest": "nuget-sources", + "dest-filename": "microsoft.codeanalysis.analyzers.3.3.3.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.0.1/microsoft.netcore.targets.1.0.1.nupkg", + "sha512": "6ed8e75f945a18651066fe9ee31cf6c8257a5974340fe4d262438903c4959a479f4a515a4d1389e6d3d3ab34f09a3c7bc2009aada2e8a7f697b6655a82d3bfc9", + "dest": "nuget-sources", + "dest-filename": "microsoft.netcore.targets.1.0.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg", + "sha512": "1ef033a68688aab9997ec1c0378acb1638b4afb618e533fcaf749d93389737ba94f4a0a94481becdf701c7e988ae2fe390136a8eae225887ee60db45063490fe", + "dest": "nuget-sources", + "dest-filename": "microsoft.netcore.targets.1.1.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.codedom/6.0.0/system.codedom.6.0.0.nupkg", + "sha512": "2b911b7c9bc524c86562a26547dfc92a8c774ed5937993a4a22e8a9ca1b146151aeaeaf15e4271ff6fe6cf20af634815aa1485a5a4c48d24acf39b2a6bc3cf27", + "dest": "nuget-sources", + "dest-filename": "system.codedom.6.0.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.codedom/4.4.0/system.codedom.4.4.0.nupkg", + "sha512": "13f96f49f3053ed35f94081d33a02e3d4f096d976a752a06a54eba1bb4ab76e0aa76b1723df95aaaa57880dd9dd21ac2069bbdd876a8aa950fe5dfa0f48b5cc7", + "dest": "nuget-sources", + "dest-filename": "system.codedom.4.4.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.win7.system.private.uri/4.3.0/runtime.win7.system.private.uri.4.3.0.nupkg", + "sha512": "4fd1c04141e6ee4f5fe0a906e7362651afd5cb995cd9fcd1049927a732b071f827bb962df1ea4f3630f3c4e928a0c1911fd82c838e654208c771dee6398abb3d", + "dest": "nuget-sources", + "dest-filename": "runtime.win7.system.private.uri.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.appcontext/4.1.0/system.appcontext.4.1.0.nupkg", + "sha512": "f724af13eb14aa57255f82841683a93b427de172b8d31b9fe2c6bc8c21a795e60ecf211b4e49e1c2e285fe1ad498e6bd9c843e109a60a3dc27b49df560106e96", + "dest": "nuget-sources", + "dest-filename": "system.appcontext.4.1.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg", + "sha512": "68052086e77d3c7198737a3da163d67740b7c44f93250c39659b3bf21b6547a9abf64cbf40481f5c78f24361af3aaf47d52d188b371554a0928a7f7665c1fc14", + "dest": "nuget-sources", + "dest-filename": "system.threading.tasks.extensions.4.5.4.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.0.0/system.threading.tasks.extensions.4.0.0.nupkg", + "sha512": "f294f1a4179f53d59f91f01a372cc7896bf8c322e9827299cb1aa3ae2b1f809e98034834f5ccd4cb3fa1c30735082d244fff6584dab6e8870ad409b55e8a4986", + "dest": "nuget-sources", + "dest-filename": "system.threading.tasks.extensions.4.0.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg", + "sha512": "81bdb93c1c86c560343df6cc367499fb2a01a9b3016617be416874a23c4355a8d95c7be34f175510f3fdea4872302a87c8efab98a328dfa39422db520c3f291c", + "dest": "nuget-sources", + "dest-filename": "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.xml.readerwriter/4.0.11/system.xml.readerwriter.4.0.11.nupkg", + "sha512": "d40d6e9d55e57acdf04132bcb8ae8abf1abb3483620cde969c78c6c393a9936abf742c1dcf66288e6e9dffcb399a880ee3c11540ac140cb32e20b41365aaf35e", + "dest": "nuget-sources", + "dest-filename": "system.xml.readerwriter.4.0.11.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.any.system.diagnostics.tools/4.3.0/runtime.any.system.diagnostics.tools.4.3.0.nupkg", + "sha512": "bd257401e179d4b836a4a2f7236a0e303ae997d2453c946bf272036620a0b14e85e5f42c229332930a954655ab4cae359d191a3e3d9746df09535a651367764c", + "dest": "nuget-sources", + "dest-filename": "runtime.any.system.diagnostics.tools.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.reflection.extensions/4.0.1/system.reflection.extensions.4.0.1.nupkg", + "sha512": "3e2f07c29836735be6247e75f760de90783d5ece64e8cce4e23eceb777da8975a35130804d87ddd26449c13d2ca34180e3f6b844b0fdd2dc594bbec6e7272098", + "dest": "nuget-sources", + "dest-filename": "system.reflection.extensions.4.0.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg", + "sha512": "5dbe6bc007a9b46491e5299602291f5dbf8cc8d51e6c1b08db2fa0efd365990b41b6e181ed6bf82e873a659396427bc0e33e85b47d645d273fef8bf8ec643631", + "dest": "nuget-sources", + "dest-filename": "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.buffers/4.5.1/system.buffers.4.5.1.nupkg", + "sha512": "80da6158e55b9bcf7e0b5e6379b9cf45a632914f037b53c5bf5609576e3cd7821f7861956b73d74470d2d0c2e56dd235a5ef4ca6ffe7e192b820dc2d023aaff2", + "dest": "nuget-sources", + "dest-filename": "system.buffers.4.5.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.buffers/4.0.0/system.buffers.4.0.0.nupkg", + "sha512": "0663f4639c4e37c9dff12717cdeaebf30e38d91e986d6a99f9f16ba88189873e0399e418659e732a18c674d8875f8f41a1cf60319604173ca8430960759fddf2", + "dest": "nuget-sources", + "dest-filename": "system.buffers.4.0.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.buffers/4.3.0/system.buffers.4.3.0.nupkg", + "sha512": "3dcbf66f6edf7e9bb4f698cddcf81b9d059811d84e05c7ac618b2640efed642f089b0ef84c927c5f58feffe43bb96a6bcf4fec422529b82998b18d70e4648cbe", + "dest": "nuget-sources", + "dest-filename": "system.buffers.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/sixlabors.imagesharp.drawing/1.0.0-beta11/sixlabors.imagesharp.drawing.1.0.0-beta11.nupkg", + "sha512": "15c8f11059ce33331a4a9c7981a5bd91ffc19eaf05f236a1c54d5013ac0fafeb6e065cd2f63d4e9037297cdc9216ac4e67e5d9b73b967da740c174e3318a15f9", + "dest": "nuget-sources", + "dest-filename": "sixlabors.imagesharp.drawing.1.0.0-beta11.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/sixlabors.imagesharp/1.0.4/sixlabors.imagesharp.1.0.4.nupkg", + "sha512": "66d710910a44505cdee5bbcfa7c2d2d6025891f7c1facdea8fd52e46fbc76122ab4f7bd1e1656ab782dd84292d59bddec93a1ecf8b94117dad75b5f69b52e23e", + "dest": "nuget-sources", + "dest-filename": "sixlabors.imagesharp.1.0.4.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.diagnostics.debug/4.0.11/system.diagnostics.debug.4.0.11.nupkg", + "sha512": "02f4d0bf969eb1a876def21c1ffd75f8ed5f979aed9a1169f409e60a6e07016854e2154da5c0164fabaeaf6527a18d8e67282db1b69327a1b3581e9c0c742f58", + "dest": "nuget-sources", + "dest-filename": "system.diagnostics.debug.4.0.11.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg", + "sha512": "6c58fe1e3618e7f87684c1cea7efc7d3b19bd7df8d2535f9e27b62c52f441f11b67b21225d6bcd62f409e02c2a16231c4db19be33b8fab5b9b0a5c8660ddab24", + "dest": "nuget-sources", + "dest-filename": "system.diagnostics.debug.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.identitymodel.tokens.jwt/6.15.0/system.identitymodel.tokens.jwt.6.15.0.nupkg", + "sha512": "89281a9114e6ae727f7a35de411509f4361e84c384b9fb15a3699903e642947865c76cb773176e15c2488fc7fae7d8ce100cd573cf0e9666525cab275b40115c", + "dest": "nuget-sources", + "dest-filename": "system.identitymodel.tokens.jwt.6.15.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.io.filesystem.primitives/4.0.1/system.io.filesystem.primitives.4.0.1.nupkg", + "sha512": "dce1c4074938391ea4ea01226812982a893bfc910e66ac99ecfe31c9b6fe635f3fbff11dcab222ed5036eb21c4f49cd3f121c310adbf87d22cf3d512bf6a9d73", + "dest": "nuget-sources", + "dest-filename": "system.io.filesystem.primitives.4.0.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.io.filesystem.primitives/4.3.0/system.io.filesystem.primitives.4.3.0.nupkg", + "sha512": "5885953d09582cffd973d23a21a929064d72f2bc9518af3732d671fffcc628a8b686f1d058a001ee6a114023b3e48b3fc0d0e4b22629a1c7f715e03795ee9ee5", + "dest": "nuget-sources", + "dest-filename": "system.io.filesystem.primitives.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/concentus/1.1.7/concentus.1.1.7.nupkg", + "sha512": "ac1cbf5172bbceaf9961ee591fbf39f774720b1c5e841d9829068bf13af6a3519ce957b62c2695954a0cb6ce8bce5d4773941b17810b6c7c3e57a0821e7c0922", + "dest": "nuget-sources", + "dest-filename": "concentus.1.1.7.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection.primitives/4.3.0/runtime.any.system.reflection.primitives.4.3.0.nupkg", + "sha512": "a2f374276290ad9b799d3e49cd8fe7839c07b52f22894bcd77b9470841564319fb2ebbd7503e76feef42db4e8a362af8648cf0842a1cb0b5d9a60a58ef8b205e", + "dest": "nuget-sources", + "dest-filename": "runtime.any.system.reflection.primitives.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.text.encoding.codepages/6.0.0/system.text.encoding.codepages.6.0.0.nupkg", + "sha512": "ec873a95ec517de2c5a5364ada30974ddd5e0fafef2ad2517609a1900b5059d35757536fd073805001fa68d5b56a3d4647010a96c9eb233b1d172a3b45fbe4a9", + "dest": "nuget-sources", + "dest-filename": "system.text.encoding.codepages.6.0.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.runtime.numerics/4.0.1/system.runtime.numerics.4.0.1.nupkg", + "sha512": "333a3ba974e80ee66d33a9d8412e0bd585350bd30ecc65ed35e9d7c69284dbb90bc8b8d019c40476f3277049e0c7ae9b05a7d1e27614f057f39a141132304cd4", + "dest": "nuget-sources", + "dest-filename": "system.runtime.numerics.4.0.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.diagnostics.tools/4.0.1/system.diagnostics.tools.4.0.1.nupkg", + "sha512": "a812ccbbdd0a66eb57075121ea6332a526803ef883ca9f8b06431d6668ad50efd13624fa87dfaf6aed03c652f795c2ffb9fa9d9895a2fafa96eca614cbf86cdb", + "dest": "nuget-sources", + "dest-filename": "system.diagnostics.tools.4.0.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.threading.tasks/4.0.11/system.threading.tasks.4.0.11.nupkg", + "sha512": "fb66c496a5b4c88c5cb6e9d7b7d220e10f2fc0aed181420390f12f8d9986a1bd2829e9f1bf080bb6361cd8b8b4ffc9b622288dfa42124859e1be1e981b5cfa7b", + "dest": "nuget-sources", + "dest-filename": "system.threading.tasks.4.0.11.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg", + "sha512": "7d488ff82cb20a3b3cef6380f2dae5ea9f7baa66bf75ad711aade1e3301b25993ccf2694e33c847ea5b9bdb90ff34c46fcd8a6ba7d6f95605ba0c124ed7c5d13", + "dest": "nuget-sources", + "dest-filename": "system.threading.tasks.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/glibsharp/3.22.25.128/glibsharp.3.22.25.128.nupkg", + "sha512": "a0c634eb422c36b07a18adf7410a5bb6f56a28ea85e7ebb1dfc42dfa0a57cdfc9791d62b16dcbe015179d5aefdddf2645a15c836e690c2ac775de5da30192454", + "dest": "nuget-sources", + "dest-filename": "glibsharp.3.22.25.128.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.identitymodel.jsonwebtokens/6.15.0/microsoft.identitymodel.jsonwebtokens.6.15.0.nupkg", + "sha512": "fe93392df05693573f7894fae7dbce9d3f093dbc4496754a0f125bdf26df401c34fb3ae80eb6b12e6b4a34dac0b6eea77102316f6f6abf102a8bc22bc604212a", + "dest": "nuget-sources", + "dest-filename": "microsoft.identitymodel.jsonwebtokens.6.15.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg", + "sha512": "4981b2d7a106703b185e176ad35bfda149156f3b752778fa71c56b3686407765fd2b6625de352bd563aac1e1e8769d7886cc59a0d5d0bfb41ed60277360beb81", + "dest": "nuget-sources", + "dest-filename": "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.net.sockets/4.1.0/system.net.sockets.4.1.0.nupkg", + "sha512": "b231a1ca9d281923ffa1b8dbafa2cc074ce679fc2d473ad7c7192cdc3b51c8ab125c606cbbe0248e02b415e384bfba1bdbc59b28a139589c78aa3687e0236019", + "dest": "nuget-sources", + "dest-filename": "system.net.sockets.4.1.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection/4.3.0/runtime.any.system.reflection.4.3.0.nupkg", + "sha512": "293d3dd8be87e1c5cd76ece4ed64ebb5ae6b50be95a39bee401eeed64355e34641905f8c14392fbc3acf8609f5d6fca731f39ce7607962eb5951f09516480015", + "dest": "nuget-sources", + "dest-filename": "runtime.any.system.reflection.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/silk.net.core/2.10.1/silk.net.core.2.10.1.nupkg", + "sha512": "abf974ee5257efc79e3809ca5db72c615d8453bdb70b84f96fc521409997165c8a5388faac83526cc1b1d87aa8f0926247457313c13b18c6b486f333597e9bdb", + "dest": "nuget-sources", + "dest-filename": "silk.net.core.2.10.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.xml.xdocument/4.0.11/system.xml.xdocument.4.0.11.nupkg", + "sha512": "f8ae902901963f2636f39c0652d82daa9df3fb3e3d5a60493c39f6cf01ed07c7d57f175a2d2895f4a872d4e92527e5131522218d1a67da2fd491e162273a8527", + "dest": "nuget-sources", + "dest-filename": "system.xml.xdocument.4.0.11.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.collections.concurrent/4.0.12/system.collections.concurrent.4.0.12.nupkg", + "sha512": "a46bd40b8cc7afeaea14c80ee6ab99a5ef6d27e9e897cfe842e9ab5ca04b9de8d7192a310225b1040d57d4870921487acf5df993ab81301d49994048e1341e85", + "dest": "nuget-sources", + "dest-filename": "system.collections.concurrent.4.0.12.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.0.1/system.reflection.emit.lightweight.4.0.1.nupkg", + "sha512": "542863fa085a31705b0b294b64744c11617a098beae4d5664beb53189148d19246c9a112de30f2d597e0888069a414f2aed8e94a2b369294a81b24b991bc2149", + "dest": "nuget-sources", + "dest-filename": "system.reflection.emit.lightweight.4.0.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.3.0/system.reflection.emit.lightweight.4.3.0.nupkg", + "sha512": "ad58af07296bd084907a089f92026fa3898b764eb9d6a07c9414b550a83ac60456f32a34127c29bb93a9633fb07ba9fd828f7b41a31dce5ff019a7cf1ab29435", + "dest": "nuget-sources", + "dest-filename": "system.reflection.emit.lightweight.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.security.principal/4.3.0/system.security.principal.4.3.0.nupkg", + "sha512": "db8a1ed0d189637d9ef83147550ce5da890cf6ec189a7d006ba9de86ab55679e7f025e18bdaed2dc137ddf82a7e6a0131fb4d54d4264831862b1d7c5ee62837e", + "dest": "nuget-sources", + "dest-filename": "system.security.principal.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/4.5.0/system.security.accesscontrol.4.5.0.nupkg", + "sha512": "e9142d713f93c8380b505b009e699d7d144674b60ac526469123ce774e76b6f605c4e4cc6906fa00d970846a99b4d3b9d8fa2c682a17bbbb9ab459deba303198", + "dest": "nuget-sources", + "dest-filename": "system.security.accesscontrol.4.5.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.net.nameresolution/4.3.0/system.net.nameresolution.4.3.0.nupkg", + "sha512": "40d39e131fe7a392e58e9f58b516b5db88383de91c05b771f5e509acf46cc874271e90623d327ab039003ab8f2714144694390261278de324e1aee228a828ab4", + "dest": "nuget-sources", + "dest-filename": "system.net.nameresolution.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.primitives/4.0.0/system.security.cryptography.primitives.4.0.0.nupkg", + "sha512": "a11562f4fd90ff39c12af2078aa3743e323d8a70fe98cfe3d7e0ec182a2166d353c1ed8d76dd2a9525a80287d7dea228f04982edef6584b89f32f72647b2822f", + "dest": "nuget-sources", + "dest-filename": "system.security.cryptography.primitives.4.0.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.text.encoding/4.0.11/system.text.encoding.4.0.11.nupkg", + "sha512": "f974335143f36b318abf040ed535887f28089d749b1fa55056345df5243dfbd56d27b74c6e4d87a737fdbb8e699c5291bd25f1e5db4700bb00bf53330c7e3e9a", + "dest": "nuget-sources", + "dest-filename": "system.text.encoding.4.0.11.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg", + "sha512": "6ff7feec7313a7121f795ec7d376e4b8728c17294219fafdfd4ea078f9df1455b4685f0b3962c3810098e95d68594a8392c0b799d36ec8284cd6fcbd4cfe2c67", + "dest": "nuget-sources", + "dest-filename": "system.text.encoding.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.text.encoding.extensions/4.0.11/system.text.encoding.extensions.4.0.11.nupkg", + "sha512": "b2ba1f2a96bf14466fb31e4ac1fad25e7032688357340ad8976b8aafe7cbe39c061835a4e17d7cf6ae291d3155f07d3371f6b65ffc1c15474c3c86dbb7735e82", + "dest": "nuget-sources", + "dest-filename": "system.text.encoding.extensions.4.0.11.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.text.json/4.7.0/system.text.json.4.7.0.nupkg", + "sha512": "d6ad50bdc50a094b0e0d08cba8d708e77e974b11102b64e618bc8e324ef7288015f91b44ceddd845d974b138277c4a45aa27c32a4aeb0a918fa65929eb088e7c", + "dest": "nuget-sources", + "dest-filename": "system.text.json.4.7.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.resources.resourcemanager/4.0.1/system.resources.resourcemanager.4.0.1.nupkg", + "sha512": "5165916e258dd38fa83278fb98dce271a95e0091c1274b8cf5f17d88b9e6284f7a7bf145194afe4f20250cc31ad714141f9e0687cf235ff05460fb47cea0c525", + "dest": "nuget-sources", + "dest-filename": "system.resources.resourcemanager.4.0.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg", + "sha512": "9067db28f1c48d08fc52ad40a608f88c14ad9112646741ddaf426fdfe68bed61ab01954b179461e61d187371600c1e6e5c36c788993f5a105a64f5702a6b81d4", + "dest": "nuget-sources", + "dest-filename": "system.resources.resourcemanager.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.win.system.console/4.3.0/runtime.win.system.console.4.3.0.nupkg", + "sha512": "97473714049c029256d04027f825f0ec4cbd208d4455add8034496425e515437de812f1bd54ba65b00cdee86573502db0662f97100c52bcb47add4d67163febc", + "dest": "nuget-sources", + "dest-filename": "runtime.win.system.console.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.csp/4.0.0/system.security.cryptography.csp.4.0.0.nupkg", + "sha512": "6f3fb8256086a16ed7fe339e0f09d42a081c4f783b0f8626bb7eec08261532ecf517f6c7a41bfbb8e2b99b8f1c79ef99ef7c724d8719e287fe7981ebe8b6aa8e", + "dest": "nuget-sources", + "dest-filename": "system.security.cryptography.csp.4.0.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.globalization.extensions/4.0.1/system.globalization.extensions.4.0.1.nupkg", + "sha512": "415ab44aa3e46b59ad1d314ceda11f9dc78f85adede3daece96c83c98448e2a0cad7e79045edeeeaca8618115c38517364b00cdd9a0a7228e7da1ebc342b0116", + "dest": "nuget-sources", + "dest-filename": "system.globalization.extensions.4.0.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/cairosharp/3.22.25.128/cairosharp.3.22.25.128.nupkg", + "sha512": "259e6fac6bd4fe22a43f1ea2c4f935701f756295829c5b9e1e93aa4b36bc0c2bc55635b70200c2ff85d0cfc4c0af500e9c1c5ab25da7e665d07744f69bd5434d", + "dest": "nuget-sources", + "dest-filename": "cairosharp.3.22.25.128.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencymodel/3.1.1/microsoft.extensions.dependencymodel.3.1.1.nupkg", + "sha512": "962939cede743858bd9e70509f5951ffd72bcfe59411d18a7a217f6a8b0ec7bcc76d6da755184da38183242635c761945dc5bb6b426092943ff206d2c0cbacad", + "dest": "nuget-sources", + "dest-filename": "microsoft.extensions.dependencymodel.3.1.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/pangosharp/3.22.25.128/pangosharp.3.22.25.128.nupkg", + "sha512": "9ff54c0f4f58964d3129649170bcb757563707aa67ffbc2c1c2b764fab8e79043556a13747215b22a93f00ef18791b7f32c9a1a596ddb153da52082050f47a32", + "dest": "nuget-sources", + "dest-filename": "pangosharp.3.22.25.128.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.runtime/4.1.0/system.runtime.4.1.0.nupkg", + "sha512": "4b05eb68bb485846707c4fe3393f9616d3ffb6c5f62a121d81142ddf7d0241c931fe96d193b7bf02281a9368458e0764466766557cfa9709035dc76d8fdd7706", + "dest": "nuget-sources", + "dest-filename": "system.runtime.4.1.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.runtime/4.3.0/system.runtime.4.3.0.nupkg", + "sha512": "92ab2249f08073cfafdc4cfbd7db36d651ad871b8d8ba961006982187de374bf4a30af93f15f73b05af343f7a70cbd484b04d646570587636ae72171eb0714fb", + "dest": "nuget-sources", + "dest-filename": "system.runtime.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.0.1/microsoft.netcore.platforms.1.0.1.nupkg", + "sha512": "5f3622dafd8fe8f3406c7a7ee506a7363c9955b28819ae1f2b067c38eae7ab6e620eb63442929b967c94fc511e47a2b7547ab62b6f1aafe37daa222499c9bb19", + "dest": "nuget-sources", + "dest-filename": "microsoft.netcore.platforms.1.0.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/2.0.0/microsoft.netcore.platforms.2.0.0.nupkg", + "sha512": "0827f83639833a88ac7bb1408a3d953ee1c880a2acbbaf7abe44f084e90f5507cbb13981d962c57d0e3278ee5476d93c143eb7e9404cc7a63d7a8bf324a4fbe8", + "dest": "nuget-sources", + "dest-filename": "microsoft.netcore.platforms.2.0.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg", + "sha512": "6bf892c274596fe2c7164e3d8503b24e187f64d0b7bec6d9b05eb95f04086fceb7a85ea6b2685d42dc465c52f6f0e6f636c0b3fddac48f6f0125dfd83e92d106", + "dest": "nuget-sources", + "dest-filename": "microsoft.netcore.platforms.1.1.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.win.system.net.primitives/4.3.0/runtime.win.system.net.primitives.4.3.0.nupkg", + "sha512": "fbe0502089649df4a7e6e268f0b4270c5668f49d604ce04cbad1ab1932b4c0415c888469bad664669a1320769d8e14445bfce96111fc3d6079115f6fba1416e2", + "dest": "nuget-sources", + "dest-filename": "runtime.win.system.net.primitives.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.reflection/4.1.0/system.reflection.4.1.0.nupkg", + "sha512": "67143ef8f6fb1044830c70c66e9a2b4f1850f50df5dadfaa5177338362ea7b9e9fe4b0ba59cd4eac6e1c8db4e0c285c239e4c2b3ce61391618b411aaff45f7c2", + "dest": "nuget-sources", + "dest-filename": "system.reflection.4.1.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.reflection/4.3.0/system.reflection.4.3.0.nupkg", + "sha512": "2325b67ed60dce0302807064f25422cbe1b7fb275b539b44fba3c4a8ce4926f21d78529a5c34b31c03d80d110f7bace9af9589d457266beac014220057af8333", + "dest": "nuget-sources", + "dest-filename": "system.reflection.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/ryujinx.audio.openal.dependencies/1.21.0.1/ryujinx.audio.openal.dependencies.1.21.0.1.nupkg", + "sha512": "4b6b99d943db72eac80779e2bbae15e9bac11ff1a30365f5363990f49f0c605fff5ce0b57bbb54e33cd73eed6e588e28598cfc0fe5bea7b56c2a3dda2d031194", + "dest": "nuget-sources", + "dest-filename": "ryujinx.audio.openal.dependencies.1.21.0.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.win-x64/6.0.7/microsoft.netcore.app.host.win-x64.6.0.7.nupkg", + "sha512": "c61e9cad5984b856cfbe39cde5ae8f9c9b10d48e0ffab9e8d90483c8b63f1020c620cf5ccc42aafe90f020a952f19b4ec7fe3227f0db64fc195be543f89365ef", + "dest": "nuget-sources", + "dest-filename": "microsoft.netcore.app.host.win-x64.6.0.7.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/opentk.graphics/4.7.2/opentk.graphics.4.7.2.nupkg", + "sha512": "8f3febdee59336340a62f94fbdbca67ede425b9b862e10bdd9ae8e6172bcf0280d79856769a1cd65d86d195553f11b09d1ad99ae3f3c847c526d8ee06e9f2825", + "dest": "nuget-sources", + "dest-filename": "opentk.graphics.4.7.2.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.any.system.globalization/4.3.0/runtime.any.system.globalization.4.3.0.nupkg", + "sha512": "3aac1a076212fae7d0ac81d2b5fdf216b064a1d890577307f89c9a4984c239838c3bdfac4dea052027de090704839319231eef49ce542f3e8bb2f85ba23d28dc", + "dest": "nuget-sources", + "dest-filename": "runtime.any.system.globalization.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.csharp/4.5.0/microsoft.csharp.4.5.0.nupkg", + "sha512": "c9659e4db182cc13a544f583088c624d95b579c66231b6a8d194fdeca28459d061acbbd4a94f11773921cee091433be8c73c6547bbf2b4ee3738e805764c6fea", + "dest": "nuget-sources", + "dest-filename": "microsoft.csharp.4.5.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.csharp/4.7.0/microsoft.csharp.4.7.0.nupkg", + "sha512": "2c96988515f95714d4b83f5650f183dc6a564e0b3cf5255fa0e3ef48476debab4bde542f9f2f6c47f6620b7a71d6a515e4415e6d2e388b60817a29621d5690df", + "dest": "nuget-sources", + "dest-filename": "microsoft.csharp.4.7.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.threading.timer/4.0.1/system.threading.timer.4.0.1.nupkg", + "sha512": "6aa43dc5b3914050850b8ddafcc2256e60670d51c0f1b38b0d26d80f36e76cf5b40d6053bf92b4abecce5f786de5b13daa70eddf541865509c7a73fe3785de4b", + "dest": "nuget-sources", + "dest-filename": "system.threading.timer.4.0.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/opentk.windowing.graphicslibraryframework/4.7.2/opentk.windowing.graphicslibraryframework.4.7.2.nupkg", + "sha512": "5c02b8d65a7be6722880a5c9a121684f95470c80dd6e317c132dedd6a5ba99122ed05c883d9aa2bd8bd569e20610909483347d910f957552053b7033d88a3e84", + "dest": "nuget-sources", + "dest-filename": "opentk.windowing.graphicslibraryframework.4.7.2.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.unix.system.private.uri/4.3.0/runtime.unix.system.private.uri.4.3.0.nupkg", + "sha512": "203ebe272791d79ab0c40afe9d0543852ee91b9fb4ae5bc15524d97728bc8bc9d7e0cbcf65d1fab8cfb0aa7a4ae37e7938933eef127aa5ea46f60e57b6ad2d91", + "dest": "nuget-sources", + "dest-filename": "runtime.unix.system.private.uri.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg", + "sha512": "e78f0cea69c14895b1b089644077dbce8631a626055d96522f4d29e061d8bfc3e48aa1419e74faf265b998612c03f721f5f0cef4690f824150a5689764dee601", + "dest": "nuget-sources", + "dest-filename": "netstandard.library.2.0.3.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/netstandard.library/2.0.0/netstandard.library.2.0.0.nupkg", + "sha512": "e3d64072b9cd9f9e86209c06a22688ecda7070427c9a35327d2a9560824c0e1381ccf7bc1d21d2ef8b301761f4bfc7f38fba712df7188d2f4fe4f748aac4d0c7", + "dest": "nuget-sources", + "dest-filename": "netstandard.library.2.0.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/netstandard.library/1.6.0/netstandard.library.1.6.0.nupkg", + "sha512": "9838af4e2a3621de24d117c7fa58e5e8f170e50ea4e0ae3fe3d3401dfadbefd6eb5ecc3b64532c8340f6340727822eed305ef3bc21629f2bb6d76c639d054925", + "dest": "nuget-sources", + "dest-filename": "netstandard.library.1.6.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.unix.system.net.sockets/4.3.0/runtime.unix.system.net.sockets.4.3.0.nupkg", + "sha512": "31b62be088315ead04d89f452a6c49a656b88f0668f7dadb2790511675d48705e01c9df24dbed3a0095157875c208ab6e6b5b6afc82bac13e4d6cdd3026f8424", + "dest": "nuget-sources", + "dest-filename": "runtime.unix.system.net.sockets.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/discordrichpresence/1.0.175/discordrichpresence.1.0.175.nupkg", + "sha512": "487c16a74a849a6998a025bf1c21e9c3b5a5aba874ecada16db3f653c7e55f9818e70cc097765baf432b902037c932bc0cbd229e33f03366f5e624aade40c3fb", + "dest": "nuget-sources", + "dest-filename": "discordrichpresence.1.0.175.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.runtime.extensions/4.1.0/system.runtime.extensions.4.1.0.nupkg", + "sha512": "42d009be57d6497aa0724924891289f3decd916d0432c1c865cc0494092f5e59287f632a70c5060b3c78e361ab04510d75dfb3c2d2853f54201f735eb6e2dea6", + "dest": "nuget-sources", + "dest-filename": "system.runtime.extensions.4.1.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg", + "sha512": "680a32b19c2bd5026f8687aa5382aea4f432b4f032f8bde299facb618c56d57369adef7f7cc8e60ad82ae3c12e5dd50772491363bf8044c778778628a6605bbc", + "dest": "nuget-sources", + "dest-filename": "system.runtime.extensions.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/opentk.mathematics/4.7.2/opentk.mathematics.4.7.2.nupkg", + "sha512": "865157b30d62c8bcbe0ca52d4ac14a6293a33c358d97115f3aafa267c43623f0a3ca22a2eb81194da0197de36dcd849aaed8f3f6270e75e6a47454df41a59876", + "dest": "nuget-sources", + "dest-filename": "opentk.mathematics.4.7.2.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg", + "sha512": "fd8e32d7d3e9a465202e391b0ab8b95e212900879bc4d8ac22954fd2d0f98fa579e9d25f88885ac2a4bf1eba755db940f8d131250a3ffec34dbe77431a379cab", + "dest": "nuget-sources", + "dest-filename": "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.net.primitives/4.0.11/system.net.primitives.4.0.11.nupkg", + "sha512": "50d5a977a4926fbfaf47bc4656111ed6edb8bb6acfff0cc5c2ee9c104628a255c8298a649f33ca2abdf9c7dacf4bfbf15e48ab7f92bd797b7d50ca328fac48b9", + "dest": "nuget-sources", + "dest-filename": "system.net.primitives.4.0.11.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.net.primitives/4.3.0/system.net.primitives.4.3.0.nupkg", + "sha512": "9f7fdece330a81f3312ea7c804927852413bee2c929f3066b736993803df47cc0692fbca236c222bf19dc8f59b42f54f2a4c00da9a4d624e458da5874d127ce6", + "dest": "nuget-sources", + "dest-filename": "system.net.primitives.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/gtksharp.dependencies/1.1.1/gtksharp.dependencies.1.1.1.nupkg", + "sha512": "6373a348b6ce3dfa2ad03c0e0eb74c4de7a4b45847c3d9ff16807eebafe6689c19f1828027abe33757f6453cee847e27a9dd952b1545576d51c63200baf1d28b", + "dest": "nuget-sources", + "dest-filename": "gtksharp.dependencies.1.1.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.win.system.diagnostics.debug/4.3.0/runtime.win.system.diagnostics.debug.4.3.0.nupkg", + "sha512": "a11bee46985198d0cf9717b99dfb1e92a22875ad5555c175562e53b81797ce4b70fba8ad0620b64b6be9ef9a9584d17bffe6597785010bdddde87e1ea27ce7f4", + "dest": "nuget-sources", + "dest-filename": "runtime.win.system.diagnostics.debug.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.0.1/system.reflection.emit.ilgeneration.4.0.1.nupkg", + "sha512": "c3819cd3a58f609ff579652536f9f414481caa4d9e7dc277e0d3c8c8fe8e0ff90806fa94f7c6436d4af853c6fccd26d5af57f0a49c5baceef4e0daaa39e26773", + "dest": "nuget-sources", + "dest-filename": "system.reflection.emit.ilgeneration.4.0.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.3.0/system.reflection.emit.ilgeneration.4.3.0.nupkg", + "sha512": "e9be5f62bf64b1947a49857337306a5d0980686b58d665989e94006ab04aa7e0bbf4d8543d1b57d5bb38079052f275f339b73054a7357e4fa357208a0ac85d69", + "dest": "nuget-sources", + "dest-filename": "system.reflection.emit.ilgeneration.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.native.system.security.cryptography/4.0.0/runtime.native.system.security.cryptography.4.0.0.nupkg", + "sha512": "83b8befe1f76e75346ea2e49cf27aa86489813034dd6e2845ac700ddb155602968a7c1d9806770418c0426e304aef1efc24b3abd4c57f792cb32449c2adf1310", + "dest": "nuget-sources", + "dest-filename": "runtime.native.system.security.cryptography.4.0.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/4.5.0/system.security.cryptography.cng.4.5.0.nupkg", + "sha512": "0ec1d266805e55ed9b0249cfc1dae09c242581df345d1712f15ddebfde76045f191388d48b68bbfad21a16d87a99df67bab7b54892f685f42de08823a4dc9bc5", + "dest": "nuget-sources", + "dest-filename": "system.security.cryptography.cng.4.5.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/4.2.0/system.security.cryptography.cng.4.2.0.nupkg", + "sha512": "4ed77501662e6d18733f507077de9d277b61b3d2dacee791e0b3a56c9a604bd2acfb81334c51660ba33bb7a6e24ed46c2da02716f6613a937152ea4806540bf1", + "dest": "nuget-sources", + "dest-filename": "system.security.cryptography.cng.4.2.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.csharp/4.2.0/microsoft.codeanalysis.csharp.4.2.0.nupkg", + "sha512": "d54de9b27a4632fd45982e2094c37db3a39425447f79332c289cbd0b8c3f163a05a82d6679b1cdc37ce19cfa701e99070eaddaed15f9e2afd0a5b8beac826465", + "dest": "nuget-sources", + "dest-filename": "microsoft.codeanalysis.csharp.4.2.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/ryujinx.sdl2-cs/2.0.22-build20/ryujinx.sdl2-cs.2.0.22-build20.nupkg", + "sha512": "83179ffcac8687880e16207c1286a7eaf593f028686299520b23150299bd2fdede4ad1e323a18c047bed7a075e7645ef2c888e17bac4293b1f843d991582e221", + "dest": "nuget-sources", + "dest-filename": "ryujinx.sdl2-cs.2.0.22-build20.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.openssl/4.0.0/system.security.cryptography.openssl.4.0.0.nupkg", + "sha512": "432629e457c7061a7d207fb60597a5a8a806fab8c62574833e509afa3c4ac8fed529dbc7f21d69e16dc9fdd091aaa575191e9fb552eedcf28aaa8b5954d32e9b", + "dest": "nuget-sources", + "dest-filename": "system.security.cryptography.openssl.4.0.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.io.compression/4.1.0/system.io.compression.4.1.0.nupkg", + "sha512": "2402b7ba4f0b43bb916cbfd608f9efdb9f60406d2a19cd9e7a677867806962c30b5666b6270b873ff9748b4fc3f7fd6e0451f2a5214d5478593f57d4d8430979", + "dest": "nuget-sources", + "dest-filename": "system.io.compression.4.1.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.security.claims/4.3.0/system.security.claims.4.3.0.nupkg", + "sha512": "ab72b90801f6c051a2b31645448eebfca74642b3cfa1d51f80e21a0d0d7ad44d3366dea139347e2852781b7f3bae820df16c3eb188a2c96244df05394ed72c86", + "dest": "nuget-sources", + "dest-filename": "system.security.claims.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.osx-x64/6.0.7/microsoft.netcore.app.runtime.osx-x64.6.0.7.nupkg", + "sha512": "2f16bfd5687606742b13d97e9d366d6259ee1e12ed65e74886181d85ce2956fafeb81e1d21b04558e623522ad0a7c2c9d648c651745a9216c2875f4a976ab832", + "dest": "nuget-sources", + "dest-filename": "microsoft.netcore.app.runtime.osx-x64.6.0.7.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/atksharp/3.22.25.128/atksharp.3.22.25.128.nupkg", + "sha512": "b6f34f51f632b35d96aebe2b46785478ec8dc59c77180bb45b3adb7d72197fd3d39f5807376d53bc4f6cbfb04a0fce7beb8c8cd927031403e8ab576c4ee0a2f4", + "dest": "nuget-sources", + "dest-filename": "atksharp.3.22.25.128.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.reflection.metadata/5.0.0/system.reflection.metadata.5.0.0.nupkg", + "sha512": "3b74e3e491eee87a8410f5b9a2e556233d9919267f6a054da7a4c9c34b6916b07c77ea9ef8cceb5b7c3361e7394e502cc3c9a09247c6a06bb58509e82554e527", + "dest": "nuget-sources", + "dest-filename": "system.reflection.metadata.5.0.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.native.system.net.http/4.0.1/runtime.native.system.net.http.4.0.1.nupkg", + "sha512": "ad933eb14740a111a81b5de6837dd0fc9390dde308fedf4338a498f97cd40ecfc65c745802e92c8ec8543d75dd262ebfef476df2e646b63cd99c609258d1bbd9", + "dest": "nuget-sources", + "dest-filename": "runtime.native.system.net.http.4.0.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.any.system.threading.tasks/4.3.0/runtime.any.system.threading.tasks.4.3.0.nupkg", + "sha512": "5f37a56f5d6c7fc198c7ef76b822b85284f9d7d1c06583c26a698793ade65da1b273d5fb03c20be1eb91a9c835f7122ad2775f4e51dffb2758fabac2a30f8c23", + "dest": "nuget-sources", + "dest-filename": "runtime.any.system.threading.tasks.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.linux-x64/6.0.7/microsoft.netcore.app.host.linux-x64.6.0.7.nupkg", + "sha512": "77c7da154e1e1699bad7ec9f2bfa56f571a068c7b2de7e81f0f2c1d404ebb620654cecba75981e665f81ce671d062a99b76634e3373b5ad05d71f924c994dd4f", + "dest": "nuget-sources", + "dest-filename": "microsoft.netcore.app.host.linux-x64.6.0.7.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.globalization/4.0.11/system.globalization.4.0.11.nupkg", + "sha512": "66bc21667f5f839bc711eda3b0463863d70e0ad86770fd5410e0123006d6f031755cf7220187fb7cefed69b3f4a9eab8f0868cae765cb1425c8bf60427f395e6", + "dest": "nuget-sources", + "dest-filename": "system.globalization.4.0.11.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.globalization/4.3.0/system.globalization.4.3.0.nupkg", + "sha512": "823d2ba308cb073b40a3146ecccd0d9fd7b1615ac3fbefb16f73d873e411fd81c3bdc87df206d3dc7e2f14c9cd53aafca684a3570c25471280aada8de805ece2", + "dest": "nuget-sources", + "dest-filename": "system.globalization.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.private.uri/4.3.0/system.private.uri.4.3.0.nupkg", + "sha512": "5989a57ef273b689a663e961a0fe09d9b1d88438e5478358efc4b165de3b2674fa9579c301ce12d2d2fa5f33295f2acb42eceea2ebebf70c733da6364ceaf94d", + "dest": "nuget-sources", + "dest-filename": "system.private.uri.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.reflection.primitives/4.0.1/system.reflection.primitives.4.0.1.nupkg", + "sha512": "08ad6f78c5f68af95a47b0854b4ee4360c4bad6e83946c2e45eaa88b48d27d06618c6b7479bd813eb5f30a2db486590d17645e9c0e06a72dbe12ffd37730707e", + "dest": "nuget-sources", + "dest-filename": "system.reflection.primitives.4.0.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg", + "sha512": "d4b9cc905f5a5cab900206338e889068bf66c18ee863a29d68eff3cde2ccca734112a2a851f2e2e5388a21ec28005fa19317c64d9b23923b05d6344be2e49eaa", + "dest": "nuget-sources", + "dest-filename": "system.reflection.primitives.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/shaderc.net/0.1.0/shaderc.net.0.1.0.nupkg", + "sha512": "04ae2e3da77b5ae29e795291372ca63dcb90534043cbc432f25b72383832a0f010f0e346e7d022a1fb42068c7ec300e37c3592389607c36219847bbb060e2fc5", + "dest": "nuget-sources", + "dest-filename": "shaderc.net.0.1.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.identitymodel.logging/6.15.0/microsoft.identitymodel.logging.6.15.0.nupkg", + "sha512": "ac409b1dc88ab7b825e1d8bb943b476a1a1c22ac29191e283764e757cd14aa4e24571730adb54da6e7a11d3b9427a4d5e028259554098afaa94d6d62e2099a1c", + "dest": "nuget-sources", + "dest-filename": "microsoft.identitymodel.logging.6.15.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.native.system/4.0.0/runtime.native.system.4.0.0.nupkg", + "sha512": "55ff3eafa406ec3d8e33d8be44d0d06352ce746abffdec1378716b275d634e133fc1bc56fc312bf0d921efc59e8de4ac811022cc34a77fc1f1abc982c931932b", + "dest": "nuget-sources", + "dest-filename": "runtime.native.system.4.0.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg", + "sha512": "299c5a96fffdcaf1972e3e3d1c727837d18ac9e88cb79c09914f12ff1de7280dff10c9232a49a1c1d3ba7785a5cf76f28c9dce414f0a2a567688de7fd5331dc8", + "dest": "nuget-sources", + "dest-filename": "runtime.native.system.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.identitymodel.tokens/6.15.0/microsoft.identitymodel.tokens.6.15.0.nupkg", + "sha512": "a377f80f91aba6601d281ee82d820daeaf2331b62da3b331680ddbafd2d3f1bed1b8b989ec218ee4d245335184a3d22e9663551c789abd270cbf457788ffb6de", + "dest": "nuget-sources", + "dest-filename": "microsoft.identitymodel.tokens.6.15.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.any.system.globalization.calendars/4.3.0/runtime.any.system.globalization.calendars.4.3.0.nupkg", + "sha512": "19053b502b7160af6f6b0bc5b334a8d124f77f6b4418993294fb485d0bb318cd6e97cdbda9bf8c9927366288413cad7209c9d8156a5425a6320c453a8804fb3d", + "dest": "nuget-sources", + "dest-filename": "runtime.any.system.globalization.calendars.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.any.system.text.encoding/4.3.0/runtime.any.system.text.encoding.4.3.0.nupkg", + "sha512": "cbe6df98acd50e2251d3343620c408af56cfe7c1979277a8ec65b5eef093e93ed93c05980902a7152ed83302d5a625d7058921baa7f446c5e67194fa4c06f20a", + "dest": "nuget-sources", + "dest-filename": "runtime.any.system.text.encoding.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.encoding/4.0.0/system.security.cryptography.encoding.4.0.0.nupkg", + "sha512": "f20d60a5f9affcb49995d1bf27a1c09173ad601147241c4ca504e13324d35f7d6618e8a92d04e174d5d3d9821a03e122fd3b0f8fc1d512d105b6afd73b496c5f", + "dest": "nuget-sources", + "dest-filename": "system.security.cryptography.encoding.4.0.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.text.regularexpressions/4.1.0/system.text.regularexpressions.4.1.0.nupkg", + "sha512": "9b612027e43c33cc256e016e0b400547c5923e93ab6ed1a40d2b97292cb18a1195fa79aba2b0166a6b11842a0fef6685d31b848375daffdf6d2acf297af40bbe", + "dest": "nuget-sources", + "dest-filename": "system.text.regularexpressions.4.1.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/5.0.0/system.runtime.compilerservices.unsafe.5.0.0.nupkg", + "sha512": "23226c503b06abecee5a9604a6e4dd3dabcdf921f55d6aa6dad2bab1ca12a001c7866af5a6de01cc9b4ace54e5c8ee1d5c2fd29dd9dfd7eda3ed86f9b35fa59f", + "dest": "nuget-sources", + "dest-filename": "system.runtime.compilerservices.unsafe.5.0.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.7.0/system.runtime.compilerservices.unsafe.4.7.0.nupkg", + "sha512": "14c154122872d3929f4f691aa2cb8db78f62b8b6e18b278b39a53d128d93b5cc59be330fa9b6b4613c81f9acfe004f1c97f2f815df753a8b97628c17dd543605", + "dest": "nuget-sources", + "dest-filename": "system.runtime.compilerservices.unsafe.4.7.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/6.0.0/system.runtime.compilerservices.unsafe.6.0.0.nupkg", + "sha512": "d4057301be4ec4936f24b9ce003b5ec4d99681ab6d9b65d5393dd38d04cdec37784aaa12c1a8b50ac3767ed878dae425749490773fec01e734f93cf1045822b3", + "dest": "nuget-sources", + "dest-filename": "system.runtime.compilerservices.unsafe.6.0.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.runtime.handles/4.0.1/system.runtime.handles.4.0.1.nupkg", + "sha512": "966a943195b66118277a340075609676e951216d404478ac55196760f0b7b2bd9314bfbb38051204a1517c53097bd656e588e8ab1ec336ce264957956695848a", + "dest": "nuget-sources", + "dest-filename": "system.runtime.handles.4.0.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg", + "sha512": "0a5baf1dd554bf9e01bcb4ce082cb26ee82b783364feb47cba730faeecd70edc528efad0394dcce11f37d7f9507f8608f15629ebaf051906bfd3513e46af0f11", + "dest": "nuget-sources", + "dest-filename": "system.runtime.handles.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.memory/4.5.4/system.memory.4.5.4.nupkg", + "sha512": "8ece5491eb0fe332bc190f40cf76b3beee0c5f996325034861be221fdb0ff02fd59e4f7020b3c4a1f29a457f76ff76c4c95d46d38555e4f48c7a3bf172d87966", + "dest": "nuget-sources", + "dest-filename": "system.memory.4.5.4.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.memory/4.5.3/system.memory.4.5.3.nupkg", + "sha512": "70fce15a52cc76aacbae05c8e89e2e398d1d32903f63f640a7dd4a3e5747f2c7a887d4bfd22f2a2e40274906cf91648dfd169734fb7c74eb9b4f72614084e1db", + "dest": "nuget-sources", + "dest-filename": "system.memory.4.5.3.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.unix.system.diagnostics.debug/4.3.0/runtime.unix.system.diagnostics.debug.4.3.0.nupkg", + "sha512": "a8ce331953b1f4424aa7f4b6dfedfce9ad138940bc92f332de2bc6d05185830ec6eb832e752f62eaf425f749caadd4ea1789121cb7ed79740fa5868eba55c838", + "dest": "nuget-sources", + "dest-filename": "runtime.unix.system.diagnostics.debug.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.objectmodel/4.0.12/system.objectmodel.4.0.12.nupkg", + "sha512": "f5191cdb360bd2624abd7454c66862540f97aa19df92ea0854786b9d3cb9549e95c6194cfe8adc01589203c4feb1673a129c4929486bcb5f8db83ea535477c53", + "dest": "nuget-sources", + "dest-filename": "system.objectmodel.4.0.12.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/crc32.net/1.2.0/crc32.net.1.2.0.nupkg", + "sha512": "7d8d2291449dfc3fab36f3f3dee48dcc769198e9ca5e6c68b0657ef1bccb4cab12a200374e0dffbf4285d082e8016ad22db3e96431a5bd59fe5b2a1d5bea9123", + "dest": "nuget-sources", + "dest-filename": "crc32.net.1.2.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.net.http/4.1.0/system.net.http.4.1.0.nupkg", + "sha512": "55ef2f727784e744ba069bc0cdd1586ed714cb9239ab724c650629055f4f2e9f88493afd176e833d46d1493974a8e95c805c4ed4d989f095d6def8d39322fd7c", + "dest": "nuget-sources", + "dest-filename": "system.net.http.4.1.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/silk.net.vulkan.extensions.khr/2.10.1/silk.net.vulkan.extensions.khr.2.10.1.nupkg", + "sha512": "d0a5fab0fbc549f62cca0558245b41b696bf89e1e74f75732afb56012a474b5bd70ed0842e24f63c6ec7404a2779dae46c50a959fc2960aed83d3467a0819d65", + "dest": "nuget-sources", + "dest-filename": "silk.net.vulkan.extensions.khr.2.10.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.win32.registry/4.5.0/microsoft.win32.registry.4.5.0.nupkg", + "sha512": "2ca99fd058a083064184da33d12f72a5c43412151d426c309e2284a5df4b722b2f26dc72616ab6452a24ed81693839b756861d47eea27d60d7db7ff6749ab664", + "dest": "nuget-sources", + "dest-filename": "microsoft.win32.registry.4.5.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg", + "sha512": "b2cf809fe50c4b46bd6f2372265cd3059622550123afceb5dbb2410906c07a7f47bae4273584d29253d5e7a63a17c68c7ba0434608bbc8fd4d00e479b2f128ff", + "dest": "nuget-sources", + "dest-filename": "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.0.1/system.reflection.emit.4.0.1.nupkg", + "sha512": "ff7766886b945148ea65a49e4ddc648336340def2c2e94b8277b584444ec9126d96918f0bcbeb62016a530623a89ccd9eae749d62065b01058387b5d09fc7dd1", + "dest": "nuget-sources", + "dest-filename": "system.reflection.emit.4.0.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.3.0/system.reflection.emit.4.3.0.nupkg", + "sha512": "be45051467a36ab965410f112a475fb81510a5595347d1cc0c46b028e0436a339218dd3c073f048c2d338b67dc13b45742290b6c46f55982503f74a8f2698818", + "dest": "nuget-sources", + "dest-filename": "system.reflection.emit.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/newtonsoft.json/12.0.2/newtonsoft.json.12.0.2.nupkg", + "sha512": "9adc1e0573d6869d42310013b414fb65f319adb6414ca7e31b0cfa63be4dc068f1fc6ced0da5277f0f062bd299d93e1f0c8a8a2720e373d471970e7e1b615c54", + "dest": "nuget-sources", + "dest-filename": "newtonsoft.json.12.0.2.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.unix.system.console/4.3.0/runtime.unix.system.console.4.3.0.nupkg", + "sha512": "7c5cbda7d12315fff6b1e036d55ea27140de8b849f1a9705fd2710a00a2b70f06f534eb0d3e3c8ffb019e1a47d96c559ac61d5fc9d840e48f6e56542fdaccb83", + "dest": "nuget-sources", + "dest-filename": "runtime.unix.system.console.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/opentk.core/4.7.2/opentk.core.4.7.2.nupkg", + "sha512": "268f88b7f2391817383d00fb2dc71ed93e51520b3b583480eb3386a05c04842da85c9db14121e86065d6d9de7e657f6c9900b1c5b0e41f3a415809f24065e070", + "dest": "nuget-sources", + "dest-filename": "opentk.core.4.7.2.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.reflection.typeextensions/4.1.0/system.reflection.typeextensions.4.1.0.nupkg", + "sha512": "5b1875ae86f76f60307fbe261c7471e996d4d4eade0c4783cb35a5aad7fec4f01be01cb1f1f78af22d483ecce12096f6ed431d69c4a66c7bf235008bcac30cb7", + "dest": "nuget-sources", + "dest-filename": "system.reflection.typeextensions.4.1.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/system.threading.threadpool/4.3.0/system.threading.threadpool.4.3.0.nupkg", + "sha512": "450a40f94a48e9396979e764e494ad624d8333f3378b91ea69b23fc836df8f5c43bbd6c8cfd91da2ab95a476e1ff042338968e09b720447f2241c014bfc75159", + "dest": "nuget-sources", + "dest-filename": "system.threading.threadpool.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/silk.net.vulkan/2.10.1/silk.net.vulkan.2.10.1.nupkg", + "sha512": "83a68239d20c2e7ff15af5da53a1fa8c5b35f36fc842ed34035da8f558c3f9a411eceb7822bd70c819c99ceb6328b95931c0e04d8e93e1278aa4ce92a1fc6941", + "dest": "nuget-sources", + "dest-filename": "silk.net.vulkan.2.10.1.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.unix.system.net.primitives/4.3.0/runtime.unix.system.net.primitives.4.3.0.nupkg", + "sha512": "c2a0ecf5c72b226b4776eb6281f00267827d6086a0ad758ebf6e6c64a1c148d2056fe99c87ab4207add5fa67f1db73dd1ed3dca81141fc896be6b6e98795c97e", + "dest": "nuget-sources", + "dest-filename": "runtime.unix.system.net.primitives.4.3.0.nupkg" + }, + { + "type": "file", + "url": "https://api.nuget.org/v3-flatcontainer/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg", + "sha512": "6de9544b4da49f127680cf5b3b4afea96bfcac3293038a1b0a12eea0ad60be368af31ee1dfd66d48d458b40200738c04aa0c71adcc54ae2dddbea2cd50d6f28d", + "dest": "nuget-sources", + "dest-filename": "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" + } +] \ No newline at end of file From 854691199b9be87dde0a9419d75ccbe93da16ff2 Mon Sep 17 00:00:00 2001 From: xargon Date: Wed, 24 Aug 2022 10:58:35 +0200 Subject: [PATCH 041/393] WORKFLOW: added donet6 --- .github/workflows/cooker-selfhosted.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index c3082f2f..38c066ac 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -39,7 +39,7 @@ jobs: git submodule update sudo apt install -y flatpak flatpak-builder p7zip-full flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - flatpak install --user -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13 org.freedesktop.Platform.ffmpeg-full/x86_64/21.08 + flatpak install --user -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13 org.freedesktop.Platform.ffmpeg-full/x86_64/21.08 org.freedesktop.Sdk.Extension.dotnet6/x86_64/21.08 - name: Build flatpak run: | From d87faec969f732a51c0f77e1302d6c40cbe53c02 Mon Sep 17 00:00:00 2001 From: xargon Date: Wed, 24 Aug 2022 17:16:38 +0200 Subject: [PATCH 042/393] RYUJINX: disabled submodules --- net.retrodeck.retrodeck.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index b0c22dff..dffb6f77 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -570,6 +570,7 @@ modules: - type: git url: https://github.com/Ryujinx/Ryujinx.git commit: 66e7fdb8710ff24bfb80c9c638ce2e6fa9563068 + disable-submodules: true # Ryujinx - END From 40b47c0246526572f379e312fef7e4abe1cab465 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Thu, 25 Aug 2022 11:59:17 +0200 Subject: [PATCH 043/393] RYUJINX: removed, it's not building --- net.retrodeck.retrodeck.yml | 93 ++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 47 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index dffb6f77..ee7cbb28 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -523,56 +523,55 @@ modules: - type: file path: rd-submodules/yuzu/compatibility_list.json - # Yuzu - END + # # Yuzu - END - # Ryujinx - START - # https://github.com/flathub/org.ryujinx.Ryujinx + # # Ryujinx - START + # # https://github.com/flathub/org.ryujinx.Ryujinx - - name: Ryujinx - buildsystem: simple - build-options: - append-path: /usr/lib/sdk/dotnet6/bin - append-ld-library-path: /usr/lib/sdk/dotnet6/lib - arch: - x86_64: - env: - RUNTIME: linux-x64 - env: - PKG_CONFIG_PATH: /app/lib/pkgconfig:/app/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/lib/sdk/dotnet6/lib/pkgconfig - DOTNET_CLI_TELEMETRY_OPTOUT: 'true' - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 'true' - RYUJINX_VERSION: 1.1.209 - RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: flathub - RYUJINX_TARGET_RELEASE_CHANNEL_REPO: org.ryujinx.Ryujinx - RYUJINX_TARGET_RELEASE_CHANNEL_NAME: master - build-commands: - - | - export RYUJINX_GIT_SHORT_HASH=$(git rev-parse --short HEAD) - sed -r --in-place "s/\%\%RYUJINX_BUILD_VERSION\%\%/$RYUJINX_VERSION/g;" Ryujinx.Common/ReleaseInformations.cs - sed -r --in-place "s/\%\%RYUJINX_BUILD_GIT_HASH\%\%/$RYUJINX_GIT_SHORT_HASH/g;" Ryujinx.Common/ReleaseInformations.cs - sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_NAME/g;" Ryujinx.Common/ReleaseInformations.cs - sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_OWNER/g;" Ryujinx.Common/ReleaseInformations.cs - sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_REPO\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_REPO/g;" Ryujinx.Common/ReleaseInformations.cs - mkdir -p /app/bin - dotnet publish -c Release -r $RUNTIME /p:DebugType=embedded Ryujinx /p:Version=$RYUJINX_VERSION /p:SourceRevisionId=$RYUJINX_GIT_SHORT_HASH /p:ExtraDefineConstants=DISABLE_UPDATER --self-contained --source nuget-sources - if [ $? -ne 0 ]; then - exit 1; - fi; - cp -r --remove-destination /run/build/Ryujinx/Ryujinx/bin/Release/net6.0/$RUNTIME/publish/* /app/bin/ - mkdir -p /app/lib/ffmpeg - ln -s /usr/lib/x86_64-linux-gnu/libX11.so.6 /app/lib/libX11.so - wget https://raw.githubusercontent.com/flathub/org.ryujinx.Ryujinx/master/ryujinx-wrapper - install -Dm755 ryujinx-wrapper /app/bin/ryujinx-wrapper - install -Dm644 distribution/linux/ryujinx-logo.svg /app/share/icons/hicolor/scalable/apps/ryujinx.svg - install -Dm644 distribution/linux/ryujinx-mime.xml /app/share/mime/packages/$FLATPAK_ID.mime.xml - sources: - - rd-submodules/ryujinx/nuget_sources.json - - type: git - url: https://github.com/Ryujinx/Ryujinx.git - commit: 66e7fdb8710ff24bfb80c9c638ce2e6fa9563068 - disable-submodules: true + # - name: Ryujinx + # buildsystem: simple + # build-options: + # append-path: /usr/lib/sdk/dotnet6/bin + # append-ld-library-path: /usr/lib/sdk/dotnet6/lib + # arch: + # x86_64: + # env: + # RUNTIME: linux-x64 + # env: + # PKG_CONFIG_PATH: /app/lib/pkgconfig:/app/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/lib/sdk/dotnet6/lib/pkgconfig + # DOTNET_CLI_TELEMETRY_OPTOUT: 'true' + # DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 'true' + # RYUJINX_VERSION: 1.1.209 + # RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: flathub + # RYUJINX_TARGET_RELEASE_CHANNEL_REPO: org.ryujinx.Ryujinx + # RYUJINX_TARGET_RELEASE_CHANNEL_NAME: master + # build-commands: + # - | + # export RYUJINX_GIT_SHORT_HASH=$(git rev-parse --short HEAD) + # sed -r --in-place "s/\%\%RYUJINX_BUILD_VERSION\%\%/$RYUJINX_VERSION/g;" Ryujinx.Common/ReleaseInformations.cs + # sed -r --in-place "s/\%\%RYUJINX_BUILD_GIT_HASH\%\%/$RYUJINX_GIT_SHORT_HASH/g;" Ryujinx.Common/ReleaseInformations.cs + # sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_NAME/g;" Ryujinx.Common/ReleaseInformations.cs + # sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_OWNER/g;" Ryujinx.Common/ReleaseInformations.cs + # sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_REPO\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_REPO/g;" Ryujinx.Common/ReleaseInformations.cs + # mkdir -p /app/bin + # dotnet publish -c Release -r $RUNTIME /p:DebugType=embedded Ryujinx /p:Version=$RYUJINX_VERSION /p:SourceRevisionId=$RYUJINX_GIT_SHORT_HASH /p:ExtraDefineConstants=DISABLE_UPDATER --self-contained --source nuget-sources + # if [ $? -ne 0 ]; then + # exit 1; + # fi; + # cp -r --remove-destination /run/build/Ryujinx/Ryujinx/bin/Release/net6.0/$RUNTIME/publish/* /app/bin/ + # mkdir -p /app/lib/ffmpeg + # ln -s /usr/lib/x86_64-linux-gnu/libX11.so.6 /app/lib/libX11.so + # wget https://raw.githubusercontent.com/flathub/org.ryujinx.Ryujinx/master/ryujinx-wrapper + # install -Dm755 ryujinx-wrapper /app/bin/ryujinx-wrapper + # install -Dm644 distribution/linux/ryujinx-logo.svg /app/share/icons/hicolor/scalable/apps/ryujinx.svg + # install -Dm644 distribution/linux/ryujinx-mime.xml /app/share/mime/packages/$FLATPAK_ID.mime.xml + # sources: + # - rd-submodules/ryujinx/nuget_sources.json + # - type: git + # url: https://github.com/Ryujinx/Ryujinx.git + # commit: 66e7fdb8710ff24bfb80c9c638ce2e6fa9563068 - # Ryujinx - END + # # Ryujinx - END # CITRA - START From 1bbd143f5fe95d9c4e2eb8b6db81546c23419e9e Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Fri, 26 Aug 2022 14:00:46 +0200 Subject: [PATCH 044/393] PCSX2: updated --- net.retrodeck.retrodeck.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index ee7cbb28..f5dc94f8 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1,6 +1,7 @@ app-id: net.retrodeck.retrodeck runtime: org.kde.Platform -runtime-version: 5.15-21.08 +#runtime-version: 5.15-21.08 +runtime-version: 6.3 #bumped because of pcsx2-qt sdk: org.kde.Sdk sdk-extensions: - org.freedesktop.Sdk.Extension.llvm13 # Needed for rpcs3 @@ -721,6 +722,8 @@ modules: - -DDISABLE_PCSX2_WRAPPER=TRUE - -DDISABLE_ADVANCE_SIMD=TRUE - -DSDL2_API=TRUE + #- '-DWAYLAND_API=TRUE"' enable this if Steam Deck goes to Wayland + - '-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=TRUE' cleanup: - /share/pixmaps - /share/man @@ -728,8 +731,8 @@ modules: sources: - type: git url: https://github.com/PCSX2/pcsx2.git - tag: v1.7.3172 - commit: 7a5f63e0f5925ff29f589883e04d3c66779f4f17 + tag: v1.7.3229 + commit: e3eae7fbe83aad3952e3ed6a8e56fc016b51a9c3 # PCSX2 Flathub Workaround - START # This workaround disables the PCSX2 libraries (disable-submodules: true) and install them separately @@ -800,7 +803,9 @@ modules: - '-DDISABLE_PCSX2_WRAPPER=TRUE' - '-DDISABLE_ADVANCE_SIMD=TRUE' - '-DSDL2_API=TRUE' + #- '-DWAYLAND_API=TRUE"' enable this if Steam Deck goes to Wayland - '-DQT_BUILD=TRUE' + - '-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=TRUE' cleanup: - /share/pixmaps - /share/man @@ -812,8 +817,8 @@ modules: sources: - type: git url: https://github.com/PCSX2/pcsx2.git - tag: v1.7.3172 - commit: 7a5f63e0f5925ff29f589883e04d3c66779f4f17 + tag: v1.7.3229 + commit: e3eae7fbe83aad3952e3ed6a8e56fc016b51a9c3 # same as above disable-submodules: true @@ -1307,4 +1312,4 @@ modules: sources: - type: git url: https://github.com/XargonWan/RetroDECK.git - branch: cooker + branch: cooker \ No newline at end of file From 531564523d7f3900789d7905ed59e11b028f1178 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Mon, 29 Aug 2022 11:17:47 +0200 Subject: [PATCH 045/393] Updated base-version to 6.3 --- net.retrodeck.retrodeck.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index f5dc94f8..a30fad38 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -7,7 +7,8 @@ sdk-extensions: - org.freedesktop.Sdk.Extension.llvm13 # Needed for rpcs3 - org.freedesktop.Sdk.Extension.dotnet6 # Needed for Ryujinx base: io.qt.qtwebengine.BaseApp # Needed for Yuzu -base-version: 5.15-21.08 # Needed for Yuzu +#base-version: 5.15-21.08 # Needed for Yuzu +base-version: 6.3 command: retrodeck.sh finish-args: From 3d584c9aa75f26af0119c9389dc719963bd4a8ef Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Mon, 29 Aug 2022 11:20:51 +0200 Subject: [PATCH 046/393] YUZU: updated to mainline-0-1148 --- net.retrodeck.retrodeck.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index a30fad38..497791b4 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -514,8 +514,8 @@ modules: sources: - type: git url: https://github.com/yuzu-emu/yuzu-mainline.git - tag: mainline-0-1039 - commit: 983afc5328725109a1cf13c61103b8a553c005d0 + tag: mainline-0-1148 + commit: fb0f5137669a5a378efc31260880af22778a0351 disable-shallow-clone: true x-checker-data: type: git From 6eb03dde570892f692e1c1ca732949019e0503c9 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Mon, 29 Aug 2022 16:34:55 +0200 Subject: [PATCH 047/393] Trying some workarounds for qt5 --- net.retrodeck.retrodeck.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 497791b4..8e658528 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1,14 +1,18 @@ app-id: net.retrodeck.retrodeck runtime: org.kde.Platform #runtime-version: 5.15-21.08 -runtime-version: 6.3 #bumped because of pcsx2-qt +runtime-version: + - 5.15-21.08 + - 6.3 # bumped because of pcsx2-qt sdk: org.kde.Sdk sdk-extensions: - org.freedesktop.Sdk.Extension.llvm13 # Needed for rpcs3 - org.freedesktop.Sdk.Extension.dotnet6 # Needed for Ryujinx base: io.qt.qtwebengine.BaseApp # Needed for Yuzu #base-version: 5.15-21.08 # Needed for Yuzu -base-version: 6.3 +base-version: + - 5.15-21.08 + - 6.3 command: retrodeck.sh finish-args: From afdf660c333e55a324ba26746eb8aba8150cb2ef Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Mon, 29 Aug 2022 16:46:18 +0200 Subject: [PATCH 048/393] Replaced qt5 with qt6 --- .github/workflows/cooker-selfhosted.yml | 8 +++++++- net.retrodeck.retrodeck.yml | 8 ++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 38c066ac..a2bc226f 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -39,7 +39,13 @@ jobs: git submodule update sudo apt install -y flatpak flatpak-builder p7zip-full flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - flatpak install --user -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13 org.freedesktop.Platform.ffmpeg-full/x86_64/21.08 org.freedesktop.Sdk.Extension.dotnet6/x86_64/21.08 + flatpak install --user -y \ + org.kde.Sdk//6.3 \ + org.kde.Platform//6.3 \ + io.qt.qtwebengine.BaseApp/x86_64/6.3 \ + org.freedesktop.Sdk.Extension.llvm13 \ + org.freedesktop.Platform.ffmpeg-full/x86_64/21.08 \ + org.freedesktop.Sdk.Extension.dotnet6/x86_64/21.08 - name: Build flatpak run: | diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 8e658528..1fa49179 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1,18 +1,14 @@ app-id: net.retrodeck.retrodeck runtime: org.kde.Platform #runtime-version: 5.15-21.08 -runtime-version: - - 5.15-21.08 - - 6.3 # bumped because of pcsx2-qt +runtime-version: 6.3 # bumped because of pcsx2-qt sdk: org.kde.Sdk sdk-extensions: - org.freedesktop.Sdk.Extension.llvm13 # Needed for rpcs3 - org.freedesktop.Sdk.Extension.dotnet6 # Needed for Ryujinx base: io.qt.qtwebengine.BaseApp # Needed for Yuzu #base-version: 5.15-21.08 # Needed for Yuzu -base-version: - - 5.15-21.08 - - 6.3 +base-version: 6.3 command: retrodeck.sh finish-args: From fa6c152b7ac3348a00a17c7670e1be9143610788 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 30 Aug 2022 09:28:30 +0200 Subject: [PATCH 049/393] YUZU: bumped and added both QT5 and QT6 --- .github/workflows/cooker-selfhosted.yml | 2 +- net.retrodeck.retrodeck.yml | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index a2bc226f..034a2587 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -42,9 +42,9 @@ jobs: flatpak install --user -y \ org.kde.Sdk//6.3 \ org.kde.Platform//6.3 \ + org.freedesktop.Platform.ffmpeg-full/x86_64/21.08 \ io.qt.qtwebengine.BaseApp/x86_64/6.3 \ org.freedesktop.Sdk.Extension.llvm13 \ - org.freedesktop.Platform.ffmpeg-full/x86_64/21.08 \ org.freedesktop.Sdk.Extension.dotnet6/x86_64/21.08 - name: Build flatpak diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 1fa49179..b5b8e718 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1,14 +1,15 @@ app-id: net.retrodeck.retrodeck runtime: org.kde.Platform #runtime-version: 5.15-21.08 -runtime-version: 6.3 # bumped because of pcsx2-qt +runtime-version: + - 5.15-21.08 + - 6.3 # bumped because of pcsx2-qt sdk: org.kde.Sdk sdk-extensions: - org.freedesktop.Sdk.Extension.llvm13 # Needed for rpcs3 - org.freedesktop.Sdk.Extension.dotnet6 # Needed for Ryujinx base: io.qt.qtwebengine.BaseApp # Needed for Yuzu -#base-version: 5.15-21.08 # Needed for Yuzu -base-version: 6.3 +base-version: 5.15-21.08 # Needed for Yuzu command: retrodeck.sh finish-args: @@ -495,8 +496,8 @@ modules: - -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON - -DYUZU_USE_QT_WEB_ENGINE=ON - -DYUZU_USE_BUNDLED_FFMPEG=ON - - -DDISPLAY_VERSION=1039 - - -DBUILD_TAG=mainline-1039 + - -DDISPLAY_VERSION=1149 + - -DBUILD_TAG=mainline-1149 - -DBUILD_REPOSITORY=yuzu-emu/yuzu-mainline build-options: env: @@ -514,8 +515,8 @@ modules: sources: - type: git url: https://github.com/yuzu-emu/yuzu-mainline.git - tag: mainline-0-1148 - commit: fb0f5137669a5a378efc31260880af22778a0351 + tag: mainline-0-1149 + commit: 96b400da8806d8b9e003605c3fde615737c790e2 disable-shallow-clone: true x-checker-data: type: git From 87b57a61ad3ea72345fdf40c53b569f20b8dacd5 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 30 Aug 2022 09:36:30 +0200 Subject: [PATCH 050/393] YUZU: bumped and added both QT5 and QT6 -fix1 --- .github/workflows/cooker-selfhosted.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 034a2587..b87193e0 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -39,7 +39,7 @@ jobs: git submodule update sudo apt install -y flatpak flatpak-builder p7zip-full flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - flatpak install --user -y \ + flatpak install --user -y --noninteractive \ org.kde.Sdk//6.3 \ org.kde.Platform//6.3 \ org.freedesktop.Platform.ffmpeg-full/x86_64/21.08 \ From 91ad9af7dbb19100408de34c097627a06a0979f2 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 30 Aug 2022 09:59:43 +0200 Subject: [PATCH 051/393] Reverted to QT5 and added QT6 as module --- net.retrodeck.retrodeck.yml | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index b5b8e718..9c31754d 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1,9 +1,7 @@ app-id: net.retrodeck.retrodeck runtime: org.kde.Platform -#runtime-version: 5.15-21.08 -runtime-version: - - 5.15-21.08 - - 6.3 # bumped because of pcsx2-qt +runtime-version: 5.15-21.08 +#runtime-version: 6.3 # bumped because of pcsx2-qt sdk: org.kde.Sdk sdk-extensions: - org.freedesktop.Sdk.Extension.llvm13 # Needed for rpcs3 @@ -107,6 +105,34 @@ modules: - ln -s "xml" "${FLATPAK_DEST}/bin/xmlstarlet" ||: cleanup: ['*'] + # pcsx2-qt needs QT6, maybe others, here until every qt emulator will support qt6 (not yuzu atm) + - name: qt6-core5compat + buildsystem: cmake-ninja + builddir: true + sources: + - type: archive + url: https://download.qt.io/official_releases/qt/6.2/6.2.4/submodules/qt5compat-everywhere-src-6.2.4.tar.xz + sha256: 5de2b9e25bf7de161fbb88ecdd468ed1788bc899392fc05ed80aa590ebb352fa + x-checker-data: + type: html + url: https://download.qt.io/official_releases/qt/6.2/ + version-pattern: '>([\d\.-]*)/<' + url-template: https://download.qt.io/official_releases/qt/6.2/$version/submodules/qt5compat-everywhere-src-$version.tar.xz + + post-install: + - mv /app/mkspecs /app/lib + - ln -sr ${FLATPAK_DEST}/lib/${FLATPAK_ARCH}-linux-gnu/libQt*.so* -t ${FLATPAK_DEST}/lib/ + - sed -i 's/\\([0-9]\\+\\.[0-9]\\+\\)\\.[0-9]\\+ ${_Qt6.*_FIND_VERSION_EXACT}/\\1/' + ${FLATPAK_DEST}/lib/${FLATPAK_ARCH}-linux-gnu/cmake/Qt6*/Qt6*Config.cmake + - sed -e 's@PATHS \"${CMAKE_CURRENT_LIST_DIR}/..\" NO_DEFAULT_PATH@PATHS \"${CMAKE_CURRENT_LIST_DIR}/..\" + \"/usr/lib/${CMAKE_CXX_LIBRARY_ARCHITECTURE}/cmake/\" NO_DEFAULT_PATH@' -i + ${FLATPAK_DEST}/lib/${FLATPAK_ARCH}-linux-gnu/cmake/Qt6*/Qt6*Config.cmake + - sed -e 's@\\($$QT_MODULE_BIN_BASE\\)@\\1 '${FLATPAK_DEST}'/bin @' -i ${FLATPAK_DEST}/lib/mkspecs/modules/*.pri + - sed -e 's@\\($$QT_MODULE_INCLUDE_BASE \\)@\\1'${FLATPAK_DEST}'/include @' + -i ${FLATPAK_DEST}/lib/mkspecs/modules/*.pri + - sed -e 's@$$QT_MODULE_INCLUDE_BASE/@'${FLATPAK_DEST}'/include/@g' -i ${FLATPAK_DEST}/lib/mkspecs/modules/*.pri + - sed -e 's@$$QT_MODULE_LIB_BASE@'${FLATPAK_DEST}'/lib@g' -i ${FLATPAK_DEST}/lib/mkspecs/modules/*.pri + # mesa repo got a double certificate issue and gnutils cannot handle that so GLU download fails, # this affects even the shared-modules's glu so I have to replace it temporarly # more info there: https://gitlab.com/gnutls/gnutls/-/issues/1335 From 95721d5510ddd74589f4fa351b88fe19782cf6b2 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 30 Aug 2022 10:01:21 +0200 Subject: [PATCH 052/393] Actually: switched back to QT5 and added QT6 as module --- net.retrodeck.retrodeck.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 9c31754d..32275873 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1,7 +1,7 @@ app-id: net.retrodeck.retrodeck runtime: org.kde.Platform -runtime-version: 5.15-21.08 -#runtime-version: 6.3 # bumped because of pcsx2-qt +#runtime-version: 5.15-21.08 +runtime-version: 6.3 # bumped because of pcsx2-qt sdk: org.kde.Sdk sdk-extensions: - org.freedesktop.Sdk.Extension.llvm13 # Needed for rpcs3 @@ -106,6 +106,7 @@ modules: cleanup: ['*'] # pcsx2-qt needs QT6, maybe others, here until every qt emulator will support qt6 (not yuzu atm) + # from: https://github.com/flathub/org.profex_xrd.Profex - name: qt6-core5compat buildsystem: cmake-ninja builddir: true From 9398798ce7a0d3fbe91ee6080103c3041560da9e Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 30 Aug 2022 11:12:39 +0200 Subject: [PATCH 053/393] Actually: switched back to QT5 and added QT6 as module -fix1 --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 32275873..8d8f02fd 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -121,7 +121,7 @@ modules: url-template: https://download.qt.io/official_releases/qt/6.2/$version/submodules/qt5compat-everywhere-src-$version.tar.xz post-install: - - mv /app/mkspecs /app/lib + - mv -f /app/mkspecs /app/lib - ln -sr ${FLATPAK_DEST}/lib/${FLATPAK_ARCH}-linux-gnu/libQt*.so* -t ${FLATPAK_DEST}/lib/ - sed -i 's/\\([0-9]\\+\\.[0-9]\\+\\)\\.[0-9]\\+ ${_Qt6.*_FIND_VERSION_EXACT}/\\1/' ${FLATPAK_DEST}/lib/${FLATPAK_ARCH}-linux-gnu/cmake/Qt6*/Qt6*Config.cmake From e665af6576bdd3b628ec3a6b3f9442e856282ecf Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 30 Aug 2022 12:26:09 +0200 Subject: [PATCH 054/393] Actually: switched back to QT5 and added QT6 as module -fix2 --- net.retrodeck.retrodeck.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 8d8f02fd..16918804 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -121,7 +121,8 @@ modules: url-template: https://download.qt.io/official_releases/qt/6.2/$version/submodules/qt5compat-everywhere-src-$version.tar.xz post-install: - - mv -f /app/mkspecs /app/lib + - mkdir -p /app/lib/mkspecs + - cp -rf /app/mkspecs/* /app/lib/mkspecs/ - ln -sr ${FLATPAK_DEST}/lib/${FLATPAK_ARCH}-linux-gnu/libQt*.so* -t ${FLATPAK_DEST}/lib/ - sed -i 's/\\([0-9]\\+\\.[0-9]\\+\\)\\.[0-9]\\+ ${_Qt6.*_FIND_VERSION_EXACT}/\\1/' ${FLATPAK_DEST}/lib/${FLATPAK_ARCH}-linux-gnu/cmake/Qt6*/Qt6*Config.cmake @@ -133,7 +134,9 @@ modules: -i ${FLATPAK_DEST}/lib/mkspecs/modules/*.pri - sed -e 's@$$QT_MODULE_INCLUDE_BASE/@'${FLATPAK_DEST}'/include/@g' -i ${FLATPAK_DEST}/lib/mkspecs/modules/*.pri - sed -e 's@$$QT_MODULE_LIB_BASE@'${FLATPAK_DEST}'/lib@g' -i ${FLATPAK_DEST}/lib/mkspecs/modules/*.pri - + cleanup: + - /app/mkspecs + # mesa repo got a double certificate issue and gnutils cannot handle that so GLU download fails, # this affects even the shared-modules's glu so I have to replace it temporarly # more info there: https://gitlab.com/gnutls/gnutls/-/issues/1335 From 132336af3ef6018d29d7df68d576757d8b45b23e Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 30 Aug 2022 13:57:39 +0200 Subject: [PATCH 055/393] Actually: switched back to QT5 and added QT6 as module -fix3 --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 16918804..21f08c8d 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -122,7 +122,7 @@ modules: post-install: - mkdir -p /app/lib/mkspecs - - cp -rf /app/mkspecs/* /app/lib/mkspecs/ + - cp -R /app/mkspecs/* /app/lib/mkspecs/ - ln -sr ${FLATPAK_DEST}/lib/${FLATPAK_ARCH}-linux-gnu/libQt*.so* -t ${FLATPAK_DEST}/lib/ - sed -i 's/\\([0-9]\\+\\.[0-9]\\+\\)\\.[0-9]\\+ ${_Qt6.*_FIND_VERSION_EXACT}/\\1/' ${FLATPAK_DEST}/lib/${FLATPAK_ARCH}-linux-gnu/cmake/Qt6*/Qt6*Config.cmake From e1148d5cb154d2b8277125ea51f44cf2c01274a4 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 30 Aug 2022 14:46:55 +0200 Subject: [PATCH 056/393] Actually: switched back to QT5 and added QT6 as module -fix4: forced ln --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 21f08c8d..b3409d26 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -123,7 +123,7 @@ modules: post-install: - mkdir -p /app/lib/mkspecs - cp -R /app/mkspecs/* /app/lib/mkspecs/ - - ln -sr ${FLATPAK_DEST}/lib/${FLATPAK_ARCH}-linux-gnu/libQt*.so* -t ${FLATPAK_DEST}/lib/ + - ln -fsr ${FLATPAK_DEST}/lib/${FLATPAK_ARCH}-linux-gnu/libQt*.so* -t ${FLATPAK_DEST}/lib/ - sed -i 's/\\([0-9]\\+\\.[0-9]\\+\\)\\.[0-9]\\+ ${_Qt6.*_FIND_VERSION_EXACT}/\\1/' ${FLATPAK_DEST}/lib/${FLATPAK_ARCH}-linux-gnu/cmake/Qt6*/Qt6*Config.cmake - sed -e 's@PATHS \"${CMAKE_CURRENT_LIST_DIR}/..\" NO_DEFAULT_PATH@PATHS \"${CMAKE_CURRENT_LIST_DIR}/..\" From a9af2cf3b8ac47f1a10b075f5c84d027c3e84adb Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 30 Aug 2022 17:05:25 +0200 Subject: [PATCH 057/393] Updated ES-DE to 1.2.6 and commented unused emulators --- es-configs/es_find_rules.xml | 181 ++++++++++++++++++++++- es-configs/es_systems.xml | 276 ++++++++++++++++++++++++++--------- net.retrodeck.retrodeck.yml | 4 +- 3 files changed, 388 insertions(+), 73 deletions(-) diff --git a/es-configs/es_find_rules.xml b/es-configs/es_find_rules.xml index b1023578..3b025d89 100644 --- a/es-configs/es_find_rules.xml +++ b/es-configs/es_find_rules.xml @@ -51,6 +51,20 @@ atari800-jz.atari800 + + + + BasiliskII + net.cebix.basilisk + + + /var/lib/flatpak/exports/bin/net.cebix.basilisk + ~/.local/share/flatpak/exports/bin/net.cebix.basilisk + ~/Applications/BasiliskII-x86_64.AppImage + ~/.local/bin/BasiliskII-x86_64.AppImage + ~/bin/BasiliskII-x86_64.AppImage + + @@ -149,6 +163,17 @@ ~/bin/duckstation-qt-x64.AppImage + + + + easyrpg-player + + + ~/Applications/easyrpg/easyrpg-player + ~/.local/bin/easyrpg/easyrpg-player + ~/bin/easyrpg/easyrpg-player + + @@ -183,10 +208,43 @@ ~/bin/hypseus-singe/hypseus.bin + + + + lightspark + + + ~/Applications/lightspark/lightspark + ~/.local/bin/lightspark/lightspark + ~/bin/lightspark/lightspark + + + + + + linapple + + + ~/Applications/linapple/linapple + ~/.local/bin/linapple/linapple + ~/bin/linapple/linapple + + mame + org.mamedev.MAME + + + /var/lib/flatpak/exports/bin/org.mamedev.MAME + ~/.local/share/flatpak/exports/bin/org.mamedev.MAME + + + + + + mednafen @@ -249,6 +307,17 @@ + + pcsx2-qt + + + ~/Applications/pcsx2*-Qt.AppImage + ~/.local/bin/pcsx2*-Qt.AppImage + ~/bin/pcsx2*-Qt.AppImage + + + + PCSX2 pcsx2 @@ -284,9 +353,10 @@ - PPSSPPSDL ppsspp-emu.ppsspp-sdl org.ppsspp.PPSSPP + PPSSPPSDL + PPSSPPQt /var/lib/flatpak/exports/bin/org.ppsspp.PPSSPP @@ -340,6 +410,17 @@ ~/.local/share/flatpak/exports/bin/com.snes9x.Snes9x + + + + ruffle + + + ~/Applications/ruffle/ruffle + ~/.local/bin/ruffle/ruffle + ~/bin/ruffle/ruffle + + @@ -354,12 +435,99 @@ ~/bin/publish/Ryujinx + + + + scummvm + org.scummvm.ScummVM + + + /var/lib/flatpak/exports/bin/org.scummvm.ScummVM + ~/.local/share/flatpak/exports/bin/org.scummvm.ScummVM + + + + + + sdl2trs + + + ~/Applications/sdl2trs/sdl2trs + ~/.local/bin/sdl2trs/sdl2trs + ~/bin/sdl2trs/sdl2trs + + + + + + SheepShaver + + + ~/Applications/SheepShaver-x86_64.AppImage + ~/.local/bin/SheepShaver-x86_64.AppImage + ~/bin/SheepShaver-x86_64.AppImage + + + + + + simcoupe + + + ~/Applications/simcoupe/simcoupe + ~/.local/bin/simcoupe/simcoupe + ~/bin/simcoupe/simcoupe + + + + + + snes9x + + + /var/lib/flatpak/exports/bin/com.snes9x.Snes9x + ~/.local/share/flatpak/exports/bin/com.snes9x.Snes9x + + + + + + solarus-run + solarus.run + + + + + + steam + + + + + + ~/Applications/tsugaru/Tsugaru_CUI + ~/.local/bin/tsugaru/Tsugaru_CUI + ~/bin/tsugaru/Tsugaru_CUI + + visualboyadvance-m + + + + vita3k + Vita3K + + + ~/Applications/Vita3K/Vita3K + ~/.local/bin/Vita3K/Vita3K + ~/bin/Vita3K/Vita3K + + @@ -374,6 +542,17 @@ ~/bin/Xemu*.AppImage + + + + xroar + + + ~/Applications/xroar/xroar + ~/.local/bin/xroar/xroar + ~/bin/xroar/xroar + + diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml index 95fc9e0b..b3731ac7 100644 --- a/es-configs/es_systems.xml +++ b/es-configs/es_systems.xml @@ -21,50 +21,52 @@ n64 64dd + amiga Commodore Amiga %ROMPATH%/amiga - .adf .ADF .adz .ADZ .dms .DMS .fdi .FDI .ipf .IPF .hdf .HDF .hdz .HDZ .lha .LHA .cue .CUE .ccd .CCD .nrg .NRG .mds .MDS .iso .ISO .uae .UAE .m3u .M3U .7z .7Z .zip .ZIP + .adf .ADF .adz .ADZ .ccd .CCD .chd .CHD .cue .CUE .dms .DMS .fdi .FDI .hdf .HDF .hdz .HDZ .ipf .IPF .rp9 .RP9 .iso .ISO .lha .LHA .m3u .M3U .mds .MDS .nrg .NRG .uae .UAE .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae2021_libretro.so %ROM% amiga amiga - - amiga600 - Commodore Amiga 600 - %ROMPATH%/amiga600 - .adf .ADF .adz .ADZ .dms .DMS .fdi .FDI .ipf .IPF .hdf .HDF .hdz .HDZ .lha .LHA .cue .CUE .ccd .CCD .nrg .NRG .mds .MDS .iso .ISO .uae .UAE .m3u .M3U .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae2021_libretro.so %ROM% - amiga - amiga600 - amiga1200 Commodore Amiga 1200 %ROMPATH%/amiga1200 - .adf .ADF .adz .ADZ .dms .DMS .fdi .FDI .ipf .IPF .hdf .HDF .hdz .HDZ .lha .LHA .cue .CUE .ccd .CCD .nrg .NRG .mds .MDS .iso .ISO .uae .UAE .m3u .M3U .7z .7Z .zip .ZIP + .adf .ADF .adz .ADZ .ccd .CCD .chd .CHD .cue .CUE .dms .DMS .fdi .FDI .hdf .HDF .hdz .HDZ .ipf .IPF .rp9 .RP9 .iso .ISO .lha .LHA .m3u .M3U .mds .MDS .nrg .NRG .uae .UAE .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae2021_libretro.so %ROM% amiga amiga1200 + + amiga600 + Commodore Amiga 600 + %ROMPATH%/amiga600 + .adf .ADF .adz .ADZ .ccd .CCD .chd .CHD .cue .CUE .dms .DMS .fdi .FDI .hdf .HDF .hdz .HDZ .ipf .IPF .rp9 .RP9 .iso .ISO .lha .LHA .m3u .M3U .mds .MDS .nrg .NRG .uae .UAE .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae2021_libretro.so %ROM% + amiga + amiga600 + amigacd32 Commodore Amiga CD32 %ROMPATH%/amigacd32 - .adf .ADF .adz .ADZ .dms .DMS .fdi .FDI .ipf .IPF .hdf .HDF .hdz .HDZ .lha .LHA .cue .CUE .ccd .CCD .nrg .NRG .mds .MDS .iso .ISO .uae .UAE .m3u .M3U .7z .7Z .zip .ZIP + .adf .ADF .adz .ADZ .ccd .CCD .chd .CHD .cue .CUE .dms .DMS .fdi .FDI .hdf .HDF .hdz .HDZ .ipf .IPF .rp9 .RP9 .iso .ISO .lha .LHA .m3u .M3U .mds .MDS .nrg .NRG .uae .UAE .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae2021_libretro.so %ROM% amigacd32 @@ -89,21 +91,25 @@ android android + apple2gs Apple IIGS %ROMPATH%/apple2gs - .nib .NIB .do .DO .po .PO .dsk .DSK .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% + .2mg .2MG + %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %ROMPATH%/apple2gs apple2gs -flop3 %ROM% apple2gs apple2gs @@ -116,11 +122,12 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2010_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2003_plus_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2000_libretro.so %ROM% - %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %ROMPATH%/arcade %BASENAME% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM% - %EMULATOR_FLYCAST% %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM% arcade arcade @@ -151,6 +158,7 @@ .xfd .XFD .atr .ATR .atx .ATX .cdm .CDM .cas .CAS .bin .BIN .a52 .A52 .xex .XEX .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/a5200_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.so %ROM% + atari5200 atari5200 @@ -198,6 +206,7 @@ .lnx .LNX .o .O .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/handy_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_lynx_libretro.so %ROM% + atarilynx atarilynx @@ -275,7 +284,7 @@ cdtv Commodore CDTV %ROMPATH%/cdtv - .cue .CUE .ccd .CCD .nrg .NRG .mds .MDS .iso .ISO .m3u .M3U .7z .7Z .zip .ZIP + .ccd .CCD .chd .CHD .cue .CUE .iso .ISO .m3u .M3U .mds .MDS .nrg .NRG .rp9 .RP9 .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae2021_libretro.so %ROM% cdtv @@ -299,19 +308,22 @@ channelf channelf + colecovision ColecoVision - %ROMPATH%/coleco + %ROMPATH%/colecovision .bin .BIN .cas .CAS .col .COL .cv .CV .dsk .DSK .m3u .M3U .mx1 .MX1 .mx2 .MX2 .ri .RI .rom .ROM .sc .SC .sg .SG .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearcoleco_libretro.so %ROM% @@ -350,9 +362,12 @@ doom Doom %ROMPATH%/doom - .wad .WAD .iwad .IWAD .pwad .PWAD - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prboom_libretro.so %ROM% - pc + .desktop .iwad .IWAD .pk4 .PK4 .pwad .PWAD .sh .wad .WAD + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prboom_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/boom3_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/boom3_xp_libretro.so %ROM% + %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% + pc, pcwindows doom @@ -368,15 +383,18 @@ dos dos + dreamcast Sega Dreamcast @@ -388,16 +406,27 @@ dreamcast dreamcast + + easyrpg + EasyRPG Game Engine + %ROMPATH%/easyrpg + .easyrpg .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/easyrpg_libretro.so %ROM% + + easyrpg + easyrpg + famicom Nintendo Family Computer %ROMPATH%/famicom - .nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP + .fds .FDS .nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM% - %EMULATOR_NESTOPIA-UE% --fullscreen %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quicknes_libretro.so %ROM% + famicom famicom @@ -430,11 +459,33 @@ .nes .NES .fds .FDS .unf .UNF .UNIF .UNIF .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM% - %EMULATOR_NESTOPIA-UE% --fullscreen %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM% + fds fds + gameandwatch Nintendo Game and Watch @@ -453,6 +504,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/smsplus_libretro.so %ROM% + gamegear gamegear @@ -510,9 +562,9 @@ gc Nintendo GameCube %ROMPATH%/gc - .gcm .GCM .iso .ISO .wbfs .WBFS .wia .WIA .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .rvz .RVZ .tgc .TGC .wad .WAD .m3u .M3U .7z .7Z .zip .ZIP - %EMULATOR_DOLPHIN% -b -e %ROM% + .gcm .GCM .iso .ISO .wbfs .WBFS .wia .WIA .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .json .JSON .rvz .RVZ .tgc .TGC .wad .WAD .m3u .M3U .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM% + %EMULATOR_DOLPHIN% -b -e %ROM% %EMULATOR_PRIMEHACK% -b -e %ROM% gc gc @@ -521,12 +573,13 @@ genesis Sega Genesis %ROMPATH%/genesis - .68k .68K .bin .BIN .bms .BMS .chd .CHD .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx .MDX .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP + .32x .32X .68k .68K .bin .BIN .bms .BMS .chd .CHD .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx .MDX .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/blastem_libretro.so %ROM% %EMULATOR_BLASTEM% -m gen %ROM% + genesis genesis @@ -534,8 +587,9 @@ gx4000 Amstrad GX4000 %ROMPATH%/gx4000 - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% + .cdt .CDT .cpr .CPR .dsk .DSK .kcr .KCR .m3u .M3U .sna .SNA .tap .TAR .voc .VOC .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/cap32_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/crocods_libretro.so %ROM% gx4000 gx4000 @@ -553,7 +607,7 @@ Java 2 Micro Edition (J2ME) %ROMPATH%/j2me .jar .JAR .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/squirreljme_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/squirreljme_libretro.so %ROM% android j2me @@ -575,11 +629,12 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2010_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2003_plus_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2000_libretro.so %ROM% - %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %ROMPATH%/mame %BASENAME% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM% - %EMULATOR_FLYCAST% %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM% arcade mame @@ -611,6 +666,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/smsplus_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% + mastersystem mastersystem @@ -640,15 +696,25 @@ megadrive Sega Mega Drive %ROMPATH%/megadrive - .68k .68K .bin .BIN .bms .BMS .chd .CHD .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx .MDX .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP + .32x .32X .68k .68K .bin .BIN .bms .BMS .chd .CHD .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx .MDX .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/blastem_libretro.so %ROM% - %EMULATOR_BLASTEM% -m gen %ROM% + megadrive megadrive + + megaduck + Creatronic Mega Duck + %ROMPATH%/megaduck + .bin .BIN .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/sameduck_libretro.so %ROM% + megaduck + megaduck + mess Multi Emulator Super System @@ -733,6 +799,17 @@ msxturbor msxturbor + multivision Othello Multivision @@ -757,13 +834,23 @@ n64 Nintendo 64 %ROMPATH%/n64 - .n64 .N64 .v64 .V64 .z64 .Z64 .bin .BIN .u1 .U1 .7z .7Z .zip .ZIP + .bin .BIN .n64 .N64 .ndd .NDD .u1 .U1 .v64 .V64 .z64 .Z64 .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mupen64plus_next_libretro.so %ROM% - %EMULATOR_MUPEN64PLUS% --nogui %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/parallel_n64_libretro.so %ROM% n64 n64 + + n64dd + Nintendo 64DD + %ROMPATH%/n64dd + .bin .BIN .n64 .N64 .ndd .NDD .u1 .U1 .v64 .V64 .z64 .Z64 .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/parallel_n64_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mupen64plus_next_libretro.so %ROM% + n64 + n64dd + naomi Sega NAOMI @@ -828,12 +915,13 @@ nes Nintendo Entertainment System %ROMPATH%/nes - .nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP + .fds .FDS .nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM% %EMULATOR_NESTOPIA-UE% --fullscreen %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quicknes_libretro.so %ROM% + nes nes @@ -844,6 +932,7 @@ .ngp .NGP .ngc .NGC .ngpc .NGPC .npc .NPC .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_ngp_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/race_libretro.so %ROM% + ngp ngp @@ -854,6 +943,7 @@ .ngp .NGP .ngc .NGC .ngpc .NGPC .npc .NPC .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_ngp_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/race_libretro.so %ROM% + ngpc ngpc @@ -875,15 +965,17 @@ openbor openbor + palm Palm OS @@ -919,6 +1011,7 @@ .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM% + pcengine pcengine @@ -929,6 +1022,7 @@ .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM% + pcenginecd pcenginecd @@ -937,7 +1031,8 @@ NEC PC-FX %ROMPATH%/pcfx .cue CUE .ccd .CCD .toc .TOC .chd .CHD .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pcfx_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pcfx_libretro.so %ROM% + pcfx pcfx @@ -966,8 +1061,8 @@ ports Ports %ROMPATH%/ports - .sh - %EMULATOR_OS-SHELL% %ROM% + .desktop .sh + %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% pc ports @@ -977,8 +1072,9 @@ %ROMPATH%/ps2 .bin .BIN .chd .CHD .ciso .CISO .cso .CSO .dump .DUMP .elf .ELF .gz .GZ .m3u .M3U .mdf .MDF .img .IMG .iso .ISO .isz .ISZ .ngr .NRG %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM% - %EMULATOR_PCSX2% --nogui %ROM% - %EMULATOR_PLAY!% --disc %ROM% + %EMULATOR_PCSX2% -batch %ROM% + %EMULATOR_PCSX2-LEGACY% --nogui %ROM% + ps2 ps2 @@ -986,7 +1082,7 @@ ps3 Sony PlayStation 3 %ROMPATH%/ps3 - .ps3 .PS3 .ps3dir .PS3DIR + .desktop .ps3 .PS3 .ps3dir .PS3DIR %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% %EMULATOR_RPCS3% --no-gui %ROM% ps3 @@ -1011,15 +1107,17 @@ psp psp + psx Sony PlayStation @@ -1030,6 +1128,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx_rearmed_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/swanstation_libretro.so %ROM% %EMULATOR_DUCKSTATION% -batch %ROM% + psx psx @@ -1039,6 +1138,7 @@ %ROMPATH%/samcoupe .dsk .DSK .mgt .MGT .sbt .SBT .sad .SAD .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/simcp_libretro.so %ROM% + samcoupe samcoupe @@ -1067,6 +1167,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/yabasanshiro_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/yabause_libretro.so %ROM% + saturn saturn @@ -1079,6 +1180,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/yabasanshiro_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/yabause_libretro.so %ROM% + saturn saturnjp @@ -1087,7 +1189,8 @@ ScummVM Game Engine %ROMPATH%/scummvm .scummvm .SCUMMVM .svm .SVM - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/scummvm_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/scummvm_libretro.so %ROM% + scummvm scummvm @@ -1158,6 +1261,17 @@ sg-1000 sg-1000 + + sgb + Nintendo Super Game Boy + %ROMPATH%/sgb + .gb .GB .gbc .GBC .sgb .SGB .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mgba_libretro.so %ROM% + + gb + sgb + snes Nintendo SNES (Super Nintendo) @@ -1192,15 +1306,17 @@ snes snesna + spectravideo Spectravideo @@ -1244,6 +1360,15 @@ supergrafx supergrafx + + supervision + Watara Supervision + %ROMPATH%/supervision + .bin .BIN .sv .SV .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/potator_libretro.so %ROM% + supervision + supervision + switch Nintendo Switch @@ -1263,15 +1388,17 @@ android symbian + tg16 NEC TurboGrafx-16 @@ -1279,6 +1406,7 @@ .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM% + pcengine tg16 @@ -1289,6 +1417,7 @@ .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM% + pcenginecd tg-cd @@ -1305,8 +1434,8 @@ tic80 TIC-80 Game Engine %ROMPATH%/tic80 - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% + .tic .TIC + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tic80_libretro.so %ROM% tic80 tic80 @@ -1319,15 +1448,19 @@ moto to8 + uzebox Uzebox @@ -1369,7 +1502,8 @@ Nintendo Virtual Boy %ROMPATH%/virtualboy .vb .VB .vboy .VBOY .bin .BIN .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_vb_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_vb_libretro.so %ROM% + virtualboy virtualboy @@ -1377,10 +1511,10 @@ wii Nintendo Wii %ROMPATH%/wii - .gcm .GCM .iso .ISO .wbfs .WBFS .wia .WIA .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .rvz .RVZ .tgc .TGC .wad .WAD .m3u .M3U .7z .7Z .zip .ZIP - %EMULATOR_DOLPHIN% -b -e %ROM% + .gcm .GCM .iso .ISO .wbfs .WBFS .wia .WIA .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .json .JSON .rvz .RVZ .tgc .TGC .wad .WAD .m3u .M3U .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM% - %EMULATOR_PRIMEHACK% -b -e %ROM% + %EMULATOR_DOLPHIN% -b -e %ROM% + wii wii @@ -1398,7 +1532,8 @@ Bandai WonderSwan %ROMPATH%/wonderswan .ws .WS .pc2 .PC2 .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_wswan_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_wswan_libretro.so %ROM% + wonderswan wonderswan @@ -1407,7 +1542,8 @@ Bandai WonderSwan Color %ROMPATH%/wonderswancolor .ws .WS .wsc .WSC .pc2 .PC2 .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_wswan_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_wswan_libretro.so %ROM% + wonderswancolor wonderswancolor diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index b3409d26..fef63589 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -222,7 +222,7 @@ modules: url: https://github.com/zeux/pugixml/releases/download/v1.11.4/pugixml-1.11.4.tar.gz sha256: 8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716 - # When updating this module remember to check those: https://gitlab.com/es-de/emulationstation-de/-/tree/stable-1.2.5/resources/systems/unix + # When updating this module remember to check those: https://gitlab.com/es-de/emulationstation-de/-/tree/v1.2.6/resources/systems/unix # But we don't include them 1:1 as RetroDECK got some specific configs in some cases - name: emulationstation-de buildsystem: cmake-ninja @@ -232,7 +232,7 @@ modules: sources: - type: git url: https://gitlab.com/es-de/emulationstation-de - branch: 5a76fef25ffc659f098ee65215281c51a63c3198 + branch: 18b2ee412e1bb3ea35ffd6e680ebf1dacda8e0ff - type: shell commands: - sed -i 's/QUIT EMULATIONSTATION/QUIT RETRODECK/g' es-app/src/guis/GuiMenu.cpp From d77b770f280ba06f8d5bcda73da05417519dab9a Mon Sep 17 00:00:00 2001 From: xargon Date: Tue, 30 Aug 2022 21:50:36 +0200 Subject: [PATCH 058/393] Updated qt6-core5compact to 6.3.0 to reflect the flatpak runtime version --- net.retrodeck.retrodeck.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index fef63589..32103436 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -112,13 +112,13 @@ modules: builddir: true sources: - type: archive - url: https://download.qt.io/official_releases/qt/6.2/6.2.4/submodules/qt5compat-everywhere-src-6.2.4.tar.xz - sha256: 5de2b9e25bf7de161fbb88ecdd468ed1788bc899392fc05ed80aa590ebb352fa + url: https://download.qt.io/official_releases/qt/6.3/6.3.0/submodules/qt5compat-everywhere-src-6.3.0.tar.xz + sha256: 2b199be780c50d9214512b922d94cb240b0412fd63f459e356b76102cad1713e x-checker-data: type: html - url: https://download.qt.io/official_releases/qt/6.2/ + url: https://download.qt.io/official_releases/qt/6.3/ version-pattern: '>([\d\.-]*)/<' - url-template: https://download.qt.io/official_releases/qt/6.2/$version/submodules/qt5compat-everywhere-src-$version.tar.xz + url-template: https://download.qt.io/official_releases/qt/6.3/$version/submodules/qt5compat-everywhere-src-$version.tar.xz post-install: - mkdir -p /app/lib/mkspecs From 0996a7bf0861287dafa381307c5cf5c0500e4b1b Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 30 Aug 2022 21:52:46 +0200 Subject: [PATCH 059/393] Updated qt6-core5compact to 6.3.0 to reflect the flatpak runtime version --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 32103436..c7b3e657 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -106,7 +106,7 @@ modules: cleanup: ['*'] # pcsx2-qt needs QT6, maybe others, here until every qt emulator will support qt6 (not yuzu atm) - # from: https://github.com/flathub/org.profex_xrd.Profex + # from: https://github.com/flathub/org.profex_xrd.Profex - name: qt6-core5compat buildsystem: cmake-ninja builddir: true From 47e4bc5ad25c62ddeb211253d0ed213116533ed0 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 30 Aug 2022 22:14:52 +0200 Subject: [PATCH 060/393] YUZU: trying to add buildcommands for QT5 --- net.retrodeck.retrodeck.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index c7b3e657..0124ed7e 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -106,7 +106,7 @@ modules: cleanup: ['*'] # pcsx2-qt needs QT6, maybe others, here until every qt emulator will support qt6 (not yuzu atm) - # from: https://github.com/flathub/org.profex_xrd.Profex + # from: https://github.com/flathub/org.profex_xrd.Profex - name: qt6-core5compat buildsystem: cmake-ninja builddir: true @@ -515,6 +515,7 @@ modules: x-checker-data: type: git tag-pattern: ^n([\d.]+)$ + - name: yuzu buildsystem: cmake-ninja builddir: true @@ -534,6 +535,10 @@ modules: TITLEBARFORMATIDLE: yuzu {} TITLEBARFORMATRUNNING: yuzu {} | {} LDFLAGS: -L/app/lib -Wl,-z,relro,-z,now -Wl,--as-needed + build-commands: + - | + find_package(Qt6 REQUIRED COMPONENTS Core5Compat) + target_link_libraries(mytarget PRIVATE Qt6::Core5Compat) cleanup: - /share/man - /share/pixmaps From 506692b56d3bad859e244bdc3c93db5d0e4c6eed Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Wed, 31 Aug 2022 12:07:28 +0200 Subject: [PATCH 061/393] YUZU: trying to specify qt5 path --- net.retrodeck.retrodeck.yml | 57 +++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index fef63589..571dfd02 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -107,35 +107,35 @@ modules: # pcsx2-qt needs QT6, maybe others, here until every qt emulator will support qt6 (not yuzu atm) # from: https://github.com/flathub/org.profex_xrd.Profex - - name: qt6-core5compat - buildsystem: cmake-ninja - builddir: true - sources: - - type: archive - url: https://download.qt.io/official_releases/qt/6.2/6.2.4/submodules/qt5compat-everywhere-src-6.2.4.tar.xz - sha256: 5de2b9e25bf7de161fbb88ecdd468ed1788bc899392fc05ed80aa590ebb352fa - x-checker-data: - type: html - url: https://download.qt.io/official_releases/qt/6.2/ - version-pattern: '>([\d\.-]*)/<' - url-template: https://download.qt.io/official_releases/qt/6.2/$version/submodules/qt5compat-everywhere-src-$version.tar.xz + # - name: qt6-core5compat + # buildsystem: cmake-ninja + # builddir: true + # sources: + # - type: archive + # url: https://download.qt.io/official_releases/qt/6.2/6.2.4/submodules/qt5compat-everywhere-src-6.2.4.tar.xz + # sha256: 5de2b9e25bf7de161fbb88ecdd468ed1788bc899392fc05ed80aa590ebb352fa + # x-checker-data: + # type: html + # url: https://download.qt.io/official_releases/qt/6.2/ + # version-pattern: '>([\d\.-]*)/<' + # url-template: https://download.qt.io/official_releases/qt/6.2/$version/submodules/qt5compat-everywhere-src-$version.tar.xz - post-install: - - mkdir -p /app/lib/mkspecs - - cp -R /app/mkspecs/* /app/lib/mkspecs/ - - ln -fsr ${FLATPAK_DEST}/lib/${FLATPAK_ARCH}-linux-gnu/libQt*.so* -t ${FLATPAK_DEST}/lib/ - - sed -i 's/\\([0-9]\\+\\.[0-9]\\+\\)\\.[0-9]\\+ ${_Qt6.*_FIND_VERSION_EXACT}/\\1/' - ${FLATPAK_DEST}/lib/${FLATPAK_ARCH}-linux-gnu/cmake/Qt6*/Qt6*Config.cmake - - sed -e 's@PATHS \"${CMAKE_CURRENT_LIST_DIR}/..\" NO_DEFAULT_PATH@PATHS \"${CMAKE_CURRENT_LIST_DIR}/..\" - \"/usr/lib/${CMAKE_CXX_LIBRARY_ARCHITECTURE}/cmake/\" NO_DEFAULT_PATH@' -i - ${FLATPAK_DEST}/lib/${FLATPAK_ARCH}-linux-gnu/cmake/Qt6*/Qt6*Config.cmake - - sed -e 's@\\($$QT_MODULE_BIN_BASE\\)@\\1 '${FLATPAK_DEST}'/bin @' -i ${FLATPAK_DEST}/lib/mkspecs/modules/*.pri - - sed -e 's@\\($$QT_MODULE_INCLUDE_BASE \\)@\\1'${FLATPAK_DEST}'/include @' - -i ${FLATPAK_DEST}/lib/mkspecs/modules/*.pri - - sed -e 's@$$QT_MODULE_INCLUDE_BASE/@'${FLATPAK_DEST}'/include/@g' -i ${FLATPAK_DEST}/lib/mkspecs/modules/*.pri - - sed -e 's@$$QT_MODULE_LIB_BASE@'${FLATPAK_DEST}'/lib@g' -i ${FLATPAK_DEST}/lib/mkspecs/modules/*.pri - cleanup: - - /app/mkspecs + # post-install: + # - mkdir -p /app/lib/mkspecs + # - cp -R /app/mkspecs/* /app/lib/mkspecs/ + # - ln -fsr ${FLATPAK_DEST}/lib/${FLATPAK_ARCH}-linux-gnu/libQt*.so* -t ${FLATPAK_DEST}/lib/ + # - sed -i 's/\\([0-9]\\+\\.[0-9]\\+\\)\\.[0-9]\\+ ${_Qt6.*_FIND_VERSION_EXACT}/\\1/' + # ${FLATPAK_DEST}/lib/${FLATPAK_ARCH}-linux-gnu/cmake/Qt6*/Qt6*Config.cmake + # - sed -e 's@PATHS \"${CMAKE_CURRENT_LIST_DIR}/..\" NO_DEFAULT_PATH@PATHS \"${CMAKE_CURRENT_LIST_DIR}/..\" + # \"/usr/lib/${CMAKE_CXX_LIBRARY_ARCHITECTURE}/cmake/\" NO_DEFAULT_PATH@' -i + # ${FLATPAK_DEST}/lib/${FLATPAK_ARCH}-linux-gnu/cmake/Qt6*/Qt6*Config.cmake + # - sed -e 's@\\($$QT_MODULE_BIN_BASE\\)@\\1 '${FLATPAK_DEST}'/bin @' -i ${FLATPAK_DEST}/lib/mkspecs/modules/*.pri + # - sed -e 's@\\($$QT_MODULE_INCLUDE_BASE \\)@\\1'${FLATPAK_DEST}'/include @' + # -i ${FLATPAK_DEST}/lib/mkspecs/modules/*.pri + # - sed -e 's@$$QT_MODULE_INCLUDE_BASE/@'${FLATPAK_DEST}'/include/@g' -i ${FLATPAK_DEST}/lib/mkspecs/modules/*.pri + # - sed -e 's@$$QT_MODULE_LIB_BASE@'${FLATPAK_DEST}'/lib@g' -i ${FLATPAK_DEST}/lib/mkspecs/modules/*.pri + # cleanup: + # - /app/mkspecs # mesa repo got a double certificate issue and gnutils cannot handle that so GLU download fails, # this affects even the shared-modules's glu so I have to replace it temporarly @@ -529,6 +529,7 @@ modules: - -DDISPLAY_VERSION=1149 - -DBUILD_TAG=mainline-1149 - -DBUILD_REPOSITORY=yuzu-emu/yuzu-mainline + - -DCMAKE_PREFIX_PATH=/run/build/yuzu/_flatpak_build/externals/qt5_5_15_2 build-options: env: TITLEBARFORMATIDLE: yuzu {} From 5ab18daa2fe04ddb44e2b44a7953bf304c45fcbf Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Wed, 31 Aug 2022 12:09:48 +0200 Subject: [PATCH 062/393] YUZU: trying to specify qt5 path -fix1 --- net.retrodeck.retrodeck.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index e452a90e..988c468c 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -536,10 +536,6 @@ modules: TITLEBARFORMATIDLE: yuzu {} TITLEBARFORMATRUNNING: yuzu {} | {} LDFLAGS: -L/app/lib -Wl,-z,relro,-z,now -Wl,--as-needed - build-commands: - - | - find_package(Qt6 REQUIRED COMPONENTS Core5Compat) - target_link_libraries(mytarget PRIVATE Qt6::Core5Compat) cleanup: - /share/man - /share/pixmaps From 37cf5221d09e7068b80431332c38391bb8d96cce Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Wed, 31 Aug 2022 12:17:26 +0200 Subject: [PATCH 063/393] YUZU: updated + modules --- net.retrodeck.retrodeck.yml | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 988c468c..a9a69d75 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -408,17 +408,18 @@ modules: - -DCMAKE_BUILD_TYPE=RelWithDebInfo sources: - type: archive - url: https://github.com/nih-at/libzip/archive/v1.8.0.tar.gz - sha256: 83e5d6d5dbe8f9df80aad388fa523ca3558398ed440a5afda6ef9b36b0ffdc1f + url: https://github.com/nih-at/libzip/archive/v1.9.2.tar.gz + sha256: 7f28eaec7a02ca099ea9dad88fc8023f7f6ddfca54b780040ff7fdb39d9efb3c x-checker-data: type: anitya project-id: 10649 url-template: https://github.com/nih-at/libzip/archive/v$version.tar.gz - name: zstd - buildsystem: simple - build-commands: - - make -j $FLATPAK_BUILDER_N_JOBS - - make PREFIX=/ DESTDIR="${FLATPAK_DEST}" install + buildsystem: meson + subdir: build/meson + config-opts: + - '-Dbin_programs=false' + - '-Dbin_contrib=false' sources: - type: archive url: >- @@ -441,6 +442,8 @@ modules: x-checker-data: type: anitya project-id: 11526 + versions: + <: 9.0.0 url-template: >- https://github.com/fmtlib/fmt/releases/download/$version/fmt-$version.zip - name: glslang @@ -449,8 +452,8 @@ modules: - -DCMAKE_BUILD_TYPE=Release sources: - type: archive - url: https://github.com/KhronosGroup/glslang/archive/11.9.0.tar.gz - sha256: d5744adba19eef9ad3d73f524226b39fec559d94cb582cd442e3c5de930004b2 + url: https://github.com/KhronosGroup/glslang/archive/11.11.0.tar.gz + sha256: 26c216c3062512c018cbdd752224b8dad703b7e5bb90bf338ba2dbb5d4f11438 x-checker-data: type: anitya stable-only: true @@ -470,6 +473,8 @@ modules: x-checker-data: type: anitya stable-only: true + versions: + <: 3.0.0 project-id: 7680 url-template: https://github.com/catchorg/Catch2/archive/v$version.tar.gz - name: nlohmann-json @@ -480,8 +485,8 @@ modules: - -DJSON_BuildTests=OFF sources: - type: archive - url: https://github.com/nlohmann/json/archive/v3.10.5.tar.gz - sha256: 5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4 + url: https://github.com/nlohmann/json/archive/v3.11.2.tar.gz + sha256: d69f9deb6a75e2580465c6c4c5111b89c4dc2fa94e3a85fcd2ffcd9a143d9273 x-checker-data: type: anitya project-id: 11152 @@ -527,8 +532,8 @@ modules: - -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON - -DYUZU_USE_QT_WEB_ENGINE=ON - -DYUZU_USE_BUNDLED_FFMPEG=ON - - -DDISPLAY_VERSION=1149 - - -DBUILD_TAG=mainline-1149 + - -DDISPLAY_VERSION=1150 + - -DBUILD_TAG=mainline-1150 - -DBUILD_REPOSITORY=yuzu-emu/yuzu-mainline - -DCMAKE_PREFIX_PATH=/run/build/yuzu/_flatpak_build/externals/qt5_5_15_2 build-options: @@ -547,8 +552,8 @@ modules: sources: - type: git url: https://github.com/yuzu-emu/yuzu-mainline.git - tag: mainline-0-1149 - commit: 96b400da8806d8b9e003605c3fde615737c790e2 + tag: mainline-0-1150 + commit: e5774ced75e1d19c5a42cac719f7de475a3630b3 disable-shallow-clone: true x-checker-data: type: git @@ -557,6 +562,7 @@ modules: path: rd-submodules/yuzu/yuzu-launcher.sh - type: file path: rd-submodules/yuzu/compatibility_list.json + dest: dist/compatibility_list # # Yuzu - END From 73891336d6280fc7c9947bc5aa4884d91c583fe5 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Wed, 31 Aug 2022 13:52:49 +0200 Subject: [PATCH 064/393] Workflow renamed --- .github/workflows/cooker-selfhosted.yml | 2 +- .github/workflows/main-selfhosted.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index b87193e0..5f394a55 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -13,7 +13,7 @@ on: jobs: - Building_flatpak: + Building_RetroDECK: runs-on: self-hosted steps: diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index f3352edc..00b97b34 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -13,7 +13,7 @@ on: jobs: - Building_flatpak: + Building_RetroDECK: runs-on: self-hosted steps: From 72572a9b919803ffb64247610bdde8580725f4c2 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Wed, 31 Aug 2022 13:53:07 +0200 Subject: [PATCH 065/393] YUZU: clean up --- net.retrodeck.retrodeck.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index a9a69d75..ecdeb925 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -535,7 +535,7 @@ modules: - -DDISPLAY_VERSION=1150 - -DBUILD_TAG=mainline-1150 - -DBUILD_REPOSITORY=yuzu-emu/yuzu-mainline - - -DCMAKE_PREFIX_PATH=/run/build/yuzu/_flatpak_build/externals/qt5_5_15_2 + #- -DCMAKE_PREFIX_PATH=/run/build/yuzu/_flatpak_build/externals/qt5_5_15_2 build-options: env: TITLEBARFORMATIDLE: yuzu {} @@ -546,9 +546,7 @@ modules: - /share/pixmaps post-install: - 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: - type: git url: https://github.com/yuzu-emu/yuzu-mainline.git From baefc23813a69341063012643422da70c971ec30 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Wed, 31 Aug 2022 14:05:30 +0200 Subject: [PATCH 066/393] General code cleanup --- net.retrodeck.retrodeck.yml | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index ecdeb925..6cd27e45 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -422,14 +422,12 @@ modules: - '-Dbin_contrib=false' sources: - type: archive - url: >- - https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.gz + url: https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.gz sha256: 7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0 x-checker-data: type: anitya project-id: 12083 - url-template: >- - https://github.com/facebook/zstd/releases/download/v$version/zstd-$version.tar.gz + url-template: https://github.com/facebook/zstd/releases/download/v$version/zstd-$version.tar.gz - name: fmt buildsystem: cmake-ninja config-opts: @@ -444,8 +442,7 @@ modules: project-id: 11526 versions: <: 9.0.0 - url-template: >- - https://github.com/fmtlib/fmt/releases/download/$version/fmt-$version.zip + url-template: https://github.com/fmtlib/fmt/releases/download/$version/fmt-$version.zip - name: glslang buildsystem: cmake-ninja config-opts: @@ -504,8 +501,7 @@ modules: x-checker-data: type: anitya project-id: 6845 - url-template: >- - https://boostorg.jfrog.io/artifactory/main/release/$version/source/boost_1_79_0.tar.bz2 + url-template: https://boostorg.jfrog.io/artifactory/main/release/$version/source/boost_1_79_0.tar.bz2 - name: nv-codec-headers make-install-args: - PREFIX=/app @@ -629,12 +625,8 @@ modules: - /share/man - /share/pixmaps post-install: - - >- - install -Dm644 ../dist/citra.svg - /app/share/icons/hicolor/scalable/apps/citra.svg - - >- - install -Dm644 ../dist/icon.png - /app/share/icons/hicolor/512x512/apps/citra.png + - install -Dm644 ../dist/citra.svg /app/share/icons/hicolor/scalable/apps/citra.svg + - install -Dm644 ../dist/icon.png /app/share/icons/hicolor/512x512/apps/citra.png sources: - type: git url: https://github.com/citra-emu/citra-nightly.git @@ -728,8 +720,7 @@ modules: - make prefix=/app install sources: - type: archive - url: >- - https://download.savannah.nongnu.org/releases/pngpp/png++-0.2.10.tar.gz + url: https://download.savannah.nongnu.org/releases/pngpp/png++-0.2.10.tar.gz sha256: 998af216ab16ebb88543fbaa2dbb9175855e944775b66f2996fc945c8444eee1 - name: libpcap @@ -849,9 +840,7 @@ modules: - /share/man - /share/doc post-install: - - >- - ln -s ${FLATPAK_DEST}/share/PCSX2/resources - ${FLATPAK_DEST}/bin/resources + - ln -s ${FLATPAK_DEST}/share/PCSX2/resources ${FLATPAK_DEST}/bin/resources sources: - type: git url: https://github.com/PCSX2/pcsx2.git From dcac0b9e53147b1bdf8aa5d73d647ed7d17b03f5 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Wed, 31 Aug 2022 15:15:38 +0200 Subject: [PATCH 067/393] TEST: disabling Yuzu --- net.retrodeck.retrodeck.yml | 80 ++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 6cd27e45..4b4dfdd2 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -517,46 +517,46 @@ modules: type: git tag-pattern: ^n([\d.]+)$ - - name: yuzu - buildsystem: cmake-ninja - builddir: true - config-opts: - - -DCMAKE_BUILD_TYPE=RelWithDebInfo - - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON - - -DENABLE_QT_TRANSLATION=ON - - -DYUZU_ENABLE_COMPATIBILITY_REPORTING=ON - - -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON - - -DYUZU_USE_QT_WEB_ENGINE=ON - - -DYUZU_USE_BUNDLED_FFMPEG=ON - - -DDISPLAY_VERSION=1150 - - -DBUILD_TAG=mainline-1150 - - -DBUILD_REPOSITORY=yuzu-emu/yuzu-mainline - #- -DCMAKE_PREFIX_PATH=/run/build/yuzu/_flatpak_build/externals/qt5_5_15_2 - build-options: - env: - TITLEBARFORMATIDLE: yuzu {} - TITLEBARFORMATRUNNING: yuzu {} | {} - LDFLAGS: -L/app/lib -Wl,-z,relro,-z,now -Wl,--as-needed - cleanup: - - /share/man - - /share/pixmaps - post-install: - - install -Dm755 ../yuzu-launcher.sh /app/bin/yuzu-launcher - - install -Dm644 ../dist/yuzu.svg /app/share/icons/hicolor/scalable/apps/yuzu.svg - sources: - - type: git - url: https://github.com/yuzu-emu/yuzu-mainline.git - tag: mainline-0-1150 - commit: e5774ced75e1d19c5a42cac719f7de475a3630b3 - disable-shallow-clone: true - x-checker-data: - type: git - tag-pattern: ^(mainline-0-\d+)$ - - type: file - path: rd-submodules/yuzu/yuzu-launcher.sh - - type: file - path: rd-submodules/yuzu/compatibility_list.json - dest: dist/compatibility_list + # - name: yuzu + # buildsystem: cmake-ninja + # builddir: true + # config-opts: + # - -DCMAKE_BUILD_TYPE=RelWithDebInfo + # - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON + # - -DENABLE_QT_TRANSLATION=ON + # - -DYUZU_ENABLE_COMPATIBILITY_REPORTING=ON + # - -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON + # - -DYUZU_USE_QT_WEB_ENGINE=ON + # - -DYUZU_USE_BUNDLED_FFMPEG=ON + # - -DDISPLAY_VERSION=1150 + # - -DBUILD_TAG=mainline-1150 + # - -DBUILD_REPOSITORY=yuzu-emu/yuzu-mainline + # #- -DCMAKE_PREFIX_PATH=/run/build/yuzu/_flatpak_build/externals/qt5_5_15_2 + # build-options: + # env: + # TITLEBARFORMATIDLE: yuzu {} + # TITLEBARFORMATRUNNING: yuzu {} | {} + # LDFLAGS: -L/app/lib -Wl,-z,relro,-z,now -Wl,--as-needed + # cleanup: + # - /share/man + # - /share/pixmaps + # post-install: + # - install -Dm755 ../yuzu-launcher.sh /app/bin/yuzu-launcher + # - install -Dm644 ../dist/yuzu.svg /app/share/icons/hicolor/scalable/apps/yuzu.svg + # sources: + # - type: git + # url: https://github.com/yuzu-emu/yuzu-mainline.git + # tag: mainline-0-1150 + # commit: e5774ced75e1d19c5a42cac719f7de475a3630b3 + # disable-shallow-clone: true + # x-checker-data: + # type: git + # tag-pattern: ^(mainline-0-\d+)$ + # - type: file + # path: rd-submodules/yuzu/yuzu-launcher.sh + # - type: file + # path: rd-submodules/yuzu/compatibility_list.json + # dest: dist/compatibility_list # # Yuzu - END From 3bb6b7ad0289c25a8970975b23234e4887a825a9 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Wed, 31 Aug 2022 15:16:30 +0200 Subject: [PATCH 068/393] TEST: re-enabled Yuzu --- net.retrodeck.retrodeck.yml | 80 ++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 4b4dfdd2..6cd27e45 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -517,46 +517,46 @@ modules: type: git tag-pattern: ^n([\d.]+)$ - # - name: yuzu - # buildsystem: cmake-ninja - # builddir: true - # config-opts: - # - -DCMAKE_BUILD_TYPE=RelWithDebInfo - # - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON - # - -DENABLE_QT_TRANSLATION=ON - # - -DYUZU_ENABLE_COMPATIBILITY_REPORTING=ON - # - -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON - # - -DYUZU_USE_QT_WEB_ENGINE=ON - # - -DYUZU_USE_BUNDLED_FFMPEG=ON - # - -DDISPLAY_VERSION=1150 - # - -DBUILD_TAG=mainline-1150 - # - -DBUILD_REPOSITORY=yuzu-emu/yuzu-mainline - # #- -DCMAKE_PREFIX_PATH=/run/build/yuzu/_flatpak_build/externals/qt5_5_15_2 - # build-options: - # env: - # TITLEBARFORMATIDLE: yuzu {} - # TITLEBARFORMATRUNNING: yuzu {} | {} - # LDFLAGS: -L/app/lib -Wl,-z,relro,-z,now -Wl,--as-needed - # cleanup: - # - /share/man - # - /share/pixmaps - # post-install: - # - install -Dm755 ../yuzu-launcher.sh /app/bin/yuzu-launcher - # - install -Dm644 ../dist/yuzu.svg /app/share/icons/hicolor/scalable/apps/yuzu.svg - # sources: - # - type: git - # url: https://github.com/yuzu-emu/yuzu-mainline.git - # tag: mainline-0-1150 - # commit: e5774ced75e1d19c5a42cac719f7de475a3630b3 - # disable-shallow-clone: true - # x-checker-data: - # type: git - # tag-pattern: ^(mainline-0-\d+)$ - # - type: file - # path: rd-submodules/yuzu/yuzu-launcher.sh - # - type: file - # path: rd-submodules/yuzu/compatibility_list.json - # dest: dist/compatibility_list + - name: yuzu + buildsystem: cmake-ninja + builddir: true + config-opts: + - -DCMAKE_BUILD_TYPE=RelWithDebInfo + - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON + - -DENABLE_QT_TRANSLATION=ON + - -DYUZU_ENABLE_COMPATIBILITY_REPORTING=ON + - -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON + - -DYUZU_USE_QT_WEB_ENGINE=ON + - -DYUZU_USE_BUNDLED_FFMPEG=ON + - -DDISPLAY_VERSION=1150 + - -DBUILD_TAG=mainline-1150 + - -DBUILD_REPOSITORY=yuzu-emu/yuzu-mainline + #- -DCMAKE_PREFIX_PATH=/run/build/yuzu/_flatpak_build/externals/qt5_5_15_2 + build-options: + env: + TITLEBARFORMATIDLE: yuzu {} + TITLEBARFORMATRUNNING: yuzu {} | {} + LDFLAGS: -L/app/lib -Wl,-z,relro,-z,now -Wl,--as-needed + cleanup: + - /share/man + - /share/pixmaps + post-install: + - install -Dm755 ../yuzu-launcher.sh /app/bin/yuzu-launcher + - install -Dm644 ../dist/yuzu.svg /app/share/icons/hicolor/scalable/apps/yuzu.svg + sources: + - type: git + url: https://github.com/yuzu-emu/yuzu-mainline.git + tag: mainline-0-1150 + commit: e5774ced75e1d19c5a42cac719f7de475a3630b3 + disable-shallow-clone: true + x-checker-data: + type: git + tag-pattern: ^(mainline-0-\d+)$ + - type: file + path: rd-submodules/yuzu/yuzu-launcher.sh + - type: file + path: rd-submodules/yuzu/compatibility_list.json + dest: dist/compatibility_list # # Yuzu - END From cbbd0ed2212c54e1ebcce2df24cd8d0e77fb9406 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Wed, 31 Aug 2022 16:20:00 +0200 Subject: [PATCH 069/393] Everything is breaking on QT6, reverting to QT5 --- net.retrodeck.retrodeck.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 6cd27e45..6dfcd0ef 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1,7 +1,7 @@ app-id: net.retrodeck.retrodeck runtime: org.kde.Platform -#runtime-version: 5.15-21.08 -runtime-version: 6.3 # bumped because of pcsx2-qt +runtime-version: 5.15-21.08 +#runtime-version: 6.3 # bumped because of pcsx2-qt sdk: org.kde.Sdk sdk-extensions: - org.freedesktop.Sdk.Extension.llvm13 # Needed for rpcs3 From 4e3cc52eb8086f673acb84b3499d47bfa44f4de9 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Wed, 31 Aug 2022 19:26:18 +0200 Subject: [PATCH 070/393] PCSX2-QT: disabled until a workaround is found --- net.retrodeck.retrodeck.yml | 54 ++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 6dfcd0ef..5e81e9f6 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -821,33 +821,33 @@ modules: commit: e47e674cd09583ff0503f0f6defd6d23d8b718d3 # PCSX2 Flathub Workaround - END - - name: pcsx2-qt - buildsystem: cmake-ninja - builddir: true - config-opts: - - '-DCMAKE_BUILD_TYPE=Release' - - '-DPACKAGE_MODE=TRUE' - - '-DXDG_STD=TRUE' - - '-DDISABLE_BUILD_DATE=TRUE' - - '-DDISABLE_PCSX2_WRAPPER=TRUE' - - '-DDISABLE_ADVANCE_SIMD=TRUE' - - '-DSDL2_API=TRUE' - #- '-DWAYLAND_API=TRUE"' enable this if Steam Deck goes to Wayland - - '-DQT_BUILD=TRUE' - - '-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=TRUE' - cleanup: - - /share/pixmaps - - /share/man - - /share/doc - post-install: - - ln -s ${FLATPAK_DEST}/share/PCSX2/resources ${FLATPAK_DEST}/bin/resources - sources: - - type: git - url: https://github.com/PCSX2/pcsx2.git - tag: v1.7.3229 - commit: e3eae7fbe83aad3952e3ed6a8e56fc016b51a9c3 - # same as above - disable-submodules: true + # - name: pcsx2-qt + # buildsystem: cmake-ninja + # builddir: true + # config-opts: + # - '-DCMAKE_BUILD_TYPE=Release' + # - '-DPACKAGE_MODE=TRUE' + # - '-DXDG_STD=TRUE' + # - '-DDISABLE_BUILD_DATE=TRUE' + # - '-DDISABLE_PCSX2_WRAPPER=TRUE' + # - '-DDISABLE_ADVANCE_SIMD=TRUE' + # - '-DSDL2_API=TRUE' + # #- '-DWAYLAND_API=TRUE"' enable this if Steam Deck goes to Wayland + # - '-DQT_BUILD=TRUE' + # - '-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=TRUE' + # cleanup: + # - /share/pixmaps + # - /share/man + # - /share/doc + # post-install: + # - ln -s ${FLATPAK_DEST}/share/PCSX2/resources ${FLATPAK_DEST}/bin/resources + # sources: + # - type: git + # url: https://github.com/PCSX2/pcsx2.git + # tag: v1.7.3229 + # commit: e3eae7fbe83aad3952e3ed6a8e56fc016b51a9c3 + # # same as above + # #disable-submodules: true # PCSX2 - END From 5b6cb0ccd44c28335a9339c5c5190ae035243059 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Thu, 1 Sep 2022 13:55:12 +0200 Subject: [PATCH 071/393] PCSX2-QT: Added from appimage --- net.retrodeck.retrodeck.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 5e81e9f6..81ab5c60 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -849,6 +849,21 @@ modules: # # same as above # #disable-submodules: true + # Inspired by: + # https://github.com/flathub/com.zettlr.Zettlr/blob/master/com.zettlr.Zettlr.yaml + - name: pcsx2-qt-appimage + buildsystem: simple + build-commands: + - chmod +x pcsx2*.AppImage + - ./pcsx2*.AppImage --appimage-extract + - mkdir -p "${FLATPAK_DEST}/pcsx2-qt" + - cp -r squashfs-root/* "${FLATPAK_DEST}/pcsx2-qt" + - ln -s "${FLATPAK_DEST}/pcsx2-qt/bin/pcsx2-qt" "${FLATPAK_DEST}/bin/pcsx2-qt" + sources: + - type: url + url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.3271/pcsx2-v1.7.3271-linux-AppImage-64bit-AVX2-Qt.AppImage + sha256: 34aca477585bf9492b8f51ae066fe52c2a321c7b5656b9b76df97d51f75e4f85 + # PCSX2 - END # Dolphin - START From 25c015cc6f06224804b352f26efbbcde54f98574 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Thu, 1 Sep 2022 16:14:51 +0200 Subject: [PATCH 072/393] PCSX2-QT: Added from appimage -fix1 - REMEMBER TO PUSH IT DOWN --- net.retrodeck.retrodeck.yml | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 81ab5c60..ee6b0f9f 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -88,6 +88,20 @@ modules: url: https://github.com/XargonWan/RetroDECK.git branch: cooker + - name: pcsx2-qt-appimage + buildsystem: simple + build-commands: + - ls -la #debug + - chmod +x pcsx2*.AppImage + - ./pcsx2*.AppImage --appimage-extract + - mkdir -p "${FLATPAK_DEST}/pcsx2-qt" + - cp -r squashfs-root/* "${FLATPAK_DEST}/pcsx2-qt" + - ln -s "${FLATPAK_DEST}/pcsx2-qt/bin/pcsx2-qt" "${FLATPAK_DEST}/bin/pcsx2-qt" + sources: + - type: file + url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.3271/pcsx2-v1.7.3271-linux-AppImage-64bit-AVX2-Qt.AppImage + sha256: 34aca477585bf9492b8f51ae066fe52c2a321c7b5656b9b76df97d51f75e4f85 + - name: xmlstarlet config-opts: - --disable-static-libs @@ -851,18 +865,7 @@ modules: # Inspired by: # https://github.com/flathub/com.zettlr.Zettlr/blob/master/com.zettlr.Zettlr.yaml - - name: pcsx2-qt-appimage - buildsystem: simple - build-commands: - - chmod +x pcsx2*.AppImage - - ./pcsx2*.AppImage --appimage-extract - - mkdir -p "${FLATPAK_DEST}/pcsx2-qt" - - cp -r squashfs-root/* "${FLATPAK_DEST}/pcsx2-qt" - - ln -s "${FLATPAK_DEST}/pcsx2-qt/bin/pcsx2-qt" "${FLATPAK_DEST}/bin/pcsx2-qt" - sources: - - type: url - url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.3271/pcsx2-v1.7.3271-linux-AppImage-64bit-AVX2-Qt.AppImage - sha256: 34aca477585bf9492b8f51ae066fe52c2a321c7b5656b9b76df97d51f75e4f85 + # PCSX2 - END From 23fedb155e66e7ac7c17e1a70557a5cdd44a35fa Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Thu, 1 Sep 2022 20:20:06 +0200 Subject: [PATCH 073/393] CEMU: added --- net.retrodeck.retrodeck.yml | 42 ++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index ee6b0f9f..bdc194ff 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -88,20 +88,6 @@ modules: url: https://github.com/XargonWan/RetroDECK.git branch: cooker - - name: pcsx2-qt-appimage - buildsystem: simple - build-commands: - - ls -la #debug - - chmod +x pcsx2*.AppImage - - ./pcsx2*.AppImage --appimage-extract - - mkdir -p "${FLATPAK_DEST}/pcsx2-qt" - - cp -r squashfs-root/* "${FLATPAK_DEST}/pcsx2-qt" - - ln -s "${FLATPAK_DEST}/pcsx2-qt/bin/pcsx2-qt" "${FLATPAK_DEST}/bin/pcsx2-qt" - sources: - - type: file - url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.3271/pcsx2-v1.7.3271-linux-AppImage-64bit-AVX2-Qt.AppImage - sha256: 34aca477585bf9492b8f51ae066fe52c2a321c7b5656b9b76df97d51f75e4f85 - - name: xmlstarlet config-opts: - --disable-static-libs @@ -866,6 +852,19 @@ modules: # Inspired by: # https://github.com/flathub/com.zettlr.Zettlr/blob/master/com.zettlr.Zettlr.yaml + - name: pcsx2-qt-appimage + buildsystem: simple + build-commands: + - ls -la #debug + - chmod +x pcsx2*.AppImage + - ./pcsx2*.AppImage --appimage-extract + - mkdir -p "${FLATPAK_DEST}/pcsx2-qt" + - cp -r squashfs-root/* "${FLATPAK_DEST}/pcsx2-qt" + - ln -s "${FLATPAK_DEST}/pcsx2-qt/bin/pcsx2-qt" "${FLATPAK_DEST}/bin/pcsx2-qt" + sources: + - type: file + url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.3271/pcsx2-v1.7.3271-linux-AppImage-64bit-AVX2-Qt.AppImage + sha256: 34aca477585bf9492b8f51ae066fe52c2a321c7b5656b9b76df97d51f75e4f85 # PCSX2 - END @@ -1309,6 +1308,21 @@ modules: # Duckstation - END + # CEMU - START + + - name: Cemu + buildsystem: cmake-ninja + builddir: true + config-opts: + - -DENABLE_VCPKG=false + - -DCMAKE_BUILD_TYPE=release + sources: + - type: git + url: https://github.com/cemu-project/Cemu + commit: d8da8a54a6c08296a884b892d714cabcb7e4bdb5 + + # CEMU - END + # External manifests end - name: retrodeck From 72aaf4feac495df3bf52c19e6ff977ac49c02ea6 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Thu, 1 Sep 2022 20:22:22 +0200 Subject: [PATCH 074/393] CEMU: added -fix1 --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index bdc194ff..c157c2da 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1315,7 +1315,7 @@ modules: builddir: true config-opts: - -DENABLE_VCPKG=false - - -DCMAKE_BUILD_TYPE=release + - -DCMAKE_BUILD_TYPE=Release sources: - type: git url: https://github.com/cemu-project/Cemu From 355d6c49fc7145e5266d79474e9fd5f2a8a73057 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Fri, 2 Sep 2022 08:38:28 +0200 Subject: [PATCH 075/393] CEMU: added imgui dpendency in the manifest and removed from xwWidget's submodules --- net.retrodeck.retrodeck.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index c157c2da..467642d8 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -179,6 +179,13 @@ modules: url: https://ftp.osuosl.org/pub/blfs/conglomeration/libgudev/libgudev-237.tar.xz sha256: 0d06b21170d20c93e4f0534dbb9b0a8b4f1119ffb00b4031aaeb5b9148b686aa + - name: imgui + buildsystem: meson + sources: + - type: git + url: https://github.com/ocornut/imgui.git + commit: 60bea052a92cbb4a93b221002fdf04f0da3698e1 + # ES-DE - START # https://gitlab.com/es-de/emulationstation-de @@ -795,10 +802,6 @@ modules: dest: 3rdparty/rapidyaml/rapidyaml url: https://github.com/biojppm/rapidyaml.git commit: 213b201d264139cd1b887790197e08850af628e3 - - type: git - dest: 3rdparty/imgui/imgui - url: https://github.com/ocornut/imgui.git - commit: 60bea052a92cbb4a93b221002fdf04f0da3698e1 - type: git dest: 3rdparty/glslang/glslang url: https://github.com/KhronosGroup/glslang.git From 2928f40cede5f997f35ce6ebe6991d26d8875dd5 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Fri, 2 Sep 2022 08:42:15 +0200 Subject: [PATCH 076/393] CEMU: added in es_systems and es_find_rules --- es-configs/es_find_rules.xml | 11 +++++++++++ es-configs/es_systems.xml | 5 +++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/es-configs/es_find_rules.xml b/es-configs/es_find_rules.xml index 3b025d89..baa96687 100644 --- a/es-configs/es_find_rules.xml +++ b/es-configs/es_find_rules.xml @@ -86,6 +86,17 @@ ~/.local/share/flatpak/exports/bin/dev.bsnes.bsnes + + + + Cemu + + + ~/Applications/Cemu/Cemu + ~/.local/bin/Cemu/Cemu + ~/bin/Cemu/Cemu + + diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml index b3731ac7..8c898921 100644 --- a/es-configs/es_systems.xml +++ b/es-configs/es_systems.xml @@ -1522,11 +1522,12 @@ wiiu Nintendo Wii U %ROMPATH%/wiiu - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% + .rpx .RPX .wua .WUA .wud .WUD .wux .WUX + %EMULATOR_CEMU% -g %ROM% wiiu wiiu + wonderswan Bandai WonderSwan From 23f85763ad952ee917639ece918d77e00ebe5a49 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Fri, 2 Sep 2022 10:09:16 +0200 Subject: [PATCH 077/393] CEMU: added imgui dpendency in the manifest and removed from xwWidget's submodules -fix1 --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 467642d8..8624ed33 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -180,7 +180,7 @@ modules: sha256: 0d06b21170d20c93e4f0534dbb9b0a8b4f1119ffb00b4031aaeb5b9148b686aa - name: imgui - buildsystem: meson + buildsystem: cmake-ninja sources: - type: git url: https://github.com/ocornut/imgui.git From 9e104314fb1887765c4bf750232b3d1eca649816 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Fri, 2 Sep 2022 14:36:14 +0200 Subject: [PATCH 078/393] Restored imgui to pcsx2 and added to qemu. Removed fomr global. --- net.retrodeck.retrodeck.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 8624ed33..e93ace32 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -179,13 +179,6 @@ modules: url: https://ftp.osuosl.org/pub/blfs/conglomeration/libgudev/libgudev-237.tar.xz sha256: 0d06b21170d20c93e4f0534dbb9b0a8b4f1119ffb00b4031aaeb5b9148b686aa - - name: imgui - buildsystem: cmake-ninja - sources: - - type: git - url: https://github.com/ocornut/imgui.git - commit: 60bea052a92cbb4a93b221002fdf04f0da3698e1 - # ES-DE - START # https://gitlab.com/es-de/emulationstation-de @@ -802,6 +795,10 @@ modules: dest: 3rdparty/rapidyaml/rapidyaml url: https://github.com/biojppm/rapidyaml.git commit: 213b201d264139cd1b887790197e08850af628e3 + - type: git + dest: 3rdparty/imgui/imgui + url: https://github.com/ocornut/imgui.git + commit: 60bea052a92cbb4a93b221002fdf04f0da3698e1 - type: git dest: 3rdparty/glslang/glslang url: https://github.com/KhronosGroup/glslang.git @@ -1323,6 +1320,10 @@ modules: - type: git url: https://github.com/cemu-project/Cemu commit: d8da8a54a6c08296a884b892d714cabcb7e4bdb5 + - type: git + dest: 3rdparty/imgui/imgui + url: https://github.com/ocornut/imgui.git + commit: 60bea052a92cbb4a93b221002fdf04f0da3698e1 # CEMU - END From 6fd738ae1c0eb37bf724e0a5f68b1d34185c4a07 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Fri, 2 Sep 2022 21:52:20 +0200 Subject: [PATCH 079/393] CEMU: trying some stuff --- net.retrodeck.retrodeck.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index e93ace32..c2cc631d 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1315,7 +1315,10 @@ modules: builddir: true config-opts: - -DENABLE_VCPKG=false - - -DCMAKE_BUILD_TYPE=Release + - -DCMAKE_BUILD_TYPE=Release + #- -DCMAKE_C_COMPILER=/usr/bin/gcc + #- -DCMAKE_CXX_COMPILER=/usr/bin/g++ + - -Dimgui_LINK_LIBRARIES=/app/lib/imgui sources: - type: git url: https://github.com/cemu-project/Cemu From 2e235d4135f7593c1896e65718ce52749e982f6f Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Sat, 3 Sep 2022 17:51:02 +0200 Subject: [PATCH 080/393] Added cheevos login tool --- emu-configs/retroarch.cfg | 2 +- es-configs/tools-gamelist.xml | 13 ++++++++++--- tools/cheevos.sh | 18 ++++++++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) create mode 100755 tools/cheevos.sh diff --git a/emu-configs/retroarch.cfg b/emu-configs/retroarch.cfg index 1eb1b6db..265c05f8 100644 --- a/emu-configs/retroarch.cfg +++ b/emu-configs/retroarch.cfg @@ -60,7 +60,7 @@ cheevos_auto_screenshot = "true" cheevos_badges_enable = "false" cheevos_challenge_indicators = "true" cheevos_custom_host = "" -cheevos_enable = "true" +cheevos_enable = "false" cheevos_hardcore_mode_enable = "false" cheevos_leaderboards_enable = "true" cheevos_password = "" diff --git a/es-configs/tools-gamelist.xml b/es-configs/tools-gamelist.xml index b1341252..e59195be 100644 --- a/es-configs/tools-gamelist.xml +++ b/es-configs/tools-gamelist.xml @@ -1,6 +1,13 @@ + ./cheevos.sh + RetroAchievements Login + Enter your RetroAchievements account details. + true + true + + ./start-splore.sh Start Splore @@ -70,13 +77,13 @@ true true - + ./theme-fix.sh Theme fix diff --git a/tools/cheevos.sh b/tools/cheevos.sh new file mode 100755 index 00000000..71897d8a --- /dev/null +++ b/tools/cheevos.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +racfg="" + +login=$(zenity --forms --title="RetroAchievements Login" \ + --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ + --text="Enter your RetroAchievements Account details.\n\nBe aware that this tool cannot verify your login details.\nFor registration and more info visit\nhttps://retroachievements.org/\n" \ + --separator="=SEP=" \ + --add-entry="Username" \ + --add-password="Password") + +arrIN=(${login//=SEP=/ }) +user=${arrIN[0]} +pass=${arrIN[1]} + +sed -i "s%cheevos_enable =.*%cheevos_enable = \"true\"" $racfg +sed -i "s%cheevos_username =.*%cheevos_username = \"$user\"" $racfg +sed -i "s%cheevos_password =.*%cheevos_password = \"$pass\"" $racfg From 28dcccc4a31641214ee8f7972ffd1f0451387dbd Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Sat, 3 Sep 2022 17:53:52 +0200 Subject: [PATCH 081/393] CEMU: not building, temporary disabled it --- net.retrodeck.retrodeck.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index c2cc631d..98fe9acd 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1310,23 +1310,23 @@ modules: # CEMU - START - - name: Cemu - buildsystem: cmake-ninja - builddir: true - config-opts: - - -DENABLE_VCPKG=false - - -DCMAKE_BUILD_TYPE=Release - #- -DCMAKE_C_COMPILER=/usr/bin/gcc - #- -DCMAKE_CXX_COMPILER=/usr/bin/g++ - - -Dimgui_LINK_LIBRARIES=/app/lib/imgui - sources: - - type: git - url: https://github.com/cemu-project/Cemu - commit: d8da8a54a6c08296a884b892d714cabcb7e4bdb5 - - type: git - dest: 3rdparty/imgui/imgui - url: https://github.com/ocornut/imgui.git - commit: 60bea052a92cbb4a93b221002fdf04f0da3698e1 + # - name: Cemu + # buildsystem: cmake-ninja + # builddir: true + # config-opts: + # - -DENABLE_VCPKG=false + # - -DCMAKE_BUILD_TYPE=Release + # #- -DCMAKE_C_COMPILER=/usr/bin/gcc + # #- -DCMAKE_CXX_COMPILER=/usr/bin/g++ + # - -Dimgui_LINK_LIBRARIES=/app/lib/imgui + # sources: + # - type: git + # url: https://github.com/cemu-project/Cemu + # commit: d8da8a54a6c08296a884b892d714cabcb7e4bdb5 + # - type: git + # dest: 3rdparty/imgui/imgui + # url: https://github.com/ocornut/imgui.git + # commit: 60bea052a92cbb4a93b221002fdf04f0da3698e1 # CEMU - END From 7011fb236152a26b70601d146b193614f732f2c3 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Sun, 4 Sep 2022 14:31:08 +0200 Subject: [PATCH 082/393] DoomWolf: copypasted parsers from AmberELEC --- emu-configs/parsers/ecwolf.sh.todo | 66 +++++++++++++++++++++++++ emu-configs/parsers/gzdoom.sh.todo | 79 ++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+) create mode 100644 emu-configs/parsers/ecwolf.sh.todo create mode 100644 emu-configs/parsers/gzdoom.sh.todo diff --git a/emu-configs/parsers/ecwolf.sh.todo b/emu-configs/parsers/ecwolf.sh.todo new file mode 100644 index 00000000..5b1629ec --- /dev/null +++ b/emu-configs/parsers/ecwolf.sh.todo @@ -0,0 +1,66 @@ +#!/bin/bash + +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2021-present Shanti Gilbert (https://github.com/shantigilbert) +# Copyright (C) 2021-present AmberELEC (https://github.com/AmberELEC) + +. /etc/profile + +EE_DEVICE=$(cat /storage/.config/.OS_ARCH) +CONFIG_DIR="/storage/.config/distribution/ecwolf" +CONFIG_FILE="${CONFIG_DIR}/ecwolf.cfg" +SAVE_DIR="/storage/roms/gamedata/ecwolf" + +if [ ! -L "/storage/.config/ecwolf" ] +then + ln -sf "/storage/.config/distribution/ecwolf" "/storage/.config/ecwolf" +fi + +if [ ! -f "/storage/.config/distribution/ecwolf/ecwolf.cfg" ] +then + cp -rf /usr/config/distribution/ecwolf/ecwolf.cfg /storage/.config/distribution/ecwolf/ +fi + +mkdir -p ${SAVE_DIR} + +params=" --config ${CONFIG_FILE} --savedir ${SAVE_DIR}" + +# data can be SD2 SD3 SOD WL6 or N3D and it's passed as the ROM +DATA=${1#*.} + +# If its a mod (extension .ecwolf) read the file and parse the data +if [ ${DATA} == "ecwolf" ]; then + dos2unix "${1}" + while IFS== read -r key value; do + if [ "$key" == "DATA" ]; then + params+=" --data $value" + fi + if [ "$key" == "PK3" ]; then + params+=" --file $value" + fi + if [ "$key" == "PK3_1" ]; then + params+=" --file $value" + fi + if [ "$key" == "PK3_2" ]; then + params+=" --file $value" + fi + if [ "$key" == "PK3_3" ]; then + params+=" --file $value" + fi + if [ "$key" == "PK3_4" ]; then + params+=" --file $value" + fi + done < "${1}" +else + params+=" --data ${DATA}" +fi + +if [[ "$EE_DEVICE" == RG351P ]]; then + params+=" --res 480 320" +fi +if [[ "$EE_DEVICE" == RG351V ]] || [[ "$EE_DEVICE" == RG351MP ]]; then + params+=" --res 640 480" +fi + +cd "${CONFIG_DIR}" +/usr/bin/ecwolf ${params} > /tmp/logs/ecwolf.log 2>&1 \ No newline at end of file diff --git a/emu-configs/parsers/gzdoom.sh.todo b/emu-configs/parsers/gzdoom.sh.todo new file mode 100644 index 00000000..93b07b57 --- /dev/null +++ b/emu-configs/parsers/gzdoom.sh.todo @@ -0,0 +1,79 @@ +#!/usr/bin/bash + +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2021-present AmberELEC (https://github.com/AmberELEC) + +#. /etc/profile + +ROM="${1##*/}" +PLATFORM="doom" +CONF="/storage/.config/distribution/configs/distribution.conf" + +function get_setting() { + #We look for the setting on the ROM first, if not found we search for platform and lastly we search globally + PAT="s|^${PLATFORM}\[\"${ROM}\"\].*${1}=\(.*\)|\1|p" + EES=$(sed -n "${PAT}" "${CONF}" | head -1) + + if [ -z "${EES}" ]; then + PAT="s|^${PLATFORM}[\.-]${1}=\(.*\)|\1|p" + EES=$(sed -n "${PAT}" "${CONF}" | head -1) + fi + + if [ -z "${EES}" ]; then + PAT="s|^global[\.-].*${1}=\(.*\)|\1|p" + EES=$(sed -n "${PAT}" "${CONF}" | head -1) + fi + + [ -z "${EES}" ] && EES="false" +} + +# Show FPS +get_setting "show_fps" +echo ${EES} +if [ "${EES}" == "auto" ] || [ "${EES}" == "disabled" ] || [ "${EES}" == "false" ] || [ "${EES}" == "none" ] || [ "${EES}" == "0" ]; then + SHOWFPS='0' +else + SHOWFPS='1' +fi + +EE_DEVICE=$(cat /storage/.config/.OS_ARCH) +RUN_DIR="/storage/roms/doom" +CONFIG="/storage/.config/distribution/gzdoom/gzdoom.ini" +SAVE_DIR="/storage/roms/gamedata/gzdoom" + +if [ ! -L "/storage/.config/gzdoom" ] +then + ln -sf "/storage/.config/distribution/gzdoom" "/storage/.config/gzdoom" +fi + +if [ ! -f "/storage/.config/distribution/gzdoom/gzdoom.ini" ] +then + cp -rf /usr/config/distribution/gzdoom/gzdoom.ini /storage/.config/distribution/gzdoom/ +fi + +mkdir -p ${SAVE_DIR} + +params=" -config ${CONFIG} -savedir ${SAVE_DIR}" + +# EXT can be wad, WAD, iwad, IWAD, pwad, PWAD or doom +EXT=${1#*.} + +# If its not a simple wad (extension .doom) read the file and parse the data +if [ ${EXT} == "doom" ]; then + dos2unix "${1}" + while IFS== read -r key value; do + if [ "$key" == "IWAD" ]; then + params+=" -iwad $value" + fi + if [ "$key" == "MOD" ]; then + params+=" -file $value" + fi + done < "${1}" +else + params+=" -iwad ${1}" +fi + +params+=" +gl_es 1 +vid_preferbackend 3 +cl_capfps 0 +vid_fps $SHOWFPS" + +cd "${RUN_DIR}" +/usr/bin/gzdoom ${params} >/tmp/logs/gzdoom.log 2>&1 \ No newline at end of file From 687af79eed16fa44747ef336eca6afae36995d82 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Sun, 4 Sep 2022 14:31:10 +0200 Subject: [PATCH 083/393] Updated flathub push script --- flathub-push.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/flathub-push.sh b/flathub-push.sh index 92e7ff16..f6034bf6 100755 --- a/flathub-push.sh +++ b/flathub-push.sh @@ -1,11 +1,13 @@ #!/bin/bash branch="main-"$(date +%d%m%y.%H%M) +#gits_folder=~/gits +gits_folder="/home/public-folder/gits" # without last / -cd ~/gits +cd $gits_folder rm -rf flathub git clone --recursive https://github.com/flathub/net.retrodeck.retrodeck.git flathub -cd ~/gits/RetroDECK +cd $gits_folder/RetroDECK git checkout main git submodule init git submodule update @@ -13,12 +15,13 @@ git submodule update # these must be included in the exclusion list as they must be redownloaded #sync -rav --progress --exclude={'res/screenshots/','shared-modules/','rd-submodules/retroarch','.git/','docs','retrodeck-flatpak/','retrodeck-flatpak-cooker/','.flatpak-builder/'} ~/RetroDECK/ ~/flathub/ -cd ~/gits/flathub +cd $gits_folder/flathub git checkout -b $branch git rm -rf * git clean -fxd # restroing git index -cd ~/gits/RetroDECK +# Copying only a few files as the others are cloned by git in retrodeck.sh +cd $gits_folder/RetroDECK cp -rf \ 'rd-submodules' \ 'flathub.json' \ @@ -27,8 +30,8 @@ cp -rf \ 'net.retrodeck.retrodeck.desktop' \ 'net.retrodeck.retrodeck.yml' \ 'README.md' \ -~/gits/flathub/ -cd ~/gits/flathub +$gits_folder/flathub/ +cd $gits_folder/flathub # #rebuilding submodules # git config -f .gitmodules --get-regexp '^submodule\..*\.path$' | From d9bcc43ccd177ef13d65bd1ba7a9b534f4ad9219 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Sun, 4 Sep 2022 15:06:59 +0200 Subject: [PATCH 084/393] Updated flathub push script --- flathub-push.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/flathub-push.sh b/flathub-push.sh index f6034bf6..f417c6b6 100755 --- a/flathub-push.sh +++ b/flathub-push.sh @@ -1,14 +1,19 @@ #!/bin/bash -branch="main-"$(date +%d%m%y.%H%M) +# EDITABLES: +#rd_branch="main" +rd_branch="cooker" #gits_folder=~/gits gits_folder="/home/public-folder/gits" # without last / +# NON-EDITABLES +branch="$rd_branch-"$(date +%d%m%y.%H%M) + cd $gits_folder rm -rf flathub git clone --recursive https://github.com/flathub/net.retrodeck.retrodeck.git flathub cd $gits_folder/RetroDECK -git checkout main +git checkout $rd_branch git submodule init git submodule update # NOTE: the only linked submodules are: rd-submodules/retroarch @@ -73,5 +78,5 @@ git submodule deinit -f . # checkout again git submodule update --init --recursive git add * -git commit -m "Updated flathub/net.retrodeck.retrodeck from RetroDECK/main" +git commit -m "Updated flathub/net.retrodeck.retrodeck from RetroDECK/$rd_branch" git push origin $branch \ No newline at end of file From 69ab7bb8988ebfaff1a15da1296166bbfca67e2f Mon Sep 17 00:00:00 2001 From: Steam Deck User Date: Sun, 4 Sep 2022 21:30:52 +0200 Subject: [PATCH 085/393] PCSX2-QT> fixed symlink patch --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 98fe9acd..529f712d 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -860,7 +860,7 @@ modules: - ./pcsx2*.AppImage --appimage-extract - mkdir -p "${FLATPAK_DEST}/pcsx2-qt" - cp -r squashfs-root/* "${FLATPAK_DEST}/pcsx2-qt" - - ln -s "${FLATPAK_DEST}/pcsx2-qt/bin/pcsx2-qt" "${FLATPAK_DEST}/bin/pcsx2-qt" + - 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.3271/pcsx2-v1.7.3271-linux-AppImage-64bit-AVX2-Qt.AppImage From 76dbd7e6c42346bcb4642624b3fc7000b02168ad Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Sun, 4 Sep 2022 21:38:25 +0200 Subject: [PATCH 086/393] PCSX2-QT: fixed symlink path --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 529f712d..5435a671 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -860,7 +860,7 @@ modules: - ./pcsx2*.AppImage --appimage-extract - mkdir -p "${FLATPAK_DEST}/pcsx2-qt" - cp -r squashfs-root/* "${FLATPAK_DEST}/pcsx2-qt" - - 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: - type: file url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.3271/pcsx2-v1.7.3271-linux-AppImage-64bit-AVX2-Qt.AppImage From eebff894cb5215994c6cb44636450ff1656c6003 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Sun, 4 Sep 2022 21:44:01 +0200 Subject: [PATCH 087/393] Disabled overlays tool --- net.retrodeck.retrodeck.yml | 2 +- tools/{overlays.sh => overlays.sh.disabled} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename tools/{overlays.sh => overlays.sh.disabled} (100%) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 5435a671..529f712d 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -860,7 +860,7 @@ modules: - ./pcsx2*.AppImage --appimage-extract - mkdir -p "${FLATPAK_DEST}/pcsx2-qt" - cp -r squashfs-root/* "${FLATPAK_DEST}/pcsx2-qt" - - 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: - type: file url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.3271/pcsx2-v1.7.3271-linux-AppImage-64bit-AVX2-Qt.AppImage diff --git a/tools/overlays.sh b/tools/overlays.sh.disabled similarity index 100% rename from tools/overlays.sh rename to tools/overlays.sh.disabled From b7a45fe4197da4df8219e276d6c18158ac03b4b3 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Sun, 4 Sep 2022 21:52:56 +0200 Subject: [PATCH 088/393] TOOLS: added missing emulators --- tools/configure-emulators.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) mode change 100644 => 100755 tools/configure-emulators.sh diff --git a/tools/configure-emulators.sh b/tools/configure-emulators.sh old mode 100644 new mode 100755 index 25f5be7b..a646bf47 --- a/tools/configure-emulators.sh +++ b/tools/configure-emulators.sh @@ -7,6 +7,8 @@ then fi emulator="$(zenity --list \ +--width=600 \ +--height=350 \ --title "RetroDECK" \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --text="Which emulator do you want to configure?" \ @@ -15,8 +17,10 @@ emulator="$(zenity --list \ "RetroArch" \ "Citra" \ "Dolphin" \ +"Duckstation" \ "MelonDS" \ -"PCSX2" \ +"PCSX2-QT" \ +"PCSX2 (Legacy)" \ "PPSSPP" \ "RPCS3" \ "XEMU" \ @@ -31,12 +35,18 @@ then elif [ $emulator == "Dolphin" ] then dolphin-emu +elif [ $emulator == "Duckstation" ] +then + duckstation-qt elif [ $emulator == "MelonDS" ] then melonDS -elif [ $emulator == "PCSX2" ] +elif [ $emulator == "PCSX2 (Legacy)" ] then pcsx2 +elif [ $emulator == "pcsx2-qt" ] +then + pcsx2-qt elif [ $emulator == "PPSSPP" ] then PPSSPPSDL From e71bf3da389fdfa8d73145e6322a9aeb27403843 Mon Sep 17 00:00:00 2001 From: anthonycaccese Date: Mon, 5 Sep 2022 08:23:50 -0400 Subject: [PATCH 089/393] ES_Settings.xml - Theme & Scraper Updates Turn on Screenshots, PhysicalMedia to enable MixImages to be generated Set MiximageBoxSize to small Set GamelistVideoPillarbox to false --- es-configs/es_settings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/es-configs/es_settings.xml b/es-configs/es_settings.xml index 8feeb468..599b3987 100644 --- a/es-configs/es_settings.xml +++ b/es-configs/es_settings.xml @@ -14,7 +14,7 @@ - + @@ -49,9 +49,9 @@ - + - + @@ -101,7 +101,7 @@ - + @@ -118,4 +118,4 @@ - \ No newline at end of file + From c49a6e8b4722981519d28f9e04a94d9e8796b9ec Mon Sep 17 00:00:00 2001 From: anthonycaccese Date: Mon, 5 Sep 2022 08:23:50 -0400 Subject: [PATCH 090/393] ES_Settings.xml - Theme & Scraper Updates Turn on Screenshots, PhysicalMedia to enable MixImages to be generated Set MiximageBoxSize to small Set GamelistVideoPillarbox to false --- es-configs/es_settings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/es-configs/es_settings.xml b/es-configs/es_settings.xml index 8feeb468..599b3987 100644 --- a/es-configs/es_settings.xml +++ b/es-configs/es_settings.xml @@ -14,7 +14,7 @@ - + @@ -49,9 +49,9 @@ - + - + @@ -101,7 +101,7 @@ - + @@ -118,4 +118,4 @@ - \ No newline at end of file + From e4987020a17ec4c17ea722a6c25ae1e4ffdc4718 Mon Sep 17 00:00:00 2001 From: anthonycaccese Date: Mon, 5 Sep 2022 08:38:37 -0400 Subject: [PATCH 091/393] Updated included themes Updated Art-Book-Next (Auto Collection Images, Steam Deck Color Scheme, MixImage Support) Added Alekfull NX (Light Color Version) Added Retrofix Revisited --- net.retrodeck.retrodeck.yml | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 529f712d..c5857faf 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -242,6 +242,8 @@ modules: # ES-DE - END + # ES-DE Themes - START + - name: art-book-next buildsystem: simple build-commands: @@ -250,27 +252,29 @@ modules: sources: - type: git url: https://github.com/anthonycaccese/art-book-next-retropie.git - commit: 5b953838424e029e7ad534d2a20a7c7f7f5b9e8a - - - name: art-book-next-no-meta + commit: cbd282eb05bb2deb138dad99c3420be56d35c1b8 + + - name: alekfull-nx-light buildsystem: simple build-commands: - - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-no-meta/ - - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-no-meta/ + - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/alekfull-nx-light/ + - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/alekfull-nx-light/ sources: - type: git - url: https://github.com/anthonycaccese/art-book-next-retropie.git - commit: 3b93a8e2bea9d65aee5b0d07f07f56e76653a265 - - - name: art-book-next-miximage + url: https://github.com/anthonycaccese/alekfull-nx-retropie.git + commit: b02be0fde13b1a9c9f09064edbb517901beb62c7 + + - name: retrofix-revisited buildsystem: simple build-commands: - - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-miximage/ - - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-miximage/ + - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/retrofix-revisited/ + - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/retrofix-revisited/ sources: - type: git - url: https://github.com/anthonycaccese/art-book-next-retropie.git - commit: 87b580aceabcf53149e1398039377416bdbd056c + url: https://github.com/anthonycaccese/retrofix-revisited-retropie.git + commit: 6e75c9521426e69eb9abcb39d135d97a17d14568 + + # ES-DE Themes - END # External manifests start @@ -1378,4 +1382,4 @@ modules: sources: - type: git url: https://github.com/XargonWan/RetroDECK.git - branch: cooker \ No newline at end of file + branch: cooker From 1ca1a5a8c1b98b74ebed57a345d06aa39778e997 Mon Sep 17 00:00:00 2001 From: anthonycaccese Date: Mon, 5 Sep 2022 08:38:37 -0400 Subject: [PATCH 092/393] Updated included themes Updated Art-Book-Next (Auto Collection Images, Steam Deck Color Scheme, MixImage Support) Added Alekfull NX (Light Color Version) Added Retrofix Revisited --- net.retrodeck.retrodeck.yml | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 529f712d..c5857faf 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -242,6 +242,8 @@ modules: # ES-DE - END + # ES-DE Themes - START + - name: art-book-next buildsystem: simple build-commands: @@ -250,27 +252,29 @@ modules: sources: - type: git url: https://github.com/anthonycaccese/art-book-next-retropie.git - commit: 5b953838424e029e7ad534d2a20a7c7f7f5b9e8a - - - name: art-book-next-no-meta + commit: cbd282eb05bb2deb138dad99c3420be56d35c1b8 + + - name: alekfull-nx-light buildsystem: simple build-commands: - - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-no-meta/ - - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-no-meta/ + - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/alekfull-nx-light/ + - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/alekfull-nx-light/ sources: - type: git - url: https://github.com/anthonycaccese/art-book-next-retropie.git - commit: 3b93a8e2bea9d65aee5b0d07f07f56e76653a265 - - - name: art-book-next-miximage + url: https://github.com/anthonycaccese/alekfull-nx-retropie.git + commit: b02be0fde13b1a9c9f09064edbb517901beb62c7 + + - name: retrofix-revisited buildsystem: simple build-commands: - - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-miximage/ - - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-miximage/ + - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/retrofix-revisited/ + - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/retrofix-revisited/ sources: - type: git - url: https://github.com/anthonycaccese/art-book-next-retropie.git - commit: 87b580aceabcf53149e1398039377416bdbd056c + url: https://github.com/anthonycaccese/retrofix-revisited-retropie.git + commit: 6e75c9521426e69eb9abcb39d135d97a17d14568 + + # ES-DE Themes - END # External manifests start @@ -1378,4 +1382,4 @@ modules: sources: - type: git url: https://github.com/XargonWan/RetroDECK.git - branch: cooker \ No newline at end of file + branch: cooker From 41d9f2199246b4f61d7ea4570b2501463c5e3150 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 5 Sep 2022 17:11:54 +0200 Subject: [PATCH 093/393] Added rewind tool (missing racfg location) --- es-configs/tools-gamelist.xml | 7 +++++++ tools/rewind.sh | 23 +++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100755 tools/rewind.sh diff --git a/es-configs/tools-gamelist.xml b/es-configs/tools-gamelist.xml index e59195be..b171f16a 100644 --- a/es-configs/tools-gamelist.xml +++ b/es-configs/tools-gamelist.xml @@ -98,4 +98,11 @@ true true + + ./rewind.sh + Rewind toggler + Enable or disable the rewind function for some RetroArch cores. + true + true + \ No newline at end of file diff --git a/tools/rewind.sh b/tools/rewind.sh new file mode 100755 index 00000000..abc79a22 --- /dev/null +++ b/tools/rewind.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +racfg="" + +zenity --question \ +--no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ +--title "RetroDECK" \ +--text="Do you want to enable the rewind function in RetroArch cores?\n\nNOTE:\nThis may impact on performances expecially on the latest systems." + +if [ $? == 0 ] #yes, enable +then + sed -i 's%rewind_enable = .*%rewind_enable = "true"' $racfg + zenity --info \ + --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ + --title "RetroDECK" \ + --text="Rewind enabled\!\nYou can check on Libretro docs to see which cores supports this function." +else # no, disable + sed -i 's%rewind_enable = .*%rewind_enable = "false"' $racfg + zenity --info \ + --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ + --title "RetroDECK" \ + --text="Rewind disabled." +fi From 03196eb5676e56e72ee2668392026ed3e06ee99e Mon Sep 17 00:00:00 2001 From: Stefano Date: Mon, 5 Sep 2022 17:11:54 +0200 Subject: [PATCH 094/393] Added rewind tool (missing racfg location) --- es-configs/tools-gamelist.xml | 7 +++++++ tools/rewind.sh | 23 +++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100755 tools/rewind.sh diff --git a/es-configs/tools-gamelist.xml b/es-configs/tools-gamelist.xml index e59195be..b171f16a 100644 --- a/es-configs/tools-gamelist.xml +++ b/es-configs/tools-gamelist.xml @@ -98,4 +98,11 @@ true true + + ./rewind.sh + Rewind toggler + Enable or disable the rewind function for some RetroArch cores. + true + true + \ No newline at end of file diff --git a/tools/rewind.sh b/tools/rewind.sh new file mode 100755 index 00000000..abc79a22 --- /dev/null +++ b/tools/rewind.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +racfg="" + +zenity --question \ +--no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ +--title "RetroDECK" \ +--text="Do you want to enable the rewind function in RetroArch cores?\n\nNOTE:\nThis may impact on performances expecially on the latest systems." + +if [ $? == 0 ] #yes, enable +then + sed -i 's%rewind_enable = .*%rewind_enable = "true"' $racfg + zenity --info \ + --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ + --title "RetroDECK" \ + --text="Rewind enabled\!\nYou can check on Libretro docs to see which cores supports this function." +else # no, disable + sed -i 's%rewind_enable = .*%rewind_enable = "false"' $racfg + zenity --info \ + --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ + --title "RetroDECK" \ + --text="Rewind disabled." +fi From 68bd684ae069366683134a7197a89e0bb917304c Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 5 Sep 2022 17:12:18 +0200 Subject: [PATCH 095/393] Added rewind tool (missing racfg location) --- es-configs/tools-gamelist.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es-configs/tools-gamelist.xml b/es-configs/tools-gamelist.xml index b171f16a..2df4ef4f 100644 --- a/es-configs/tools-gamelist.xml +++ b/es-configs/tools-gamelist.xml @@ -105,4 +105,4 @@ true true - \ No newline at end of file + \ No newline at end of file From 389afd40061c8f82daf800791388a0cc10cecb39 Mon Sep 17 00:00:00 2001 From: Stefano Date: Mon, 5 Sep 2022 17:12:18 +0200 Subject: [PATCH 096/393] Added rewind tool (missing racfg location) --- es-configs/tools-gamelist.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es-configs/tools-gamelist.xml b/es-configs/tools-gamelist.xml index b171f16a..2df4ef4f 100644 --- a/es-configs/tools-gamelist.xml +++ b/es-configs/tools-gamelist.xml @@ -105,4 +105,4 @@ true true - \ No newline at end of file + \ No newline at end of file From dd8439eb701101ca34b9680179dd9abdc87c2d54 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 5 Sep 2022 20:16:14 +0200 Subject: [PATCH 097/393] Added write_coinf to the lockfile script --- retrodeck.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/retrodeck.sh b/retrodeck.sh index c00608a9..842afcb5 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -222,6 +222,7 @@ ra_init() { create_lock() { # creating RetroDECK's lock file and writing the version number in it echo "$version" > "$lockfile" + conf_write } post_update() { From 08b82838cd7c01e7a5a011979ba0bcb635e15568 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 5 Sep 2022 20:16:14 +0200 Subject: [PATCH 098/393] Added write_coinf to the lockfile script --- retrodeck.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/retrodeck.sh b/retrodeck.sh index c00608a9..842afcb5 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -222,6 +222,7 @@ ra_init() { create_lock() { # creating RetroDECK's lock file and writing the version number in it echo "$version" > "$lockfile" + conf_write } post_update() { From 841078b6d6a1b983838e63fb10d224246f6e1e2f Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Mon, 5 Sep 2022 20:49:54 +0200 Subject: [PATCH 099/393] DUCKSTATION: added first config --- emu-configs/duckstation/settings.ini | 230 +++++++++++++++++++++++++++ retrodeck.sh | 8 + 2 files changed, 238 insertions(+) create mode 100644 emu-configs/duckstation/settings.ini diff --git a/emu-configs/duckstation/settings.ini b/emu-configs/duckstation/settings.ini new file mode 100644 index 00000000..a4ce96e0 --- /dev/null +++ b/emu-configs/duckstation/settings.ini @@ -0,0 +1,230 @@ +[Main] +SettingsVersion = 3 +EmulationSpeed = 1.000000 +FastForwardSpeed = 0.000000 +TurboSpeed = 0.000000 +SyncToHostRefreshRate = false +IncreaseTimerResolution = true +InhibitScreensaver = true +StartPaused = false +StartFullscreen = false +PauseOnFocusLoss = true +PauseOnMenu = true +SaveStateOnExit = true +ConfirmPowerOff = true +LoadDevicesFromSaveStates = true +ApplyGameSettings = true +AutoLoadCheats = true +DisableAllEnhancements = false +RewindEnable = false +RewindFrequency = 10.000000 +RewindSaveSlots = 10 +RunaheadFrameCount = 0.000000 +ControllerBackend = SDL +ControllerEnhancedMode = false +EnableDiscordPresence = false + + +[Console] +Region = Auto +Enable8MBRAM = false + + +[CPU] +ExecutionMode = Recompiler +OverclockNumerator = 1 +OverclockDenominator = 1 +OverclockEnable = false +RecompilerMemoryExceptions = false +RecompilerBlockLinking = true +ICache = false +FastmemMode = true + + +[GPU] +Renderer = Vulkan +ResolutionScale = 1 +Multisamples = 1 +UseDebugDevice = false +UseSoftwareRendererForReadbacks = false +PerSampleShading = false +UseThread = true +ThreadedPresentation = true +TrueColor = false +ScaledDithering = true +TextureFilter = Nearest +DownsampleMode = Disabled +DisableInterlacing = true +ForceNTSCTimings = false +WidescreenHack = false +ChromaSmoothing24Bit = false +PGXPEnable = false +PGXPCulling = true +PGXPTextureCorrection = true +PGXPVertexCache = false +PGXPCPU = false +PGXPPreserveProjFP = false +PGXPTolerance = -1.000000 +PGXPDepthBuffer = false +PGXPDepthClearThreshold = 300.000000 + + +[Display] +CropMode = Overscan +ActiveStartOffset = 0 +ActiveEndOffset = 0 +LineStartOffset = 0 +LineEndOffset = 0 +AspectRatio = Auto (Game Native) +CustomAspectRatioNumerator = 4 +Force4_3For24Bit = false +LinearFiltering = true +IntegerScaling = false +Stretch = false +PostProcessing = false +ShowOSDMessages = true +ShowFPS = false +ShowVPS = false +ShowSpeed = false +ShowResolution = false +ShowStatusIndicators = true +ShowEnhancements = false +Fullscreen = false +VSync = false +DisplayAllFrames = false +PostProcessChain = +MaxFPS = 0.000000 +InternalResolutionScreenshots = false + + +[CDROM] +ReadaheadSectors = 8 +RegionCheck = false +LoadImageToRAM = false +MuteCDAudio = false +ReadSpeedup = 1 +SeekSpeedup = 1 + + +[Audio] +Backend = Cubeb +OutputVolume = 100 +FastForwardVolume = 100 +BufferSize = 2048 +Resampling = true +OutputMuted = 0 +Sync = true +DumpOnBoot = false + + +[BIOS] +SearchDirectory = /home/deck/retrodeck/bios +PathNTSCU = +PathNTSCJ = +PathPAL = +PatchTTYEnable = false +PatchFastBoot = false + + +[Controller1] +Type = DigitalController +ButtonUp = Keyboard/W +ButtonDown = Keyboard/S +ButtonLeft = Keyboard/A +ButtonRight = Keyboard/D +ButtonSelect = Keyboard/Backspace +ButtonStart = Keyboard/Return +ButtonTriangle = Keyboard/Keypad+8 +ButtonCross = Keyboard/Keypad+2 +ButtonSquare = Keyboard/Keypad+4 +ButtonCircle = Keyboard/Keypad+6 +ButtonL1 = Keyboard/Q +ButtonL2 = Keyboard/1 +ButtonR1 = Keyboard/E +ButtonR2 = Keyboard/3 + + +[Controller2] +Type = None + + +[Controller3] +Type = None + + +[Controller4] +Type = None + + +[Controller5] +Type = None + + +[Controller6] +Type = None + + +[Controller7] +Type = None + + +[Controller8] +Type = None + + +[MemoryCards] +Card1Type = PerGameTitle +Card2Type = None +UsePlaylistTitle = true + + +[ControllerPorts] +MultitapMode = Disabled + + +[Logging] +LogLevel = Info +LogFilter = +LogToConsole = true +LogToDebug = false +LogToWindow = false +LogToFile = false + + +[Debug] +ShowVRAM = false +DumpCPUToVRAMCopies = false +DumpVRAMToCPUCopies = false +ShowGPUState = false +ShowCDROMState = false +ShowSPUState = false +ShowTimersState = false +ShowMDECState = false +ShowDMAState = false + + +[Hacks] +DMAMaxSliceTicks = 1000 +DMAHaltTicks = 100 +GPUFIFOSize = 16 +GPUMaxRunAhead = 128 + + +[Hotkeys] +FastForward = Keyboard/Tab +TogglePause = Keyboard/Space +ToggleFullscreen = Keyboard/Alt+Return +Screenshot = Keyboard/F10 +OpenQuickMenu = Keyboard/Escape + + +[Cheevos] +Enabled = true +TestMode = false +UnofficialTestMode = false +UseFirstDiscFromPlaylist = true + + +[UI] +MainWindowGeometry = AdnQywADAAAAAADrAAAAEQAABAoAAALpAAAA6wAAAC4AAAQKAAAC6QAAAAAAAAAABQAAAADrAAAALgAABAoAAALp +MainWindowState = AAAA/wAAAAD9AAAAAAAAAyAAAAI9AAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAOAHQAbwBvAGwAQgBhAHIBAAAAAP////8AAAAAAAAAAA== diff --git a/retrodeck.sh b/retrodeck.sh index 842afcb5..34e2829e 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -169,6 +169,14 @@ 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 + echo "------------------------" + echo "Initializing DUCKSTATION" + echo "------------------------" + mkdir -p /var/config/duckstation/ + cp -fv $emuconfigs/duckstation/* /var/config/duckstation + sed -i 's#/home/deck/retrodeck/bios#'$rdhome/bios'#g' /var/config/ppsspp/PSP/SYSTEM/settings.ini + # PICO-8 # Moved PICO-8 stuff in the finit as only it knows here roms folders is From 8a7de033d79a81215ff5d77ae0b038b9d4ea02c9 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Mon, 5 Sep 2022 20:49:54 +0200 Subject: [PATCH 100/393] DUCKSTATION: added first config --- emu-configs/duckstation/settings.ini | 230 +++++++++++++++++++++++++++ retrodeck.sh | 8 + 2 files changed, 238 insertions(+) create mode 100644 emu-configs/duckstation/settings.ini diff --git a/emu-configs/duckstation/settings.ini b/emu-configs/duckstation/settings.ini new file mode 100644 index 00000000..a4ce96e0 --- /dev/null +++ b/emu-configs/duckstation/settings.ini @@ -0,0 +1,230 @@ +[Main] +SettingsVersion = 3 +EmulationSpeed = 1.000000 +FastForwardSpeed = 0.000000 +TurboSpeed = 0.000000 +SyncToHostRefreshRate = false +IncreaseTimerResolution = true +InhibitScreensaver = true +StartPaused = false +StartFullscreen = false +PauseOnFocusLoss = true +PauseOnMenu = true +SaveStateOnExit = true +ConfirmPowerOff = true +LoadDevicesFromSaveStates = true +ApplyGameSettings = true +AutoLoadCheats = true +DisableAllEnhancements = false +RewindEnable = false +RewindFrequency = 10.000000 +RewindSaveSlots = 10 +RunaheadFrameCount = 0.000000 +ControllerBackend = SDL +ControllerEnhancedMode = false +EnableDiscordPresence = false + + +[Console] +Region = Auto +Enable8MBRAM = false + + +[CPU] +ExecutionMode = Recompiler +OverclockNumerator = 1 +OverclockDenominator = 1 +OverclockEnable = false +RecompilerMemoryExceptions = false +RecompilerBlockLinking = true +ICache = false +FastmemMode = true + + +[GPU] +Renderer = Vulkan +ResolutionScale = 1 +Multisamples = 1 +UseDebugDevice = false +UseSoftwareRendererForReadbacks = false +PerSampleShading = false +UseThread = true +ThreadedPresentation = true +TrueColor = false +ScaledDithering = true +TextureFilter = Nearest +DownsampleMode = Disabled +DisableInterlacing = true +ForceNTSCTimings = false +WidescreenHack = false +ChromaSmoothing24Bit = false +PGXPEnable = false +PGXPCulling = true +PGXPTextureCorrection = true +PGXPVertexCache = false +PGXPCPU = false +PGXPPreserveProjFP = false +PGXPTolerance = -1.000000 +PGXPDepthBuffer = false +PGXPDepthClearThreshold = 300.000000 + + +[Display] +CropMode = Overscan +ActiveStartOffset = 0 +ActiveEndOffset = 0 +LineStartOffset = 0 +LineEndOffset = 0 +AspectRatio = Auto (Game Native) +CustomAspectRatioNumerator = 4 +Force4_3For24Bit = false +LinearFiltering = true +IntegerScaling = false +Stretch = false +PostProcessing = false +ShowOSDMessages = true +ShowFPS = false +ShowVPS = false +ShowSpeed = false +ShowResolution = false +ShowStatusIndicators = true +ShowEnhancements = false +Fullscreen = false +VSync = false +DisplayAllFrames = false +PostProcessChain = +MaxFPS = 0.000000 +InternalResolutionScreenshots = false + + +[CDROM] +ReadaheadSectors = 8 +RegionCheck = false +LoadImageToRAM = false +MuteCDAudio = false +ReadSpeedup = 1 +SeekSpeedup = 1 + + +[Audio] +Backend = Cubeb +OutputVolume = 100 +FastForwardVolume = 100 +BufferSize = 2048 +Resampling = true +OutputMuted = 0 +Sync = true +DumpOnBoot = false + + +[BIOS] +SearchDirectory = /home/deck/retrodeck/bios +PathNTSCU = +PathNTSCJ = +PathPAL = +PatchTTYEnable = false +PatchFastBoot = false + + +[Controller1] +Type = DigitalController +ButtonUp = Keyboard/W +ButtonDown = Keyboard/S +ButtonLeft = Keyboard/A +ButtonRight = Keyboard/D +ButtonSelect = Keyboard/Backspace +ButtonStart = Keyboard/Return +ButtonTriangle = Keyboard/Keypad+8 +ButtonCross = Keyboard/Keypad+2 +ButtonSquare = Keyboard/Keypad+4 +ButtonCircle = Keyboard/Keypad+6 +ButtonL1 = Keyboard/Q +ButtonL2 = Keyboard/1 +ButtonR1 = Keyboard/E +ButtonR2 = Keyboard/3 + + +[Controller2] +Type = None + + +[Controller3] +Type = None + + +[Controller4] +Type = None + + +[Controller5] +Type = None + + +[Controller6] +Type = None + + +[Controller7] +Type = None + + +[Controller8] +Type = None + + +[MemoryCards] +Card1Type = PerGameTitle +Card2Type = None +UsePlaylistTitle = true + + +[ControllerPorts] +MultitapMode = Disabled + + +[Logging] +LogLevel = Info +LogFilter = +LogToConsole = true +LogToDebug = false +LogToWindow = false +LogToFile = false + + +[Debug] +ShowVRAM = false +DumpCPUToVRAMCopies = false +DumpVRAMToCPUCopies = false +ShowGPUState = false +ShowCDROMState = false +ShowSPUState = false +ShowTimersState = false +ShowMDECState = false +ShowDMAState = false + + +[Hacks] +DMAMaxSliceTicks = 1000 +DMAHaltTicks = 100 +GPUFIFOSize = 16 +GPUMaxRunAhead = 128 + + +[Hotkeys] +FastForward = Keyboard/Tab +TogglePause = Keyboard/Space +ToggleFullscreen = Keyboard/Alt+Return +Screenshot = Keyboard/F10 +OpenQuickMenu = Keyboard/Escape + + +[Cheevos] +Enabled = true +TestMode = false +UnofficialTestMode = false +UseFirstDiscFromPlaylist = true + + +[UI] +MainWindowGeometry = AdnQywADAAAAAADrAAAAEQAABAoAAALpAAAA6wAAAC4AAAQKAAAC6QAAAAAAAAAABQAAAADrAAAALgAABAoAAALp +MainWindowState = AAAA/wAAAAD9AAAAAAAAAyAAAAI9AAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAOAHQAbwBvAGwAQgBhAHIBAAAAAP////8AAAAAAAAAAA== diff --git a/retrodeck.sh b/retrodeck.sh index 842afcb5..34e2829e 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -169,6 +169,14 @@ 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 + echo "------------------------" + echo "Initializing DUCKSTATION" + echo "------------------------" + mkdir -p /var/config/duckstation/ + cp -fv $emuconfigs/duckstation/* /var/config/duckstation + sed -i 's#/home/deck/retrodeck/bios#'$rdhome/bios'#g' /var/config/ppsspp/PSP/SYSTEM/settings.ini + # PICO-8 # Moved PICO-8 stuff in the finit as only it knows here roms folders is From 0646d46646935b155fc7b6f57a2e0f2e5fb2f34c Mon Sep 17 00:00:00 2001 From: anthonycaccese Date: Mon, 5 Sep 2022 16:02:58 -0400 Subject: [PATCH 101/393] Update Alekfull-NX Theme to Latest Version Updated metadata layout --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index c5857faf..246c908b 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -262,7 +262,7 @@ modules: sources: - type: git url: https://github.com/anthonycaccese/alekfull-nx-retropie.git - commit: b02be0fde13b1a9c9f09064edbb517901beb62c7 + commit: 67c8c8dee086bd06bcdc6dc34bb9bef1e1c11be7 - name: retrofix-revisited buildsystem: simple From cf4eb42855e6d16547170763efd3c3c524331000 Mon Sep 17 00:00:00 2001 From: anthonycaccese Date: Mon, 5 Sep 2022 16:02:58 -0400 Subject: [PATCH 102/393] Update Alekfull-NX Theme to Latest Version Updated metadata layout --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index c5857faf..246c908b 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -262,7 +262,7 @@ modules: sources: - type: git url: https://github.com/anthonycaccese/alekfull-nx-retropie.git - commit: b02be0fde13b1a9c9f09064edbb517901beb62c7 + commit: 67c8c8dee086bd06bcdc6dc34bb9bef1e1c11be7 - name: retrofix-revisited buildsystem: simple From d93de935b67e8db5108b01605abf831ec37f027e Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 6 Sep 2022 14:46:59 +0200 Subject: [PATCH 103/393] Simplyfing variable system --- global.sh | 27 ++++++++++++++++--- net.retrodeck.retrodeck.yml | 2 +- retrodeck.sh | 52 ++++++++++++++++--------------------- 3 files changed, 47 insertions(+), 34 deletions(-) diff --git a/global.sh b/global.sh index 6f69a74e..0c69693d 100755 --- a/global.sh +++ b/global.sh @@ -2,9 +2,22 @@ # This file is containing some global function needed for the script such as the config file tools -rd_conf="/var/config/retrodeck/retrodeck.cfg" +rd_conf="/var/config/retrodeck/retrodeck.cfg" # RetroDECK config file path -conf_init() { +# if everything is working put this stuff down there +if [ ! -f $rd_conf ] +then + # Init default values, this may be overwritten by retrodeck.cfg as it sourced later with global.sh + lockfile="/var/config/retrodeck/.lock" # where the lockfile is located + emuconfigs="/app/retrodeck/emu-configs" # folder with all the default emulator configs + sdcard="/run/media/mmcblk0p1" # Steam Deck SD default path + rdhome="$HOME/retrodeck" # the retrodeck home, aka ~/retrodeck + media_folder="$HOME/retrodeck/downloaded_media" # the media folder, where all the scraped data is downloaded into + themes_folder="$HOME/retrodeck/themes" # the themes folder + hard_version="$(cat '/app/retrodeck/version')" # hardcoded version (in the readonly filesystem) +fi + +#conf_init() { # initializing and reading the retrodeck config file if [ ! -f $rd_conf ] then # I have to initialize the variables as they cannot be red from an empty config file @@ -16,7 +29,13 @@ conf_init() { echo "#!/bin/bash" >> $rd_conf # version info taken from the version file - version="$(cat /app/retrodeck/version)" + # if the version variable is not set means that is a first installation, so we populate with the hardcoded version + if [ -z $version ] + then + version="$hard_version" + #else + # version="$version" + fi echo "version=$version" >> $rd_conf # the retrodeck home, aka ~/retrodeck @@ -41,7 +60,7 @@ conf_init() { echo "Loading it" source $rd_conf fi -} +#} conf_write() { # writes the variables in the retrodeck config file diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 246c908b..77bd3695 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -61,7 +61,7 @@ modules: # This module is used to define the RetroDECK version # If the version is set as cooker it will automatically generate the version tag based on the date # else it will just put what is written, "v" is not needed - # The version number is stored in /var/conf/retrodeck/version + # The version number is hardcoded in /app/retrodeck/version # # UPDATE STEPS FOR MAIN: # [ ] Update the VERSION variable diff --git a/retrodeck.sh b/retrodeck.sh index 34e2829e..963a5158 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -1,17 +1,7 @@ #!/bin/bash -# Init default values, this may be overwritten by retrodeck.cfg as it sourced later with global.sh - -lockfile="/var/config/retrodeck/.lock" # where the lockfile is located -emuconfigs="/app/retrodeck/emu-configs" # folder with all the default emulator configs -sdcard="/run/media/mmcblk0p1" # Steam Deck SD default path -rd_conf="/var/config/retrodeck/retrodeck.cfg" # RetroDECK config file path -version="$(cat /app/retrodeck/version)" # version info taken from the version file -rdhome="$HOME/retrodeck" # the retrodeck home, aka ~/retrodeck -media_folder="$HOME/retrodeck/downloaded_media" # the media folder, where all the scraped data is downloaded into -themes_folder="$HOME/retrodeck/themes" # the themes folder - source /app/bin/global.sh +#conf_init # We moved the lockfile in /var/config/retrodeck in order to solve issue #53 - Remove in a few versions if [ -f "$HOME/retrodeck/.lock" ] @@ -228,8 +218,8 @@ ra_init() { } create_lock() { - # creating RetroDECK's lock file and writing the version number in it - echo "$version" > "$lockfile" + # creating RetroDECK's lock file and writing the version in the config file + touch "$lockfile" conf_write } @@ -438,7 +428,7 @@ finit() { for i in "$@"; do case $i in -h*|--help*) - echo "RetroDECK v""$(cat /var/config/retrodeck/version)" + echo "RetroDECK v""$version" echo " Usage: flatpak run [FLATPAK-RUN-OPTION] net.retrodeck-retrodeck [ARGUMENTS] @@ -459,12 +449,12 @@ https://retrodeck.net exit ;; --version*|-v*) - conf_init + #conf_init echo "RetroDECK v$version" exit ;; --info-msg*) - conf_init + #conf_init echo "RetroDECK v$version" echo "RetroDECK config file is in: $rd_conf" echo "Contents:" @@ -497,23 +487,27 @@ https://retrodeck.net done # UPDATE TRIGGERED -# if lockfile exists but the version doesn't match -if [ -f "$lockfile" ] && [ "$(cat "$lockfile")" != "$version" ]; +# if lockfile exists +if [ -f "$lockfile" ] then - echo "Lockfile version is "$(cat "$lockfile")" but the actual version is $version" - conf_init # Initializing/reading the config file (sourced from global.sh) - post_update # Executing post update script - conf_write # Writing variables in the config file (sourced from global.sh) - start_retrodeck - exit 0 -fi -# LOCKFILE REMOVED + #conf_init # Initializing/reading the config file (sourced from global.sh) + + # ...but the version doesn't match with the config file + if [ "$hard_version" != "$version" ]; + then + echo "Config file's version is "$(cat "$version")" but the actual version is $hard_version" + post_update # Executing post update script + conf_write # Writing variables in the config file (sourced from global.sh) + start_retrodeck + exit 0 + 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 -if [ ! -f "$lockfile" ]; -then +else echo "Lockfile not found" - conf_init # Initializing/reading the config file (sourced from global.sh) + #conf_init # Initializing/reading the config file (sourced from global.sh) finit # Executing First/Force init conf_write # Writing variables in the config file (sourced from global.sh) exit 0 From 481b2f8c559537a48f89b05a5d1519416ee925e4 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 6 Sep 2022 14:46:59 +0200 Subject: [PATCH 104/393] Simplyfing variable system --- global.sh | 27 ++++++++++++++++--- net.retrodeck.retrodeck.yml | 2 +- retrodeck.sh | 52 ++++++++++++++++--------------------- 3 files changed, 47 insertions(+), 34 deletions(-) diff --git a/global.sh b/global.sh index 6f69a74e..0c69693d 100755 --- a/global.sh +++ b/global.sh @@ -2,9 +2,22 @@ # This file is containing some global function needed for the script such as the config file tools -rd_conf="/var/config/retrodeck/retrodeck.cfg" +rd_conf="/var/config/retrodeck/retrodeck.cfg" # RetroDECK config file path -conf_init() { +# if everything is working put this stuff down there +if [ ! -f $rd_conf ] +then + # Init default values, this may be overwritten by retrodeck.cfg as it sourced later with global.sh + lockfile="/var/config/retrodeck/.lock" # where the lockfile is located + emuconfigs="/app/retrodeck/emu-configs" # folder with all the default emulator configs + sdcard="/run/media/mmcblk0p1" # Steam Deck SD default path + rdhome="$HOME/retrodeck" # the retrodeck home, aka ~/retrodeck + media_folder="$HOME/retrodeck/downloaded_media" # the media folder, where all the scraped data is downloaded into + themes_folder="$HOME/retrodeck/themes" # the themes folder + hard_version="$(cat '/app/retrodeck/version')" # hardcoded version (in the readonly filesystem) +fi + +#conf_init() { # initializing and reading the retrodeck config file if [ ! -f $rd_conf ] then # I have to initialize the variables as they cannot be red from an empty config file @@ -16,7 +29,13 @@ conf_init() { echo "#!/bin/bash" >> $rd_conf # version info taken from the version file - version="$(cat /app/retrodeck/version)" + # if the version variable is not set means that is a first installation, so we populate with the hardcoded version + if [ -z $version ] + then + version="$hard_version" + #else + # version="$version" + fi echo "version=$version" >> $rd_conf # the retrodeck home, aka ~/retrodeck @@ -41,7 +60,7 @@ conf_init() { echo "Loading it" source $rd_conf fi -} +#} conf_write() { # writes the variables in the retrodeck config file diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 246c908b..77bd3695 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -61,7 +61,7 @@ modules: # This module is used to define the RetroDECK version # If the version is set as cooker it will automatically generate the version tag based on the date # else it will just put what is written, "v" is not needed - # The version number is stored in /var/conf/retrodeck/version + # The version number is hardcoded in /app/retrodeck/version # # UPDATE STEPS FOR MAIN: # [ ] Update the VERSION variable diff --git a/retrodeck.sh b/retrodeck.sh index 34e2829e..963a5158 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -1,17 +1,7 @@ #!/bin/bash -# Init default values, this may be overwritten by retrodeck.cfg as it sourced later with global.sh - -lockfile="/var/config/retrodeck/.lock" # where the lockfile is located -emuconfigs="/app/retrodeck/emu-configs" # folder with all the default emulator configs -sdcard="/run/media/mmcblk0p1" # Steam Deck SD default path -rd_conf="/var/config/retrodeck/retrodeck.cfg" # RetroDECK config file path -version="$(cat /app/retrodeck/version)" # version info taken from the version file -rdhome="$HOME/retrodeck" # the retrodeck home, aka ~/retrodeck -media_folder="$HOME/retrodeck/downloaded_media" # the media folder, where all the scraped data is downloaded into -themes_folder="$HOME/retrodeck/themes" # the themes folder - source /app/bin/global.sh +#conf_init # We moved the lockfile in /var/config/retrodeck in order to solve issue #53 - Remove in a few versions if [ -f "$HOME/retrodeck/.lock" ] @@ -228,8 +218,8 @@ ra_init() { } create_lock() { - # creating RetroDECK's lock file and writing the version number in it - echo "$version" > "$lockfile" + # creating RetroDECK's lock file and writing the version in the config file + touch "$lockfile" conf_write } @@ -438,7 +428,7 @@ finit() { for i in "$@"; do case $i in -h*|--help*) - echo "RetroDECK v""$(cat /var/config/retrodeck/version)" + echo "RetroDECK v""$version" echo " Usage: flatpak run [FLATPAK-RUN-OPTION] net.retrodeck-retrodeck [ARGUMENTS] @@ -459,12 +449,12 @@ https://retrodeck.net exit ;; --version*|-v*) - conf_init + #conf_init echo "RetroDECK v$version" exit ;; --info-msg*) - conf_init + #conf_init echo "RetroDECK v$version" echo "RetroDECK config file is in: $rd_conf" echo "Contents:" @@ -497,23 +487,27 @@ https://retrodeck.net done # UPDATE TRIGGERED -# if lockfile exists but the version doesn't match -if [ -f "$lockfile" ] && [ "$(cat "$lockfile")" != "$version" ]; +# if lockfile exists +if [ -f "$lockfile" ] then - echo "Lockfile version is "$(cat "$lockfile")" but the actual version is $version" - conf_init # Initializing/reading the config file (sourced from global.sh) - post_update # Executing post update script - conf_write # Writing variables in the config file (sourced from global.sh) - start_retrodeck - exit 0 -fi -# LOCKFILE REMOVED + #conf_init # Initializing/reading the config file (sourced from global.sh) + + # ...but the version doesn't match with the config file + if [ "$hard_version" != "$version" ]; + then + echo "Config file's version is "$(cat "$version")" but the actual version is $hard_version" + post_update # Executing post update script + conf_write # Writing variables in the config file (sourced from global.sh) + start_retrodeck + exit 0 + 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 -if [ ! -f "$lockfile" ]; -then +else echo "Lockfile not found" - conf_init # Initializing/reading the config file (sourced from global.sh) + #conf_init # Initializing/reading the config file (sourced from global.sh) finit # Executing First/Force init conf_write # Writing variables in the config file (sourced from global.sh) exit 0 From 5d4baa88523c55613c44249cf4a08ef4e50e5a5f Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 6 Sep 2022 15:24:36 +0200 Subject: [PATCH 105/393] Simplyfing variable system - step 2 --- global.sh | 76 +++++++++++++++++----------------------------------- retrodeck.sh | 1 - 2 files changed, 24 insertions(+), 53 deletions(-) diff --git a/global.sh b/global.sh index 0c69693d..98829902 100755 --- a/global.sh +++ b/global.sh @@ -2,66 +2,38 @@ # This file is containing some global function needed for the script such as the config file tools -rd_conf="/var/config/retrodeck/retrodeck.cfg" # RetroDECK config file path +# Static variables +rd_conf="/var/config/retrodeck/retrodeck.cfg" # RetroDECK config file path +emuconfigs="/app/retrodeck/emu-configs" # folder with all the default emulator configs +lockfile="/var/config/retrodeck/.lock" # where the lockfile is located +sdcard="/run/media/mmcblk0p1" # Steam Deck SD default path +hard_version="$(cat '/app/retrodeck/version')" # hardcoded version (in the readonly filesystem) -# if everything is working put this stuff down there + +# If there is no config file I initalize the file with the the default values if [ ! -f $rd_conf ] then - # Init default values, this may be overwritten by retrodeck.cfg as it sourced later with global.sh - lockfile="/var/config/retrodeck/.lock" # where the lockfile is located - emuconfigs="/app/retrodeck/emu-configs" # folder with all the default emulator configs - sdcard="/run/media/mmcblk0p1" # Steam Deck SD default path + + echo "RetroDECK config file not found in $rd_conf" + echo "Initializing" + + echo "#!/bin/bash" >> $rd_conf + version="$hard_version" # if we are here means that the we are in a new installation, so the version is valorized with the hardcoded one rdhome="$HOME/retrodeck" # the retrodeck home, aka ~/retrodeck + roms_folder="$rdhome/roms" # the default roms folder path media_folder="$HOME/retrodeck/downloaded_media" # the media folder, where all the scraped data is downloaded into themes_folder="$HOME/retrodeck/themes" # the themes folder - hard_version="$(cat '/app/retrodeck/version')" # hardcoded version (in the readonly filesystem) + + # writing the needed variables in the config file + conf_write + +# If the config file is existing i just read the variables (source it) +else + echo "Found RetroDECK config file in $rd_conf" + echo "Loading it" + source $rd_conf fi -#conf_init() { - # initializing and reading the retrodeck config file - if [ ! -f $rd_conf ] - then # I have to initialize the variables as they cannot be red from an empty config file - echo "RetroDECK config file not found in $rd_conf" - echo "Initializing" - touch $rd_conf - - # Variables to manage: adding a variable here means adding it to conf_write() - echo "#!/bin/bash" >> $rd_conf - - # version info taken from the version file - # if the version variable is not set means that is a first installation, so we populate with the hardcoded version - if [ -z $version ] - then - version="$hard_version" - #else - # version="$version" - fi - echo "version=$version" >> $rd_conf - - # the retrodeck home, aka ~/retrodeck - rdhome="$HOME/retrodeck" - echo "rdhome=$rdhome" >> $rd_conf - - # default roms folder location (internal) - roms_folder="$roms_folder" - echo "roms_folder=$roms_folder" >> $rd_conf - - # default media folder location (internal) - media_folder="$media_folder" - echo "media_folder=$media_folder" >> $rd_conf - - # default themes folder location (internal) - themes_folder="$themes_folder" - echo "themes_folder=$themes_folder" >> $rd_conf - - - else # i just read the variables - echo "Found RetroDECK config file in $rd_conf" - echo "Loading it" - source $rd_conf - fi -#} - conf_write() { # writes the variables in the retrodeck config file diff --git a/retrodeck.sh b/retrodeck.sh index 963a5158..f5ba4071 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -1,7 +1,6 @@ #!/bin/bash source /app/bin/global.sh -#conf_init # We moved the lockfile in /var/config/retrodeck in order to solve issue #53 - Remove in a few versions if [ -f "$HOME/retrodeck/.lock" ] From f2c6dd59bb5c86be05a9d5c8932118074d55b2d0 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 6 Sep 2022 15:24:36 +0200 Subject: [PATCH 106/393] Simplyfing variable system - step 2 --- global.sh | 76 +++++++++++++++++----------------------------------- retrodeck.sh | 1 - 2 files changed, 24 insertions(+), 53 deletions(-) diff --git a/global.sh b/global.sh index 0c69693d..98829902 100755 --- a/global.sh +++ b/global.sh @@ -2,66 +2,38 @@ # This file is containing some global function needed for the script such as the config file tools -rd_conf="/var/config/retrodeck/retrodeck.cfg" # RetroDECK config file path +# Static variables +rd_conf="/var/config/retrodeck/retrodeck.cfg" # RetroDECK config file path +emuconfigs="/app/retrodeck/emu-configs" # folder with all the default emulator configs +lockfile="/var/config/retrodeck/.lock" # where the lockfile is located +sdcard="/run/media/mmcblk0p1" # Steam Deck SD default path +hard_version="$(cat '/app/retrodeck/version')" # hardcoded version (in the readonly filesystem) -# if everything is working put this stuff down there + +# If there is no config file I initalize the file with the the default values if [ ! -f $rd_conf ] then - # Init default values, this may be overwritten by retrodeck.cfg as it sourced later with global.sh - lockfile="/var/config/retrodeck/.lock" # where the lockfile is located - emuconfigs="/app/retrodeck/emu-configs" # folder with all the default emulator configs - sdcard="/run/media/mmcblk0p1" # Steam Deck SD default path + + echo "RetroDECK config file not found in $rd_conf" + echo "Initializing" + + echo "#!/bin/bash" >> $rd_conf + version="$hard_version" # if we are here means that the we are in a new installation, so the version is valorized with the hardcoded one rdhome="$HOME/retrodeck" # the retrodeck home, aka ~/retrodeck + roms_folder="$rdhome/roms" # the default roms folder path media_folder="$HOME/retrodeck/downloaded_media" # the media folder, where all the scraped data is downloaded into themes_folder="$HOME/retrodeck/themes" # the themes folder - hard_version="$(cat '/app/retrodeck/version')" # hardcoded version (in the readonly filesystem) + + # writing the needed variables in the config file + conf_write + +# If the config file is existing i just read the variables (source it) +else + echo "Found RetroDECK config file in $rd_conf" + echo "Loading it" + source $rd_conf fi -#conf_init() { - # initializing and reading the retrodeck config file - if [ ! -f $rd_conf ] - then # I have to initialize the variables as they cannot be red from an empty config file - echo "RetroDECK config file not found in $rd_conf" - echo "Initializing" - touch $rd_conf - - # Variables to manage: adding a variable here means adding it to conf_write() - echo "#!/bin/bash" >> $rd_conf - - # version info taken from the version file - # if the version variable is not set means that is a first installation, so we populate with the hardcoded version - if [ -z $version ] - then - version="$hard_version" - #else - # version="$version" - fi - echo "version=$version" >> $rd_conf - - # the retrodeck home, aka ~/retrodeck - rdhome="$HOME/retrodeck" - echo "rdhome=$rdhome" >> $rd_conf - - # default roms folder location (internal) - roms_folder="$roms_folder" - echo "roms_folder=$roms_folder" >> $rd_conf - - # default media folder location (internal) - media_folder="$media_folder" - echo "media_folder=$media_folder" >> $rd_conf - - # default themes folder location (internal) - themes_folder="$themes_folder" - echo "themes_folder=$themes_folder" >> $rd_conf - - - else # i just read the variables - echo "Found RetroDECK config file in $rd_conf" - echo "Loading it" - source $rd_conf - fi -#} - conf_write() { # writes the variables in the retrodeck config file diff --git a/retrodeck.sh b/retrodeck.sh index 963a5158..f5ba4071 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -1,7 +1,6 @@ #!/bin/bash source /app/bin/global.sh -#conf_init # We moved the lockfile in /var/config/retrodeck in order to solve issue #53 - Remove in a few versions if [ -f "$HOME/retrodeck/.lock" ] From 3336006282ffcd980c6063b3b55d63fe6e772fda Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 6 Sep 2022 17:46:48 +0200 Subject: [PATCH 107/393] CITRA: trying to fix shader cache --- es-configs/es_find_rules.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es-configs/es_find_rules.xml b/es-configs/es_find_rules.xml index baa96687..3e71b426 100644 --- a/es-configs/es_find_rules.xml +++ b/es-configs/es_find_rules.xml @@ -100,7 +100,7 @@ - citra + citra-qt citra-emu.citra-nightly org.citra_emu.citra From 38fd3088233cb02a21c4470328c8018ccd935263 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 6 Sep 2022 17:46:48 +0200 Subject: [PATCH 108/393] CITRA: trying to fix shader cache --- es-configs/es_find_rules.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es-configs/es_find_rules.xml b/es-configs/es_find_rules.xml index baa96687..3e71b426 100644 --- a/es-configs/es_find_rules.xml +++ b/es-configs/es_find_rules.xml @@ -100,7 +100,7 @@ - citra + citra-qt citra-emu.citra-nightly org.citra_emu.citra From 8c856a1b74a3d384f062e9b632d2110b7fe2ecb2 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 6 Sep 2022 18:04:44 +0200 Subject: [PATCH 109/393] OPERA-3DO: removed aoutload (workaround), removed unsupported ext --- emu-configs/retroarch-core-options.cfg | 1 + es-configs/es_systems.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/emu-configs/retroarch-core-options.cfg b/emu-configs/retroarch-core-options.cfg index b7ab1bd2..4656d63a 100644 --- a/emu-configs/retroarch-core-options.cfg +++ b/emu-configs/retroarch-core-options.cfg @@ -385,6 +385,7 @@ mupen64plus-txHiresEnable = "False" mupen64plus-txHiresFullAlphaChannel = "False" mupen64plus-u-cbutton = "C4" mupen64plus-virefresh = "Auto" +opera_savestate_auto_load = "False" pcsx2_accurate_date = "enabled" pcsx2_anisotropic_filter = "0" pcsx2_aspect_ratio = "0" diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml index 8c898921..73957de1 100644 --- a/es-configs/es_systems.xml +++ b/es-configs/es_systems.xml @@ -5,7 +5,7 @@ 3do 3DO %ROMPATH%/3do - .iso .ISO .bin .BIN .chd .CHD .cue .CUE .7z .7Z .zip .ZIP + .iso .ISO .bin .BIN .chd .CHD .cue .CUE %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/opera_libretro.so %ROM% 3do 3do From 53a5d81f5ebaccad3bbc6083f6bcd0082c078e75 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 6 Sep 2022 18:04:44 +0200 Subject: [PATCH 110/393] OPERA-3DO: removed aoutload (workaround), removed unsupported ext --- emu-configs/retroarch-core-options.cfg | 1 + es-configs/es_systems.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/emu-configs/retroarch-core-options.cfg b/emu-configs/retroarch-core-options.cfg index b7ab1bd2..4656d63a 100644 --- a/emu-configs/retroarch-core-options.cfg +++ b/emu-configs/retroarch-core-options.cfg @@ -385,6 +385,7 @@ mupen64plus-txHiresEnable = "False" mupen64plus-txHiresFullAlphaChannel = "False" mupen64plus-u-cbutton = "C4" mupen64plus-virefresh = "Auto" +opera_savestate_auto_load = "False" pcsx2_accurate_date = "enabled" pcsx2_anisotropic_filter = "0" pcsx2_aspect_ratio = "0" diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml index 8c898921..73957de1 100644 --- a/es-configs/es_systems.xml +++ b/es-configs/es_systems.xml @@ -5,7 +5,7 @@ 3do 3DO %ROMPATH%/3do - .iso .ISO .bin .BIN .chd .CHD .cue .CUE .7z .7Z .zip .ZIP + .iso .ISO .bin .BIN .chd .CHD .cue .CUE %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/opera_libretro.so %ROM% 3do 3do From a1497a44e803682b3411642f4194cbd437bdf0dc Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 6 Sep 2022 21:34:31 +0200 Subject: [PATCH 111/393] Workflow: fix the stuck mount --- .github/workflows/cooker-selfhosted.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 5f394a55..9b039617 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -34,6 +34,7 @@ jobs: - name: Initialize enviornment run: | + while [[ $(findmnt /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles) != "" ]]; do sudo umount /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles; done git pull git submodule init git submodule update From 9d47a3a8c40ab921c519bb1efa7090014ae7fe79 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 6 Sep 2022 21:34:31 +0200 Subject: [PATCH 112/393] Workflow: fix the stuck mount --- .github/workflows/cooker-selfhosted.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 5f394a55..9b039617 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -34,6 +34,7 @@ jobs: - name: Initialize enviornment run: | + while [[ $(findmnt /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles) != "" ]]; do sudo umount /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles; done git pull git submodule init git submodule update From b9c4308d2ece6fbdb47c06f0fb19b1c173176558 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 6 Sep 2022 21:40:27 +0200 Subject: [PATCH 113/393] Workflow: fix the stuck mount -fix2 --- .github/workflows/cooker-selfhosted.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 9b039617..6c779de7 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -17,6 +17,9 @@ jobs: runs-on: self-hosted steps: + - name: Remove stuck mounts + run: while [[ $(findmnt /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles) != "" ]]; do sudo umount /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles; done + - name: Get date for artifacts id: date run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M%S')" @@ -34,7 +37,6 @@ jobs: - name: Initialize enviornment run: | - while [[ $(findmnt /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles) != "" ]]; do sudo umount /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles; done git pull git submodule init git submodule update From 0af81f45ee554580e5aad9f27b0dd0a99044cc87 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 6 Sep 2022 21:40:27 +0200 Subject: [PATCH 114/393] Workflow: fix the stuck mount -fix2 --- .github/workflows/cooker-selfhosted.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 9b039617..6c779de7 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -17,6 +17,9 @@ jobs: runs-on: self-hosted steps: + - name: Remove stuck mounts + run: while [[ $(findmnt /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles) != "" ]]; do sudo umount /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles; done + - name: Get date for artifacts id: date run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M%S')" @@ -34,7 +37,6 @@ jobs: - name: Initialize enviornment run: | - while [[ $(findmnt /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles) != "" ]]; do sudo umount /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles; done git pull git submodule init git submodule update From 135234156b08edd53626005ae6d1571bb2024a9c Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 6 Sep 2022 21:42:10 +0200 Subject: [PATCH 115/393] Workflow: fix the stuck mount -fix3 --- .github/workflows/cooker-selfhosted.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 6c779de7..a37c1870 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -18,7 +18,7 @@ jobs: steps: - name: Remove stuck mounts - run: while [[ $(findmnt /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles) != "" ]]; do sudo umount /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles; done + run: umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/* - name: Get date for artifacts id: date From 2fb7186d7ac42a69d403f51617757c438abb4d7b Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 6 Sep 2022 21:42:10 +0200 Subject: [PATCH 116/393] Workflow: fix the stuck mount -fix3 --- .github/workflows/cooker-selfhosted.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 6c779de7..a37c1870 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -18,7 +18,7 @@ jobs: steps: - name: Remove stuck mounts - run: while [[ $(findmnt /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles) != "" ]]; do sudo umount /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles; done + run: umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/* - name: Get date for artifacts id: date From 05825305c95fa4035481c1c2991b1823f78a1e31 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 6 Sep 2022 21:43:15 +0200 Subject: [PATCH 117/393] Workflow: fix the stuck mount -fix4 --- .github/workflows/cooker-selfhosted.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index a37c1870..d3f7729e 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -18,7 +18,8 @@ jobs: steps: - name: Remove stuck mounts - run: umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/* + run: sudo umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/* + continue-on-error: true - name: Get date for artifacts id: date From 60e5eb0ecf541b3e112bc0e19821f3c449d42ef2 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 6 Sep 2022 21:43:15 +0200 Subject: [PATCH 118/393] Workflow: fix the stuck mount -fix4 --- .github/workflows/cooker-selfhosted.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index a37c1870..d3f7729e 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -18,7 +18,8 @@ jobs: steps: - name: Remove stuck mounts - run: umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/* + run: sudo umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/* + continue-on-error: true - name: Get date for artifacts id: date From a7080ae47cf9afbcc3ab0b090af1a523f4333841 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 7 Sep 2022 20:29:23 +0200 Subject: [PATCH 119/393] Removed unused fix theme tool --- es-configs/tools-gamelist.xml | 7 ------- tools/theme-fix.sh | 31 ------------------------------- 2 files changed, 38 deletions(-) delete mode 100644 tools/theme-fix.sh diff --git a/es-configs/tools-gamelist.xml b/es-configs/tools-gamelist.xml index 2df4ef4f..3a838881 100644 --- a/es-configs/tools-gamelist.xml +++ b/es-configs/tools-gamelist.xml @@ -84,13 +84,6 @@ true true --> - - ./theme-fix.sh - Theme fix - Clean some of the scraped data in order to beautify the new theme. This is needed if you got scraped data since v0.4.2 or earlier. - true - true - ./configure-emulators.sh Configure Emulators diff --git a/tools/theme-fix.sh b/tools/theme-fix.sh deleted file mode 100644 index 66c71254..00000000 --- a/tools/theme-fix.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -zenity \ ---icon-name=net.retrodeck.retrodeck \ ---question \ ---no-wrap \ ---window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ ---title "RetroDECK" \ ---ok-label "Yes" \ ---cancel-label "No" \ ---text="This tool is will clean some unuseful scraped data in order to beautify the theme.\nDo you want to delete and fix it?" - -if [ $? == 0 ] #yes - Internal -then - find ~/retrodeck/.downloaded_media -name miximages -type d -print0|xargs -0 rm -rfv -- - find ~/retrodeck/.downloaded_media -name 3dboxes -type d -print0|xargs -0 rm -rfv -- - find ~/retrodeck/.downloaded_media -name titlescreens -type d -print0|xargs -0 rm -rfv -- - find ~/retrodeck/.downloaded_media -name backcovers -type d -print0|xargs -0 rm -rfv -- - find ~/retrodeck/.downloaded_media -namephysicalmedia -type d -print0|xargs -0 rm -rfv -- - find ~/retrodeck/.downloaded_media -namescreenshots -type d -print0|xargs -0 rm -rfv -- - rm -rf ~/retrodeck/.downloaded_media/thumbnails - ln -s ~/retrodeck/.downloaded_media/covers ~/retrodeck/.downloaded_media/thumbnails -fi - -zenity \ ---icon-name=net.retrodeck.retrodeck \ ---info \ ---no-wrap \ ---window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ ---title "RetroDECK" \ ---text="Scraped data is now cleaned and fixed, please restart RetroDECK to reload the games list." \ No newline at end of file From 361e28396f098fa4c3a85f7fc2c0cb302028a528 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 7 Sep 2022 20:29:23 +0200 Subject: [PATCH 120/393] Removed unused fix theme tool --- es-configs/tools-gamelist.xml | 7 ------- tools/theme-fix.sh | 31 ------------------------------- 2 files changed, 38 deletions(-) delete mode 100644 tools/theme-fix.sh diff --git a/es-configs/tools-gamelist.xml b/es-configs/tools-gamelist.xml index 2df4ef4f..3a838881 100644 --- a/es-configs/tools-gamelist.xml +++ b/es-configs/tools-gamelist.xml @@ -84,13 +84,6 @@ true true --> - - ./theme-fix.sh - Theme fix - Clean some of the scraped data in order to beautify the new theme. This is needed if you got scraped data since v0.4.2 or earlier. - true - true - ./configure-emulators.sh Configure Emulators diff --git a/tools/theme-fix.sh b/tools/theme-fix.sh deleted file mode 100644 index 66c71254..00000000 --- a/tools/theme-fix.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -zenity \ ---icon-name=net.retrodeck.retrodeck \ ---question \ ---no-wrap \ ---window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ ---title "RetroDECK" \ ---ok-label "Yes" \ ---cancel-label "No" \ ---text="This tool is will clean some unuseful scraped data in order to beautify the theme.\nDo you want to delete and fix it?" - -if [ $? == 0 ] #yes - Internal -then - find ~/retrodeck/.downloaded_media -name miximages -type d -print0|xargs -0 rm -rfv -- - find ~/retrodeck/.downloaded_media -name 3dboxes -type d -print0|xargs -0 rm -rfv -- - find ~/retrodeck/.downloaded_media -name titlescreens -type d -print0|xargs -0 rm -rfv -- - find ~/retrodeck/.downloaded_media -name backcovers -type d -print0|xargs -0 rm -rfv -- - find ~/retrodeck/.downloaded_media -namephysicalmedia -type d -print0|xargs -0 rm -rfv -- - find ~/retrodeck/.downloaded_media -namescreenshots -type d -print0|xargs -0 rm -rfv -- - rm -rf ~/retrodeck/.downloaded_media/thumbnails - ln -s ~/retrodeck/.downloaded_media/covers ~/retrodeck/.downloaded_media/thumbnails -fi - -zenity \ ---icon-name=net.retrodeck.retrodeck \ ---info \ ---no-wrap \ ---window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ ---title "RetroDECK" \ ---text="Scraped data is now cleaned and fixed, please restart RetroDECK to reload the games list." \ No newline at end of file From 234db695aea23251b3eb939ceb8b64cd051fdd44 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 7 Sep 2022 20:37:27 +0200 Subject: [PATCH 121/393] Updated Duckstation config --- tools/move-roms.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/move-roms.sh b/tools/move-roms.sh index 85b83fc8..00dac00a 100644 --- a/tools/move-roms.sh +++ b/tools/move-roms.sh @@ -8,7 +8,7 @@ then exit 0 fi -conf_init +#conf_init zenity --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --cancel-label="Cancel" --ok-label "Browse" --text="The roms folder is now: $roms_folder\nplease select the new location.\nA retrodeck/roms folder will be created starting from the directory that you selected." if [ $? == 1 ] #cancel From 7124cfda342553f31649c4ebe4050106d396c78a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 7 Sep 2022 20:37:27 +0200 Subject: [PATCH 122/393] Updated Duckstation config --- tools/move-roms.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/move-roms.sh b/tools/move-roms.sh index 85b83fc8..00dac00a 100644 --- a/tools/move-roms.sh +++ b/tools/move-roms.sh @@ -8,7 +8,7 @@ then exit 0 fi -conf_init +#conf_init zenity --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --cancel-label="Cancel" --ok-label "Browse" --text="The roms folder is now: $roms_folder\nplease select the new location.\nA retrodeck/roms folder will be created starting from the directory that you selected." if [ $? == 1 ] #cancel From 5d6f87ca74088f0fc4996e776cf9b4e7c58273d0 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Wed, 7 Sep 2022 20:45:50 +0200 Subject: [PATCH 123/393] SX2: Updated config for QT --- emu-configs/PCSX2/GS.ini | 89 ++++++ emu-configs/PCSX2/PCSX2.ini | 449 +++++++++++++++++++++++++++ emu-configs/{ => PCSX2}/PCSX2_ui.ini | 2 +- emu-configs/{ => PCSX2}/PCSX2_vm.ini | 0 4 files changed, 539 insertions(+), 1 deletion(-) create mode 100644 emu-configs/PCSX2/GS.ini create mode 100644 emu-configs/PCSX2/PCSX2.ini rename emu-configs/{ => PCSX2}/PCSX2_ui.ini (98%) rename emu-configs/{ => PCSX2}/PCSX2_vm.ini (100%) diff --git a/emu-configs/PCSX2/GS.ini b/emu-configs/PCSX2/GS.ini new file mode 100644 index 00000000..d91aa444 --- /dev/null +++ b/emu-configs/PCSX2/GS.ini @@ -0,0 +1,89 @@ +CaptureHeight = 480 +CaptureWidth = 640 +DisableDualSourceBlend = 0 +DisableFramebufferFetch = 0 +DumpReplaceableMipmaps = 0 +DumpReplaceableTextures = 0 +DumpTexturesWithFMVActive = 0 +HWDisableReadbacks = 0 +IntegerScaling = 0 +LoadTextureReplacements = 0 +LoadTextureReplacementsAsync = 1 +MaxAnisotropy = 0 +NTSC_Saturation = 1 +OsdScale = 100 +OsdShowCPU = 0 +OsdShowFPS = 0 +OsdShowGPU = 0 +OsdShowGSStats = 0 +OsdShowIndicators = 1 +OsdShowMessages = 1 +OsdShowResolution = 0 +OsdShowSpeed = 0 +OverrideGeometryShaders = -1 +OverrideTextureBarriers = -1 +PrecacheTextureReplacements = 0 +Renderer = 14 +ShadeBoost = 0 +ShadeBoost_Brightness = 50 +ShadeBoost_Contrast = 50 +ShadeBoost_Saturation = 50 +TVShader = 0 +ThreadedPresentation = 0 +UseBlitSwapChain = 0 +UseDebugDevice = 0 +UserHacks = 1 +UserHacks_AutoFlush = 0 +UserHacks_CPU_FB_Conversion = 0 +UserHacks_DisableDepthSupport = 0 +UserHacks_DisablePartialInvalidation = 1 +UserHacks_Disable_Safe_Features = 0 +UserHacks_HalfPixelOffset = 0 +UserHacks_Half_Bottom_Override = -1 +UserHacks_SkipDraw_End = 0 +UserHacks_SkipDraw_Start = 0 +UserHacks_TCOffsetX = 0 +UserHacks_TCOffsetY = 0 +UserHacks_TextureInsideRt = 0 +UserHacks_TriFilter = 0 +UserHacks_WildHack = 0 +UserHacks_align_sprite_X = 0 +UserHacks_merge_pp_sprite = 0 +UserHacks_round_sprite_offset = 0 +aa1 = 1 +accurate_blending_unit = 1 +accurate_date = 1 +autoflush_sw = 1 +capture_enabled = 0 +capture_out_dir = /tmp/GS_Capture +capture_threads = 4 +conservative_framebuffer = 1 +crc_hack_level = -1 +disable_shader_cache = 0 +dithering_ps2 = 2 +dump = 0 +extrathreads = 2 +extrathreads_height = 4 +filter = 2 +fxaa = 0 +interlace = 7 +linear_present = 1 +mipmap = 1 +mipmap_hw = -1 +override_GL_ARB_shader_image_load_store = -1 +override_GL_ARB_sparse_texture = -1 +paltex = 0 +png_compression_level = 1 +preload_frame_with_gs_data = 0 +save = 0 +savef = 0 +savel = 5000 +saven = 0 +savet = 0 +savez = 0 +shaderfx = 0 +shaderfx_conf = shaders/GS_FX_Settings.ini +shaderfx_glsl = shaders/GS.fx +texture_preloading = 0 +upscale_multiplier = 2 +wrap_gs_mem = 0 diff --git a/emu-configs/PCSX2/PCSX2.ini b/emu-configs/PCSX2/PCSX2.ini new file mode 100644 index 00000000..26bb2f01 --- /dev/null +++ b/emu-configs/PCSX2/PCSX2.ini @@ -0,0 +1,449 @@ +[UI] +SettingsVersion = 1 +MainWindowGeometry = AdnQywADAAAAAAAAAAAAAAAAA7UAAAJ/AAAAAAAAAAAAAAO1AAACfwAAAAAAAAAABQAAAAAAAAAAAAAAA7UAAAJ/ +MainWindowState = AAAA/wAAAAD9AAAAAAAAA7YAAAJXAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAOAHQAbwBvAGwAQgBhAHIAAAAAAP////8AAAAAAAAAAA== +PauseOnFocusLoss = true +StartFullscreen = true + + +[EmuCore] +CdvdVerboseReads = false +CdvdDumpBlocks = false +CdvdShareWrite = false +EnablePatches = true +EnableCheats = false +EnablePINE = false +EnableWideScreenPatches = false +EnableNoInterlacingPatches = false +EnableRecordingTools = true +EnableGameFixes = true +SaveStateOnShutdown = true +ConsoleToStdio = false +HostFs = false +PatchBios = false +PatchRegion = +BackupSavestate = true +SavestateZstdCompression = true +McdEnableEjection = true +McdFolderAutoManage = true +GzipIsoIndexTemplate = $(f).pindex.tmp +BlockDumpSaveDirectory = + + +[EmuCore/Speedhacks] +EECycleRate = 0 +EECycleSkip = 0 +fastCDVD = false +IntcStat = true +WaitLoop = true +vuFlagHack = true +vuThread = true +vu1Instant = true + + +[EmuCore/CPU] +FPU.DenormalsAreZero = true +FPU.FlushToZero = true +FPU.Roundmode = 3 +AffinityControlMode = 0 +VU.DenormalsAreZero = true +VU.FlushToZero = true +VU.Roundmode = 3 + + +[EmuCore/CPU/Recompiler] +EnableEE = true +EnableIOP = true +EnableEECache = false +EnableVU0 = true +EnableVU1 = true +vuOverflow = true +vuExtraOverflow = false +vuSignOverflow = false +vuUnderflow = false +fpuOverflow = true +fpuExtraOverflow = false +fpuFullMode = false +StackFrameChecks = false +PreBlockCheckEE = false +PreBlockCheckIOP = false + + +[EmuCore/GS] +VsyncQueueSize = 2 +FrameLimitEnable = true +VsyncEnable = 0 +FramerateNTSC = 59.940000 +FrameratePAL = 50.000000 +SyncToHostRefreshRate = false +AspectRatio = Auto 4:3/3:2 +FMVAspectRatioSwitch = Off +Zoom = 100.000000 +StretchY = 100.000000 +CropLeft = 0 +CropTop = 0 +CropRight = 0 +CropBottom = 0 +pcrtc_antiblur = true +disable_interlace_offset = false +pcrtc_offsets = false +pcrtc_overscan = false +IntegerScaling = false +linear_present = true +UseDebugDevice = false +UseBlitSwapChain = false +disable_shader_cache = false +DisableDualSourceBlend = false +DisableFramebufferFetch = false +ThreadedPresentation = false +SkipDuplicateFrames = false +OsdShowMessages = true +OsdShowSpeed = false +OsdShowFPS = false +OsdShowCPU = false +OsdShowGPU = false +OsdShowResolution = false +OsdShowGSStats = false +OsdShowIndicators = true +HWDisableReadbacks = false +accurate_date = true +paltex = false +autoflush_sw = true +preload_frame_with_gs_data = false +wrap_gs_mem = false +mipmap = true +UserHacks = false +UserHacks_align_sprite_X = false +UserHacks_AutoFlush = false +UserHacks_CPU_FB_Conversion = false +UserHacks_DisableDepthSupport = false +UserHacks_DisablePartialInvalidation = false +UserHacks_Disable_Safe_Features = false +UserHacks_merge_pp_sprite = false +UserHacks_WildHack = false +UserHacks_TextureInsideRt = false +fxaa = false +ShadeBoost = false +shaderfx = false +dump = false +save = false +savef = false +savet = false +savez = false +DumpReplaceableTextures = false +DumpReplaceableMipmaps = false +DumpTexturesWithFMVActive = false +DumpDirectTextures = true +DumpPaletteTextures = true +LoadTextureReplacements = false +LoadTextureReplacementsAsync = true +PrecacheTextureReplacements = false +deinterlace = 7 +OsdScale = 100 +Renderer = -1 +upscale_multiplier = 1 +mipmap_hw = -1 +accurate_blending_unit = 1 +crc_hack_level = -1 +filter = 2 +texture_preloading = 2 +GSDumpCompression = 1 +dithering_ps2 = 2 +MaxAnisotropy = 0 +extrathreads = 2 +extrathreads_height = 4 +TVShader = 0 +UserHacks_SkipDraw_Start = 0 +UserHacks_SkipDraw_End = 0 +UserHacks_Half_Bottom_Override = -1 +UserHacks_HalfPixelOffset = 0 +UserHacks_round_sprite_offset = 0 +UserHacks_TCOffsetX = 0 +UserHacks_TCOffsetY = 0 +UserHacks_CPUSpriteRenderBW = 0 +UserHacks_TriFilter = -1 +OverrideTextureBarriers = -1 +OverrideGeometryShaders = -1 +ShadeBoost_Brightness = 50 +ShadeBoost_Contrast = 50 +ShadeBoost_Saturation = 50 +saven = 0 +savel = 5000 +Adapter = +shaderfx_conf = shaders/GS_FX_Settings.ini +shaderfx_glsl = shaders/GS.fx + + +[SPU2/Mixing] +Interpolation = 5 +FinalVolume = 100 +VolumeAdjustC = 0.000000 +VolumeAdjustFL = 0.000000 +VolumeAdjustFR = 0.000000 +VolumeAdjustBL = 0.000000 +VolumeAdjustBR = 0.000000 +VolumeAdjustSL = 0.000000 +VolumeAdjustSR = 0.000000 +VolumeAdjustLFE = 0.000000 + + +[SPU2/Output] +OutputModule = cubeb +Latency = 100 +SynchMode = 0 +SpeakerConfiguration = 0 +DplDecodingLevel = 0 + + +[DEV9/Eth] +EthEnable = false +EthApi = Unset +EthDevice = +EthLogDNS = false +InterceptDHCP = false +PS2IP = 0.0.0.0 +Mask = 0.0.0.0 +Gateway = 0.0.0.0 +DNS1 = 0.0.0.0 +DNS2 = 0.0.0.0 +AutoMask = true +AutoGateway = true +ModeDNS1 = Auto +ModeDNS2 = Auto + + +[DEV9/Eth/Hosts] +Count = 0 + + +[DEV9/Hdd] +HddEnable = false +HddFile = DEV9hdd.raw +HddSizeSectors = 83886080 + + +[EmuCore/Gamefixes] +VuAddSubHack = false +FpuMulHack = false +FpuNegDivHack = false +XgKickHack = false +EETimingHack = false +SoftwareRendererFMVHack = false +SkipMPEGHack = false +OPHFlagHack = false +DMABusyHack = false +VIFFIFOHack = false +VIF1StallHack = false +GIFFIFOHack = false +GoemonTlbHack = false +IbitHack = false +VUSyncHack = false +VUOverflowHack = false +BlitInternalFPSHack = false + + +[EmuCore/Profiler] +Enabled = false +RecBlocks_EE = true +RecBlocks_IOP = true +RecBlocks_VU0 = true +RecBlocks_VU1 = true + + +[EmuCore/Debugger] +ShowDebuggerOnStart = false +AlignMemoryWindowStart = true +FontWidth = 8 +FontHeight = 12 +WindowWidth = 0 +WindowHeight = 0 +MemoryViewBytesPerRow = 16 + + +[EmuCore/TraceLog] +Enabled = false +EE.bitset = 0 +IOP.bitset = 0 + + +[Filenames] +BIOS = + + +[Framerate] +NominalScalar = 1.000000 +TurboScalar = 2.000000 +SlomoScalar = 0.500000 + + +[MemoryCards] +Slot1_Enable = true +Slot1_Filename = Mcd001.ps2 +Slot2_Enable = true +Slot2_Filename = Mcd002.ps2 +Multitap1_Slot2_Enable = false +Multitap1_Slot2_Filename = Mcd-Multitap1-Slot02.ps2 +Multitap1_Slot3_Enable = false +Multitap1_Slot3_Filename = Mcd-Multitap1-Slot03.ps2 +Multitap1_Slot4_Enable = false +Multitap1_Slot4_Filename = Mcd-Multitap1-Slot04.ps2 +Multitap2_Slot2_Enable = false +Multitap2_Slot2_Filename = Mcd-Multitap2-Slot02.ps2 +Multitap2_Slot3_Enable = false +Multitap2_Slot3_Filename = Mcd-Multitap2-Slot03.ps2 +Multitap2_Slot4_Enable = false +Multitap2_Slot4_Filename = Mcd-Multitap2-Slot04.ps2 + + +[Folders] +Bios = ../../../../../retrodeck/bios/pcsx2 +Snapshots = ../../../../../retrodeck/screenshots +SaveStates = ../../../../../retrodeck/states +MemoryCards = ../../../../../retrodeck/saves/pcsx2 +Logs = logs +Cheats = cheats +CheatsWS = cheats_ws +CheatsNI = cheats_ni +Cache = cache +Textures = textures +InputProfiles = inputprofiles + + +[InputSources] +SDL = true +SDLControllerEnhancedMode = false +XInput = false +RawInput = false + + +[Hotkeys] +ToggleFullscreen = Keyboard/Alt & Keyboard/Return +CycleAspectRatio = Keyboard/F6 +CycleInterlaceMode = Keyboard/F5 +CycleMipmapMode = Keyboard/Insert +GSDumpMultiFrame = Keyboard/Control & Keyboard/Shift & Keyboard/F8 +Screenshot = SDL-0/Back & SDL-0/A +GSDumpSingleFrame = Keyboard/Shift & Keyboard/F8 +ToggleSoftwareRendering = Keyboard/F9 +InputRecToggleMode = Keyboard/Shift & Keyboard/R +LoadStateFromSlot = SDL-0/Back & SDL-0/LeftShoulder +SaveStateToSlot = SDL-0/Back & SDL-0/RightShoulder +NextSaveStateSlot = SDL-0/Back & SDL-0/DPadUp +PreviousSaveStateSlot = SDL-0/Back & SDL-0/DPadDown +OpenPauseMenu = SDL-0/Back & SDL-0/Y +ToggleFrameLimit = Keyboard/F4 +TogglePause = SDL-0/Back & SDL-0/B +ToggleSlowMotion = Keyboard/Shift & Keyboard/Backtab +ToggleTurbo = Keyboard/Tab +HoldTurbo = Keyboard/L + + +[Pad] +MultitapPort1 = false +MultitapPort2 = false +PointerXScale = 8.000000 +PointerYScale = 8.000000 +PointerXInvert = false +PointerYInvert = false + + +[Pad1] +Type = DualShock2 +Deadzone = 0.000000 +AxisScale = 1.330000 +LargeMotorScale = 1.000000 +SmallMotorScale = 1.000000 +PressureModifier = 0.500000 +Up = SDL-0/-RightY +Right = SDL-0/DPadRight +Down = SDL-0/DPadDown +Left = SDL-0/DPadLeft +Triangle = SDL-0/Y +Circle = SDL-0/B +Cross = SDL-0/A +Square = SDL-0/X +Select = SDL-0/Back +Start = SDL-0/Start +L1 = SDL-0/LeftShoulder +L2 = SDL-0/+LeftTrigger +R1 = SDL-0/RightShoulder +R2 = SDL-0/+RightTrigger +L3 = SDL-0/LeftStick +R3 = SDL-0/RightStick +LUp = SDL-0/-LeftY +LRight = SDL-0/+LeftX +LDown = SDL-0/+LeftY +LLeft = SDL-0/-LeftX +RUp = SDL-0/-RightY +RRight = SDL-0/+RightX +RDown = SDL-0/+RightY +RLeft = SDL-0/-RightX +SmallMotor = SDL-0/SmallMotor +LargeMotor = SDL-0/LargeMotor + + +[Pad2] +Type = None +Deadzone = 0.000000 +AxisScale = 1.330000 +LargeMotorScale = 1.000000 +SmallMotorScale = 1.000000 +PressureModifier = 0.500000 + + +[Pad3] +Type = None +Deadzone = 0.000000 +AxisScale = 1.330000 +LargeMotorScale = 1.000000 +SmallMotorScale = 1.000000 +PressureModifier = 0.500000 + + +[Pad4] +Type = None +Deadzone = 0.000000 +AxisScale = 1.330000 +LargeMotorScale = 1.000000 +SmallMotorScale = 1.000000 +PressureModifier = 0.500000 + + +[Pad5] +Type = None +Deadzone = 0.000000 +AxisScale = 1.330000 +LargeMotorScale = 1.000000 +SmallMotorScale = 1.000000 +PressureModifier = 0.500000 + + +[Pad6] +Type = None +Deadzone = 0.000000 +AxisScale = 1.330000 +LargeMotorScale = 1.000000 +SmallMotorScale = 1.000000 +PressureModifier = 0.500000 + + +[Pad7] +Type = None +Deadzone = 0.000000 +AxisScale = 1.330000 +LargeMotorScale = 1.000000 +SmallMotorScale = 1.000000 +PressureModifier = 0.500000 + + +[Pad8] +Type = None +Deadzone = 0.000000 +AxisScale = 1.330000 +LargeMotorScale = 1.000000 +SmallMotorScale = 1.000000 +PressureModifier = 0.500000 + + +[GameList] +RecursivePaths = /home/deck/retrodeck/roms/ps2 diff --git a/emu-configs/PCSX2_ui.ini b/emu-configs/PCSX2/PCSX2_ui.ini similarity index 98% rename from emu-configs/PCSX2_ui.ini rename to emu-configs/PCSX2/PCSX2_ui.ini index 00f098ce..891b6cab 100644 --- a/emu-configs/PCSX2_ui.ini +++ b/emu-configs/PCSX2/PCSX2_ui.ini @@ -40,7 +40,7 @@ UseDefaultLangs=enabled UseDefaultCheats=enabled UseDefaultCheatsWS=enabled UseDefaultTextures=enabled -Bios=~/retrodeck/bios +Bios=/run/media/deck/DeckSD/retrodeck/roms/bios Snapshots=/var/config/PCSX2/snaps Savestates=/var/config/PCSX2/sstates MemoryCards=/var/config/PCSX2/memcards diff --git a/emu-configs/PCSX2_vm.ini b/emu-configs/PCSX2/PCSX2_vm.ini similarity index 100% rename from emu-configs/PCSX2_vm.ini rename to emu-configs/PCSX2/PCSX2_vm.ini From dc04ad1dc38e5524cc49da0977729da1d537fb1c Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Wed, 7 Sep 2022 20:45:50 +0200 Subject: [PATCH 124/393] SX2: Updated config for QT --- emu-configs/PCSX2/GS.ini | 89 ++++++ emu-configs/PCSX2/PCSX2.ini | 449 +++++++++++++++++++++++++++ emu-configs/{ => PCSX2}/PCSX2_ui.ini | 2 +- emu-configs/{ => PCSX2}/PCSX2_vm.ini | 0 4 files changed, 539 insertions(+), 1 deletion(-) create mode 100644 emu-configs/PCSX2/GS.ini create mode 100644 emu-configs/PCSX2/PCSX2.ini rename emu-configs/{ => PCSX2}/PCSX2_ui.ini (98%) rename emu-configs/{ => PCSX2}/PCSX2_vm.ini (100%) diff --git a/emu-configs/PCSX2/GS.ini b/emu-configs/PCSX2/GS.ini new file mode 100644 index 00000000..d91aa444 --- /dev/null +++ b/emu-configs/PCSX2/GS.ini @@ -0,0 +1,89 @@ +CaptureHeight = 480 +CaptureWidth = 640 +DisableDualSourceBlend = 0 +DisableFramebufferFetch = 0 +DumpReplaceableMipmaps = 0 +DumpReplaceableTextures = 0 +DumpTexturesWithFMVActive = 0 +HWDisableReadbacks = 0 +IntegerScaling = 0 +LoadTextureReplacements = 0 +LoadTextureReplacementsAsync = 1 +MaxAnisotropy = 0 +NTSC_Saturation = 1 +OsdScale = 100 +OsdShowCPU = 0 +OsdShowFPS = 0 +OsdShowGPU = 0 +OsdShowGSStats = 0 +OsdShowIndicators = 1 +OsdShowMessages = 1 +OsdShowResolution = 0 +OsdShowSpeed = 0 +OverrideGeometryShaders = -1 +OverrideTextureBarriers = -1 +PrecacheTextureReplacements = 0 +Renderer = 14 +ShadeBoost = 0 +ShadeBoost_Brightness = 50 +ShadeBoost_Contrast = 50 +ShadeBoost_Saturation = 50 +TVShader = 0 +ThreadedPresentation = 0 +UseBlitSwapChain = 0 +UseDebugDevice = 0 +UserHacks = 1 +UserHacks_AutoFlush = 0 +UserHacks_CPU_FB_Conversion = 0 +UserHacks_DisableDepthSupport = 0 +UserHacks_DisablePartialInvalidation = 1 +UserHacks_Disable_Safe_Features = 0 +UserHacks_HalfPixelOffset = 0 +UserHacks_Half_Bottom_Override = -1 +UserHacks_SkipDraw_End = 0 +UserHacks_SkipDraw_Start = 0 +UserHacks_TCOffsetX = 0 +UserHacks_TCOffsetY = 0 +UserHacks_TextureInsideRt = 0 +UserHacks_TriFilter = 0 +UserHacks_WildHack = 0 +UserHacks_align_sprite_X = 0 +UserHacks_merge_pp_sprite = 0 +UserHacks_round_sprite_offset = 0 +aa1 = 1 +accurate_blending_unit = 1 +accurate_date = 1 +autoflush_sw = 1 +capture_enabled = 0 +capture_out_dir = /tmp/GS_Capture +capture_threads = 4 +conservative_framebuffer = 1 +crc_hack_level = -1 +disable_shader_cache = 0 +dithering_ps2 = 2 +dump = 0 +extrathreads = 2 +extrathreads_height = 4 +filter = 2 +fxaa = 0 +interlace = 7 +linear_present = 1 +mipmap = 1 +mipmap_hw = -1 +override_GL_ARB_shader_image_load_store = -1 +override_GL_ARB_sparse_texture = -1 +paltex = 0 +png_compression_level = 1 +preload_frame_with_gs_data = 0 +save = 0 +savef = 0 +savel = 5000 +saven = 0 +savet = 0 +savez = 0 +shaderfx = 0 +shaderfx_conf = shaders/GS_FX_Settings.ini +shaderfx_glsl = shaders/GS.fx +texture_preloading = 0 +upscale_multiplier = 2 +wrap_gs_mem = 0 diff --git a/emu-configs/PCSX2/PCSX2.ini b/emu-configs/PCSX2/PCSX2.ini new file mode 100644 index 00000000..26bb2f01 --- /dev/null +++ b/emu-configs/PCSX2/PCSX2.ini @@ -0,0 +1,449 @@ +[UI] +SettingsVersion = 1 +MainWindowGeometry = AdnQywADAAAAAAAAAAAAAAAAA7UAAAJ/AAAAAAAAAAAAAAO1AAACfwAAAAAAAAAABQAAAAAAAAAAAAAAA7UAAAJ/ +MainWindowState = AAAA/wAAAAD9AAAAAAAAA7YAAAJXAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAOAHQAbwBvAGwAQgBhAHIAAAAAAP////8AAAAAAAAAAA== +PauseOnFocusLoss = true +StartFullscreen = true + + +[EmuCore] +CdvdVerboseReads = false +CdvdDumpBlocks = false +CdvdShareWrite = false +EnablePatches = true +EnableCheats = false +EnablePINE = false +EnableWideScreenPatches = false +EnableNoInterlacingPatches = false +EnableRecordingTools = true +EnableGameFixes = true +SaveStateOnShutdown = true +ConsoleToStdio = false +HostFs = false +PatchBios = false +PatchRegion = +BackupSavestate = true +SavestateZstdCompression = true +McdEnableEjection = true +McdFolderAutoManage = true +GzipIsoIndexTemplate = $(f).pindex.tmp +BlockDumpSaveDirectory = + + +[EmuCore/Speedhacks] +EECycleRate = 0 +EECycleSkip = 0 +fastCDVD = false +IntcStat = true +WaitLoop = true +vuFlagHack = true +vuThread = true +vu1Instant = true + + +[EmuCore/CPU] +FPU.DenormalsAreZero = true +FPU.FlushToZero = true +FPU.Roundmode = 3 +AffinityControlMode = 0 +VU.DenormalsAreZero = true +VU.FlushToZero = true +VU.Roundmode = 3 + + +[EmuCore/CPU/Recompiler] +EnableEE = true +EnableIOP = true +EnableEECache = false +EnableVU0 = true +EnableVU1 = true +vuOverflow = true +vuExtraOverflow = false +vuSignOverflow = false +vuUnderflow = false +fpuOverflow = true +fpuExtraOverflow = false +fpuFullMode = false +StackFrameChecks = false +PreBlockCheckEE = false +PreBlockCheckIOP = false + + +[EmuCore/GS] +VsyncQueueSize = 2 +FrameLimitEnable = true +VsyncEnable = 0 +FramerateNTSC = 59.940000 +FrameratePAL = 50.000000 +SyncToHostRefreshRate = false +AspectRatio = Auto 4:3/3:2 +FMVAspectRatioSwitch = Off +Zoom = 100.000000 +StretchY = 100.000000 +CropLeft = 0 +CropTop = 0 +CropRight = 0 +CropBottom = 0 +pcrtc_antiblur = true +disable_interlace_offset = false +pcrtc_offsets = false +pcrtc_overscan = false +IntegerScaling = false +linear_present = true +UseDebugDevice = false +UseBlitSwapChain = false +disable_shader_cache = false +DisableDualSourceBlend = false +DisableFramebufferFetch = false +ThreadedPresentation = false +SkipDuplicateFrames = false +OsdShowMessages = true +OsdShowSpeed = false +OsdShowFPS = false +OsdShowCPU = false +OsdShowGPU = false +OsdShowResolution = false +OsdShowGSStats = false +OsdShowIndicators = true +HWDisableReadbacks = false +accurate_date = true +paltex = false +autoflush_sw = true +preload_frame_with_gs_data = false +wrap_gs_mem = false +mipmap = true +UserHacks = false +UserHacks_align_sprite_X = false +UserHacks_AutoFlush = false +UserHacks_CPU_FB_Conversion = false +UserHacks_DisableDepthSupport = false +UserHacks_DisablePartialInvalidation = false +UserHacks_Disable_Safe_Features = false +UserHacks_merge_pp_sprite = false +UserHacks_WildHack = false +UserHacks_TextureInsideRt = false +fxaa = false +ShadeBoost = false +shaderfx = false +dump = false +save = false +savef = false +savet = false +savez = false +DumpReplaceableTextures = false +DumpReplaceableMipmaps = false +DumpTexturesWithFMVActive = false +DumpDirectTextures = true +DumpPaletteTextures = true +LoadTextureReplacements = false +LoadTextureReplacementsAsync = true +PrecacheTextureReplacements = false +deinterlace = 7 +OsdScale = 100 +Renderer = -1 +upscale_multiplier = 1 +mipmap_hw = -1 +accurate_blending_unit = 1 +crc_hack_level = -1 +filter = 2 +texture_preloading = 2 +GSDumpCompression = 1 +dithering_ps2 = 2 +MaxAnisotropy = 0 +extrathreads = 2 +extrathreads_height = 4 +TVShader = 0 +UserHacks_SkipDraw_Start = 0 +UserHacks_SkipDraw_End = 0 +UserHacks_Half_Bottom_Override = -1 +UserHacks_HalfPixelOffset = 0 +UserHacks_round_sprite_offset = 0 +UserHacks_TCOffsetX = 0 +UserHacks_TCOffsetY = 0 +UserHacks_CPUSpriteRenderBW = 0 +UserHacks_TriFilter = -1 +OverrideTextureBarriers = -1 +OverrideGeometryShaders = -1 +ShadeBoost_Brightness = 50 +ShadeBoost_Contrast = 50 +ShadeBoost_Saturation = 50 +saven = 0 +savel = 5000 +Adapter = +shaderfx_conf = shaders/GS_FX_Settings.ini +shaderfx_glsl = shaders/GS.fx + + +[SPU2/Mixing] +Interpolation = 5 +FinalVolume = 100 +VolumeAdjustC = 0.000000 +VolumeAdjustFL = 0.000000 +VolumeAdjustFR = 0.000000 +VolumeAdjustBL = 0.000000 +VolumeAdjustBR = 0.000000 +VolumeAdjustSL = 0.000000 +VolumeAdjustSR = 0.000000 +VolumeAdjustLFE = 0.000000 + + +[SPU2/Output] +OutputModule = cubeb +Latency = 100 +SynchMode = 0 +SpeakerConfiguration = 0 +DplDecodingLevel = 0 + + +[DEV9/Eth] +EthEnable = false +EthApi = Unset +EthDevice = +EthLogDNS = false +InterceptDHCP = false +PS2IP = 0.0.0.0 +Mask = 0.0.0.0 +Gateway = 0.0.0.0 +DNS1 = 0.0.0.0 +DNS2 = 0.0.0.0 +AutoMask = true +AutoGateway = true +ModeDNS1 = Auto +ModeDNS2 = Auto + + +[DEV9/Eth/Hosts] +Count = 0 + + +[DEV9/Hdd] +HddEnable = false +HddFile = DEV9hdd.raw +HddSizeSectors = 83886080 + + +[EmuCore/Gamefixes] +VuAddSubHack = false +FpuMulHack = false +FpuNegDivHack = false +XgKickHack = false +EETimingHack = false +SoftwareRendererFMVHack = false +SkipMPEGHack = false +OPHFlagHack = false +DMABusyHack = false +VIFFIFOHack = false +VIF1StallHack = false +GIFFIFOHack = false +GoemonTlbHack = false +IbitHack = false +VUSyncHack = false +VUOverflowHack = false +BlitInternalFPSHack = false + + +[EmuCore/Profiler] +Enabled = false +RecBlocks_EE = true +RecBlocks_IOP = true +RecBlocks_VU0 = true +RecBlocks_VU1 = true + + +[EmuCore/Debugger] +ShowDebuggerOnStart = false +AlignMemoryWindowStart = true +FontWidth = 8 +FontHeight = 12 +WindowWidth = 0 +WindowHeight = 0 +MemoryViewBytesPerRow = 16 + + +[EmuCore/TraceLog] +Enabled = false +EE.bitset = 0 +IOP.bitset = 0 + + +[Filenames] +BIOS = + + +[Framerate] +NominalScalar = 1.000000 +TurboScalar = 2.000000 +SlomoScalar = 0.500000 + + +[MemoryCards] +Slot1_Enable = true +Slot1_Filename = Mcd001.ps2 +Slot2_Enable = true +Slot2_Filename = Mcd002.ps2 +Multitap1_Slot2_Enable = false +Multitap1_Slot2_Filename = Mcd-Multitap1-Slot02.ps2 +Multitap1_Slot3_Enable = false +Multitap1_Slot3_Filename = Mcd-Multitap1-Slot03.ps2 +Multitap1_Slot4_Enable = false +Multitap1_Slot4_Filename = Mcd-Multitap1-Slot04.ps2 +Multitap2_Slot2_Enable = false +Multitap2_Slot2_Filename = Mcd-Multitap2-Slot02.ps2 +Multitap2_Slot3_Enable = false +Multitap2_Slot3_Filename = Mcd-Multitap2-Slot03.ps2 +Multitap2_Slot4_Enable = false +Multitap2_Slot4_Filename = Mcd-Multitap2-Slot04.ps2 + + +[Folders] +Bios = ../../../../../retrodeck/bios/pcsx2 +Snapshots = ../../../../../retrodeck/screenshots +SaveStates = ../../../../../retrodeck/states +MemoryCards = ../../../../../retrodeck/saves/pcsx2 +Logs = logs +Cheats = cheats +CheatsWS = cheats_ws +CheatsNI = cheats_ni +Cache = cache +Textures = textures +InputProfiles = inputprofiles + + +[InputSources] +SDL = true +SDLControllerEnhancedMode = false +XInput = false +RawInput = false + + +[Hotkeys] +ToggleFullscreen = Keyboard/Alt & Keyboard/Return +CycleAspectRatio = Keyboard/F6 +CycleInterlaceMode = Keyboard/F5 +CycleMipmapMode = Keyboard/Insert +GSDumpMultiFrame = Keyboard/Control & Keyboard/Shift & Keyboard/F8 +Screenshot = SDL-0/Back & SDL-0/A +GSDumpSingleFrame = Keyboard/Shift & Keyboard/F8 +ToggleSoftwareRendering = Keyboard/F9 +InputRecToggleMode = Keyboard/Shift & Keyboard/R +LoadStateFromSlot = SDL-0/Back & SDL-0/LeftShoulder +SaveStateToSlot = SDL-0/Back & SDL-0/RightShoulder +NextSaveStateSlot = SDL-0/Back & SDL-0/DPadUp +PreviousSaveStateSlot = SDL-0/Back & SDL-0/DPadDown +OpenPauseMenu = SDL-0/Back & SDL-0/Y +ToggleFrameLimit = Keyboard/F4 +TogglePause = SDL-0/Back & SDL-0/B +ToggleSlowMotion = Keyboard/Shift & Keyboard/Backtab +ToggleTurbo = Keyboard/Tab +HoldTurbo = Keyboard/L + + +[Pad] +MultitapPort1 = false +MultitapPort2 = false +PointerXScale = 8.000000 +PointerYScale = 8.000000 +PointerXInvert = false +PointerYInvert = false + + +[Pad1] +Type = DualShock2 +Deadzone = 0.000000 +AxisScale = 1.330000 +LargeMotorScale = 1.000000 +SmallMotorScale = 1.000000 +PressureModifier = 0.500000 +Up = SDL-0/-RightY +Right = SDL-0/DPadRight +Down = SDL-0/DPadDown +Left = SDL-0/DPadLeft +Triangle = SDL-0/Y +Circle = SDL-0/B +Cross = SDL-0/A +Square = SDL-0/X +Select = SDL-0/Back +Start = SDL-0/Start +L1 = SDL-0/LeftShoulder +L2 = SDL-0/+LeftTrigger +R1 = SDL-0/RightShoulder +R2 = SDL-0/+RightTrigger +L3 = SDL-0/LeftStick +R3 = SDL-0/RightStick +LUp = SDL-0/-LeftY +LRight = SDL-0/+LeftX +LDown = SDL-0/+LeftY +LLeft = SDL-0/-LeftX +RUp = SDL-0/-RightY +RRight = SDL-0/+RightX +RDown = SDL-0/+RightY +RLeft = SDL-0/-RightX +SmallMotor = SDL-0/SmallMotor +LargeMotor = SDL-0/LargeMotor + + +[Pad2] +Type = None +Deadzone = 0.000000 +AxisScale = 1.330000 +LargeMotorScale = 1.000000 +SmallMotorScale = 1.000000 +PressureModifier = 0.500000 + + +[Pad3] +Type = None +Deadzone = 0.000000 +AxisScale = 1.330000 +LargeMotorScale = 1.000000 +SmallMotorScale = 1.000000 +PressureModifier = 0.500000 + + +[Pad4] +Type = None +Deadzone = 0.000000 +AxisScale = 1.330000 +LargeMotorScale = 1.000000 +SmallMotorScale = 1.000000 +PressureModifier = 0.500000 + + +[Pad5] +Type = None +Deadzone = 0.000000 +AxisScale = 1.330000 +LargeMotorScale = 1.000000 +SmallMotorScale = 1.000000 +PressureModifier = 0.500000 + + +[Pad6] +Type = None +Deadzone = 0.000000 +AxisScale = 1.330000 +LargeMotorScale = 1.000000 +SmallMotorScale = 1.000000 +PressureModifier = 0.500000 + + +[Pad7] +Type = None +Deadzone = 0.000000 +AxisScale = 1.330000 +LargeMotorScale = 1.000000 +SmallMotorScale = 1.000000 +PressureModifier = 0.500000 + + +[Pad8] +Type = None +Deadzone = 0.000000 +AxisScale = 1.330000 +LargeMotorScale = 1.000000 +SmallMotorScale = 1.000000 +PressureModifier = 0.500000 + + +[GameList] +RecursivePaths = /home/deck/retrodeck/roms/ps2 diff --git a/emu-configs/PCSX2_ui.ini b/emu-configs/PCSX2/PCSX2_ui.ini similarity index 98% rename from emu-configs/PCSX2_ui.ini rename to emu-configs/PCSX2/PCSX2_ui.ini index 00f098ce..891b6cab 100644 --- a/emu-configs/PCSX2_ui.ini +++ b/emu-configs/PCSX2/PCSX2_ui.ini @@ -40,7 +40,7 @@ UseDefaultLangs=enabled UseDefaultCheats=enabled UseDefaultCheatsWS=enabled UseDefaultTextures=enabled -Bios=~/retrodeck/bios +Bios=/run/media/deck/DeckSD/retrodeck/roms/bios Snapshots=/var/config/PCSX2/snaps Savestates=/var/config/PCSX2/sstates MemoryCards=/var/config/PCSX2/memcards diff --git a/emu-configs/PCSX2_vm.ini b/emu-configs/PCSX2/PCSX2_vm.ini similarity index 100% rename from emu-configs/PCSX2_vm.ini rename to emu-configs/PCSX2/PCSX2_vm.ini From 3975152c481f731847d2f81fe27b197d3853ba30 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 7 Sep 2022 20:52:36 +0200 Subject: [PATCH 125/393] PCSX2: sedded configs --- emu-configs/PCSX2/PCSX2.ini | 10 +++++----- emu-configs/PCSX2/PCSX2_ui.ini | 2 +- retrodeck.sh | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/emu-configs/PCSX2/PCSX2.ini b/emu-configs/PCSX2/PCSX2.ini index 26bb2f01..6a820bf6 100644 --- a/emu-configs/PCSX2/PCSX2.ini +++ b/emu-configs/PCSX2/PCSX2.ini @@ -296,10 +296,10 @@ Multitap2_Slot4_Filename = Mcd-Multitap2-Slot04.ps2 [Folders] -Bios = ../../../../../retrodeck/bios/pcsx2 -Snapshots = ../../../../../retrodeck/screenshots -SaveStates = ../../../../../retrodeck/states -MemoryCards = ../../../../../retrodeck/saves/pcsx2 +Bios = ~/retrodeck/bios/pcsx2 +Snapshots = ~/retrodeck/screenshots +SaveStates = ~/retrodeck/states +MemoryCards = ~/retrodeck/saves/pcsx2 Logs = logs Cheats = cheats CheatsWS = cheats_ws @@ -446,4 +446,4 @@ PressureModifier = 0.500000 [GameList] -RecursivePaths = /home/deck/retrodeck/roms/ps2 +RecursivePaths = ~/retrodeck/roms/ps2 diff --git a/emu-configs/PCSX2/PCSX2_ui.ini b/emu-configs/PCSX2/PCSX2_ui.ini index 891b6cab..72e94628 100644 --- a/emu-configs/PCSX2/PCSX2_ui.ini +++ b/emu-configs/PCSX2/PCSX2_ui.ini @@ -40,7 +40,7 @@ UseDefaultLangs=enabled UseDefaultCheats=enabled UseDefaultCheatsWS=enabled UseDefaultTextures=enabled -Bios=/run/media/deck/DeckSD/retrodeck/roms/bios +Bios=~/retrodeck/roms/bios Snapshots=/var/config/PCSX2/snaps Savestates=/var/config/PCSX2/sstates MemoryCards=/var/config/PCSX2/memcards diff --git a/retrodeck.sh b/retrodeck.sh index f5ba4071..e5b7e580 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -98,8 +98,9 @@ standalones_init() { echo "Initializing PCSX2" echo "----------------------" mkdir -pv /var/config/PCSX2/inis/ - cp -fvr $emuconfigs/PCSX2_ui.ini /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.ini cp -fvr $emuconfigs/GS.ini /var/config/PCSX2/inis/ cp -fvr $emuconfigs/PCSX2_vm.ini /var/config/PCSX2/inis/ dir_prep "$rdhome/states" "/var/config/PCSX2/sstates" From 1513a60d52583557b8b7511decb9c23b9c715dfd Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 7 Sep 2022 20:52:36 +0200 Subject: [PATCH 126/393] PCSX2: sedded configs --- emu-configs/PCSX2/PCSX2.ini | 10 +++++----- emu-configs/PCSX2/PCSX2_ui.ini | 2 +- retrodeck.sh | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/emu-configs/PCSX2/PCSX2.ini b/emu-configs/PCSX2/PCSX2.ini index 26bb2f01..6a820bf6 100644 --- a/emu-configs/PCSX2/PCSX2.ini +++ b/emu-configs/PCSX2/PCSX2.ini @@ -296,10 +296,10 @@ Multitap2_Slot4_Filename = Mcd-Multitap2-Slot04.ps2 [Folders] -Bios = ../../../../../retrodeck/bios/pcsx2 -Snapshots = ../../../../../retrodeck/screenshots -SaveStates = ../../../../../retrodeck/states -MemoryCards = ../../../../../retrodeck/saves/pcsx2 +Bios = ~/retrodeck/bios/pcsx2 +Snapshots = ~/retrodeck/screenshots +SaveStates = ~/retrodeck/states +MemoryCards = ~/retrodeck/saves/pcsx2 Logs = logs Cheats = cheats CheatsWS = cheats_ws @@ -446,4 +446,4 @@ PressureModifier = 0.500000 [GameList] -RecursivePaths = /home/deck/retrodeck/roms/ps2 +RecursivePaths = ~/retrodeck/roms/ps2 diff --git a/emu-configs/PCSX2/PCSX2_ui.ini b/emu-configs/PCSX2/PCSX2_ui.ini index 891b6cab..72e94628 100644 --- a/emu-configs/PCSX2/PCSX2_ui.ini +++ b/emu-configs/PCSX2/PCSX2_ui.ini @@ -40,7 +40,7 @@ UseDefaultLangs=enabled UseDefaultCheats=enabled UseDefaultCheatsWS=enabled UseDefaultTextures=enabled -Bios=/run/media/deck/DeckSD/retrodeck/roms/bios +Bios=~/retrodeck/roms/bios Snapshots=/var/config/PCSX2/snaps Savestates=/var/config/PCSX2/sstates MemoryCards=/var/config/PCSX2/memcards diff --git a/retrodeck.sh b/retrodeck.sh index f5ba4071..e5b7e580 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -98,8 +98,9 @@ standalones_init() { echo "Initializing PCSX2" echo "----------------------" mkdir -pv /var/config/PCSX2/inis/ - cp -fvr $emuconfigs/PCSX2_ui.ini /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.ini cp -fvr $emuconfigs/GS.ini /var/config/PCSX2/inis/ cp -fvr $emuconfigs/PCSX2_vm.ini /var/config/PCSX2/inis/ dir_prep "$rdhome/states" "/var/config/PCSX2/sstates" From e0b81c5b273b6ef480078482ea15ee0ef38da0c2 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 7 Sep 2022 20:54:36 +0200 Subject: [PATCH 127/393] PCSX2: cleaned old files --- emu-configs/GS.ini | 89 ---------------------------------------------- retrodeck.sh | 2 -- 2 files changed, 91 deletions(-) delete mode 100644 emu-configs/GS.ini diff --git a/emu-configs/GS.ini b/emu-configs/GS.ini deleted file mode 100644 index d91aa444..00000000 --- a/emu-configs/GS.ini +++ /dev/null @@ -1,89 +0,0 @@ -CaptureHeight = 480 -CaptureWidth = 640 -DisableDualSourceBlend = 0 -DisableFramebufferFetch = 0 -DumpReplaceableMipmaps = 0 -DumpReplaceableTextures = 0 -DumpTexturesWithFMVActive = 0 -HWDisableReadbacks = 0 -IntegerScaling = 0 -LoadTextureReplacements = 0 -LoadTextureReplacementsAsync = 1 -MaxAnisotropy = 0 -NTSC_Saturation = 1 -OsdScale = 100 -OsdShowCPU = 0 -OsdShowFPS = 0 -OsdShowGPU = 0 -OsdShowGSStats = 0 -OsdShowIndicators = 1 -OsdShowMessages = 1 -OsdShowResolution = 0 -OsdShowSpeed = 0 -OverrideGeometryShaders = -1 -OverrideTextureBarriers = -1 -PrecacheTextureReplacements = 0 -Renderer = 14 -ShadeBoost = 0 -ShadeBoost_Brightness = 50 -ShadeBoost_Contrast = 50 -ShadeBoost_Saturation = 50 -TVShader = 0 -ThreadedPresentation = 0 -UseBlitSwapChain = 0 -UseDebugDevice = 0 -UserHacks = 1 -UserHacks_AutoFlush = 0 -UserHacks_CPU_FB_Conversion = 0 -UserHacks_DisableDepthSupport = 0 -UserHacks_DisablePartialInvalidation = 1 -UserHacks_Disable_Safe_Features = 0 -UserHacks_HalfPixelOffset = 0 -UserHacks_Half_Bottom_Override = -1 -UserHacks_SkipDraw_End = 0 -UserHacks_SkipDraw_Start = 0 -UserHacks_TCOffsetX = 0 -UserHacks_TCOffsetY = 0 -UserHacks_TextureInsideRt = 0 -UserHacks_TriFilter = 0 -UserHacks_WildHack = 0 -UserHacks_align_sprite_X = 0 -UserHacks_merge_pp_sprite = 0 -UserHacks_round_sprite_offset = 0 -aa1 = 1 -accurate_blending_unit = 1 -accurate_date = 1 -autoflush_sw = 1 -capture_enabled = 0 -capture_out_dir = /tmp/GS_Capture -capture_threads = 4 -conservative_framebuffer = 1 -crc_hack_level = -1 -disable_shader_cache = 0 -dithering_ps2 = 2 -dump = 0 -extrathreads = 2 -extrathreads_height = 4 -filter = 2 -fxaa = 0 -interlace = 7 -linear_present = 1 -mipmap = 1 -mipmap_hw = -1 -override_GL_ARB_shader_image_load_store = -1 -override_GL_ARB_sparse_texture = -1 -paltex = 0 -png_compression_level = 1 -preload_frame_with_gs_data = 0 -save = 0 -savef = 0 -savel = 5000 -saven = 0 -savet = 0 -savez = 0 -shaderfx = 0 -shaderfx_conf = shaders/GS_FX_Settings.ini -shaderfx_glsl = shaders/GS.fx -texture_preloading = 0 -upscale_multiplier = 2 -wrap_gs_mem = 0 diff --git a/retrodeck.sh b/retrodeck.sh index e5b7e580..cd01bdb2 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -101,8 +101,6 @@ 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 - cp -fvr $emuconfigs/GS.ini /var/config/PCSX2/inis/ - cp -fvr $emuconfigs/PCSX2_vm.ini /var/config/PCSX2/inis/ dir_prep "$rdhome/states" "/var/config/PCSX2/sstates" dir_prep "$rdhome/screenshots" "/var/config/PCSX2/snaps" dir_prep "$rdhome/.logs" "/var/config/PCSX2/logs" From e86555ce970ea1520c06f17d3855ab84ac05fb66 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 7 Sep 2022 20:54:36 +0200 Subject: [PATCH 128/393] PCSX2: cleaned old files --- emu-configs/GS.ini | 89 ---------------------------------------------- retrodeck.sh | 2 -- 2 files changed, 91 deletions(-) delete mode 100644 emu-configs/GS.ini diff --git a/emu-configs/GS.ini b/emu-configs/GS.ini deleted file mode 100644 index d91aa444..00000000 --- a/emu-configs/GS.ini +++ /dev/null @@ -1,89 +0,0 @@ -CaptureHeight = 480 -CaptureWidth = 640 -DisableDualSourceBlend = 0 -DisableFramebufferFetch = 0 -DumpReplaceableMipmaps = 0 -DumpReplaceableTextures = 0 -DumpTexturesWithFMVActive = 0 -HWDisableReadbacks = 0 -IntegerScaling = 0 -LoadTextureReplacements = 0 -LoadTextureReplacementsAsync = 1 -MaxAnisotropy = 0 -NTSC_Saturation = 1 -OsdScale = 100 -OsdShowCPU = 0 -OsdShowFPS = 0 -OsdShowGPU = 0 -OsdShowGSStats = 0 -OsdShowIndicators = 1 -OsdShowMessages = 1 -OsdShowResolution = 0 -OsdShowSpeed = 0 -OverrideGeometryShaders = -1 -OverrideTextureBarriers = -1 -PrecacheTextureReplacements = 0 -Renderer = 14 -ShadeBoost = 0 -ShadeBoost_Brightness = 50 -ShadeBoost_Contrast = 50 -ShadeBoost_Saturation = 50 -TVShader = 0 -ThreadedPresentation = 0 -UseBlitSwapChain = 0 -UseDebugDevice = 0 -UserHacks = 1 -UserHacks_AutoFlush = 0 -UserHacks_CPU_FB_Conversion = 0 -UserHacks_DisableDepthSupport = 0 -UserHacks_DisablePartialInvalidation = 1 -UserHacks_Disable_Safe_Features = 0 -UserHacks_HalfPixelOffset = 0 -UserHacks_Half_Bottom_Override = -1 -UserHacks_SkipDraw_End = 0 -UserHacks_SkipDraw_Start = 0 -UserHacks_TCOffsetX = 0 -UserHacks_TCOffsetY = 0 -UserHacks_TextureInsideRt = 0 -UserHacks_TriFilter = 0 -UserHacks_WildHack = 0 -UserHacks_align_sprite_X = 0 -UserHacks_merge_pp_sprite = 0 -UserHacks_round_sprite_offset = 0 -aa1 = 1 -accurate_blending_unit = 1 -accurate_date = 1 -autoflush_sw = 1 -capture_enabled = 0 -capture_out_dir = /tmp/GS_Capture -capture_threads = 4 -conservative_framebuffer = 1 -crc_hack_level = -1 -disable_shader_cache = 0 -dithering_ps2 = 2 -dump = 0 -extrathreads = 2 -extrathreads_height = 4 -filter = 2 -fxaa = 0 -interlace = 7 -linear_present = 1 -mipmap = 1 -mipmap_hw = -1 -override_GL_ARB_shader_image_load_store = -1 -override_GL_ARB_sparse_texture = -1 -paltex = 0 -png_compression_level = 1 -preload_frame_with_gs_data = 0 -save = 0 -savef = 0 -savel = 5000 -saven = 0 -savet = 0 -savez = 0 -shaderfx = 0 -shaderfx_conf = shaders/GS_FX_Settings.ini -shaderfx_glsl = shaders/GS.fx -texture_preloading = 0 -upscale_multiplier = 2 -wrap_gs_mem = 0 diff --git a/retrodeck.sh b/retrodeck.sh index e5b7e580..cd01bdb2 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -101,8 +101,6 @@ 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 - cp -fvr $emuconfigs/GS.ini /var/config/PCSX2/inis/ - cp -fvr $emuconfigs/PCSX2_vm.ini /var/config/PCSX2/inis/ dir_prep "$rdhome/states" "/var/config/PCSX2/sstates" dir_prep "$rdhome/screenshots" "/var/config/PCSX2/snaps" dir_prep "$rdhome/.logs" "/var/config/PCSX2/logs" From 1bf10b8daa3c826e5d3a7477d7811e1e064d48b2 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 7 Sep 2022 20:57:49 +0200 Subject: [PATCH 129/393] Fixed configured emulator tool --- tools/configure-emulators.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/configure-emulators.sh b/tools/configure-emulators.sh index a646bf47..f469bfc8 100755 --- a/tools/configure-emulators.sh +++ b/tools/configure-emulators.sh @@ -20,7 +20,7 @@ emulator="$(zenity --list \ "Duckstation" \ "MelonDS" \ "PCSX2-QT" \ -"PCSX2 (Legacy)" \ +"PCSX2-Legacy" \ "PPSSPP" \ "RPCS3" \ "XEMU" \ @@ -41,10 +41,10 @@ then elif [ $emulator == "MelonDS" ] then melonDS -elif [ $emulator == "PCSX2 (Legacy)" ] +elif [ $emulator == "PCSX2-Legacy" ] then pcsx2 -elif [ $emulator == "pcsx2-qt" ] +elif [ $emulator == "PCSX2-QT" ] then pcsx2-qt elif [ $emulator == "PPSSPP" ] From c4bd4cc36561f309a47e2c3bbdabe2e3f279bbc0 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 7 Sep 2022 20:57:49 +0200 Subject: [PATCH 130/393] Fixed configured emulator tool --- tools/configure-emulators.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/configure-emulators.sh b/tools/configure-emulators.sh index a646bf47..f469bfc8 100755 --- a/tools/configure-emulators.sh +++ b/tools/configure-emulators.sh @@ -20,7 +20,7 @@ emulator="$(zenity --list \ "Duckstation" \ "MelonDS" \ "PCSX2-QT" \ -"PCSX2 (Legacy)" \ +"PCSX2-Legacy" \ "PPSSPP" \ "RPCS3" \ "XEMU" \ @@ -41,10 +41,10 @@ then elif [ $emulator == "MelonDS" ] then melonDS -elif [ $emulator == "PCSX2 (Legacy)" ] +elif [ $emulator == "PCSX2-Legacy" ] then pcsx2 -elif [ $emulator == "pcsx2-qt" ] +elif [ $emulator == "PCSX2-QT" ] then pcsx2-qt elif [ $emulator == "PPSSPP" ] From 5335e33367963a2e2329896c3ca1655331a90383 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 8 Sep 2022 17:45:57 +0200 Subject: [PATCH 131/393] DOLPHIN: fixed some paths --- emu-configs/dolphin/Dolphin.ini | 10 +++++----- retrodeck.sh | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/emu-configs/dolphin/Dolphin.ini b/emu-configs/dolphin/Dolphin.ini index bb6ae945..a6f1c2ea 100644 --- a/emu-configs/dolphin/Dolphin.ini +++ b/emu-configs/dolphin/Dolphin.ini @@ -24,19 +24,19 @@ DSPHLE = True Fullscreen = True DisableScreenSaver = True [GBA] -BIOS = /var/data/dolphin-emu/GBA/gba_bios.bin +BIOS = ~/retrodeck/bios Rom1 = Rom2 = Rom3 = Rom4 = SavesInRomPath = False -SavesPath = /var/data/dolphin-emu/GBA/Saves/ +SavesPath = ~/retrodeck/saves Threads = True [General] -ISOPath0 = /run/user/1000/doc/9cd3cde7/wii -ISOPath1 = /run/user/1000/doc/14708e0c/gc +ISOPath0 = ~/retrodeck/roms/wii +ISOPath1 = ~/retrodeck/roms/gc ISOPaths = 2 -WiiSDCardPath = /var/data/dolphin-emu/Wii/sd.raw +WiiSDCardPath = ~/retrodeck/saves/sd.raw WirelessMac = 00:17:ab:83:9b:d4 HotkeysRequireFocus = True RecursiveISOPaths = True diff --git a/retrodeck.sh b/retrodeck.sh index cd01bdb2..adb5e4ed 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -90,8 +90,7 @@ standalones_init() { echo "----------------------" mkdir -pv /var/config/dolphin-emu/ cp -fvr "$emuconfigs/dolphin/"* /var/config/dolphin-emu/ - dir_prep "$rdhome/saves" "/var/data/dolphin-emu/GBA/Saves" - dir_prep "$rdhome/saves" "/var/data/dolphin-emu/Wii" + sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/dolphin-emu/Dolphin.ini # pcsx2 echo "----------------------" From 974f66c505c3f8730d12aed5cb620242ce78b8db Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 8 Sep 2022 17:45:57 +0200 Subject: [PATCH 132/393] DOLPHIN: fixed some paths --- emu-configs/dolphin/Dolphin.ini | 10 +++++----- retrodeck.sh | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/emu-configs/dolphin/Dolphin.ini b/emu-configs/dolphin/Dolphin.ini index bb6ae945..a6f1c2ea 100644 --- a/emu-configs/dolphin/Dolphin.ini +++ b/emu-configs/dolphin/Dolphin.ini @@ -24,19 +24,19 @@ DSPHLE = True Fullscreen = True DisableScreenSaver = True [GBA] -BIOS = /var/data/dolphin-emu/GBA/gba_bios.bin +BIOS = ~/retrodeck/bios Rom1 = Rom2 = Rom3 = Rom4 = SavesInRomPath = False -SavesPath = /var/data/dolphin-emu/GBA/Saves/ +SavesPath = ~/retrodeck/saves Threads = True [General] -ISOPath0 = /run/user/1000/doc/9cd3cde7/wii -ISOPath1 = /run/user/1000/doc/14708e0c/gc +ISOPath0 = ~/retrodeck/roms/wii +ISOPath1 = ~/retrodeck/roms/gc ISOPaths = 2 -WiiSDCardPath = /var/data/dolphin-emu/Wii/sd.raw +WiiSDCardPath = ~/retrodeck/saves/sd.raw WirelessMac = 00:17:ab:83:9b:d4 HotkeysRequireFocus = True RecursiveISOPaths = True diff --git a/retrodeck.sh b/retrodeck.sh index cd01bdb2..adb5e4ed 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -90,8 +90,7 @@ standalones_init() { echo "----------------------" mkdir -pv /var/config/dolphin-emu/ cp -fvr "$emuconfigs/dolphin/"* /var/config/dolphin-emu/ - dir_prep "$rdhome/saves" "/var/data/dolphin-emu/GBA/Saves" - dir_prep "$rdhome/saves" "/var/data/dolphin-emu/Wii" + sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/dolphin-emu/Dolphin.ini # pcsx2 echo "----------------------" From 918cc4cdfafebe20344808c62e207c25bbfc1238 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 8 Sep 2022 17:50:52 +0200 Subject: [PATCH 133/393] Hiddem Primehack for the moment --- es-configs/es_systems.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml index 73957de1..3f8d3a60 100644 --- a/es-configs/es_systems.xml +++ b/es-configs/es_systems.xml @@ -565,7 +565,7 @@ .gcm .GCM .iso .ISO .wbfs .WBFS .wia .WIA .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .json .JSON .rvz .RVZ .tgc .TGC .wad .WAD .m3u .M3U .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM% %EMULATOR_DOLPHIN% -b -e %ROM% - %EMULATOR_PRIMEHACK% -b -e %ROM% + gc gc From 217a7fd0833a281868a2096ba7d23306f81ade1f Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 8 Sep 2022 17:50:52 +0200 Subject: [PATCH 134/393] Hiddem Primehack for the moment --- es-configs/es_systems.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml index 73957de1..3f8d3a60 100644 --- a/es-configs/es_systems.xml +++ b/es-configs/es_systems.xml @@ -565,7 +565,7 @@ .gcm .GCM .iso .ISO .wbfs .WBFS .wia .WIA .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .json .JSON .rvz .RVZ .tgc .TGC .wad .WAD .m3u .M3U .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM% %EMULATOR_DOLPHIN% -b -e %ROM% - %EMULATOR_PRIMEHACK% -b -e %ROM% + gc gc From 5aae1dc5ab2748eba173a5f19dd47ff66ce000a0 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 9 Sep 2022 08:42:16 +0200 Subject: [PATCH 135/393] CEMU: updated --- net.retrodeck.retrodeck.yml | 46 +++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 77bd3695..ba25b907 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1314,23 +1314,35 @@ modules: # CEMU - START - # - name: Cemu - # buildsystem: cmake-ninja - # builddir: true - # config-opts: - # - -DENABLE_VCPKG=false - # - -DCMAKE_BUILD_TYPE=Release - # #- -DCMAKE_C_COMPILER=/usr/bin/gcc - # #- -DCMAKE_CXX_COMPILER=/usr/bin/g++ - # - -Dimgui_LINK_LIBRARIES=/app/lib/imgui - # sources: - # - type: git - # url: https://github.com/cemu-project/Cemu - # commit: d8da8a54a6c08296a884b892d714cabcb7e4bdb5 - # - type: git - # dest: 3rdparty/imgui/imgui - # url: https://github.com/ocornut/imgui.git - # commit: 60bea052a92cbb4a93b221002fdf04f0da3698e1 + - name: cemu + buildsystem: cmake-ninja + builddir: true + build-options: + env: + CC: clang + CXX: clang++ + AR: llvm-ar + RANLIB: llvm-ranlib + ldflags: -fuse-ld=lld + prepend-ld-library-path: /usr/lib/sdk/llvm13/lib + prepend-path: /usr/lib/sdk/llvm13/bin + config-opts: + - -DCMAKE_BUILD_TYPE=RelWithDebInfo + - -DENABLE_VCPKG=false + sources: + - type: git + url: https://github.com/cemu-project/Cemu + tag: v2.0-1 + commit: e5d7d5d1736019d08e1ff8d9bd2e385330c5b7de + - type: git + dest: 3rdparty/imgui/imgui + url: https://github.com/ocornut/imgui.git + commit: 60bea052a92cbb4a93b221002fdf04f0da3698e1 + cleanup: + - /app/include + - /app/lib/*.a + - /app/lib/*.la + - /app/lib/pkgconfig # CEMU - END From d688fc61a69e020ff88965919ea740b4b0dedaac Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 9 Sep 2022 08:42:16 +0200 Subject: [PATCH 136/393] CEMU: updated --- net.retrodeck.retrodeck.yml | 46 +++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 77bd3695..ba25b907 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1314,23 +1314,35 @@ modules: # CEMU - START - # - name: Cemu - # buildsystem: cmake-ninja - # builddir: true - # config-opts: - # - -DENABLE_VCPKG=false - # - -DCMAKE_BUILD_TYPE=Release - # #- -DCMAKE_C_COMPILER=/usr/bin/gcc - # #- -DCMAKE_CXX_COMPILER=/usr/bin/g++ - # - -Dimgui_LINK_LIBRARIES=/app/lib/imgui - # sources: - # - type: git - # url: https://github.com/cemu-project/Cemu - # commit: d8da8a54a6c08296a884b892d714cabcb7e4bdb5 - # - type: git - # dest: 3rdparty/imgui/imgui - # url: https://github.com/ocornut/imgui.git - # commit: 60bea052a92cbb4a93b221002fdf04f0da3698e1 + - name: cemu + buildsystem: cmake-ninja + builddir: true + build-options: + env: + CC: clang + CXX: clang++ + AR: llvm-ar + RANLIB: llvm-ranlib + ldflags: -fuse-ld=lld + prepend-ld-library-path: /usr/lib/sdk/llvm13/lib + prepend-path: /usr/lib/sdk/llvm13/bin + config-opts: + - -DCMAKE_BUILD_TYPE=RelWithDebInfo + - -DENABLE_VCPKG=false + sources: + - type: git + url: https://github.com/cemu-project/Cemu + tag: v2.0-1 + commit: e5d7d5d1736019d08e1ff8d9bd2e385330c5b7de + - type: git + dest: 3rdparty/imgui/imgui + url: https://github.com/ocornut/imgui.git + commit: 60bea052a92cbb4a93b221002fdf04f0da3698e1 + cleanup: + - /app/include + - /app/lib/*.a + - /app/lib/*.la + - /app/lib/pkgconfig # CEMU - END From ef15d13d81566b51c800101950da84dacbeb55bb Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 9 Sep 2022 08:42:45 +0200 Subject: [PATCH 137/393] CEMU: updated --- net.retrodeck.retrodeck.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index ba25b907..55a36c9a 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1313,6 +1313,7 @@ modules: # Duckstation - END # CEMU - START + # temporary here: https://github.com/Eonfge/flathub/blob/8bb2905b0fefdff820a2b65dac2a7cde916d3ce5/info.cemu.Cemu.yaml - name: cemu buildsystem: cmake-ninja From c69a960c3d7dd9a62df95617366bf76348871b22 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 9 Sep 2022 08:42:45 +0200 Subject: [PATCH 138/393] CEMU: updated --- net.retrodeck.retrodeck.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index ba25b907..55a36c9a 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1313,6 +1313,7 @@ modules: # Duckstation - END # CEMU - START + # temporary here: https://github.com/Eonfge/flathub/blob/8bb2905b0fefdff820a2b65dac2a7cde916d3ce5/info.cemu.Cemu.yaml - name: cemu buildsystem: cmake-ninja From 4aadeffe29b646e5cdbeba6bab3b8f98d9798029 Mon Sep 17 00:00:00 2001 From: anthonycaccese Date: Sat, 10 Sep 2022 09:39:26 -0400 Subject: [PATCH 139/393] Updated Art-Book-Next to latest version commit: 23932f484a9949313baf80f92b2fbca38a7a8f37 --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 55a36c9a..1a8cf21c 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -252,7 +252,7 @@ modules: sources: - type: git url: https://github.com/anthonycaccese/art-book-next-retropie.git - commit: cbd282eb05bb2deb138dad99c3420be56d35c1b8 + commit: 23932f484a9949313baf80f92b2fbca38a7a8f37 - name: alekfull-nx-light buildsystem: simple From e154b90f5653a7109962e737e7a410b2f6edab8f Mon Sep 17 00:00:00 2001 From: anthonycaccese Date: Sat, 10 Sep 2022 09:39:26 -0400 Subject: [PATCH 140/393] Updated Art-Book-Next to latest version commit: 23932f484a9949313baf80f92b2fbca38a7a8f37 --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 55a36c9a..1a8cf21c 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -252,7 +252,7 @@ modules: sources: - type: git url: https://github.com/anthonycaccese/art-book-next-retropie.git - commit: cbd282eb05bb2deb138dad99c3420be56d35c1b8 + commit: 23932f484a9949313baf80f92b2fbca38a7a8f37 - name: alekfull-nx-light buildsystem: simple From 44812521d0ca103ed9ea4d461dfd4c40bb242f8e Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 10 Sep 2022 17:02:11 +0200 Subject: [PATCH 141/393] CEMU: updated manifest --- net.retrodeck.retrodeck.yml | 64 +++++++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 17 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 1a8cf21c..ef2477d9 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1315,30 +1315,60 @@ modules: # CEMU - START # temporary here: https://github.com/Eonfge/flathub/blob/8bb2905b0fefdff820a2b65dac2a7cde916d3ce5/info.cemu.Cemu.yaml - - name: cemu + # Needed for imgui + - name: glad buildsystem: cmake-ninja - builddir: true - build-options: - env: - CC: clang - CXX: clang++ - AR: llvm-ar - RANLIB: llvm-ranlib - ldflags: -fuse-ld=lld - prepend-ld-library-path: /usr/lib/sdk/llvm13/lib - prepend-path: /usr/lib/sdk/llvm13/bin config-opts: - -DCMAKE_BUILD_TYPE=RelWithDebInfo + - -DBUILD_SHARED_LIBS=true + - -DGLAD_REPRODUCIBLE=true + - -DGLAD_INSTALL=true + sources: + - type: archive + url: https://github.com/Dav1dde/glad/archive/refs/tags/v0.1.36.tar.gz + sha256: 8470ed1b0e9fbe88e10c34770505c8a1dc8ccb78cadcf673331aaf5224f963d2 + + # Needed for imgui + - name: glfw + buildsystem: cmake-ninja + builddir: true + config-opts: + - -DBUILD_SHARED_LIBS=ON + - -DGLFW_BUILD_EXAMPLES=OFF + - -DGLFW_BUILD_TESTS=OFF + - -DGLFW_BUILD_DOCS=OFF + sources: + - type: archive + url: https://github.com/glfw/glfw/releases/download/3.3.2/glfw-3.3.2.zip + sha256: 08a33a512f29d7dbf78eab39bd7858576adcc95228c9efe8e4bc5f0f3261efc7 + cleanup: + - /include + - /lib/pkgconfig + + - name: imgui + buildsystem: cmake + sources: + - type: archive + url: https://github.com/ocornut/imgui/archive/refs/tags/v1.88.zip + sha256: 81087a74599e5890a07b636887cee73a7dc1a9eb9e1f19a4a0d82a76090bf4c2 + - type: file + path: imguiCMakeLists.txt + dest-filename: CMakeLists.txt + + - name: Cemu + buildsystem: cmake-ninja + builddir: true + config-opts: - -DENABLE_VCPKG=false + - -DCMAKE_BUILD_TYPE=release + - -DCMAKE_C_COMPILER=/usr/bin/gcc + - -DCMAKE_CXX_COMPILER=/usr/bin/g++ + - -G Ninja + - -DCMAKE_MAKE_PROGRAM=/usr/bin/ninja sources: - type: git url: https://github.com/cemu-project/Cemu - tag: v2.0-1 - commit: e5d7d5d1736019d08e1ff8d9bd2e385330c5b7de - - type: git - dest: 3rdparty/imgui/imgui - url: https://github.com/ocornut/imgui.git - commit: 60bea052a92cbb4a93b221002fdf04f0da3698e1 + commit: d8da8a54a6c08296a884b892d714cabcb7e4bdb5 cleanup: - /app/include - /app/lib/*.a From 7cd36ef9496f1f357bd58ae3e709e4e67d1f164f Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 10 Sep 2022 17:02:11 +0200 Subject: [PATCH 142/393] CEMU: updated manifest --- net.retrodeck.retrodeck.yml | 64 +++++++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 17 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 1a8cf21c..ef2477d9 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1315,30 +1315,60 @@ modules: # CEMU - START # temporary here: https://github.com/Eonfge/flathub/blob/8bb2905b0fefdff820a2b65dac2a7cde916d3ce5/info.cemu.Cemu.yaml - - name: cemu + # Needed for imgui + - name: glad buildsystem: cmake-ninja - builddir: true - build-options: - env: - CC: clang - CXX: clang++ - AR: llvm-ar - RANLIB: llvm-ranlib - ldflags: -fuse-ld=lld - prepend-ld-library-path: /usr/lib/sdk/llvm13/lib - prepend-path: /usr/lib/sdk/llvm13/bin config-opts: - -DCMAKE_BUILD_TYPE=RelWithDebInfo + - -DBUILD_SHARED_LIBS=true + - -DGLAD_REPRODUCIBLE=true + - -DGLAD_INSTALL=true + sources: + - type: archive + url: https://github.com/Dav1dde/glad/archive/refs/tags/v0.1.36.tar.gz + sha256: 8470ed1b0e9fbe88e10c34770505c8a1dc8ccb78cadcf673331aaf5224f963d2 + + # Needed for imgui + - name: glfw + buildsystem: cmake-ninja + builddir: true + config-opts: + - -DBUILD_SHARED_LIBS=ON + - -DGLFW_BUILD_EXAMPLES=OFF + - -DGLFW_BUILD_TESTS=OFF + - -DGLFW_BUILD_DOCS=OFF + sources: + - type: archive + url: https://github.com/glfw/glfw/releases/download/3.3.2/glfw-3.3.2.zip + sha256: 08a33a512f29d7dbf78eab39bd7858576adcc95228c9efe8e4bc5f0f3261efc7 + cleanup: + - /include + - /lib/pkgconfig + + - name: imgui + buildsystem: cmake + sources: + - type: archive + url: https://github.com/ocornut/imgui/archive/refs/tags/v1.88.zip + sha256: 81087a74599e5890a07b636887cee73a7dc1a9eb9e1f19a4a0d82a76090bf4c2 + - type: file + path: imguiCMakeLists.txt + dest-filename: CMakeLists.txt + + - name: Cemu + buildsystem: cmake-ninja + builddir: true + config-opts: - -DENABLE_VCPKG=false + - -DCMAKE_BUILD_TYPE=release + - -DCMAKE_C_COMPILER=/usr/bin/gcc + - -DCMAKE_CXX_COMPILER=/usr/bin/g++ + - -G Ninja + - -DCMAKE_MAKE_PROGRAM=/usr/bin/ninja sources: - type: git url: https://github.com/cemu-project/Cemu - tag: v2.0-1 - commit: e5d7d5d1736019d08e1ff8d9bd2e385330c5b7de - - type: git - dest: 3rdparty/imgui/imgui - url: https://github.com/ocornut/imgui.git - commit: 60bea052a92cbb4a93b221002fdf04f0da3698e1 + commit: d8da8a54a6c08296a884b892d714cabcb7e4bdb5 cleanup: - /app/include - /app/lib/*.a From 373462e02684f2c5d6dbcda5f5c3c6f1a34505d8 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 10 Sep 2022 17:30:27 +0200 Subject: [PATCH 143/393] PCSX2-QT: updated --- net.retrodeck.retrodeck.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index ef2477d9..cc7244b1 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -867,8 +867,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.3271/pcsx2-v1.7.3271-linux-AppImage-64bit-AVX2-Qt.AppImage - sha256: 34aca477585bf9492b8f51ae066fe52c2a321c7b5656b9b76df97d51f75e4f85 + url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.3300/pcsx2-v1.7.3300-linux-AppImage-64bit-AVX2-Qt.AppImage + sha256: 2785b1290bcbff36f1bcea66d61322975b194a383836f805daafe46aade7ce0f # PCSX2 - END From 42924742e6e0d2379ca5d7045e1ff80827a4327b Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 10 Sep 2022 17:30:27 +0200 Subject: [PATCH 144/393] PCSX2-QT: updated --- net.retrodeck.retrodeck.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index ef2477d9..cc7244b1 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -867,8 +867,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.3271/pcsx2-v1.7.3271-linux-AppImage-64bit-AVX2-Qt.AppImage - sha256: 34aca477585bf9492b8f51ae066fe52c2a321c7b5656b9b76df97d51f75e4f85 + url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.3300/pcsx2-v1.7.3300-linux-AppImage-64bit-AVX2-Qt.AppImage + sha256: 2785b1290bcbff36f1bcea66d61322975b194a383836f805daafe46aade7ce0f # PCSX2 - END From e34cf8549b3f68f1604c79e43396ef854689ca43 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 10 Sep 2022 17:35:36 +0200 Subject: [PATCH 145/393] PCSX2-QT: increased menu scaling --- emu-configs/PCSX2/GS.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emu-configs/PCSX2/GS.ini b/emu-configs/PCSX2/GS.ini index d91aa444..93ca603a 100644 --- a/emu-configs/PCSX2/GS.ini +++ b/emu-configs/PCSX2/GS.ini @@ -11,7 +11,7 @@ LoadTextureReplacements = 0 LoadTextureReplacementsAsync = 1 MaxAnisotropy = 0 NTSC_Saturation = 1 -OsdScale = 100 +OsdScale = 250 OsdShowCPU = 0 OsdShowFPS = 0 OsdShowGPU = 0 From dde08bc106cd48502fece57e00f0a842e17ef43d Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 10 Sep 2022 17:35:36 +0200 Subject: [PATCH 146/393] PCSX2-QT: increased menu scaling --- emu-configs/PCSX2/GS.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emu-configs/PCSX2/GS.ini b/emu-configs/PCSX2/GS.ini index d91aa444..93ca603a 100644 --- a/emu-configs/PCSX2/GS.ini +++ b/emu-configs/PCSX2/GS.ini @@ -11,7 +11,7 @@ LoadTextureReplacements = 0 LoadTextureReplacementsAsync = 1 MaxAnisotropy = 0 NTSC_Saturation = 1 -OsdScale = 100 +OsdScale = 250 OsdShowCPU = 0 OsdShowFPS = 0 OsdShowGPU = 0 From e32ab950a33ccb8c131f6c5795bc0c0a6fb3dd22 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 10 Sep 2022 17:37:48 +0200 Subject: [PATCH 147/393] PCSX2-QT: setted as default emulator --- es-configs/es_systems.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml index 3f8d3a60..78d392a7 100644 --- a/es-configs/es_systems.xml +++ b/es-configs/es_systems.xml @@ -1070,9 +1070,9 @@ ps2 Sony PlayStation 2 %ROMPATH%/ps2 + %EMULATOR_PCSX2% -batch %ROM% .bin .BIN .chd .CHD .ciso .CISO .cso .CSO .dump .DUMP .elf .ELF .gz .GZ .m3u .M3U .mdf .MDF .img .IMG .iso .ISO .isz .ISZ .ngr .NRG %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM% - %EMULATOR_PCSX2% -batch %ROM% %EMULATOR_PCSX2-LEGACY% --nogui %ROM% ps2 From 9abf73fa9a07b85a6d3d42086440984cf7530253 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 10 Sep 2022 17:37:48 +0200 Subject: [PATCH 148/393] PCSX2-QT: setted as default emulator --- es-configs/es_systems.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml index 3f8d3a60..78d392a7 100644 --- a/es-configs/es_systems.xml +++ b/es-configs/es_systems.xml @@ -1070,9 +1070,9 @@ ps2 Sony PlayStation 2 %ROMPATH%/ps2 + %EMULATOR_PCSX2% -batch %ROM% .bin .BIN .chd .CHD .ciso .CISO .cso .CSO .dump .DUMP .elf .ELF .gz .GZ .m3u .M3U .mdf .MDF .img .IMG .iso .ISO .isz .ISZ .ngr .NRG %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM% - %EMULATOR_PCSX2% -batch %ROM% %EMULATOR_PCSX2-LEGACY% --nogui %ROM% ps2 From 4bdcac0d00cd0cf3bfae4d9a5a9432a617303df1 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 10 Sep 2022 17:47:22 +0200 Subject: [PATCH 149/393] PCSX2-QT: bios folder was wrong --- emu-configs/PCSX2/PCSX2.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emu-configs/PCSX2/PCSX2.ini b/emu-configs/PCSX2/PCSX2.ini index 6a820bf6..1cd87ed8 100644 --- a/emu-configs/PCSX2/PCSX2.ini +++ b/emu-configs/PCSX2/PCSX2.ini @@ -296,7 +296,7 @@ Multitap2_Slot4_Filename = Mcd-Multitap2-Slot04.ps2 [Folders] -Bios = ~/retrodeck/bios/pcsx2 +Bios = ~/retrodeck/bios Snapshots = ~/retrodeck/screenshots SaveStates = ~/retrodeck/states MemoryCards = ~/retrodeck/saves/pcsx2 From 20fa2f86271c64474c36d5be72077f3fb027ba23 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 10 Sep 2022 17:47:22 +0200 Subject: [PATCH 150/393] PCSX2-QT: bios folder was wrong --- emu-configs/PCSX2/PCSX2.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emu-configs/PCSX2/PCSX2.ini b/emu-configs/PCSX2/PCSX2.ini index 6a820bf6..1cd87ed8 100644 --- a/emu-configs/PCSX2/PCSX2.ini +++ b/emu-configs/PCSX2/PCSX2.ini @@ -296,7 +296,7 @@ Multitap2_Slot4_Filename = Mcd-Multitap2-Slot04.ps2 [Folders] -Bios = ~/retrodeck/bios/pcsx2 +Bios = ~/retrodeck/bios Snapshots = ~/retrodeck/screenshots SaveStates = ~/retrodeck/states MemoryCards = ~/retrodeck/saves/pcsx2 From 427986a293a944099719e959a95e582c9457460a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 10 Sep 2022 17:47:53 +0200 Subject: [PATCH 151/393] WRAPPER: version string was not updated --- retrodeck.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/retrodeck.sh b/retrodeck.sh index adb5e4ed..61362ab3 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -216,6 +216,7 @@ ra_init() { create_lock() { # creating RetroDECK's lock file and writing the version in the config file + version=$hard_version touch "$lockfile" conf_write } @@ -493,7 +494,7 @@ then # ...but the version doesn't match with the config file if [ "$hard_version" != "$version" ]; then - echo "Config file's version is "$(cat "$version")" but the actual version is $hard_version" + echo "Config file's version is $version but the actual version is $hard_version" post_update # Executing post update script conf_write # Writing variables in the config file (sourced from global.sh) start_retrodeck From 29a9d7f2cbf2e54be7ca26dc85a255d49996bcd1 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 10 Sep 2022 17:47:53 +0200 Subject: [PATCH 152/393] WRAPPER: version string was not updated --- retrodeck.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/retrodeck.sh b/retrodeck.sh index adb5e4ed..61362ab3 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -216,6 +216,7 @@ ra_init() { create_lock() { # creating RetroDECK's lock file and writing the version in the config file + version=$hard_version touch "$lockfile" conf_write } @@ -493,7 +494,7 @@ then # ...but the version doesn't match with the config file if [ "$hard_version" != "$version" ]; then - echo "Config file's version is "$(cat "$version")" but the actual version is $hard_version" + echo "Config file's version is $version but the actual version is $hard_version" post_update # Executing post update script conf_write # Writing variables in the config file (sourced from global.sh) start_retrodeck From 81fec64aa77e0517d9e6ae84361fcdc84f233abd Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 10 Sep 2022 17:57:17 +0200 Subject: [PATCH 153/393] Pushed tools ection in the end --- es-configs/es_systems.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml index 78d392a7..dc76308e 100644 --- a/es-configs/es_systems.xml +++ b/es-configs/es_systems.xml @@ -1612,7 +1612,7 @@ zxspectrum - tools + zzztools RetroDECK Tools /var/config/retrodeck/tools .sh .SH From d361a12ec3579aa3d245cfad217394c5a2f2ab6a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 10 Sep 2022 17:57:17 +0200 Subject: [PATCH 154/393] Pushed tools ection in the end --- es-configs/es_systems.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml index 78d392a7..dc76308e 100644 --- a/es-configs/es_systems.xml +++ b/es-configs/es_systems.xml @@ -1612,7 +1612,7 @@ zxspectrum - tools + zzztools RetroDECK Tools /var/config/retrodeck/tools .sh .SH From 97e01e7f036b461f8f60c78425e579142ee201db Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 10 Sep 2022 18:47:14 +0200 Subject: [PATCH 155/393] Pushed tools ection in the end (without cemu) --- net.retrodeck.retrodeck.yml | 118 ++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index cc7244b1..9def52cc 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1316,65 +1316,65 @@ modules: # temporary here: https://github.com/Eonfge/flathub/blob/8bb2905b0fefdff820a2b65dac2a7cde916d3ce5/info.cemu.Cemu.yaml # Needed for imgui - - name: glad - buildsystem: cmake-ninja - config-opts: - - -DCMAKE_BUILD_TYPE=RelWithDebInfo - - -DBUILD_SHARED_LIBS=true - - -DGLAD_REPRODUCIBLE=true - - -DGLAD_INSTALL=true - sources: - - type: archive - url: https://github.com/Dav1dde/glad/archive/refs/tags/v0.1.36.tar.gz - sha256: 8470ed1b0e9fbe88e10c34770505c8a1dc8ccb78cadcf673331aaf5224f963d2 - - # Needed for imgui - - name: glfw - buildsystem: cmake-ninja - builddir: true - config-opts: - - -DBUILD_SHARED_LIBS=ON - - -DGLFW_BUILD_EXAMPLES=OFF - - -DGLFW_BUILD_TESTS=OFF - - -DGLFW_BUILD_DOCS=OFF - sources: - - type: archive - url: https://github.com/glfw/glfw/releases/download/3.3.2/glfw-3.3.2.zip - sha256: 08a33a512f29d7dbf78eab39bd7858576adcc95228c9efe8e4bc5f0f3261efc7 - cleanup: - - /include - - /lib/pkgconfig - - - name: imgui - buildsystem: cmake - sources: - - type: archive - url: https://github.com/ocornut/imgui/archive/refs/tags/v1.88.zip - sha256: 81087a74599e5890a07b636887cee73a7dc1a9eb9e1f19a4a0d82a76090bf4c2 - - type: file - path: imguiCMakeLists.txt - dest-filename: CMakeLists.txt - - - name: Cemu - buildsystem: cmake-ninja - builddir: true - config-opts: - - -DENABLE_VCPKG=false - - -DCMAKE_BUILD_TYPE=release - - -DCMAKE_C_COMPILER=/usr/bin/gcc - - -DCMAKE_CXX_COMPILER=/usr/bin/g++ - - -G Ninja - - -DCMAKE_MAKE_PROGRAM=/usr/bin/ninja - sources: - - type: git - url: https://github.com/cemu-project/Cemu - commit: d8da8a54a6c08296a884b892d714cabcb7e4bdb5 - cleanup: - - /app/include - - /app/lib/*.a - - /app/lib/*.la - - /app/lib/pkgconfig - +# - name: glad +# buildsystem: cmake-ninja +# config-opts: +# - -DCMAKE_BUILD_TYPE=RelWithDebInfo +# - -DBUILD_SHARED_LIBS=true +# - -DGLAD_REPRODUCIBLE=true +# - -DGLAD_INSTALL=true +# sources: +# - type: archive +# url: https://github.com/Dav1dde/glad/archive/refs/tags/v0.1.36.tar.gz +# sha256: 8470ed1b0e9fbe88e10c34770505c8a1dc8ccb78cadcf673331aaf5224f963d2 +# +# # Needed for imgui +# - name: glfw +# buildsystem: cmake-ninja +# builddir: true +# config-opts: +# - -DBUILD_SHARED_LIBS=ON +# - -DGLFW_BUILD_EXAMPLES=OFF +# - -DGLFW_BUILD_TESTS=OFF +# - -DGLFW_BUILD_DOCS=OFF +# sources: +# - type: archive +# url: https://github.com/glfw/glfw/releases/download/3.3.2/glfw-3.3.2.zip +# sha256: 08a33a512f29d7dbf78eab39bd7858576adcc95228c9efe8e4bc5f0f3261efc7 +# cleanup: +# - /include +# - /lib/pkgconfig +# +# - name: imgui +# buildsystem: cmake +# sources: +# - type: archive +# url: https://github.com/ocornut/imgui/archive/refs/tags/v1.88.zip +# sha256: 81087a74599e5890a07b636887cee73a7dc1a9eb9e1f19a4a0d82a76090bf4c2 +# - type: file +# path: imguiCMakeLists.txt +# dest-filename: CMakeLists.txt +# +# - name: Cemu +# buildsystem: cmake-ninja +# builddir: true +# config-opts: +# - -DENABLE_VCPKG=false +# - -DCMAKE_BUILD_TYPE=release +# - -DCMAKE_C_COMPILER=/usr/bin/gcc +# - -DCMAKE_CXX_COMPILER=/usr/bin/g++ +# - -G Ninja +# - -DCMAKE_MAKE_PROGRAM=/usr/bin/ninja +# sources: +# - type: git +# url: https://github.com/cemu-project/Cemu +# commit: d8da8a54a6c08296a884b892d714cabcb7e4bdb5 +# cleanup: +# - /app/include +# - /app/lib/*.a +# - /app/lib/*.la +# - /app/lib/pkgconfig +# # CEMU - END # External manifests end From 1fb8263039344522a3f4091444e1893874af2c8b Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 10 Sep 2022 18:47:14 +0200 Subject: [PATCH 156/393] Pushed tools ection in the end (without cemu) --- net.retrodeck.retrodeck.yml | 118 ++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index cc7244b1..9def52cc 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1316,65 +1316,65 @@ modules: # temporary here: https://github.com/Eonfge/flathub/blob/8bb2905b0fefdff820a2b65dac2a7cde916d3ce5/info.cemu.Cemu.yaml # Needed for imgui - - name: glad - buildsystem: cmake-ninja - config-opts: - - -DCMAKE_BUILD_TYPE=RelWithDebInfo - - -DBUILD_SHARED_LIBS=true - - -DGLAD_REPRODUCIBLE=true - - -DGLAD_INSTALL=true - sources: - - type: archive - url: https://github.com/Dav1dde/glad/archive/refs/tags/v0.1.36.tar.gz - sha256: 8470ed1b0e9fbe88e10c34770505c8a1dc8ccb78cadcf673331aaf5224f963d2 - - # Needed for imgui - - name: glfw - buildsystem: cmake-ninja - builddir: true - config-opts: - - -DBUILD_SHARED_LIBS=ON - - -DGLFW_BUILD_EXAMPLES=OFF - - -DGLFW_BUILD_TESTS=OFF - - -DGLFW_BUILD_DOCS=OFF - sources: - - type: archive - url: https://github.com/glfw/glfw/releases/download/3.3.2/glfw-3.3.2.zip - sha256: 08a33a512f29d7dbf78eab39bd7858576adcc95228c9efe8e4bc5f0f3261efc7 - cleanup: - - /include - - /lib/pkgconfig - - - name: imgui - buildsystem: cmake - sources: - - type: archive - url: https://github.com/ocornut/imgui/archive/refs/tags/v1.88.zip - sha256: 81087a74599e5890a07b636887cee73a7dc1a9eb9e1f19a4a0d82a76090bf4c2 - - type: file - path: imguiCMakeLists.txt - dest-filename: CMakeLists.txt - - - name: Cemu - buildsystem: cmake-ninja - builddir: true - config-opts: - - -DENABLE_VCPKG=false - - -DCMAKE_BUILD_TYPE=release - - -DCMAKE_C_COMPILER=/usr/bin/gcc - - -DCMAKE_CXX_COMPILER=/usr/bin/g++ - - -G Ninja - - -DCMAKE_MAKE_PROGRAM=/usr/bin/ninja - sources: - - type: git - url: https://github.com/cemu-project/Cemu - commit: d8da8a54a6c08296a884b892d714cabcb7e4bdb5 - cleanup: - - /app/include - - /app/lib/*.a - - /app/lib/*.la - - /app/lib/pkgconfig - +# - name: glad +# buildsystem: cmake-ninja +# config-opts: +# - -DCMAKE_BUILD_TYPE=RelWithDebInfo +# - -DBUILD_SHARED_LIBS=true +# - -DGLAD_REPRODUCIBLE=true +# - -DGLAD_INSTALL=true +# sources: +# - type: archive +# url: https://github.com/Dav1dde/glad/archive/refs/tags/v0.1.36.tar.gz +# sha256: 8470ed1b0e9fbe88e10c34770505c8a1dc8ccb78cadcf673331aaf5224f963d2 +# +# # Needed for imgui +# - name: glfw +# buildsystem: cmake-ninja +# builddir: true +# config-opts: +# - -DBUILD_SHARED_LIBS=ON +# - -DGLFW_BUILD_EXAMPLES=OFF +# - -DGLFW_BUILD_TESTS=OFF +# - -DGLFW_BUILD_DOCS=OFF +# sources: +# - type: archive +# url: https://github.com/glfw/glfw/releases/download/3.3.2/glfw-3.3.2.zip +# sha256: 08a33a512f29d7dbf78eab39bd7858576adcc95228c9efe8e4bc5f0f3261efc7 +# cleanup: +# - /include +# - /lib/pkgconfig +# +# - name: imgui +# buildsystem: cmake +# sources: +# - type: archive +# url: https://github.com/ocornut/imgui/archive/refs/tags/v1.88.zip +# sha256: 81087a74599e5890a07b636887cee73a7dc1a9eb9e1f19a4a0d82a76090bf4c2 +# - type: file +# path: imguiCMakeLists.txt +# dest-filename: CMakeLists.txt +# +# - name: Cemu +# buildsystem: cmake-ninja +# builddir: true +# config-opts: +# - -DENABLE_VCPKG=false +# - -DCMAKE_BUILD_TYPE=release +# - -DCMAKE_C_COMPILER=/usr/bin/gcc +# - -DCMAKE_CXX_COMPILER=/usr/bin/g++ +# - -G Ninja +# - -DCMAKE_MAKE_PROGRAM=/usr/bin/ninja +# sources: +# - type: git +# url: https://github.com/cemu-project/Cemu +# commit: d8da8a54a6c08296a884b892d714cabcb7e4bdb5 +# cleanup: +# - /app/include +# - /app/lib/*.a +# - /app/lib/*.la +# - /app/lib/pkgconfig +# # CEMU - END # External manifests end From bbc7554b7f6a0c8acd475263a217298d7f56455a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 10 Sep 2022 20:15:02 +0200 Subject: [PATCH 157/393] PCSX2: fixed savefolder path --- emu-configs/PCSX2/PCSX2.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emu-configs/PCSX2/PCSX2.ini b/emu-configs/PCSX2/PCSX2.ini index 1cd87ed8..ba358450 100644 --- a/emu-configs/PCSX2/PCSX2.ini +++ b/emu-configs/PCSX2/PCSX2.ini @@ -299,7 +299,7 @@ Multitap2_Slot4_Filename = Mcd-Multitap2-Slot04.ps2 Bios = ~/retrodeck/bios Snapshots = ~/retrodeck/screenshots SaveStates = ~/retrodeck/states -MemoryCards = ~/retrodeck/saves/pcsx2 +MemoryCards = ~/retrodeck/saves/ps2 Logs = logs Cheats = cheats CheatsWS = cheats_ws From fc551002cc3a0fb325b0901d1c925d8dd791758c Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 10 Sep 2022 20:15:02 +0200 Subject: [PATCH 158/393] PCSX2: fixed savefolder path --- emu-configs/PCSX2/PCSX2.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emu-configs/PCSX2/PCSX2.ini b/emu-configs/PCSX2/PCSX2.ini index 1cd87ed8..ba358450 100644 --- a/emu-configs/PCSX2/PCSX2.ini +++ b/emu-configs/PCSX2/PCSX2.ini @@ -299,7 +299,7 @@ Multitap2_Slot4_Filename = Mcd-Multitap2-Slot04.ps2 Bios = ~/retrodeck/bios Snapshots = ~/retrodeck/screenshots SaveStates = ~/retrodeck/states -MemoryCards = ~/retrodeck/saves/pcsx2 +MemoryCards = ~/retrodeck/saves/ps2 Logs = logs Cheats = cheats CheatsWS = cheats_ws From 7d5ad3e4fd656fdea145e054a5237a8704b70efb Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 10 Sep 2022 20:17:49 +0200 Subject: [PATCH 159/393] Dolphin: changed saves path --- emu-configs/dolphin/Dolphin.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emu-configs/dolphin/Dolphin.ini b/emu-configs/dolphin/Dolphin.ini index a6f1c2ea..26926c3f 100644 --- a/emu-configs/dolphin/Dolphin.ini +++ b/emu-configs/dolphin/Dolphin.ini @@ -30,7 +30,7 @@ Rom2 = Rom3 = Rom4 = SavesInRomPath = False -SavesPath = ~/retrodeck/saves +SavesPath = ~/retrodeck/saves/gba Threads = True [General] ISOPath0 = ~/retrodeck/roms/wii From 9e89dba63b3c533cf927fea08384c153e686bea9 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 10 Sep 2022 20:17:49 +0200 Subject: [PATCH 160/393] Dolphin: changed saves path --- emu-configs/dolphin/Dolphin.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emu-configs/dolphin/Dolphin.ini b/emu-configs/dolphin/Dolphin.ini index a6f1c2ea..26926c3f 100644 --- a/emu-configs/dolphin/Dolphin.ini +++ b/emu-configs/dolphin/Dolphin.ini @@ -30,7 +30,7 @@ Rom2 = Rom3 = Rom4 = SavesInRomPath = False -SavesPath = ~/retrodeck/saves +SavesPath = ~/retrodeck/saves/gba Threads = True [General] ISOPath0 = ~/retrodeck/roms/wii From 371306eeeb28c14396002be241a064359fdfc492 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 10 Sep 2022 20:27:39 +0200 Subject: [PATCH 161/393] Redirected saves and states folders for the standalone emulators --- emu-configs/PCSX2/PCSX2.ini | 4 ++-- emu-configs/PCSX2/PCSX2_ui.ini | 8 ++++---- emu-configs/citra-qt-config.ini | 4 ++-- emu-configs/dolphin/Dolphin.ini | 2 +- emu-configs/melonDS.ini | 4 ++-- emu-configs/xemu.toml | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/emu-configs/PCSX2/PCSX2.ini b/emu-configs/PCSX2/PCSX2.ini index ba358450..32b0c443 100644 --- a/emu-configs/PCSX2/PCSX2.ini +++ b/emu-configs/PCSX2/PCSX2.ini @@ -298,8 +298,8 @@ Multitap2_Slot4_Filename = Mcd-Multitap2-Slot04.ps2 [Folders] Bios = ~/retrodeck/bios Snapshots = ~/retrodeck/screenshots -SaveStates = ~/retrodeck/states -MemoryCards = ~/retrodeck/saves/ps2 +SaveStates = ~/retrodeck/states/ps2/pcsx2 +MemoryCards = ~/retrodeck/saves/ps2/pcsx2/memcards Logs = logs Cheats = cheats CheatsWS = cheats_ws diff --git a/emu-configs/PCSX2/PCSX2_ui.ini b/emu-configs/PCSX2/PCSX2_ui.ini index 72e94628..14214053 100644 --- a/emu-configs/PCSX2/PCSX2_ui.ini +++ b/emu-configs/PCSX2/PCSX2_ui.ini @@ -41,10 +41,10 @@ UseDefaultCheats=enabled UseDefaultCheatsWS=enabled UseDefaultTextures=enabled Bios=~/retrodeck/roms/bios -Snapshots=/var/config/PCSX2/snaps -Savestates=/var/config/PCSX2/sstates -MemoryCards=/var/config/PCSX2/memcards -Logs=/var/config/PCSX2/logs +Snapshots=~/retrodeck/screenshots +Savestates=~/retrodeck/states/ps2/pcsx2 +MemoryCards=~/retrodeck/saves/ps2/memcards +Logs=~/retrodeck/.logs Langs=/app/share/PCSX2/resources/locale Cheats=/var/config/PCSX2/cheats CheatsWS=/var/config/PCSX2/cheats_ws diff --git a/emu-configs/citra-qt-config.ini b/emu-configs/citra-qt-config.ini index a6a37549..3cd0a0cb 100644 --- a/emu-configs/citra-qt-config.ini +++ b/emu-configs/citra-qt-config.ini @@ -106,9 +106,9 @@ use_cpu_jit=true use_cpu_jit\default=true [Data%20Storage] -nand_directory=~/retrodeck/saves/Citra/nand/ +nand_directory=~/retrodeck/saves/n3ds/citra/nand/ nand_directory\default=false -sdmc_directory=~/retrodeck/saves/Citra/sdmc/ +sdmc_directory=~/retrodeck/saves/n3ds/citra/sdmc/ sdmc_directory\default=false use_virtual_sd=true use_virtual_sd\default=true diff --git a/emu-configs/dolphin/Dolphin.ini b/emu-configs/dolphin/Dolphin.ini index 26926c3f..59737d0f 100644 --- a/emu-configs/dolphin/Dolphin.ini +++ b/emu-configs/dolphin/Dolphin.ini @@ -36,7 +36,7 @@ Threads = True ISOPath0 = ~/retrodeck/roms/wii ISOPath1 = ~/retrodeck/roms/gc ISOPaths = 2 -WiiSDCardPath = ~/retrodeck/saves/sd.raw +WiiSDCardPath = ~/retrodeck/saves/wii/dolphin/sd.raw WirelessMac = 00:17:ab:83:9b:d4 HotkeysRequireFocus = True RecursiveISOPaths = True diff --git a/emu-configs/melonDS.ini b/emu-configs/melonDS.ini index d64acf91..b1443132 100644 --- a/emu-configs/melonDS.ini +++ b/emu-configs/melonDS.ini @@ -123,8 +123,8 @@ RecentROM_6= RecentROM_7= RecentROM_8= RecentROM_9= -SaveFilePath=~/retrodeck/saves -SavestatePath=~/retrodeck/states +SaveFilePath=~/retrodeck/saves/nds/melonds +SavestatePath=~/retrodeck/states/nds/melonds CheatFilePath= EnableCheats=0 MouseHide=0 diff --git a/emu-configs/xemu.toml b/emu-configs/xemu.toml index 7e804f0e..1c119bd3 100644 --- a/emu-configs/xemu.toml +++ b/emu-configs/xemu.toml @@ -25,6 +25,6 @@ mem_limit = '128' [sys.files] bootrom_path = '/home/deck/retrodeck/bios/mcpx_1.0.bin' flashrom_path = '/home/deck/retrodeck/bios/Complex.bin' -eeprom_path = '/home/deck/retrodeck/saves/xbox-eeprom.bin' +eeprom_path = '/home/deck/retrodeck/saves/xbox/xemu/xbox-eeprom.bin' hdd_path = '/home/deck/retrodeck/bios/xbox_hdd.qcow2' From 3966549f7a348e1726c7a7d93f30b111186d8eeb Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 10 Sep 2022 20:27:39 +0200 Subject: [PATCH 162/393] Redirected saves and states folders for the standalone emulators --- emu-configs/PCSX2/PCSX2.ini | 4 ++-- emu-configs/PCSX2/PCSX2_ui.ini | 8 ++++---- emu-configs/citra-qt-config.ini | 4 ++-- emu-configs/dolphin/Dolphin.ini | 2 +- emu-configs/melonDS.ini | 4 ++-- emu-configs/xemu.toml | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/emu-configs/PCSX2/PCSX2.ini b/emu-configs/PCSX2/PCSX2.ini index ba358450..32b0c443 100644 --- a/emu-configs/PCSX2/PCSX2.ini +++ b/emu-configs/PCSX2/PCSX2.ini @@ -298,8 +298,8 @@ Multitap2_Slot4_Filename = Mcd-Multitap2-Slot04.ps2 [Folders] Bios = ~/retrodeck/bios Snapshots = ~/retrodeck/screenshots -SaveStates = ~/retrodeck/states -MemoryCards = ~/retrodeck/saves/ps2 +SaveStates = ~/retrodeck/states/ps2/pcsx2 +MemoryCards = ~/retrodeck/saves/ps2/pcsx2/memcards Logs = logs Cheats = cheats CheatsWS = cheats_ws diff --git a/emu-configs/PCSX2/PCSX2_ui.ini b/emu-configs/PCSX2/PCSX2_ui.ini index 72e94628..14214053 100644 --- a/emu-configs/PCSX2/PCSX2_ui.ini +++ b/emu-configs/PCSX2/PCSX2_ui.ini @@ -41,10 +41,10 @@ UseDefaultCheats=enabled UseDefaultCheatsWS=enabled UseDefaultTextures=enabled Bios=~/retrodeck/roms/bios -Snapshots=/var/config/PCSX2/snaps -Savestates=/var/config/PCSX2/sstates -MemoryCards=/var/config/PCSX2/memcards -Logs=/var/config/PCSX2/logs +Snapshots=~/retrodeck/screenshots +Savestates=~/retrodeck/states/ps2/pcsx2 +MemoryCards=~/retrodeck/saves/ps2/memcards +Logs=~/retrodeck/.logs Langs=/app/share/PCSX2/resources/locale Cheats=/var/config/PCSX2/cheats CheatsWS=/var/config/PCSX2/cheats_ws diff --git a/emu-configs/citra-qt-config.ini b/emu-configs/citra-qt-config.ini index a6a37549..3cd0a0cb 100644 --- a/emu-configs/citra-qt-config.ini +++ b/emu-configs/citra-qt-config.ini @@ -106,9 +106,9 @@ use_cpu_jit=true use_cpu_jit\default=true [Data%20Storage] -nand_directory=~/retrodeck/saves/Citra/nand/ +nand_directory=~/retrodeck/saves/n3ds/citra/nand/ nand_directory\default=false -sdmc_directory=~/retrodeck/saves/Citra/sdmc/ +sdmc_directory=~/retrodeck/saves/n3ds/citra/sdmc/ sdmc_directory\default=false use_virtual_sd=true use_virtual_sd\default=true diff --git a/emu-configs/dolphin/Dolphin.ini b/emu-configs/dolphin/Dolphin.ini index 26926c3f..59737d0f 100644 --- a/emu-configs/dolphin/Dolphin.ini +++ b/emu-configs/dolphin/Dolphin.ini @@ -36,7 +36,7 @@ Threads = True ISOPath0 = ~/retrodeck/roms/wii ISOPath1 = ~/retrodeck/roms/gc ISOPaths = 2 -WiiSDCardPath = ~/retrodeck/saves/sd.raw +WiiSDCardPath = ~/retrodeck/saves/wii/dolphin/sd.raw WirelessMac = 00:17:ab:83:9b:d4 HotkeysRequireFocus = True RecursiveISOPaths = True diff --git a/emu-configs/melonDS.ini b/emu-configs/melonDS.ini index d64acf91..b1443132 100644 --- a/emu-configs/melonDS.ini +++ b/emu-configs/melonDS.ini @@ -123,8 +123,8 @@ RecentROM_6= RecentROM_7= RecentROM_8= RecentROM_9= -SaveFilePath=~/retrodeck/saves -SavestatePath=~/retrodeck/states +SaveFilePath=~/retrodeck/saves/nds/melonds +SavestatePath=~/retrodeck/states/nds/melonds CheatFilePath= EnableCheats=0 MouseHide=0 diff --git a/emu-configs/xemu.toml b/emu-configs/xemu.toml index 7e804f0e..1c119bd3 100644 --- a/emu-configs/xemu.toml +++ b/emu-configs/xemu.toml @@ -25,6 +25,6 @@ mem_limit = '128' [sys.files] bootrom_path = '/home/deck/retrodeck/bios/mcpx_1.0.bin' flashrom_path = '/home/deck/retrodeck/bios/Complex.bin' -eeprom_path = '/home/deck/retrodeck/saves/xbox-eeprom.bin' +eeprom_path = '/home/deck/retrodeck/saves/xbox/xemu/xbox-eeprom.bin' hdd_path = '/home/deck/retrodeck/bios/xbox_hdd.qcow2' From 12f086b75d12a7244e1f6d3114b326318f97247c Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 10 Sep 2022 20:45:35 +0200 Subject: [PATCH 163/393] DOLPHIN: fixed paths --- retrodeck.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/retrodeck.sh b/retrodeck.sh index 61362ab3..43b5d3f5 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -91,6 +91,12 @@ standalones_init() { mkdir -pv /var/config/dolphin-emu/ cp -fvr "$emuconfigs/dolphin/"* /var/config/dolphin-emu/ sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/dolphin-emu/Dolphin.ini + dir_prep "$rdhome/saves/gc/dolphin/EUR" "/var/data/dolphin-emu/GC/EUR" + dir_prep "$rdhome/saves/gc/dolphin/USA" "/var/data/dolphin-emu/GC/USA" + dir_prep "$rdhome/saves/gc/dolphin/JAP" "/var/data/dolphin-emu/GC/JAP" + dir_prep "$rdhome/screenshots" "/var/data/dolphin-emu/ScreenShots" + dir_prep "$rdhome/states" "/var/data/dolphin-emu/StateSaves" + dir_prep "$rdhome/saves/wii/dolphin" "/var/data/dolphin-emu/Wii/" # pcsx2 echo "----------------------" From 8607036f73c4db18e1f3072243578a6cacd58b59 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 10 Sep 2022 20:45:35 +0200 Subject: [PATCH 164/393] DOLPHIN: fixed paths --- retrodeck.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/retrodeck.sh b/retrodeck.sh index 61362ab3..43b5d3f5 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -91,6 +91,12 @@ standalones_init() { mkdir -pv /var/config/dolphin-emu/ cp -fvr "$emuconfigs/dolphin/"* /var/config/dolphin-emu/ sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/dolphin-emu/Dolphin.ini + dir_prep "$rdhome/saves/gc/dolphin/EUR" "/var/data/dolphin-emu/GC/EUR" + dir_prep "$rdhome/saves/gc/dolphin/USA" "/var/data/dolphin-emu/GC/USA" + dir_prep "$rdhome/saves/gc/dolphin/JAP" "/var/data/dolphin-emu/GC/JAP" + dir_prep "$rdhome/screenshots" "/var/data/dolphin-emu/ScreenShots" + dir_prep "$rdhome/states" "/var/data/dolphin-emu/StateSaves" + dir_prep "$rdhome/saves/wii/dolphin" "/var/data/dolphin-emu/Wii/" # pcsx2 echo "----------------------" From 79d745d0406e6f4d0fd44229cea3d6405f3f23f9 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 11 Sep 2022 11:25:31 +0200 Subject: [PATCH 165/393] Updated 0.5.0b version notes --- net.retrodeck.retrodeck.appdata.xml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 6f83a9d0..7f60ff52 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -66,10 +66,18 @@ https://github.com/XargonWan/RetroDECK/releases/tag/0.5.5b
      -
    • Theme revamp!
      • +
    • 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
      • +
    • Theme revamp and more themes available such as the old one
    • Updated RetroArch and its cores from 1.10.2 to 1.10.3
      • -
    • Added a tool to clean up the scraped data in order to make it compatible with the new Art-Book, it's suggested to run it
      • +
    • 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 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).
      • +
    • 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.
     From ca28b6cf3b2fcd4234f4aadfa4f14dd355c920d2 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 11 Sep 2022 11:25:31 +0200 Subject: [PATCH 166/393] Updated 0.5.0b version notes --- net.retrodeck.retrodeck.appdata.xml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 6f83a9d0..7f60ff52 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -66,10 +66,18 @@ https://github.com/XargonWan/RetroDECK/releases/tag/0.5.5b
      -
    • Theme revamp!
      • +
    • 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
      • +
    • Theme revamp and more themes available such as the old one
    • Updated RetroArch and its cores from 1.10.2 to 1.10.3
      • -
    • Added a tool to clean up the scraped data in order to make it compatible with the new Art-Book, it's suggested to run it
      • +
    • 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 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).
      • +
    • 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.
     From 0e3257e7f122e5b7e2c593fdc0be0b6acfd3406c Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 11 Sep 2022 11:27:02 +0200 Subject: [PATCH 167/393] Updated 0.5.0b version notes --- net.retrodeck.retrodeck.appdata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 7f60ff52..c2790b28 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -68,6 +68,7 @@