From 4f9d160cb16781ea0291edcba8d126f930f5b7ce Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 27 Apr 2022 15:21:48 +0900 Subject: [PATCH 001/170] RPCS3: Clean-add --- net.retrodeck.retrodeck.yml | 114 +++++++++++++++++++++++++++++++++++- 1 file changed, 112 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index c1110a1a..11ffff98 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -4,7 +4,7 @@ runtime-version: '5.15-21.08' sdk: org.kde.Sdk # Needed for rpcs3 sdk-extensions: -- org.freedesktop.Sdk.Extension.llvm13 + - org.freedesktop.Sdk.Extension.llvm13 # /Needed for rpcs3 # Needed for Yuzu base: io.qt.qtwebengine.BaseApp @@ -26,7 +26,6 @@ finish-args: - --talk-name=org.freedesktop.ScreenSaver - --talk-name=org.freedesktop.PowerManagement.Inhibit - --talk-name=org.freedesktop.login1 - #- --filesystem=host - --filesystem=xdg-run/app/com.discordapp.Discord:create # Yuzu - --filesystem=home:ro @@ -34,6 +33,22 @@ finish-args: # Dolphin - --allow=bluetooth #- --env=QT_QPA_PLATFORM=xcb not sure if this will break something + # rpcs3 + - --socket=fallback-x11 + +# rpcs3 +add-extensions: + org.freedesktop.Platform.ffmpeg-full: + directory: lib/ffmpeg + add-ld-path: . + version: '21.08' + autodownload: true + autodelete: false +cleanup-commands: + - mkdir -p ${FLATPAK_DEST}/lib/ffmpeg +modules: + - shared-modules/glu/glu-9.json + - shared-modules/glew/glew.json cleanup: # ES-DE @@ -717,6 +732,101 @@ modules: # XEMU - END + # RPCS3 - START + # https://github.com/flathub/net.rpcs3.RPCS3 + + - name: rpcs3-llvm + buildsystem: cmake-ninja + builddir: true + build-options: + cflags: &optflags -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong + -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection + -fcf-protection -fno-omit-frame-pointer + cflags-override: true + cxxflags: -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong + -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection + -fcf-protection -fno-omit-frame-pointer -msse -msse2 -mcx16 + cxxflags-override: true + env: + AR: llvm-ar + CC: clang + CXX: clang++ + 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=Release + - -DBUILD_SHARED_LIBS=OFF + - -DLLVM_CCACHE_BUILD=ON + - -DLLVM_TARGETS_TO_BUILD='X86' + - -DLLVM_BUILD_RUNTIME=OFF + - -DLLVM_BUILD_TOOLS=OFF + - -DLLVM_INCLUDE_DOCS=OFF + - -DLLVM_INCLUDE_EXAMPLES=OFF + - -DLLVM_INCLUDE_TESTS=OFF + - -DLLVM_INCLUDE_TOOLS=OFF + - -DLLVM_INCLUDE_UTILS=OFF + - -DLLVM_USE_INTEL_JITEVENTS=ON + - -DLLVM_USE_PERF=ON + - -DLLVM_ENABLE_Z3_SOLVER=OFF + - -DCMAKE_CXX_STANDARD=17 + - -DITTAPI_SOURCE_DIR=/run/build/rpcs3-llvm/ittapi + - -Wno-dev + cleanup: + - '*' + sources: + - type: git + url: https://github.com/RPCS3/llvm-mirror.git + branch: master + commit: 509d31ad89676522f7121b3bb8688f7d29b7ee60 + - type: git + url: https://github.com/intel/ittapi.git + dest: ittapi/ittapi + disable-shallow-clone: true + + - name: rpcs3 + buildsystem: cmake-ninja + builddir: true + build-options: + append-ld-library-path: /usr/lib/sdk/llvm13/lib + append-path: /usr/lib/sdk/llvm13/bin + cflags: *optflags + cflags-override: true + cxxflags: *optflags + cxxflags-override: true + env: + AR: llvm-ar + CC: clang + CXX: clang++ + RANLIB: llvm-ranlib + ldflags: -fuse-ld=lld + config-opts: + - -DCMAKE_BUILD_TYPE=RelWithDebInfo + - -DBUILD_LLVM_SUBMODULE=OFF + - -DUSE_NATIVE_INSTRUCTIONS=OFF + - -DUSE_PRECOMPILED_HEADERS=OFF + - -DUSE_SYSTEM_CURL=ON + - -DUSE_SYSTEM_FFMPEG=ON + - -DUSE_SYSTEM_LIBPNG=ON + - -DUSE_SYSTEM_ZLIB=ON + - -Wno-dev + post-install: + - | + set -eux; + sed -i 's|RPCS3|net.rpcs3.RPCS3|' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml; + COMM_TAG="$(awk -F'[\{,]' '/version{.*}/{printf "%d.%d.%d", $2, $3, $4}' ../rpcs3/rpcs3_version.cpp)"; + COMM_COUNT="$(git rev-list --count HEAD)"; + COMM_HASH="$(git rev-parse --short=8 HEAD)"; + sed -i 's|||' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml; + sources: + - type: git + url: https://github.com/RPCS3/rpcs3.git + branch: master + commit: e9570d1a0045926f63ec8ea9af68f81743d4f365 + + # RPCS3 - START + # External manifests end From 0f3ffca5bc944c54153be94d565ea7ebe4693278 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 27 Apr 2022 15:30:28 +0900 Subject: [PATCH 002/170] CITRA: Clean-add --- net.retrodeck.retrodeck.yml | 42 +++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index c1110a1a..b4e9ae19 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -717,6 +717,48 @@ modules: # XEMU - END + # CITRA - START + # https://github.com/flathub/org.citra_emu.citra + + - name: citra + buildsystem: cmake-ninja + builddir: true + build-options: + env: + CI: '1' + GITHUB_ACTIONS: '1' + GITHUB_REPOSITORY: citra-emu/citra-nightly + GIT_TAG_NAME: nightly-1762 + config-opts: + - '-DCMAKE_BUILD_TYPE=Release' + - '-DENABLE_QT_TRANSLATION=ON' + - '-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON' + - '-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON' + - '-DENABLE_FFMPEG_VIDEO_DUMPER=ON' + - '-DENABLE_FDK=ON' + cleanup: + - /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 + sources: + - type: git + url: https://github.com/citra-emu/citra-nightly.git + tag: nightly-1762 + commit: 1382035d4de5ada310c7f4fd00f1836b16ab74fb + disable-shallow-clone: true + x-checker-data: + type: git + tag-pattern: ^(nightly-\d+)$ + is-main-source: true + + # CITRA - END + # External manifests end From bd8e08610e3cecaacea9c1583a0795293b669531 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 27 Apr 2022 15:32:45 +0900 Subject: [PATCH 003/170] RPCS3: indentation 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 11ffff98..2931a195 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -34,7 +34,7 @@ finish-args: - --allow=bluetooth #- --env=QT_QPA_PLATFORM=xcb not sure if this will break something # rpcs3 - - --socket=fallback-x11 + - --socket=fallback-x11 # rpcs3 add-extensions: From fe123e70494bb05c6486bced9fa4304498f25b50 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 27 Apr 2022 15:40:20 +0900 Subject: [PATCH 004/170] PRIMEHACK: added --- net.retrodeck.retrodeck.yml | 42 +++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index c1110a1a..1485ebb3 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -34,6 +34,7 @@ finish-args: # Dolphin - --allow=bluetooth #- --env=QT_QPA_PLATFORM=xcb not sure if this will break something + # primehack cleanup: # ES-DE @@ -717,6 +718,47 @@ modules: # XEMU - END + # PRIMEHACK - START + + - name: primehack + buildsystem: cmake-ninja + config-opts: + - -DCMAKE_BUILD_TYPE=Release + - -DENABLE_ALSA=OFF + - -DENABLE_SDL=ON + - -DENABLE_EVDEV=ON + - -DDISTRIBUTOR=Flathub + cleanup: + - /share/man + post-install: + - install -D dolphin-emu-wrapper /app/bin/dolphin-emu-wrapper + - sed -i -e 's/"2048"/"512"/g' /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg + sources: + - type: git + url: https://github.com/shiiion/dolphin.git + commit: 9ca0eb888bd6f8ed13a4efb92d808fbf0705ffa4 + # detects whether dolphin is running in a flatpak sandbox + # and makes it use xdg directories if it is. + # prevents dolphin from attempting to write conf files + # in non-writable paths, typically happens when a user + # has leftover files from a previous non-flatpak install + - type: patch + path: detectflatpak.patch + # version strings must match exactly for online multiplayer + - type: patch + path: nodirtyversion.patch + - type: file + path: appdata.xml + - type: script + commands: + - for i in {0..9}; do + - test -S $XDG_RUNTIME_DIR/discord-ipc-$i || ln -sf {app/com.discordapp.Discord,$XDG_RUNTIME_DIR}/discord-ipc-$i; + - done + - dolphin-emu "$@" + dest-filename: dolphin-emu-wrapper + + # PRIMEHACK - END + # External manifests end From 9be505b9b4a684725b3a812c15e683ed5108c9fe Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 27 Apr 2022 15:41:03 +0900 Subject: [PATCH 005/170] PRIMEHACK: added, comment fix --- net.retrodeck.retrodeck.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 1485ebb3..77faaf34 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -719,6 +719,7 @@ modules: # XEMU - END # PRIMEHACK - START + # https://github.com/flathub/io.github.shiiion.primehack - name: primehack buildsystem: cmake-ninja From 577cc77eeb48fe0cba113009bfc8b9459c76207a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 27 Apr 2022 15:46:14 +0900 Subject: [PATCH 006/170] MELONDS: added --- net.retrodeck.retrodeck.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index c1110a1a..e4200eaf 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -717,6 +717,36 @@ modules: # XEMU - END + # MELONDS - START + # https://github.com/flathub/net.kuribo64.melonDS + # ちっちゃい、かわいい！ + + - name: libslirp + buildsystem: meson + sources: + - type: git + url: https://gitlab.freedesktop.org/slirp/libslirp.git + tag: v4.4.0 + - name: melonds + buildsystem: cmake-ninja + builddir: true + build-options: + arch: + aarch64: + config-opts: + - -DENABLE_OGLRENDERER=OFF + build-commands: + - install -D -m644 -t /app/share/appdata/ ../${FLATPAK_ID}.appdata.xml + sources: + - type: git + url: https://github.com/Arisotura/melonDS.git + commit: cce9de5ee1f51e906a644922b2ada6644d81287a + - type: file + path: net.kuribo64.melonDS.appdata.xml + + # MELONDS - END + + # External manifests end From 9fe298268a41a0b7593035063f31fd6bcb1b8340 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 27 Apr 2022 16:20:39 +0900 Subject: [PATCH 007/170] PICO-8: first integration --- es_find_rules.xml | 8 ++++++++ es_systems.xml | 11 +++++++++++ retrodeck.sh | 3 +-- tools/start-splore.sh | 3 +++ 4 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 tools/start-splore.sh diff --git a/es_find_rules.xml b/es_find_rules.xml index 7c9fa526..ba0c5b35 100644 --- a/es_find_rules.xml +++ b/es_find_rules.xml @@ -168,4 +168,12 @@ ~/bin/yuzu*.AppImage + + + pico8 + + + ~/retrodeck/bios/pico-8/pico8 + + diff --git a/es_systems.xml b/es_systems.xml index 147ac61a..000f191a 100644 --- a/es_systems.xml +++ b/es_systems.xml @@ -1468,4 +1468,15 @@ tools tools + + pico-8 + Pico-8 + Lexaloffle + 2015 + console + %ROMPATH%/pico-8 + .p8 .png + %EMULATOR_PICO-8% -desktop ~/retrodeck/screenshots -windowed 0 -root_path %ROMPATH%/pico-8 -run %ROM% + pico-8 + pico-8 \ No newline at end of file diff --git a/retrodeck.sh b/retrodeck.sh index da1f0c14..30a5ffed 100755 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -57,7 +57,7 @@ then mkdir -p ~/retrodeck/saves mkdir -p ~/retrodeck/states mkdir -p ~/retrodeck/screenshots - mkdir -p ~/retrodeck/bios + mkdir -p ~/retrodeck/bios/pico-8 # ES-DE cp -r /app/retrodeck/tools/* /var/config/retrodeck/tools/ mkdir -p /var/config/emulationstation/.emulationstation/custom_systems/tools/ @@ -89,7 +89,6 @@ then mkdir -p /var/config/PCSX2/inis/ cp $emuconfigs/PCSX2_ui.ini /var/config/PCSX2/inis/ - # Locking RetroDECK touch ~/retrodeck/.lock diff --git a/tools/start-splore.sh b/tools/start-splore.sh new file mode 100644 index 00000000..5de224bc --- /dev/null +++ b/tools/start-splore.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +~/retrodeck/bios/pico-8/pico8 -desktop ~/retrodeck/screenshots -windowed 0 -root_path %ROMPATH%/pico-8 -splore \ No newline at end of file From 975b3ead9de62c4d71a8f2acf5226b937a4c567e Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 27 Apr 2022 16:25:59 +0900 Subject: [PATCH 008/170] PRIMEHACK: added submodule --- .gitmodules | 3 +++ net.retrodeck.retrodeck.yml | 6 ++---- rd-submodules/primehack | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) create mode 160000 rd-submodules/primehack diff --git a/.gitmodules b/.gitmodules index c1d4e888..b27cd7ff 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,3 +19,6 @@ [submodule "rd-submodules/citra"] path = rd-submodules/citra url = https://github.com/flathub/org.citra_emu.citra.git +[submodule "rd-submodules/primehack"] + path = rd-submodules/primehack + url = https://github.com/flathub/io.github.shiiion.primehack diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 77faaf34..4213083f 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -744,12 +744,10 @@ modules: # in non-writable paths, typically happens when a user # has leftover files from a previous non-flatpak install - type: patch - path: detectflatpak.patch + path: rd-submodules/primehack/detectflatpak.patch # version strings must match exactly for online multiplayer - type: patch - path: nodirtyversion.patch - - type: file - path: appdata.xml + path: rd-submodules/primehack/nodirtyversion.patch - type: script commands: - for i in {0..9}; do diff --git a/rd-submodules/primehack b/rd-submodules/primehack new file mode 160000 index 00000000..6bdab1bb --- /dev/null +++ b/rd-submodules/primehack @@ -0,0 +1 @@ +Subproject commit 6bdab1bbeb3e42d832af31f94725836bfa101072 From 4cbbee783d58176e70fe224eb9aa4b63ab5d7b3c Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 27 Apr 2022 16:27:41 +0900 Subject: [PATCH 009/170] MELONDS: removed appdata.xml --- net.retrodeck.retrodeck.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index e4200eaf..5ce7b8d1 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -741,8 +741,6 @@ modules: - type: git url: https://github.com/Arisotura/melonDS.git commit: cce9de5ee1f51e906a644922b2ada6644d81287a - - type: file - path: net.kuribo64.melonDS.appdata.xml # MELONDS - END From 3b6b586d18a238e9f59d926f946d85fcea57c5a8 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 27 Apr 2022 22:38:07 +0900 Subject: [PATCH 010/170] RPCS3: fixed modules --- 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 2931a195..4a543fe8 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -46,9 +46,6 @@ add-extensions: autodelete: false cleanup-commands: - mkdir -p ${FLATPAK_DEST}/lib/ffmpeg -modules: - - shared-modules/glu/glu-9.json - - shared-modules/glew/glew.json cleanup: # ES-DE @@ -735,6 +732,9 @@ modules: # RPCS3 - START # https://github.com/flathub/net.rpcs3.RPCS3 + - shared-modules/glu/glu-9.json + - shared-modules/glew/glew.json + - name: rpcs3-llvm buildsystem: cmake-ninja builddir: true From 46ca6d322977a61772cfa77f5cdf6f51ea3c726e Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 27 Apr 2022 23:26:13 +0900 Subject: [PATCH 011/170] CITRA: disabled video dumping because of building issues --- net.retrodeck.retrodeck.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index b4e9ae19..ca234238 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -723,18 +723,13 @@ modules: - name: citra buildsystem: cmake-ninja builddir: true - build-options: - env: - CI: '1' - GITHUB_ACTIONS: '1' - GITHUB_REPOSITORY: citra-emu/citra-nightly - GIT_TAG_NAME: nightly-1762 config-opts: - '-DCMAKE_BUILD_TYPE=Release' - '-DENABLE_QT_TRANSLATION=ON' - '-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON' - '-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON' - - '-DENABLE_FFMPEG_VIDEO_DUMPER=ON' + #- '-DENABLE_FFMPEG_VIDEO_DUMPER=ON' + # Disabled because of this: https://github.com/citra-emu/citra/issues/5949 - '-DENABLE_FDK=ON' cleanup: - /share/man From f5dcc1e5be6723a8bb436c27e69e920839ab98be Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 28 Apr 2022 00:08:24 +0900 Subject: [PATCH 012/170] MELONDS: removed appdata.xml --- net.retrodeck.retrodeck.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 5ce7b8d1..5b6d4199 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -735,8 +735,6 @@ modules: aarch64: config-opts: - -DENABLE_OGLRENDERER=OFF - build-commands: - - install -D -m644 -t /app/share/appdata/ ../${FLATPAK_ID}.appdata.xml sources: - type: git url: https://github.com/Arisotura/melonDS.git From 4b6207c04ac340be96a818ea5038c41e9a0f87ac Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 28 Apr 2022 13:35:15 +0900 Subject: [PATCH 013/170] Missed something for rpcs3 --- net.retrodeck.retrodeck.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index ab09c7b9..5cb8804c 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -33,11 +33,8 @@ finish-args: # Dolphin - --allow=bluetooth #- --env=QT_QPA_PLATFORM=xcb not sure if this will break something -<<<<<<< HEAD # rpcs3 - --socket=fallback-x11 - -# rpcs3 add-extensions: org.freedesktop.Platform.ffmpeg-full: directory: lib/ffmpeg @@ -47,9 +44,6 @@ add-extensions: autodelete: false cleanup-commands: - mkdir -p ${FLATPAK_DEST}/lib/ffmpeg -======= - # primehack ->>>>>>> cooker-primehack cleanup: # ES-DE From ab97f851a3fd9be5db47fcf89d2c6a17a9a43ccc Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 28 Apr 2022 13:35:44 +0900 Subject: [PATCH 014/170] TEST: maybe this was not needed, otherwise revert --- net.retrodeck.retrodeck.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 5cb8804c..f0b3a282 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -35,15 +35,6 @@ finish-args: #- --env=QT_QPA_PLATFORM=xcb not sure if this will break something # rpcs3 - --socket=fallback-x11 -add-extensions: - org.freedesktop.Platform.ffmpeg-full: - directory: lib/ffmpeg - add-ld-path: . - version: '21.08' - autodownload: true - autodelete: false -cleanup-commands: - - mkdir -p ${FLATPAK_DEST}/lib/ffmpeg cleanup: # ES-DE From 2f7dd4de324a81bbea2dfd457524b1cd128e0a38 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Thu, 28 Apr 2022 21:25:19 +0900 Subject: [PATCH 015/170] Removed branch from rpcs3 --- net.retrodeck.retrodeck.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index f0b3a282..d4c9eada 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -873,7 +873,6 @@ modules: sources: - type: git url: https://github.com/RPCS3/rpcs3.git - branch: master commit: e9570d1a0045926f63ec8ea9af68f81743d4f365 # RPCS3 - END @@ -989,4 +988,4 @@ modules: - type: dir path: tools - type: file - path: net.retrodeck.retrodeck.desktop \ No newline at end of file + path: net.retrodeck.retrodeck.desktop From c9abddaf8685cfd7d0f5c3f64b6c891956dc3ae2 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 29 Apr 2022 19:34:53 +0900 Subject: [PATCH 016/170] Moved scraped folder in ~/retrodeck --- retrodeck.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/retrodeck.sh b/retrodeck.sh index c07e100c..0479d931 100755 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -58,10 +58,17 @@ then mkdir -p ~/retrodeck/states mkdir -p ~/retrodeck/screenshots mkdir -p ~/retrodeck/bios/pico-8 + # ES-DE cp -r /app/retrodeck/tools/* /var/config/retrodeck/tools/ mkdir -p /var/config/emulationstation/.emulationstation/custom_systems/tools/ cp /app/retrodeck/tools-gamelist.xml /var/config/retrodeck/tools/gamelist.xml + # ES-DE scraped folder + mv -f /var/config/emulationstation/.emulationstation/downloaded_media /var/config/emulationstation/.emulationstation/downloaded_media.old + mkdir ~/retrodeck/.downloaded_media + ln -s ~/retrodeck/.downloaded_media /var/config/emulationstation/.emulationstation/downloaded_media + mv -f /var/config/emulationstation/.emulationstation/downloaded_media.old/* ~/retrodeck/.downloaded_media + rm -rf /var/config/emulationstation/.emulationstation/downloaded_media.old # Initializing emulators configs emuconfigs=/app/retrodeck/emu-configs/ From c35acbc73b74c7e558beabc411ab6c5d2c7ac4e6 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 29 Apr 2022 21:17:30 +0900 Subject: [PATCH 017/170] MELONDS: configured --- emu-configs/melonDS.ini | 135 ++++++++++++++++++++++++++++++++++++ net.retrodeck.retrodeck.yml | 3 + retrodeck.sh | 12 ++-- tools-gamelist.xml | 7 ++ tools/start-melonds.sh | 7 ++ tools/start-yuzu.sh | 2 +- 6 files changed, 161 insertions(+), 5 deletions(-) create mode 100644 emu-configs/melonDS.ini create mode 100644 tools/start-melonds.sh diff --git a/emu-configs/melonDS.ini b/emu-configs/melonDS.ini new file mode 100644 index 00000000..f32e452f --- /dev/null +++ b/emu-configs/melonDS.ini @@ -0,0 +1,135 @@ +Key_A=-1 +Key_B=-1 +Key_Select=-1 +Key_Start=-1 +Key_Right=-1 +Key_Left=-1 +Key_Up=-1 +Key_Down=-1 +Key_R=-1 +Key_L=-1 +Key_X=-1 +Key_Y=-1 +Joy_A=0 +Joy_B=1 +Joy_Select=6 +Joy_Start=7 +Joy_Right=258 +Joy_Left=264 +Joy_Up=257 +Joy_Down=260 +Joy_R=5 +Joy_L=4 +Joy_X=2 +Joy_Y=3 +HKKey_Lid=-1 +HKKey_Mic=-1 +HKKey_Pause=-1 +HKKey_Reset=-1 +HKKey_FastForward=-1 +HKKey_FastForwardToggle=-1 +HKKey_FullscreenToggle=-1 +HKKey_SwapScreens=-1 +HKKey_SolarSensorDecrease=-1 +HKKey_SolarSensorIncrease=-1 +HKKey_FrameStep=-1 +HKJoy_Lid=-1 +HKJoy_Mic=-1 +HKJoy_Pause=10 +HKJoy_Reset=-1 +HKJoy_FastForward=85065727 +HKJoy_FastForwardToggle=-1 +HKJoy_FullscreenToggle=-1 +HKJoy_SwapScreens=9 +HKJoy_SolarSensorDecrease=-1 +HKJoy_SolarSensorIncrease=-1 +HKJoy_FrameStep=-1 +JoystickID=0 +WindowWidth=768 +WindowHeight=414 +WindowMax=0 +ScreenRotation=0 +ScreenGap=0 +ScreenLayout=3 +ScreenSwap=0 +ScreenSizing=3 +IntegerScaling=1 +ScreenAspectTop=0 +ScreenAspectBot=0 +ScreenFilter=1 +ScreenUseGL=0 +ScreenVSync=0 +ScreenVSyncInterval=1 +3DRenderer=1 +Threaded3D=1 +GL_ScaleFactor=1 +GL_BetterPolygons=0 +LimitFPS=1 +AudioSync=0 +ShowOSD=1 +ConsoleType=0 +DirectBoot=1 +JIT_Enable=0 +JIT_MaxBlockSize=32 +JIT_BranchOptimisations=1 +JIT_LiteralOptimisations=1 +JIT_FastMemory=1 +ExternalBIOSEnable=0 +BIOS9Path= +BIOS7Path= +FirmwarePath= +DSiBIOS9Path= +DSiBIOS7Path= +DSiFirmwarePath= +DSiNANDPath= +DLDIEnable=0 +DLDISDPath=dldi.bin +DLDISize=0 +DLDIReadOnly=0 +DLDIFolderSync=0 +DLDIFolderPath= +DSiSDEnable=0 +DSiSDPath=dsisd.bin +DSiSDSize=0 +DSiSDReadOnly=0 +DSiSDFolderSync=0 +DSiSDFolderPath= +FirmwareOverrideSettings=0 +FirmwareUsername=RetroDECK +FirmwareLanguage=1 +FirmwareBirthdayMonth=3 +FirmwareBirthdayDay=4 +FirmwareFavouriteColour=0 +FirmwareMessage= +FirmwareMAC= +RandomizeMAC=0 +SockBindAnyAddr=0 +LANDevice= +DirectLAN=0 +SavStaRelocSRAM=0 +AudioInterp=0 +AudioBitrate=0 +AudioVolume=256 +MicInputType=1 +MicWavPath= +LastROMFolder= +RecentROM_0= +RecentROM_1= +RecentROM_2= +RecentROM_3= +RecentROM_4= +RecentROM_5= +RecentROM_6= +RecentROM_7= +RecentROM_8= +RecentROM_9= +SaveFilePath=~/retrodeck/saves +SavestatePath=~/retrodeck/states +CheatFilePath= +EnableCheats=0 +MouseHide=0 +MouseHideSeconds=5 +PauseLostFocus=0 +DSBatteryLevelOkay=1 +DSiBatteryLevel=15 +DSiBatteryCharging=1 diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index d4c9eada..f355a790 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -941,6 +941,7 @@ modules: # Tools - mkdir -p ${FLATPAK_DEST}/retrodeck/tools/ - cp start-retroarch.sh ${FLATPAK_DEST}/retrodeck/tools/ + - cp start-splore.sh ${FLATPAK_DEST}/retrodeck/tools/ - cp move-roms.sh ${FLATPAK_DEST}/retrodeck/tools/ - cp tools-gamelist.xml ${FLATPAK_DEST}/retrodeck/ @@ -966,6 +967,8 @@ modules: - cp qt-config.ini ${FLATPAK_DEST}/retrodeck/emu-configs/ # Pcsx2 - cp PCSX2_ui.ini ${FLATPAK_DEST}/retrodeck/emu-configs/ + # MelonDS + - cp melonDS.ini ${FLATPAK_DEST}/retrodeck/emu-configs/ #cleanup: ['*'] sources: diff --git a/retrodeck.sh b/retrodeck.sh index 0479d931..30c1b71a 100755 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -65,10 +65,10 @@ then cp /app/retrodeck/tools-gamelist.xml /var/config/retrodeck/tools/gamelist.xml # ES-DE scraped folder mv -f /var/config/emulationstation/.emulationstation/downloaded_media /var/config/emulationstation/.emulationstation/downloaded_media.old - mkdir ~/retrodeck/.downloaded_media - ln -s ~/retrodeck/.downloaded_media /var/config/emulationstation/.emulationstation/downloaded_media - mv -f /var/config/emulationstation/.emulationstation/downloaded_media.old/* ~/retrodeck/.downloaded_media - rm -rf /var/config/emulationstation/.emulationstation/downloaded_media.old + mkdir ~/retrodeck/.downloaded_media + ln -s ~/retrodeck/.downloaded_media /var/config/emulationstation/.emulationstation/downloaded_media + mv -f /var/config/emulationstation/.emulationstation/downloaded_media.old/* ~/retrodeck/.downloaded_media + rm -rf /var/config/emulationstation/.emulationstation/downloaded_media.old # Initializing emulators configs emuconfigs=/app/retrodeck/emu-configs/ @@ -97,6 +97,10 @@ then mkdir -p /var/config/PCSX2/inis/ cp $emuconfigs/PCSX2_ui.ini /var/config/PCSX2/inis/ + # MelonDS + mkdir -p /var/config/melonDS/ + cp $emuconfigs/melonDS.ini /var/config/melonDS/ + # Locking RetroDECK touch ~/retrodeck/.lock diff --git a/tools-gamelist.xml b/tools-gamelist.xml index 4e6bdd02..c9395142 100644 --- a/tools-gamelist.xml +++ b/tools-gamelist.xml @@ -13,6 +13,13 @@ Start Yuzu to manually tweak your settings. true true + + + ./start-splore.sh + Start Splore + Start PICO-8's splore + true + true ./move-roms.sh diff --git a/tools/start-melonds.sh b/tools/start-melonds.sh new file mode 100644 index 00000000..7cdd9990 --- /dev/null +++ b/tools/start-melonds.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +kdialog --title "RetroDECK" --warningyesno "Doing some changes in the emulator's configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?" +if [ $? == 0 ] +then + melonDS +fi \ No newline at end of file diff --git a/tools/start-yuzu.sh b/tools/start-yuzu.sh index a618df62..fe4f4fba 100644 --- a/tools/start-yuzu.sh +++ b/tools/start-yuzu.sh @@ -1,6 +1,6 @@ #!/bin/bash -kdialog --title "RetroDECK" --warningyesno "Doing some changes in the Yuzu configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?" +kdialog --title "RetroDECK" --warningyesno "Doing some changes in the emulator's configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?" if [ $? == 0 ] then yuzu From 72a6bc823ef3d2cffecf455d0ad9d372c38851a4 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 29 Apr 2022 22:07:49 +0900 Subject: [PATCH 018/170] Fixed find rules file that was broken --- es_find_rules.xml | 102 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 101 insertions(+), 1 deletion(-) diff --git a/es_find_rules.xml b/es_find_rules.xml index ba0c5b35..080790a9 100644 --- a/es_find_rules.xml +++ b/es_find_rules.xml @@ -1,3 +1,4 @@ + @@ -9,6 +10,7 @@ /var/lib/flatpak/exports/bin/org.libretro.RetroArch + ~/.local/share/flatpak/exports/bin/org.libretro.RetroArch ~/Applications/RetroArch-Linux-x86_64.AppImage ~/.local/bin/RetroArch-Linux-x86_64.AppImage ~/bin/RetroArch-Linux-x86_64.AppImage @@ -44,6 +46,7 @@ /var/lib/flatpak/exports/bin/org.citra_emu.citra + ~/.local/share/flatpak/exports/bin/org.citra_emu.citra @@ -54,11 +57,52 @@ /var/lib/flatpak/exports/bin/org.DolphinEmu.dolphin-emu + ~/.local/share/flatpak/exports/bin/org.DolphinEmu.dolphin-emu ~/Applications/Dolphin_Emulator*.AppImage ~/.local/bin/Dolphin_Emulator*.AppImage ~/bin/Dolphin_Emulator*.AppImage + + + + dosbox-staging + io.github.dosbox-staging + + + /var/lib/flatpak/exports/bin/io.github.dosbox-staging + ~/.local/share/flatpak/exports/bin/io.github.dosbox-staging + + + + + + duckstation-nogui + duckstation-qt + org.duckstation.DuckStation + + + /var/lib/flatpak/exports/bin/org.duckstation.DuckStation + ~/.local/share/flatpak/exports/bin/org.duckstation.DuckStation + ~/Applications/duckstation-nogui-x64.AppImage + ~/.local/bin/duckstation-nogui-x64.AppImage + ~/bin/duckstation-nogui-x64.AppImage + ~/Applications/duckstation-qt-x64.AppImage + ~/.local/bin/duckstation-qt-x64.AppImage + ~/bin/duckstation-qt-x64.AppImage + + + + + + flycast + org.flycast.Flycast + + + /var/lib/flatpak/exports/bin/org.flycast.Flycast + ~/.local/share/flatpak/exports/bin/org.flycast.Flycast + + @@ -68,6 +112,7 @@ /var/lib/flatpak/exports/bin/net.fsuae.FS-UAE + ~/.local/share/flatpak/exports/bin/net.fsuae.FS-UAE @@ -76,6 +121,18 @@ mame + + + + melonds + melonDS + net.kuribo64.melonDS + + + /var/lib/flatpak/exports/bin/net.kuribo64.melonDS + ~/.local/share/flatpak/exports/bin/net.kuribo64.melonDS + + @@ -84,6 +141,7 @@ /var/lib/flatpak/exports/bin/io.mgba.mGBA + ~/.local/share/flatpak/exports/bin/io.mgba.mGBA ~/Applications/mGBA*.AppImage ~/.local/bin/mGBA*.AppImage ~/bin/mGBA*.AppImage @@ -97,6 +155,7 @@ /var/lib/flatpak/exports/bin/io.github.m64p.m64p + ~/.local/share/flatpak/exports/bin/io.github.m64p.m64p @@ -108,6 +167,7 @@ /var/lib/flatpak/exports/bin/net.pcsx2.PCSX2 + ~/.local/share/flatpak/exports/bin/net.pcsx2.PCSX2 @@ -118,8 +178,31 @@ /var/lib/flatpak/exports/bin/org.ppsspp.PPSSPP + ~/.local/share/flatpak/exports/bin/org.ppsspp.PPSSPP + + + + primehack + io.github.shiiion.primehack + + + /var/lib/flatpak/exports/bin/io.github.shiiion.primehack + ~/.local/share/flatpak/exports/bin/io.github.shiiion.primehack + + + + + + redream + + + ~/Applications/redream + ~/.local/bin/redream + ~/bin/redream + + @@ -130,11 +213,26 @@ /var/lib/flatpak/exports/bin/net.rpcs3.RPCS3 + ~/.local/share/flatpak/exports/bin/net.rpcs3.RPCS3 ~/Applications/rpcs3*.AppImage ~/.local/bin/rpcs3*.AppImage ~/bin/rpcs3*.AppImage + + + + Ryujinx + org.ryujinx.Ryujinx + + + /var/lib/flatpak/exports/bin/org.ryujinx.Ryujinx + ~/.local/share/flatpak/exports/bin/org.ryujinx.Ryujinx + ~/Applications/publish/Ryujinx + ~/.local/bin/publish/Ryujinx + ~/bin/publish/Ryujinx + + @@ -149,6 +247,7 @@ /var/lib/flatpak/exports/bin/app.xemu.xemu + ~/.local/share/flatpak/exports/bin/app.xemu.xemu ~/Applications/Xemu*.AppImage ~/.local/bin/Xemu*.AppImage ~/bin/Xemu*.AppImage @@ -163,6 +262,7 @@ /var/lib/flatpak/exports/bin/org.yuzu_emu.yuzu + ~/.local/share/flatpak/exports/bin/org.yuzu_emu.yuzu ~/Applications/yuzu*.AppImage ~/.local/bin/yuzu*.AppImage ~/bin/yuzu*.AppImage @@ -176,4 +276,4 @@ ~/retrodeck/bios/pico-8/pico8 - + \ No newline at end of file From 594ecf9c53cd74ad57921be3c2ebd6cc69f131d6 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 29 Apr 2022 22:08:40 +0900 Subject: [PATCH 019/170] Fixed es_systems file that was broken --- es_systems.xml | 74 ++------------------------------------------------ 1 file changed, 3 insertions(+), 71 deletions(-) diff --git a/es_systems.xml b/es_systems.xml index 000f191a..b6238899 100644 --- a/es_systems.xml +++ b/es_systems.xml @@ -316,15 +316,6 @@ daphne - - - - - - - - - doom Doom %ROMPATH%/doom @@ -337,11 +328,8 @@ dos DOS %ROMPATH%/dos - .dosz .DOSZ - - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_pure_libretro.so %ROM% - - + .dosz .DOSZ + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_pure_libretro.so %ROM% dos dos @@ -366,15 +354,6 @@ dreamcast - - - - - - - - - famicom Nintendo Family Computer %ROMPATH%/famicom @@ -541,15 +520,6 @@ j2me - - - - - - - - - lutris Lutris Open Gaming Platform %ROMPATH%/lutris @@ -568,15 +538,6 @@ lutro - - - - - - - - - mame Multiple Arcade Machine Emulator %ROMPATH%/mame @@ -881,18 +842,6 @@ palm - - - - - - - - - - - - pc88 NEC PC-8800 Series %ROMPATH%/pc88 @@ -950,15 +899,6 @@ pokemini - - - - - - - - - ps2 Sony PlayStation 2 %ROMPATH%/ps2 @@ -1189,15 +1129,6 @@ spectravideo - - - - - - - - - stratagus Stratagus Game Engine %ROMPATH%/stratagus @@ -1479,4 +1410,5 @@ %EMULATOR_PICO-8% -desktop ~/retrodeck/screenshots -windowed 0 -root_path %ROMPATH%/pico-8 -run %ROM% pico-8 pico-8 + \ No newline at end of file From a1b1c2c3056aa374febe713a1a23daae8580dd0b Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 29 Apr 2022 22:09:12 +0900 Subject: [PATCH 020/170] MELONDS: added bios support --- emu-configs/melonDS.ini | 8 ++++---- retrodeck.sh | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/emu-configs/melonDS.ini b/emu-configs/melonDS.ini index f32e452f..259b852f 100644 --- a/emu-configs/melonDS.ini +++ b/emu-configs/melonDS.ini @@ -74,10 +74,10 @@ JIT_MaxBlockSize=32 JIT_BranchOptimisations=1 JIT_LiteralOptimisations=1 JIT_FastMemory=1 -ExternalBIOSEnable=0 -BIOS9Path= -BIOS7Path= -FirmwarePath= +ExternalBIOSEnable=1 +BIOS9Path=~/retrodeck/bios/bios9.bin +BIOS7Path=~/retrodeck/bios/bios7.bin +FirmwarePath=~/retrodeck/bios/firmware.bin DSiBIOS9Path= DSiBIOS7Path= DSiFirmwarePath= diff --git a/retrodeck.sh b/retrodeck.sh index 30c1b71a..674bff5c 100755 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -99,6 +99,7 @@ then # MelonDS mkdir -p /var/config/melonDS/ + ln -s ~/retrodeck/bios /var/config/melonDS/bios cp $emuconfigs/melonDS.ini /var/config/melonDS/ # Locking RetroDECK From e139a69b6066db5b562c4a3873589467db27c073 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 29 Apr 2022 22:12:23 +0900 Subject: [PATCH 021/170] MELONDS: added tool --- tools-gamelist.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools-gamelist.xml b/tools-gamelist.xml index c9395142..42b5a99a 100644 --- a/tools-gamelist.xml +++ b/tools-gamelist.xml @@ -13,6 +13,13 @@ Start Yuzu to manually tweak your settings. true true + + + ./start-melonds.sh + Start MelonDS + Start MelonDS to manually tweak your settings. + true + true ./start-splore.sh From 62352803531beea17ada42bc4c11ff1b3d8c19e0 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 29 Apr 2022 22:45:29 +0900 Subject: [PATCH 022/170] YUZU: config name clashed with citra, renamed --- emu-configs/{qt-config.ini => yuzu-qt-config.ini} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename emu-configs/{qt-config.ini => yuzu-qt-config.ini} (100%) diff --git a/emu-configs/qt-config.ini b/emu-configs/yuzu-qt-config.ini similarity index 100% rename from emu-configs/qt-config.ini rename to emu-configs/yuzu-qt-config.ini From 1e9bc36495625997e760ed54bbac5e09bbc34cf6 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 29 Apr 2022 22:50:21 +0900 Subject: [PATCH 023/170] CITRA: configured, needs testing --- emu-configs/citra-qt-config.ini | 501 ++++++++++++++++++++++++++++++++ es_find_rules.xml | 1 + net.retrodeck.retrodeck.yml | 4 +- retrodeck.sh | 7 +- tools-gamelist.xml | 9 +- tools/start-citra.sh | 7 + 6 files changed, 526 insertions(+), 3 deletions(-) create mode 100644 emu-configs/citra-qt-config.ini create mode 100644 tools/start-citra.sh diff --git a/emu-configs/citra-qt-config.ini b/emu-configs/citra-qt-config.ini new file mode 100644 index 00000000..da18f038 --- /dev/null +++ b/emu-configs/citra-qt-config.ini @@ -0,0 +1,501 @@ +[Audio] +enable_audio_stretching=true +enable_audio_stretching\default=true +enable_dsp_lle=false +enable_dsp_lle\default=true +enable_dsp_lle_multithread=false +enable_dsp_lle_multithread\default=true +mic_input_device=Default +mic_input_device\default=true +mic_input_type=0 +mic_input_type\default=true +output_device=auto +output_device\default=true +output_engine=auto +output_engine\default=true +volume=@Variant(\0\0\0\x87?\x80\0\0) +volume\default=true + +[Camera] +camera_inner_config= +camera_inner_config\default=true +camera_inner_flip=0 +camera_inner_flip\default=true +camera_inner_name=blank +camera_inner_name\default=true +camera_outer_left_config= +camera_outer_left_config\default=true +camera_outer_left_flip=0 +camera_outer_left_flip\default=true +camera_outer_left_name=blank +camera_outer_left_name\default=true +camera_outer_right_config= +camera_outer_right_config\default=true +camera_outer_right_flip=0 +camera_outer_right_flip\default=true +camera_outer_right_name=blank +camera_outer_right_name\default=true + +[Controls] +profile=0 +profile\default=true +profiles\1\button_a="button:1,engine:sdl,guid:030000005e040000120b000005050000,port:0" +profiles\1\button_a\default=false +profiles\1\button_b="button:0,engine:sdl,guid:030000005e040000120b000005050000,port:0" +profiles\1\button_b\default=false +profiles\1\button_debug="code:79,engine:keyboard" +profiles\1\button_debug\default=true +profiles\1\button_down="direction:down,engine:sdl,guid:030000005e040000120b000005050000,hat:0,port:0" +profiles\1\button_down\default=false +profiles\1\button_gpio14="code:80,engine:keyboard" +profiles\1\button_gpio14\default=true +profiles\1\button_home="button:8,engine:sdl,guid:030000005e040000120b000005050000,port:0" +profiles\1\button_home\default=false +profiles\1\button_l="button:4,engine:sdl,guid:030000005e040000120b000005050000,port:0" +profiles\1\button_l\default=false +profiles\1\button_left="direction:left,engine:sdl,guid:030000005e040000120b000005050000,hat:0,port:0" +profiles\1\button_left\default=false +profiles\1\button_r="button:5,engine:sdl,guid:030000005e040000120b000005050000,port:0" +profiles\1\button_r\default=false +profiles\1\button_right="direction:right,engine:sdl,guid:030000005e040000120b000005050000,hat:0,port:0" +profiles\1\button_right\default=false +profiles\1\button_select="button:6,engine:sdl,guid:030000005e040000120b000005050000,port:0" +profiles\1\button_select\default=false +profiles\1\button_start="button:7,engine:sdl,guid:030000005e040000120b000005050000,port:0" +profiles\1\button_start\default=false +profiles\1\button_up="direction:up,engine:sdl,guid:030000005e040000120b000005050000,hat:0,port:0" +profiles\1\button_up\default=false +profiles\1\button_x="button:3,engine:sdl,guid:030000005e040000120b000005050000,port:0" +profiles\1\button_x\default=false +profiles\1\button_y="button:2,engine:sdl,guid:030000005e040000120b000005050000,port:0" +profiles\1\button_y\default=false +profiles\1\button_zl="axis:2,direction:-,engine:sdl,guid:030000005e040000120b000005050000,port:0,threshold:0.000015" +profiles\1\button_zl\default=false +profiles\1\button_zr="axis:5,direction:-,engine:sdl,guid:030000005e040000120b000005050000,port:0,threshold:0.000015" +profiles\1\button_zr\default=false +profiles\1\c_stick="axis_x:3,axis_y:4,deadzone:0.100000,engine:sdl,guid:030000005e040000120b000005050000,port:0" +profiles\1\c_stick\default=false +profiles\1\circle_pad="axis_x:0,axis_y:1,deadzone:0.100000,engine:sdl,guid:030000005e040000120b000005050000,port:0" +profiles\1\circle_pad\default=false +profiles\1\motion_device="engine:motion_emu,update_period:100,sensitivity:0.01,tilt_clamp:90.0" +profiles\1\motion_device\default=true +profiles\1\name=default +profiles\1\name\default=true +profiles\1\touch_device=engine:emu_window +profiles\1\touch_device\default=true +profiles\1\touch_from_button_map=0 +profiles\1\touch_from_button_map\default=true +profiles\1\udp_input_address=127.0.0.1 +profiles\1\udp_input_address\default=true +profiles\1\udp_input_port=26760 +profiles\1\udp_input_port\default=true +profiles\1\udp_pad_index=0 +profiles\1\udp_pad_index\default=true +profiles\1\use_touch_from_button=false +profiles\1\use_touch_from_button\default=true +profiles\size=1 +touch_from_button_maps\1\entries\size=0 +touch_from_button_maps\1\name=default +touch_from_button_maps\1\name\default=true +touch_from_button_maps\size=1 + +[Core] +cpu_clock_percentage=100 +cpu_clock_percentage\default=true +use_cpu_jit=true +use_cpu_jit\default=true + +[Data%20Storage] +nand_directory=/home/steamos/.var/app/net.retrodeck.retrodeck/data/citra-emu/nand/ +nand_directory\default=true +sdmc_directory=/home/steamos/.var/app/net.retrodeck.retrodeck/data/citra-emu/sdmc/ +sdmc_directory\default=true +use_virtual_sd=true +use_virtual_sd\default=true + +[Debugging] +LLE\AC=false +LLE\AC\default=true +LLE\ACT=false +LLE\ACT\default=true +LLE\AM=false +LLE\AM\default=true +LLE\BOSS=false +LLE\BOSS\default=true +LLE\CAM=false +LLE\CAM\default=true +LLE\CDC=false +LLE\CDC\default=true +LLE\CECD=false +LLE\CECD\default=true +LLE\CFG=false +LLE\CFG\default=true +LLE\CSND=false +LLE\CSND\default=true +LLE\DLP=false +LLE\DLP\default=true +LLE\DSP=false +LLE\DSP\default=true +LLE\ERR=false +LLE\ERR\default=true +LLE\FRD=false +LLE\FRD\default=true +LLE\FS=false +LLE\FS\default=true +LLE\GPIO=false +LLE\GPIO\default=true +LLE\GSP=false +LLE\GSP\default=true +LLE\HID=false +LLE\HID\default=true +LLE\HTTP=false +LLE\HTTP\default=true +LLE\I2C=false +LLE\I2C\default=true +LLE\IR=false +LLE\IR\default=true +LLE\LDR=false +LLE\LDR\default=true +LLE\MCU=false +LLE\MCU\default=true +LLE\MIC=false +LLE\MIC\default=true +LLE\MP=false +LLE\MP\default=true +LLE\MVD=false +LLE\MVD\default=true +LLE\NDM=false +LLE\NDM\default=true +LLE\NEWS=false +LLE\NEWS\default=true +LLE\NFC=false +LLE\NFC\default=true +LLE\NIM=false +LLE\NIM\default=true +LLE\NS=false +LLE\NS\default=true +LLE\NWM=false +LLE\NWM\default=true +LLE\PDN=false +LLE\PDN\default=true +LLE\PM=false +LLE\PM\default=true +LLE\PS=false +LLE\PS\default=true +LLE\PTM=false +LLE\PTM\default=true +LLE\PXI=false +LLE\PXI\default=true +LLE\QTM=false +LLE\QTM\default=true +LLE\SOC=false +LLE\SOC\default=true +LLE\SPI=false +LLE\SPI\default=true +LLE\SSL=false +LLE\SSL\default=true +gdbstub_port=24689 +gdbstub_port\default=true +record_frame_times=false +use_gdbstub=false +use_gdbstub\default=true + +[Layout] +custom_bottom_bottom=480 +custom_bottom_bottom\default=true +custom_bottom_left=40 +custom_bottom_left\default=true +custom_bottom_right=360 +custom_bottom_right\default=true +custom_bottom_top=240 +custom_bottom_top\default=true +custom_layout=false +custom_layout\default=true +custom_top_bottom=240 +custom_top_bottom\default=true +custom_top_left=0 +custom_top_left\default=true +custom_top_right=400 +custom_top_right\default=true +custom_top_top=0 +custom_top_top\default=true +factor_3d=0 +factor_3d\default=true +filter_mode=true +filter_mode\default=true +layout_option=0 +pp_shader_name=none (builtin) +pp_shader_name\default=true +render_3d=0 +render_3d\default=true +swap_screen=false +swap_screen\default=true +upright_screen=false +upright_screen\default=true + +[Miscellaneous] +log_filter=*:Info +log_filter\default=true + +[Renderer] +bg_blue=0 +bg_blue\default=true +bg_green=0 +bg_green\default=true +bg_red=0 +bg_red\default=true +frame_limit=100 +frame_limit\default=true +frame_limit_alternate=200 +frame_limit_alternate\default=true +resolution_factor=1 +resolution_factor\default=true +shaders_accurate_mul=true +shaders_accurate_mul\default=true +texture_filter_name=none +texture_filter_name\default=true +use_disk_shader_cache=true +use_disk_shader_cache\default=true +use_frame_limit_alternate=false +use_frame_limit_alternate\default=true +use_hw_renderer=true +use_hw_renderer\default=true +use_hw_shader=true +use_hw_shader\default=true +use_shader_jit=true +use_shader_jit\default=true +use_vsync_new=true +use_vsync_new\default=true + +[System] +init_clock=0 +init_clock\default=true +init_time=946681277 +init_time\default=true +is_new_3ds=true +is_new_3ds\default=true +region_value=-1 +region_value\default=true + +[UI] +GameList\hideNoIcon=false +GameList\hideNoIcon\default=true +GameList\iconSize=2 +GameList\iconSize\default=true +GameList\row1=2 +GameList\row1\default=true +GameList\row2=0 +GameList\row2\default=true +GameList\singleLineMode=false +GameList\singleLineMode\default=true +Multiplayer\game_id=0 +Multiplayer\game_id\default=true +Multiplayer\host_type=0 +Multiplayer\host_type\default=true +Multiplayer\ip= +Multiplayer\ip\default=true +Multiplayer\ip_ban_list\size=0 +Multiplayer\max_player=8 +Multiplayer\max_player\default=true +Multiplayer\nickname= +Multiplayer\nickname\default=true +Multiplayer\port=24872 +Multiplayer\port\default=true +Multiplayer\room_description= +Multiplayer\room_description\default=true +Multiplayer\room_name= +Multiplayer\room_name\default=true +Multiplayer\room_nickname= +Multiplayer\room_nickname\default=true +Multiplayer\room_port=24872 +Multiplayer\room_port\default=true +Multiplayer\username_ban_list\size=0 +Paths\gamedirs\1\deep_scan=false +Paths\gamedirs\1\deep_scan\default=true +Paths\gamedirs\1\expanded=true +Paths\gamedirs\1\expanded\default=true +Paths\gamedirs\1\path=INSTALLED +Paths\gamedirs\2\deep_scan=false +Paths\gamedirs\2\deep_scan\default=true +Paths\gamedirs\2\expanded=true +Paths\gamedirs\2\expanded\default=true +Paths\gamedirs\2\path=SYSTEM +Paths\gamedirs\3\deep_scan=false +Paths\gamedirs\3\deep_scan\default=true +Paths\gamedirs\3\expanded=true +Paths\gamedirs\3\expanded\default=true +Paths\gamedirs\3\path=/run/user/1000/doc/a3fd0df5/n3ds +Paths\gamedirs\size=3 +Paths\language=en +Paths\language\default=false +Paths\moviePlaybackPath= +Paths\movieRecordPath= +Paths\recentFiles=/var/config/emulationstation/ROMs/n3ds/Gyakuten Saiban 123 - Naruhodo Selection (Japan) Decrypted.3ds +Paths\romsPath= +Paths\screenshotPath= +Paths\symbolsPath= +Paths\videoDumpingPath= +Shortcuts\Main%20Window\Advance%20Frame\Context=2 +Shortcuts\Main%20Window\Advance%20Frame\Context\default=true +Shortcuts\Main%20Window\Advance%20Frame\KeySeq=\\ +Shortcuts\Main%20Window\Advance%20Frame\KeySeq\default=true +Shortcuts\Main%20Window\Capture%20Screenshot\Context=2 +Shortcuts\Main%20Window\Capture%20Screenshot\Context\default=true +Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq=Ctrl+P +Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq\default=true +Shortcuts\Main%20Window\Continue\Pause%20Emulation\Context=1 +Shortcuts\Main%20Window\Continue\Pause%20Emulation\Context\default=true +Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq=F4 +Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq\default=true +Shortcuts\Main%20Window\Decrease%20Speed%20Limit\Context=2 +Shortcuts\Main%20Window\Decrease%20Speed%20Limit\Context\default=true +Shortcuts\Main%20Window\Decrease%20Speed%20Limit\KeySeq=- +Shortcuts\Main%20Window\Decrease%20Speed%20Limit\KeySeq\default=true +Shortcuts\Main%20Window\Exit%20Citra\Context=1 +Shortcuts\Main%20Window\Exit%20Citra\Context\default=true +Shortcuts\Main%20Window\Exit%20Citra\KeySeq=Ctrl+Q +Shortcuts\Main%20Window\Exit%20Citra\KeySeq\default=true +Shortcuts\Main%20Window\Exit%20Fullscreen\Context=1 +Shortcuts\Main%20Window\Exit%20Fullscreen\Context\default=true +Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq=Esc +Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq\default=true +Shortcuts\Main%20Window\Fullscreen\Context=1 +Shortcuts\Main%20Window\Fullscreen\Context\default=true +Shortcuts\Main%20Window\Fullscreen\KeySeq=F11 +Shortcuts\Main%20Window\Fullscreen\KeySeq\default=true +Shortcuts\Main%20Window\Increase%20Speed%20Limit\Context=2 +Shortcuts\Main%20Window\Increase%20Speed%20Limit\Context\default=true +Shortcuts\Main%20Window\Increase%20Speed%20Limit\KeySeq=+ +Shortcuts\Main%20Window\Increase%20Speed%20Limit\KeySeq\default=true +Shortcuts\Main%20Window\Load%20Amiibo\Context=2 +Shortcuts\Main%20Window\Load%20Amiibo\Context\default=true +Shortcuts\Main%20Window\Load%20Amiibo\KeySeq=F2 +Shortcuts\Main%20Window\Load%20Amiibo\KeySeq\default=true +Shortcuts\Main%20Window\Load%20File\Context=1 +Shortcuts\Main%20Window\Load%20File\Context\default=true +Shortcuts\Main%20Window\Load%20File\KeySeq=Ctrl+O +Shortcuts\Main%20Window\Load%20File\KeySeq\default=true +Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\Context=1 +Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\Context\default=true +Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\KeySeq=Ctrl+V +Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\KeySeq\default=true +Shortcuts\Main%20Window\Remove%20Amiibo\Context=2 +Shortcuts\Main%20Window\Remove%20Amiibo\Context\default=true +Shortcuts\Main%20Window\Remove%20Amiibo\KeySeq=F3 +Shortcuts\Main%20Window\Remove%20Amiibo\KeySeq\default=true +Shortcuts\Main%20Window\Restart%20Emulation\Context=1 +Shortcuts\Main%20Window\Restart%20Emulation\Context\default=true +Shortcuts\Main%20Window\Restart%20Emulation\KeySeq=F6 +Shortcuts\Main%20Window\Restart%20Emulation\KeySeq\default=true +Shortcuts\Main%20Window\Rotate%20Screens%20Upright\Context=1 +Shortcuts\Main%20Window\Rotate%20Screens%20Upright\Context\default=true +Shortcuts\Main%20Window\Rotate%20Screens%20Upright\KeySeq=F8 +Shortcuts\Main%20Window\Rotate%20Screens%20Upright\KeySeq\default=true +Shortcuts\Main%20Window\Save%20to%20Oldest%20Slot\Context=1 +Shortcuts\Main%20Window\Save%20to%20Oldest%20Slot\Context\default=true +Shortcuts\Main%20Window\Save%20to%20Oldest%20Slot\KeySeq=Ctrl+C +Shortcuts\Main%20Window\Save%20to%20Oldest%20Slot\KeySeq\default=true +Shortcuts\Main%20Window\Stop%20Emulation\Context=1 +Shortcuts\Main%20Window\Stop%20Emulation\Context\default=true +Shortcuts\Main%20Window\Stop%20Emulation\KeySeq=F5 +Shortcuts\Main%20Window\Stop%20Emulation\KeySeq\default=true +Shortcuts\Main%20Window\Swap%20Screens\Context=1 +Shortcuts\Main%20Window\Swap%20Screens\Context\default=true +Shortcuts\Main%20Window\Swap%20Screens\KeySeq=F9 +Shortcuts\Main%20Window\Swap%20Screens\KeySeq\default=true +Shortcuts\Main%20Window\Toggle%20Alternate%20Speed\Context=2 +Shortcuts\Main%20Window\Toggle%20Alternate%20Speed\Context\default=true +Shortcuts\Main%20Window\Toggle%20Alternate%20Speed\KeySeq=Ctrl+Z +Shortcuts\Main%20Window\Toggle%20Alternate%20Speed\KeySeq\default=true +Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Context=1 +Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Context\default=true +Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq=Ctrl+F +Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq\default=true +Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\Context=2 +Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\Context\default=true +Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\KeySeq=Ctrl+A +Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\KeySeq\default=true +Shortcuts\Main%20Window\Toggle%20Screen%20Layout\Context=1 +Shortcuts\Main%20Window\Toggle%20Screen%20Layout\Context\default=true +Shortcuts\Main%20Window\Toggle%20Screen%20Layout\KeySeq=F10 +Shortcuts\Main%20Window\Toggle%20Screen%20Layout\KeySeq\default=true +Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context=1 +Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context\default=true +Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq=Ctrl+S +Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq\default=true +Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\Context=2 +Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\Context\default=true +Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\KeySeq=Ctrl+D +Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\KeySeq\default=true +UILayout\gameListHeaderState=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\x5\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x4\x9c\0\0\0\x5\x1\x1\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x5\0\0\x2\x80\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\xf0\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\0\0\0\x64) +UILayout\geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\xd6\0\0\0\x97\0\0\x4*\0\0\x2\x43\0\0\0\xd6\0\0\0\xb4\0\0\x4*\0\0\x2\x43\0\0\0\0\0\0\0\0\x5\0\0\0\0\xd6\0\0\0\xb4\0\0\x4*\0\0\x2\x43) +UILayout\geometryRenderWindow=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x14\0\0\x1\x8f\0\0\x1\xf3\0\0\0\0\0\0\0\x14\0\0\x1\x8f\0\0\x1\xf3\0\0\0\0\0\0\0\0\x5\0\0\0\0\0\0\0\0\x14\0\0\x1\x8f\0\0\x1\xf3) +UILayout\microProfileDialogGeometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k\0\0\0\0\0\0\0\0\x5\0\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k) +UILayout\microProfileDialogVisible=false +UILayout\microProfileDialogVisible\default=true +UILayout\state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x2\0\0\0\0\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\x1\xfb\0\0\0\x1c\0W\0\x61\0i\0t\0T\0r\0\x65\0\x65\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x62\x1\0\0\x3\0\0\0\x1\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\b\xfb\0\0\0\x18\0\x41\0R\0M\0R\0\x65\0g\0i\0s\0t\0\x65\0r\0s\0\0\0\0\0\xff\xff\xff\xff\0\0\0n\x1\0\0\x3\xfb\0\0\0 \0G\0r\0\x61\0p\0h\0i\0\x63\0s\0\x44\0\x65\0\x62\0u\0g\0g\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x62\x1\0\0\x3\xfb\0\0\0\"\0P\0i\0\x63\0\x61\0 \0\x43\0o\0m\0m\0\x61\0n\0\x64\0 \0L\0i\0s\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x94\x1\0\0\x3\xfb\0\0\0*\0P\0i\0\x63\0\x61\0\x42\0r\0\x65\0\x61\0k\0P\0o\0i\0n\0t\0s\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x94\x1\0\0\x3\xfb\0\0\0 \0P\0i\0\x63\0\x61\0V\0\x65\0r\0t\0\x65\0x\0S\0h\0\x61\0\x64\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\x1\xd2\x1\0\0\x3\xfb\0\0\0\x12\0\x43\0i\0T\0r\0\x61\0\x63\0i\0n\0g\0\0\0\0\0\xff\xff\xff\xff\0\0\0N\x1\0\0\x3\xfb\0\0\0.\0L\0L\0\x45\0S\0\x65\0r\0v\0i\0\x63\0\x65\0M\0o\0\x64\0u\0l\0\x65\0s\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x62\x1\0\0\x3\xfb\0\0\0\x16\0I\0P\0\x43\0R\0\x65\0\x63\0o\0r\0\x64\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\xd3\x1\0\0\x3\0\0\x3U\0\0\x1Q\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0) +Updater\check_for_update_on_start=true +Updater\check_for_update_on_start\default=true +Updater\update_on_close=false +Updater\update_on_close\default=true +calloutFlags=1 +calloutFlags\default=false +confirmClose=true +confirmClose\default=true +displayTitleBars=true +displayTitleBars\default=true +enable_discord_presence=true +enable_discord_presence\default=true +firstStart=false +firstStart\default=false +fullscreen=false +fullscreen\default=true +hideInactiveMouse=false +hideInactiveMouse\default=true +pauseWhenInBackground=false +pauseWhenInBackground\default=true +screenshot_resolution_factor=0 +screenshot_resolution_factor\default=true +showConsole=false +showConsole\default=true +showFilterBar=true +showFilterBar\default=true +showStatusBar=true +showStatusBar\default=true +singleWindowMode=true +singleWindowMode\default=true +theme=colorful_dark +theme\default=false + +[Utility] +custom_textures=false +custom_textures\default=true +dump_textures=false +dump_textures\default=true +preload_textures=false +preload_textures\default=true + +[VideoDumping] +audio_bitrate=64000 +audio_bitrate\default=true +audio_encoder=libvorbis +audio_encoder\default=true +audio_encoder_options= +audio_encoder_options\default=true +format_options= +output_format=webm +output_format\default=true +video_bitrate=2500000 +video_bitrate\default=true +video_encoder=libvpx-vp9 +video_encoder\default=true +video_encoder_options="quality:realtime,speed:6,tile-columns:4,frame-parallel:1,threads:8,row-mt:1" +video_encoder_options\default=true + +[WebService] +citra_token= +citra_username= +enable_telemetry=false +enable_telemetry\default=false +web_api_url=https://api.citra-emu.org +web_api_url\default=true diff --git a/es_find_rules.xml b/es_find_rules.xml index 080790a9..d0ed22ca 100644 --- a/es_find_rules.xml +++ b/es_find_rules.xml @@ -43,6 +43,7 @@ citra-emu.citra-nightly org.citra_emu.citra + citra-qt /var/lib/flatpak/exports/bin/org.citra_emu.citra diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index f355a790..535fbcb9 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -964,11 +964,13 @@ modules: # Dolphin - cp Dolphin.ini ${FLATPAK_DEST}/retrodeck/emu-configs/ # Yuzu - - cp qt-config.ini ${FLATPAK_DEST}/retrodeck/emu-configs/ + - cp yuzu-qt-config.ini ${FLATPAK_DEST}/retrodeck/emu-configs/ # Pcsx2 - cp PCSX2_ui.ini ${FLATPAK_DEST}/retrodeck/emu-configs/ # MelonDS - cp melonDS.ini ${FLATPAK_DEST}/retrodeck/emu-configs/ + # CITRA + - cp citra-qt-config.ini ${FLATPAK_DEST}/retrodeck/emu-configs/ #cleanup: ['*'] sources: diff --git a/retrodeck.sh b/retrodeck.sh index 674bff5c..0f0f3dd1 100755 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -87,7 +87,7 @@ then mkdir -p /var/data/yuzu/nand/system/Contents/registered/ rm ~/retrodeck/bios/switch/registered ln -s data/yuzu/nand/system/Contents/registered/ ~/retrodeck/bios/switch/registered - cp $emuconfigs/qt-config.ini /var/config/yuzu/ + cp $emuconfigs/yuzu-qt-config.ini /var/config/yuzu/qt-config.ini # Dolphin mkdir -p /var/config/dolphin-emu/ @@ -102,6 +102,11 @@ then ln -s ~/retrodeck/bios /var/config/melonDS/bios cp $emuconfigs/melonDS.ini /var/config/melonDS/ + # CITRA + mkdir -p /var/config/citra-emu/ + cp $emuconfigs/citra-qt-config.ini /var/config/citra-emu/qt-config.ini + + # Locking RetroDECK touch ~/retrodeck/.lock diff --git a/tools-gamelist.xml b/tools-gamelist.xml index 42b5a99a..d383a568 100644 --- a/tools-gamelist.xml +++ b/tools-gamelist.xml @@ -21,7 +21,14 @@ true true - + + ./start-citra.sh + Start CITRA + Start CITRA to manually tweak your settings. + true + true + + ./start-splore.sh Start Splore Start PICO-8's splore diff --git a/tools/start-citra.sh b/tools/start-citra.sh new file mode 100644 index 00000000..f7fda6b6 --- /dev/null +++ b/tools/start-citra.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +kdialog --title "RetroDECK" --warningyesno "Doing some changes in the emulator's configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?" +if [ $? == 0 ] +then + citra-qt +fi \ No newline at end of file From 4f25d2e46c138ba2b23c4eeabaf5916485400201 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 29 Apr 2022 23:07:01 +0900 Subject: [PATCH 024/170] RPCS3: initial configuration --- emu-configs/config.yml | 203 ++++++++++++++++++++++++++++++++++++ net.retrodeck.retrodeck.yml | 5 +- retrodeck.sh | 4 + tools/start-rpcs3.sh | 7 ++ 4 files changed, 217 insertions(+), 2 deletions(-) create mode 100644 emu-configs/config.yml create mode 100644 tools/start-rpcs3.sh diff --git a/emu-configs/config.yml b/emu-configs/config.yml new file mode 100644 index 00000000..b57d6713 --- /dev/null +++ b/emu-configs/config.yml @@ -0,0 +1,203 @@ +Core: + PPU Decoder: Recompiler (LLVM) + PPU Threads: 2 + PPU Debug: false + PPU Calling History: false + Save LLVM logs: false + Use LLVM CPU: "" + Max LLVM Compile Threads: 0 + PPU LLVM Greedy Mode: false + PPU LLVM Precompilation: true + Thread Scheduler Mode: Operating System + Set DAZ and FTZ: false + SPU Decoder: Recompiler (LLVM) + SPU GETLLAR polling detection: false + SPU Debug: false + MFC Debug: false + Preferred SPU Threads: 0 + SPU delay penalty: 3 + SPU loop detection: false + Max SPURS Threads: 6 + SPU Block Size: Safe + Accurate GETLLAR: false + Accurate SPU DMA: false + Accurate Cache Line Stores: false + Accurate RSX reservation access: false + SPU Verification: true + SPU Cache: true + SPU Profiler: false + MFC Commands Shuffling Limit: 0 + MFC Commands Timeout: 0 + MFC Commands Shuffling In Steps: false + Enable TSX: Disabled + Accurate xfloat: false + Approximate xfloat: true + Relaxed xfloat: true + Accurate PPU 128-byte Reservation Op Max Length: 0 + Stub PPU Traps: 0 + Full Width AVX-512: false + PPU LLVM Java Mode Handling: true + Use Accurate DFMA: true + PPU Set Saturation Bit: false + PPU Accurate Non-Java Mode: false + PPU Fixup Vector NaN Values: false + PPU Accurate Vector NaN Values: false + PPU Set FPCC Bits: false + Debug Console Mode: false + Hook static functions: false + Libraries Control: + [] + HLE lwmutex: false + SPU LLVM Lower Bound: 0 + SPU LLVM Upper Bound: 18446744073709551615 + TSX Transaction First Limit: 800 + TSX Transaction Second Limit: 2000 + Clocks scale: 100 + Sleep Timers Accuracy: As Host + Performance Report Threshold: 500 + Enable Performance Report: false + Assume External Debugger: false +VFS: + Enable /host_root/: false + Initialize Directories: true + Limit disk cache size: false + Disk cache maximum size (MB): 5120 +Video: + Renderer: Vulkan + Resolution: 1280x720 + Aspect ratio: 16:9 + Frame limit: Auto + MSAA: Auto + Shader Mode: Async Shader Recompiler + Write Color Buffers: false + Write Depth Buffer: false + Read Color Buffers: false + Read Depth Buffer: false + Log shader programs: false + VSync: false + Debug output: false + Debug overlay: false + Renderdoc Compatibility Mode: false + Use GPU texture scaling: false + Stretch To Display Area: false + Force High Precision Z buffer: false + Strict Rendering Mode: false + Disable ZCull Occlusion Queries: false + Disable Vertex Cache: false + Disable FIFO Reordering: false + Enable Frame Skip: false + Force CPU Blit: false + Disable On-Disk Shader Cache: false + Disable Vulkan Memory Allocator: false + Use full RGB output range: true + Strict Texture Flushing: false + Disable native float16 support: false + Multithreaded RSX: false + Relaxed ZCULL Sync: false + Enable 3D: false + Debug Program Analyser: false + Accurate ZCULL stats: true + Consecutive Frames To Draw: 1 + Consecutive Frames To Skip: 1 + Resolution Scale: 100 + Anisotropic Filter Override: 0 + Texture LOD Bias Addend: 0 + Minimum Scalable Dimension: 16 + Shader Compiler Threads: 0 + Driver Recovery Timeout: 1000000 + Driver Wake-Up Delay: 1 + Vblank Rate: 60 + Vblank NTSC Fixup: false + DECR memory layout: false + Allow Host GPU Labels: false + Disable MSL Fast Math: false + Software VkSemaphore: false + Vulkan: + Adapter: llvmpipe (LLVM 12.0.1, 256 bits) + Force FIFO present mode: false + Force primitive restart flag: false + Force Disable Exclusive Fullscreen Mode: false + Asynchronous Texture Streaming 2: false + Enable FidelityFX Super Resolution Upscaling: false + FidelityFX CAS Sharpening Intensity: 50 + Asynchronous Queue Scheduler: Safe + Performance Overlay: + Enabled: false + Enable Framerate Graph: false + Enable Frametime Graph: false + Framerate datapoints: 50 + Frametime datapoints: 170 + Detail level: Medium + Framerate graph detail level: All + Frametime graph detail level: All + Metrics update interval (ms): 350 + Font size (px): 10 + Position: Top Left + Font: n023055ms.ttf + Horizontal Margin (px): 50 + Vertical Margin (px): 50 + Center Horizontally: false + Center Vertically: false + Opacity (%): 70 + Body Color (hex): "#FFE138FF" + Body Background (hex): "#002339FF" + Title Color (hex): "#F26C24FF" + Title Background (hex): "#00000000" + Shader Compilation Hint: + Position X (px): 20 + Position Y (px): 690 + Shader Loading Dialog: + Allow custom background: true + Darkening effect strength: 30 + Blur effect strength: 0 +Audio: + Renderer: Cubeb + Audio provider: CellAudio + Dump to file: false + Convert to 16 bit: false + Audio Channels: Downmix to Stereo + Master Volume: 100 + Enable Buffering: true + Desired Audio Buffer Duration: 100 + Enable Time Stretching: false + Time Stretching Threshold: 75 + Microphone Type: "Null" + Microphone Devices: "@@@@@@@@@@@@" + Music Handler: Qt +Input/Output: + Keyboard: "Null" + Mouse: Basic + Camera: "Null" + Camera type: Unknown + Camera flip: None + Camera ID: Default + Move: "Null" + Buzz emulated controller: "Null" + Turntable emulated controller: "Null" + GHLtar emulated controller: "Null" + Pad handler mode: Single-threaded + Pad handler sleep (microseconds): 1000 +System: + License Area: SCEE + Language: English (US) + Keyboard Type: English keyboard (US standard) + Enter button assignment: Enter with cross + Console time offset (s): 0 +Net: + Internet enabled: Disconnected + IP address: 0.0.0.0 + DNS address: 8.8.8.8 + IP swap list: "" + PSN status: Disconnected +Miscellaneous: + Automatically start games after boot: true + Exit RPCS3 when process finishes: false + Start games in fullscreen mode: false + Prevent display sleep while running games: true + Show trophy popups: true + Show shader compilation hint: true + Use native user interface: true + GDB Server: 127.0.0.1:2345 + Silence All Logs: false + Window Title Format: "FPS: %F | %R | %V | %T [%t]" +Log: {} \ No newline at end of file diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 535fbcb9..2f13da68 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -940,8 +940,7 @@ modules: # Tools - mkdir -p ${FLATPAK_DEST}/retrodeck/tools/ - - cp start-retroarch.sh ${FLATPAK_DEST}/retrodeck/tools/ - - cp start-splore.sh ${FLATPAK_DEST}/retrodeck/tools/ + - cp start-*.sh ${FLATPAK_DEST}/retrodeck/tools/ - cp move-roms.sh ${FLATPAK_DEST}/retrodeck/tools/ - cp tools-gamelist.xml ${FLATPAK_DEST}/retrodeck/ @@ -971,6 +970,8 @@ modules: - cp melonDS.ini ${FLATPAK_DEST}/retrodeck/emu-configs/ # CITRA - cp citra-qt-config.ini ${FLATPAK_DEST}/retrodeck/emu-configs/ + # RPCS3 + - cp config.yml ${FLATPAK_DEST}/retrodeck/emu-configs/ #cleanup: ['*'] sources: diff --git a/retrodeck.sh b/retrodeck.sh index 0f0f3dd1..5aa584fe 100755 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -105,6 +105,10 @@ then # CITRA mkdir -p /var/config/citra-emu/ cp $emuconfigs/citra-qt-config.ini /var/config/citra-emu/qt-config.ini + + # RPCS3 + mkdir -p /var/config/rpcs3/ + cp $emuconfigs/config.yml /var/config/rpcs3/ # Locking RetroDECK diff --git a/tools/start-rpcs3.sh b/tools/start-rpcs3.sh new file mode 100644 index 00000000..ccfb38d5 --- /dev/null +++ b/tools/start-rpcs3.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +kdialog --title "RetroDECK" --warningyesno "Doing some changes in the emulator's configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?" +if [ $? == 0 ] +then + rpcs3 +fi \ No newline at end of file From 3eff544b6e1fdb48d256273e23e5a716833761eb Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 30 Apr 2022 10:35:55 +0900 Subject: [PATCH 025/170] New GitActions workflow for cooker --- .github/workflows/cooker.yml | 53 ++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index ecc12226..ef8e3096 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -15,18 +15,13 @@ on: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: -# A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - # This workflow contains a single job called "build" - build_cooker_snap: - # The type of runner that the job will run on - runs-on: ubuntu-latest - # Steps represent a sequence of tasks that will be executed as part of the job + Job 1 - Prepearing_enviornment: + runs-on: ubuntu-latest steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 - - name: Prepearing enviornment run: | git submodule init @@ -36,11 +31,45 @@ jobs: sudo apt install flatpak flatpak-builder p7zip-full sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo 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 - - - name: Building flatpak - run: | - sudo flatpak-builder --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - sudo flatpak build-bundle local RetroDECK.flatpak net.retrodeck.retrodeck + + Job 2 - Downloading_Sources: + runs-on: ubuntu-latest + steps: + - name: Downloading sources + run: | + sudo flatpak-builder --download-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + + Job 3 - Building_part_1: + runs-on: ubuntu-latest + steps: + - name: Bulding part 1 - Until RetroArch Cores + run: | + sudo flatpak-builder --build-only --stop-at=retroarch-cores --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + + Job 4 - Building_part_2: + runs-on: ubuntu-latest + steps: + - name: Bulding part 1 - Until the end + run: | + sudo flatpak-builder --build-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + + Job 5 - Finishing_build: + runs-on: ubuntu-latest + steps: + - name: Finishing build + run: | + sudo flatpak-builder --finish-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + + Job 6 - Build_bundle: + runs-on: ubuntu-latest + steps: + - name: Build bundle + run: | + sudo flatpak build-bundle local RetroDECK.flatpak net.retrodeck.retrodeck + + Job 7 - Publishing_flatpak: + runs-on: ubuntu-latest + steps: - name: Get date for artifacts id: date From 4189d01445921850c9f8fcdb0a5cb18d9ac0843a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 30 Apr 2022 10:42:26 +0900 Subject: [PATCH 026/170] New GitActions workflow for cooker - indentation fix --- .github/workflows/cooker.yml | 110 +++++++++++++++++------------------ 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index ef8e3096..5a21085e 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -32,68 +32,68 @@ jobs: sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo 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 - Job 2 - Downloading_Sources: - runs-on: ubuntu-latest - steps: - - name: Downloading sources - run: | - sudo flatpak-builder --download-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + Job 2 - Downloading_Sources: + runs-on: ubuntu-latest + steps: + - name: Downloading sources + run: | + sudo flatpak-builder --download-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - Job 3 - Building_part_1: - runs-on: ubuntu-latest - steps: - - name: Bulding part 1 - Until RetroArch Cores - run: | - sudo flatpak-builder --build-only --stop-at=retroarch-cores --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + Job 3 - Building_part_1: + runs-on: ubuntu-latest + steps: + - name: Bulding part 1 - Until RetroArch Cores + run: | + sudo flatpak-builder --build-only --stop-at=retroarch-cores --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - Job 4 - Building_part_2: - runs-on: ubuntu-latest - steps: - - name: Bulding part 1 - Until the end - run: | - sudo flatpak-builder --build-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + Job 4 - Building_part_2: + runs-on: ubuntu-latest + steps: + - name: Bulding part 1 - Until the end + run: | + sudo flatpak-builder --build-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - Job 5 - Finishing_build: - runs-on: ubuntu-latest - steps: - - name: Finishing build - run: | - sudo flatpak-builder --finish-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + Job 5 - Finishing_build: + runs-on: ubuntu-latest + steps: + - name: Finishing build + run: | + sudo flatpak-builder --finish-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - Job 6 - Build_bundle: - runs-on: ubuntu-latest - steps: - - name: Build bundle - run: | - sudo flatpak build-bundle local RetroDECK.flatpak net.retrodeck.retrodeck + Job 6 - Build_bundle: + runs-on: ubuntu-latest + steps: + - name: Build bundle + run: | + sudo flatpak build-bundle local RetroDECK.flatpak net.retrodeck.retrodeck - Job 7 - Publishing_flatpak: - runs-on: ubuntu-latest - steps: + Job 7 - Publishing_flatpak: + runs-on: ubuntu-latest + steps: - - name: Get date for artifacts - id: date - run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M')" + - name: Get date for artifacts + id: date + run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M')" - - name: Extract branch name - shell: bash - run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" - id: extract_branch + - name: Extract branch name + shell: bash + run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" + id: extract_branch - - name: Publish the flatpak in a new cooker release - uses: ncipollo/release-action@v1 - with: - tag: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" - body: | - # Release Notes (Cooker) - This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}. + - name: Publish the flatpak in a new cooker release + uses: ncipollo/release-action@v1 + with: + tag: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" + body: | + # Release Notes (Cooker) + This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}. - Cooker channel is provided for the community to test fixes and explore new functionality. - Please DO NOT open issues or ask support on this build. + Cooker channel is provided for the community to test fixes and explore new functionality. + Please DO NOT open issues or ask support on this build. - artifacts: "RetroDECK.flatpak" - allowUpdates: true - prerelease: true - draft: false - token: ${{ secrets.TRIGGER_BUILD_TOKEN }} - repo: RetroDECK-cooker + artifacts: "RetroDECK.flatpak" + allowUpdates: true + prerelease: true + draft: false + token: ${{ secrets.TRIGGER_BUILD_TOKEN }} + repo: RetroDECK-cooker From ca649916b528aae8d4b813ca97c5fc525c25b25f Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 30 Apr 2022 10:44:16 +0900 Subject: [PATCH 027/170] New GitActions workflow for cooker - job names fix --- .github/workflows/cooker.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 5a21085e..4521e36a 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -17,7 +17,7 @@ on: jobs: - Job 1 - Prepearing_enviornment: + Job1_-_Prepearing_enviornment: runs-on: ubuntu-latest steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it @@ -32,42 +32,42 @@ jobs: sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo 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 - Job 2 - Downloading_Sources: + Job2_-_Downloading_Sources: runs-on: ubuntu-latest steps: - name: Downloading sources run: | sudo flatpak-builder --download-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - Job 3 - Building_part_1: + Job3_-_Building_part_1: runs-on: ubuntu-latest steps: - name: Bulding part 1 - Until RetroArch Cores run: | sudo flatpak-builder --build-only --stop-at=retroarch-cores --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - Job 4 - Building_part_2: + Job4_-_Building_part_2: runs-on: ubuntu-latest steps: - name: Bulding part 1 - Until the end run: | sudo flatpak-builder --build-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - Job 5 - Finishing_build: + Job5_-_Finishing_build: runs-on: ubuntu-latest steps: - name: Finishing build run: | sudo flatpak-builder --finish-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - Job 6 - Build_bundle: + Job6_-_Build_bundle: runs-on: ubuntu-latest steps: - name: Build bundle run: | sudo flatpak build-bundle local RetroDECK.flatpak net.retrodeck.retrodeck - Job 7 - Publishing_flatpak: + Job7_-_Publishing_flatpak: runs-on: ubuntu-latest steps: From c10e49421253e1cf9bd78b75164737167f9303f9 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 30 Apr 2022 10:49:29 +0900 Subject: [PATCH 028/170] New GitActions workflow for cooker - introduced jobs hierarchy --- .github/workflows/cooker.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 4521e36a..d7d9c4fa 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -34,6 +34,7 @@ jobs: Job2_-_Downloading_Sources: runs-on: ubuntu-latest + needs: [Job1_-_Prepearing_enviornment] steps: - name: Downloading sources run: | @@ -41,6 +42,7 @@ jobs: Job3_-_Building_part_1: runs-on: ubuntu-latest + needs: [Job2_-_Downloading_Sources] steps: - name: Bulding part 1 - Until RetroArch Cores run: | @@ -48,6 +50,7 @@ jobs: Job4_-_Building_part_2: runs-on: ubuntu-latest + needs: [Job3_-_Building_part_1] steps: - name: Bulding part 1 - Until the end run: | @@ -55,6 +58,7 @@ jobs: Job5_-_Finishing_build: runs-on: ubuntu-latest + needs: [Job4_-_Building_part_2] steps: - name: Finishing build run: | @@ -62,6 +66,7 @@ jobs: Job6_-_Build_bundle: runs-on: ubuntu-latest + needs: [Job5_-_Finishing_build] steps: - name: Build bundle run: | @@ -69,6 +74,7 @@ jobs: Job7_-_Publishing_flatpak: runs-on: ubuntu-latest + needs: [Job6_-_Build_bundle] steps: - name: Get date for artifacts From 4d7c2951c338e9d1b577333b571c746bd6f827b5 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Sat, 30 Apr 2022 16:44:47 +0900 Subject: [PATCH 029/170] New workflow: Added cache --- .github/workflows/cooker.yml | 53 ++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index d7d9c4fa..040669f8 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -32,46 +32,93 @@ jobs: sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo 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 + - name: cache-cooker + id: cache-cooker + uses: actions/cache@v2 + with: + path: / + key: ${{ runner.os }}-cache + Job2_-_Downloading_Sources: runs-on: ubuntu-latest needs: [Job1_-_Prepearing_enviornment] steps: - name: Downloading sources + if: steps.cache-cooker.outputs.cache-hit != 'true' run: | sudo flatpak-builder --download-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + - name: cache-cooker + id: cache-cooker + uses: actions/cache@v2 + with: + path: / + key: ${{ runner.os }}-cache + Job3_-_Building_part_1: runs-on: ubuntu-latest needs: [Job2_-_Downloading_Sources] steps: - name: Bulding part 1 - Until RetroArch Cores + if: steps.cache-cooker.outputs.cache-hit != 'true' run: | sudo flatpak-builder --build-only --stop-at=retroarch-cores --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + - name: cache-cooker + id: cache-cooker + uses: actions/cache@v2 + with: + path: / + key: ${{ runner.os }}-cache + Job4_-_Building_part_2: runs-on: ubuntu-latest needs: [Job3_-_Building_part_1] steps: - name: Bulding part 1 - Until the end + if: steps.cache-cooker.outputs.cache-hit != 'true' run: | sudo flatpak-builder --build-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + - name: cache-cooker + id: cache-cooker + uses: actions/cache@v2 + with: + path: / + key: ${{ runner.os }}-cache + Job5_-_Finishing_build: runs-on: ubuntu-latest needs: [Job4_-_Building_part_2] steps: - name: Finishing build + if: steps.cache-cooker.outputs.cache-hit != 'true' run: | sudo flatpak-builder --finish-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + - name: cache-cooker + id: cache-cooker + uses: actions/cache@v2 + with: + path: / + key: ${{ runner.os }}-cache + Job6_-_Build_bundle: runs-on: ubuntu-latest needs: [Job5_-_Finishing_build] steps: - name: Build bundle + if: steps.cache-cooker.outputs.cache-hit != 'true' run: | sudo flatpak build-bundle local RetroDECK.flatpak net.retrodeck.retrodeck + - name: cache-cooker + id: cache-cooker + uses: actions/cache@v2 + with: + path: / + key: ${{ runner.os }}-cache + Job7_-_Publishing_flatpak: runs-on: ubuntu-latest needs: [Job6_-_Build_bundle] @@ -87,6 +134,7 @@ jobs: id: extract_branch - name: Publish the flatpak in a new cooker release + if: steps.cache-cooker.outputs.cache-hit != 'true' uses: ncipollo/release-action@v1 with: tag: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" @@ -103,3 +151,8 @@ jobs: draft: false token: ${{ secrets.TRIGGER_BUILD_TOKEN }} repo: RetroDECK-cooker + + # Job8_-_Uploading_cache: + # runs-on: ubuntu-latest + # needs: [Job7_-_Publishing_flatpak] + # steps: From a7d723fd3717ab8432734900a45bf6d94e475801 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Sat, 30 Apr 2022 17:40:28 +0900 Subject: [PATCH 030/170] New workflow: different approach --- .github/workflows/cooker.yml | 58 ++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 22 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 040669f8..34c1cfa8 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -17,27 +17,27 @@ on: jobs: - Job1_-_Prepearing_enviornment: - runs-on: ubuntu-latest - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 - - name: Prepearing enviornment - run: | - git submodule init - git submodule update - sudo add-apt-repository ppa:alexlarsson/flatpak - sudo apt-get update - sudo apt install flatpak flatpak-builder p7zip-full - sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - sudo 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 + # Job1_-_Prepearing_enviornment: + # runs-on: ubuntu-latest + # steps: + # # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + # - uses: actions/checkout@v3 + # - name: Prepearing enviornment + # run: | + # git submodule init + # git submodule update + # sudo add-apt-repository ppa:alexlarsson/flatpak + # sudo apt-get update + # sudo apt install flatpak flatpak-builder p7zip-full + # sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + # sudo 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 - - name: cache-cooker - id: cache-cooker - uses: actions/cache@v2 - with: - path: / - key: ${{ runner.os }}-cache + # - name: cache-cooker + # id: cache-cooker + # uses: actions/cache@v2 + # with: + # path: ./*flatpak* + # key: ${{ runner.os }}-cache Job2_-_Downloading_Sources: runs-on: ubuntu-latest @@ -46,13 +46,20 @@ jobs: - name: Downloading sources if: steps.cache-cooker.outputs.cache-hit != 'true' run: | + git submodule init + git submodule update + sudo add-apt-repository ppa:alexlarsson/flatpak + sudo apt-get update + sudo apt install flatpak flatpak-builder p7zip-full + sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + sudo 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 sudo flatpak-builder --download-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - name: cache-cooker id: cache-cooker uses: actions/cache@v2 with: - path: / + path: ./*flatpak* key: ${{ runner.os }}-cache Job3_-_Building_part_1: @@ -62,13 +69,20 @@ jobs: - name: Bulding part 1 - Until RetroArch Cores if: steps.cache-cooker.outputs.cache-hit != 'true' run: | + git submodule init + git submodule update + sudo add-apt-repository ppa:alexlarsson/flatpak + sudo apt-get update + sudo apt install flatpak flatpak-builder p7zip-full + sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + sudo 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 sudo flatpak-builder --build-only --stop-at=retroarch-cores --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - name: cache-cooker id: cache-cooker uses: actions/cache@v2 with: - path: / + path: ./*flatpak* key: ${{ runner.os }}-cache Job4_-_Building_part_2: From cce7c59c2f9577a941888e90eb54746602a1d5e6 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Sat, 30 Apr 2022 18:28:48 +0900 Subject: [PATCH 031/170] New workflow: different approach - fix --- .github/workflows/cooker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 34c1cfa8..5451c419 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -41,7 +41,7 @@ jobs: Job2_-_Downloading_Sources: runs-on: ubuntu-latest - needs: [Job1_-_Prepearing_enviornment] + #needs: [Job1_-_Prepearing_enviornment] steps: - name: Downloading sources if: steps.cache-cooker.outputs.cache-hit != 'true' From 82f37091f7356107bd9ecda3e1dd2e288de154a4 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Sat, 30 Apr 2022 18:31:52 +0900 Subject: [PATCH 032/170] New workflow: different approach - fix2 --- .github/workflows/cooker.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 5451c419..bed9cc90 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -43,6 +43,7 @@ jobs: runs-on: ubuntu-latest #needs: [Job1_-_Prepearing_enviornment] steps: + - uses: actions/checkout@v3 - name: Downloading sources if: steps.cache-cooker.outputs.cache-hit != 'true' run: | @@ -66,6 +67,7 @@ jobs: runs-on: ubuntu-latest needs: [Job2_-_Downloading_Sources] steps: + - uses: actions/checkout@v3 - name: Bulding part 1 - Until RetroArch Cores if: steps.cache-cooker.outputs.cache-hit != 'true' run: | @@ -89,6 +91,7 @@ jobs: runs-on: ubuntu-latest needs: [Job3_-_Building_part_1] steps: + - uses: actions/checkout@v3 - name: Bulding part 1 - Until the end if: steps.cache-cooker.outputs.cache-hit != 'true' run: | @@ -105,6 +108,7 @@ jobs: runs-on: ubuntu-latest needs: [Job4_-_Building_part_2] steps: + - uses: actions/checkout@v3 - name: Finishing build if: steps.cache-cooker.outputs.cache-hit != 'true' run: | @@ -121,6 +125,7 @@ jobs: runs-on: ubuntu-latest needs: [Job5_-_Finishing_build] steps: + - uses: actions/checkout@v3 - name: Build bundle if: steps.cache-cooker.outputs.cache-hit != 'true' run: | From 65583fa4f3269e150fcbbd90bc8bc7f30e79c54d Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Sat, 30 Apr 2022 19:26:59 +0900 Subject: [PATCH 033/170] New workflow: different approach - fix3 --- .github/workflows/cooker.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index bed9cc90..ff237c31 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -95,6 +95,13 @@ jobs: - name: Bulding part 1 - Until the end if: steps.cache-cooker.outputs.cache-hit != 'true' run: | + git submodule init + git submodule update + sudo add-apt-repository ppa:alexlarsson/flatpak + sudo apt-get update + sudo apt install flatpak flatpak-builder p7zip-full + sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + sudo 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 sudo flatpak-builder --build-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - name: cache-cooker From 3b57c72cfcce592c2b871e96ab31e4ce57987182 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Sat, 30 Apr 2022 21:45:57 +0900 Subject: [PATCH 034/170] New workflow: different approach - fix4 --- .github/workflows/cooker.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index ff237c31..93f94383 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -36,7 +36,7 @@ jobs: # id: cache-cooker # uses: actions/cache@v2 # with: - # path: ./*flatpak* + # path: /home/runner/work/RetroDECK # key: ${{ runner.os }}-cache Job2_-_Downloading_Sources: @@ -60,7 +60,7 @@ jobs: id: cache-cooker uses: actions/cache@v2 with: - path: ./*flatpak* + path: /home/runner/work/RetroDECK key: ${{ runner.os }}-cache Job3_-_Building_part_1: @@ -84,7 +84,7 @@ jobs: id: cache-cooker uses: actions/cache@v2 with: - path: ./*flatpak* + path: /home/runner/work/RetroDECK key: ${{ runner.os }}-cache Job4_-_Building_part_2: From ee345a9bd0d29b9f450900aa4a1f426f3e6bf164 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Sun, 1 May 2022 13:21:33 +0900 Subject: [PATCH 035/170] Updated workflow --- .github/workflows/cooker.yml | 150 ++++++++++++++++++++++++----------- 1 file changed, 105 insertions(+), 45 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 93f94383..700164dd 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -37,15 +37,23 @@ jobs: # uses: actions/cache@v2 # with: # path: /home/runner/work/RetroDECK - # key: ${{ runner.os }}-cache + # key: ${{ runner.os }}-cooker-cache Job2_-_Downloading_Sources: runs-on: ubuntu-latest #needs: [Job1_-_Prepearing_enviornment] steps: - uses: actions/checkout@v3 + + - name: cache-cooker + id: cache-cooker + uses: actions/cache@v2 + with: + path: /home/runner/work/RetroDECK + key: ${{ runner.os }}-cooker-cache + - name: Downloading sources - if: steps.cache-cooker.outputs.cache-hit != 'true' + #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | git submodule init git submodule update @@ -56,44 +64,35 @@ jobs: sudo 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 sudo flatpak-builder --download-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - - name: cache-cooker - id: cache-cooker - uses: actions/cache@v2 - with: - path: /home/runner/work/RetroDECK - key: ${{ runner.os }}-cache + # - name: Continuing with previous worklow cache + # if: steps.cache-cooker.outputs.cache-hit == 'true' + # run: | + # cd /home/runner/work/RetroDECK/RetroDECK + # git pull + # git submodule init + # git submodule update + # sudo add-apt-repository ppa:alexlarsson/flatpak + # sudo apt-get update + # sudo apt install flatpak flatpak-builder p7zip-full + # sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + # sudo 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 + # sudo flatpak-builder --download-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml Job3_-_Building_part_1: runs-on: ubuntu-latest needs: [Job2_-_Downloading_Sources] steps: - - uses: actions/checkout@v3 - - name: Bulding part 1 - Until RetroArch Cores - if: steps.cache-cooker.outputs.cache-hit != 'true' - run: | - git submodule init - git submodule update - sudo add-apt-repository ppa:alexlarsson/flatpak - sudo apt-get update - sudo apt install flatpak flatpak-builder p7zip-full - sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - sudo 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 - sudo flatpak-builder --build-only --stop-at=retroarch-cores --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + #- uses: actions/checkout@v3 - name: cache-cooker id: cache-cooker uses: actions/cache@v2 with: path: /home/runner/work/RetroDECK - key: ${{ runner.os }}-cache + key: ${{ runner.os }}-cooker-cache - Job4_-_Building_part_2: - runs-on: ubuntu-latest - needs: [Job3_-_Building_part_1] - steps: - - uses: actions/checkout@v3 - - name: Bulding part 1 - Until the end - if: steps.cache-cooker.outputs.cache-hit != 'true' + - name: Initializing enviornment + #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | git submodule init git submodule update @@ -102,54 +101,115 @@ jobs: sudo apt install flatpak flatpak-builder p7zip-full sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo 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 - sudo flatpak-builder --build-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + + - name: Bulding part 1 - Until RetroArch Cores + if: steps.cache-cooker.outputs.cache-hit != 'true' + run: | + cd /home/runner/work/RetroDECK/RetroDECK + sudo flatpak-builder --build-only --stop-at=retroarch-cores --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + + Job4_-_Building_part_2: + runs-on: ubuntu-latest + needs: [Job3_-_Building_part_1] + steps: + #- uses: actions/checkout@v3 - name: cache-cooker id: cache-cooker uses: actions/cache@v2 with: - path: / - key: ${{ runner.os }}-cache + path: /home/runner/work/RetroDECK + key: ${{ runner.os }}-cooker-cache + + - name: Initializing enviornment + #if: steps.cache-cooker.outputs.cache-hit != 'true' + run: | + git submodule init + git submodule update + sudo add-apt-repository ppa:alexlarsson/flatpak + sudo apt-get update + sudo apt install flatpak flatpak-builder p7zip-full + sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + sudo 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 + + - name: Bulding part 1 - Until the end + if: steps.cache-cooker.outputs.cache-hit != 'true' + run: | + cd /home/runner/work/RetroDECK/RetroDECK + sudo flatpak-builder --build-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml Job5_-_Finishing_build: runs-on: ubuntu-latest needs: [Job4_-_Building_part_2] steps: - - uses: actions/checkout@v3 - - name: Finishing build - if: steps.cache-cooker.outputs.cache-hit != 'true' - run: | - sudo flatpak-builder --finish-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + #- uses: actions/checkout@v3 - name: cache-cooker id: cache-cooker uses: actions/cache@v2 with: - path: / - key: ${{ runner.os }}-cache + path: /home/runner/work/RetroDECK + key: ${{ runner.os }}-cooker-cache + + - name: Initializing enviornment + #if: steps.cache-cooker.outputs.cache-hit != 'true' + run: | + git submodule init + git submodule update + sudo add-apt-repository ppa:alexlarsson/flatpak + sudo apt-get update + sudo apt install flatpak flatpak-builder p7zip-full + sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + sudo 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 + + - name: Finishing build + if: steps.cache-cooker.outputs.cache-hit != 'true' + run: | + cd /home/runner/work/RetroDECK/RetroDECK + sudo flatpak-builder --finish-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml Job6_-_Build_bundle: runs-on: ubuntu-latest needs: [Job5_-_Finishing_build] steps: - - uses: actions/checkout@v3 - - name: Build bundle - if: steps.cache-cooker.outputs.cache-hit != 'true' - run: | - sudo flatpak build-bundle local RetroDECK.flatpak net.retrodeck.retrodeck + #- uses: actions/checkout@v3 - name: cache-cooker id: cache-cooker uses: actions/cache@v2 with: - path: / - key: ${{ runner.os }}-cache + path: /home/runner/work/RetroDECK + key: ${{ runner.os }}-cooker-cache + + - name: Initializing enviornment + #if: steps.cache-cooker.outputs.cache-hit != 'true' + run: | + git submodule init + git submodule update + sudo add-apt-repository ppa:alexlarsson/flatpak + sudo apt-get update + sudo apt install flatpak flatpak-builder p7zip-full + sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + sudo 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 + + - name: Build bundle + if: steps.cache-cooker.outputs.cache-hit != 'true' + run: | + cd /home/runner/work/RetroDECK/RetroDECK + sudo flatpak build-bundle local RetroDECK.flatpak net.retrodeck.retrodeck Job7_-_Publishing_flatpak: runs-on: ubuntu-latest needs: [Job6_-_Build_bundle] steps: + - name: cache-cooker + id: cache-cooker + uses: actions/cache@v2 + with: + path: /home/runner/work/RetroDECK + key: ${{ runner.os }}-cooker-cache + - name: Get date for artifacts id: date run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M')" From da60475080cf62bee71cf696565ef04e037344ba Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Sun, 1 May 2022 13:22:37 +0900 Subject: [PATCH 036/170] Updated workflow - syntax error --- .github/workflows/cooker.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 700164dd..637cb8cc 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -204,11 +204,11 @@ jobs: steps: - name: cache-cooker - id: cache-cooker - uses: actions/cache@v2 - with: - path: /home/runner/work/RetroDECK - key: ${{ runner.os }}-cooker-cache + id: cache-cooker + uses: actions/cache@v2 + with: + path: /home/runner/work/RetroDECK + key: ${{ runner.os }}-cooker-cache - name: Get date for artifacts id: date From b31b5b9bd12a36842f34da51271617aa94acecb2 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Sun, 1 May 2022 14:25:42 +0900 Subject: [PATCH 037/170] Updated workflow - removed some ifs --- .github/workflows/cooker.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 637cb8cc..95750348 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -103,7 +103,7 @@ jobs: sudo 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 - name: Bulding part 1 - Until RetroArch Cores - if: steps.cache-cooker.outputs.cache-hit != 'true' + #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | cd /home/runner/work/RetroDECK/RetroDECK sudo flatpak-builder --build-only --stop-at=retroarch-cores --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml @@ -133,7 +133,7 @@ jobs: sudo 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 - name: Bulding part 1 - Until the end - if: steps.cache-cooker.outputs.cache-hit != 'true' + #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | cd /home/runner/work/RetroDECK/RetroDECK sudo flatpak-builder --build-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml @@ -163,7 +163,7 @@ jobs: sudo 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 - name: Finishing build - if: steps.cache-cooker.outputs.cache-hit != 'true' + #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | cd /home/runner/work/RetroDECK/RetroDECK sudo flatpak-builder --finish-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml @@ -193,7 +193,7 @@ jobs: sudo 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 - name: Build bundle - if: steps.cache-cooker.outputs.cache-hit != 'true' + #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | cd /home/runner/work/RetroDECK/RetroDECK sudo flatpak build-bundle local RetroDECK.flatpak net.retrodeck.retrodeck @@ -220,7 +220,7 @@ jobs: id: extract_branch - name: Publish the flatpak in a new cooker release - if: steps.cache-cooker.outputs.cache-hit != 'true' + #if: steps.cache-cooker.outputs.cache-hit != 'true' uses: ncipollo/release-action@v1 with: tag: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" From c2291483b72d7f989ff9478add7562e37503ba40 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Sun, 1 May 2022 14:29:31 +0900 Subject: [PATCH 038/170] Updated workflow - maybe better to put a git pull --- .github/workflows/cooker.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 95750348..4bb9cf7a 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -43,7 +43,6 @@ jobs: runs-on: ubuntu-latest #needs: [Job1_-_Prepearing_enviornment] steps: - - uses: actions/checkout@v3 - name: cache-cooker id: cache-cooker @@ -52,9 +51,12 @@ jobs: path: /home/runner/work/RetroDECK key: ${{ runner.os }}-cooker-cache + - uses: actions/checkout@v3 + - name: Downloading sources #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | + git pull git submodule init git submodule update sudo add-apt-repository ppa:alexlarsson/flatpak From 65afb0b8399f4060b6d5ec6b41a6758bfa283fff Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Sun, 1 May 2022 19:16:19 +0900 Subject: [PATCH 039/170] Added appdata --- net.retrodeck.retrodeck.appdata.xml | 120 ++++++++++++++++++++++++++++ net.retrodeck.retrodeck.yml | 8 ++ 2 files changed, 128 insertions(+) create mode 100644 net.retrodeck.retrodeck.appdata.xml diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml new file mode 100644 index 00000000..d9fe5815 --- /dev/null +++ b/net.retrodeck.retrodeck.appdata.xml @@ -0,0 +1,120 @@ + + + + net.retrodeck.retrodeck + net.retrodeck.retrodeck.desktop + RetroDECK + Everything you need for emulation on Steam Deck + Xargon + https://retrodeck.net + https://github.com/XargonWan/RetroDECK/issues + http://discord.gg/Dz3szYsP8g + https://github.com/XargonWan/RetroDECK/wiki/FAQs---Frequently-asked-questions + https://www.paypal.me/xargon + + + + https://github.com/XargonWan/RetroDECK/blob/main/res/logo.png?raw=true + + https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen02.png?raw=true + + + https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen03.png?raw=true + + + https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen04.png?raw=true + + + https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen05.png?raw=true + + + +

+ RetroDECK brings an environment to catalog and play your retro games directly from SteamOS and it's tailored specifically for the Steam Deck.
+ It's inspired by embedded emulation systems like AmberELEC, EmuELEC, CoreELEC, Lakka, and Batocera. +

+

+ Powered by EmulationStation Desktop Edition, which uses RetroArch and other standalone emulators to allow you to import and play your favorite retro (and even not-so-retro) games in a tidy environment without flooding your Steam library.
+ No other software is needed as everything it's already included! +

+ + GPL-3.0 + CC0-1.0 + + + + https://github.com/XargonWan/RetroDECK/releases/tag/0.3.1b + +
    +
  • Fixed Dolphin: now Dolphin (Standalone) is the default emulator for GC/Wii.
    • +
+ + + + https://github.com/XargonWan/RetroDECK/releases/tag/0.3.0b + +
    +
  • Migrated everything from the old domain com.xargon.retrodeck to net.retrodeck.retrodeck to be aligned with flathub standards
    • +
  • Fixed and enhanced all the tools
    • +
  • Added 'Start Yuzu' tool
    • +
  • Swapped a/b buttons on RetroArch
    • +
  • Tweaked some RetroArch configs
    • +
  • Fixed RetroArch Hotkeys
    • +
  • Added standalone PCSX2
    • +
  • Added standalone XEMU
    • +
  • Added standalone DOLPHIN
    • +
  • Reconfigured standalone YUZU
    • +
  • Updated EmulationStation Desktop Edition
    • +
  • Updated the default Art Book DE theme
    • +
  • Updated various backend scripts
    • +
+ + + + + https://github.com/XargonWan/RetroDECK/releases/tag/0.2.0b + +
    +
  • Migrated everything from the old building script to a full fledged yaml in order to being published on Discover
    • +
  • Fixed SD Card issues
    • +
  • Improved installer script
    • +
  • Tweaked RetroArch configs
    • +
  • Added tool for relocating ROMs location from/to internal to/from external
    • +
  • Added PCSX2 and Yuzu emulators (but not yet integrated in ES-DE)
    • +
  • Created cooker channel, more info in Discord and on https://github.com/XargonWan/RetroDECK-cooker
    • +
  • Cooker will auto build when a change is pushed/PRed
    • +
  • Same as above with main
    • +
+ + + + + https://github.com/XargonWan/RetroDECK/releases/tag/0.1.1b + +
    +
  • Removed some debug stuff (press any key to continue)
    • +
  • Fixed ROMs folder
    • +
  • Fixed SD Card logic
    • +
  • Desktop file improved
    • +
  • Improved installer messages
    • +
+ + + + + https://github.com/XargonWan/RetroDECK/releases/tag/0.1.0b + +
    +
  • Pick up and play, just put your roms and bios in /retrodeck/roms and /retrodeck/bios folders.
    • +
  • SD Card support
    • +
  • Fancy interface provided by ES-DE and Art-Book-Next-DE
    • +
  • All retro systems available until PS2
    • +
  • Auto load/save states
    • +
  • Scraping
    • +
  • RetroAchievements (must be manually set)
    • +
+ + + + + diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 2f13da68..71d4e54b 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -973,6 +973,11 @@ modules: # RPCS3 - cp config.yml ${FLATPAK_DEST}/retrodeck/emu-configs/ + # Placing appdata + - mkdir -p ${FLATPAK_DEST}/share/appdata + - cp net.retrodeck.retrodeck.appdata.xml ${FLATPAK_DEST}/share/appdata + + #cleanup: ['*'] sources: - type: file @@ -995,3 +1000,6 @@ modules: path: tools - type: file path: net.retrodeck.retrodeck.desktop + - type: file + path: net.retrodeck.retrodeck.appdata.xml + From 2c20916754d7401402f90e7e8bf362937944528c Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Sun, 1 May 2022 22:43:26 +0900 Subject: [PATCH 040/170] First try on internal/global cache --- .github/workflows/cooker.yml | 91 ++++++++++++++++++++---------------- 1 file changed, 51 insertions(+), 40 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 4bb9cf7a..296fb6fe 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -15,41 +15,38 @@ on: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: + jobs: - # Job1_-_Prepearing_enviornment: - # runs-on: ubuntu-latest - # steps: - # # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - # - uses: actions/checkout@v3 - # - name: Prepearing enviornment - # run: | - # git submodule init - # git submodule update - # sudo add-apt-repository ppa:alexlarsson/flatpak - # sudo apt-get update - # sudo apt install flatpak flatpak-builder p7zip-full - # sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - # sudo 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 + Job1_-_Prepearing_enviornment: + runs-on: ubuntu-latest + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it+++++++++++++++++++++++++++++++++++ - # - name: cache-cooker - # id: cache-cooker - # uses: actions/cache@v2 - # with: - # path: /home/runner/work/RetroDECK - # key: ${{ runner.os }}-cooker-cache + - name: Get date for artifacts + id: date + run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M%S')" + + - name: Extract branch name + shell: bash + run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" + id: extract_branch + + - name: Generating build ID + id: buildID + run: echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" Job2_-_Downloading_Sources: runs-on: ubuntu-latest - #needs: [Job1_-_Prepearing_enviornment] + needs: [Job1_-_Prepearing_enviornment] steps: - - name: cache-cooker - id: cache-cooker + - name: Retrieve previous cache + id: global-cache uses: actions/cache@v2 with: - path: /home/runner/work/RetroDECK - key: ${{ runner.os }}-cooker-cache + path: /home/runner/work/RetroDECK + key: cooker-global-cache - uses: actions/checkout@v3 @@ -66,6 +63,13 @@ jobs: sudo 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 sudo flatpak-builder --download-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + - name: Generating build specific cache + id: intenral-cache + uses: actions/cache@v2 + with: + path: /home/runner/work/RetroDECK + key: jobs.Job1_-_Prepearing_enviornment.steps.buildID + # - name: Continuing with previous worklow cache # if: steps.cache-cooker.outputs.cache-hit == 'true' # run: | @@ -87,11 +91,11 @@ jobs: #- uses: actions/checkout@v3 - name: cache-cooker - id: cache-cooker + id: internal-cache uses: actions/cache@v2 with: - path: /home/runner/work/RetroDECK - key: ${{ runner.os }}-cooker-cache + path: /home/runner/work/RetroDECK + key: jobs.Job1_-_Prepearing_enviornment.steps.buildID - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -117,11 +121,11 @@ jobs: #- uses: actions/checkout@v3 - name: cache-cooker - id: cache-cooker + id: internal-cache uses: actions/cache@v2 with: - path: /home/runner/work/RetroDECK - key: ${{ runner.os }}-cooker-cache + path: /home/runner/work/RetroDECK + key: jobs.Job1_-_Prepearing_enviornment.steps.buildID - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -147,11 +151,11 @@ jobs: #- uses: actions/checkout@v3 - name: cache-cooker - id: cache-cooker + id: internal-cache uses: actions/cache@v2 with: - path: /home/runner/work/RetroDECK - key: ${{ runner.os }}-cooker-cache + path: /home/runner/work/RetroDECK + key: jobs.Job1_-_Prepearing_enviornment.steps.buildID - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -177,11 +181,11 @@ jobs: #- uses: actions/checkout@v3 - name: cache-cooker - id: cache-cooker + id: internal-cache uses: actions/cache@v2 with: - path: /home/runner/work/RetroDECK - key: ${{ runner.os }}-cooker-cache + path: /home/runner/work/RetroDECK + key: jobs.Job1_-_Prepearing_enviornment.steps.buildID - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -206,11 +210,11 @@ jobs: steps: - name: cache-cooker - id: cache-cooker + id: internal-cache uses: actions/cache@v2 with: - path: /home/runner/work/RetroDECK - key: ${{ runner.os }}-cooker-cache + path: /home/runner/work/RetroDECK + key: jobs.Job1_-_Prepearing_enviornment.steps.buildID - name: Get date for artifacts id: date @@ -240,6 +244,13 @@ jobs: token: ${{ secrets.TRIGGER_BUILD_TOKEN }} repo: RetroDECK-cooker + - name: Regenerate global cache + id: global-cache + uses: actions/cache@v2 + with: + path: /home/runner/work/RetroDECK + key: cooker-global-cache + # Job8_-_Uploading_cache: # runs-on: ubuntu-latest # needs: [Job7_-_Publishing_flatpak] From d0bd0d54b2b5e90f1650f6988b1a5a7d87bb4286 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Mon, 2 May 2022 10:15:55 +0900 Subject: [PATCH 041/170] Second try on internal/global cache --- .github/workflows/cooker.yml | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 296fb6fe..3790b672 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -41,12 +41,9 @@ jobs: needs: [Job1_-_Prepearing_enviornment] steps: - - name: Retrieve previous cache - id: global-cache - uses: actions/cache@v2 + - uses: actions/download-artifact@v2 with: - path: /home/runner/work/RetroDECK - key: cooker-global-cache + name: global-cache - uses: actions/checkout@v3 @@ -68,7 +65,7 @@ jobs: uses: actions/cache@v2 with: path: /home/runner/work/RetroDECK - key: jobs.Job1_-_Prepearing_enviornment.steps.buildID + key: ${{ jobs.Job1_-_Prepearing_enviornment.steps.buildID }} # - name: Continuing with previous worklow cache # if: steps.cache-cooker.outputs.cache-hit == 'true' @@ -95,7 +92,7 @@ jobs: uses: actions/cache@v2 with: path: /home/runner/work/RetroDECK - key: jobs.Job1_-_Prepearing_enviornment.steps.buildID + key: ${{ jobs.Job1_-_Prepearing_enviornment.steps.buildID }} - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -125,7 +122,7 @@ jobs: uses: actions/cache@v2 with: path: /home/runner/work/RetroDECK - key: jobs.Job1_-_Prepearing_enviornment.steps.buildID + key: ${{ jobs.Job1_-_Prepearing_enviornment.steps.buildID }} - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -155,7 +152,7 @@ jobs: uses: actions/cache@v2 with: path: /home/runner/work/RetroDECK - key: jobs.Job1_-_Prepearing_enviornment.steps.buildID + key: ${{ jobs.Job1_-_Prepearing_enviornment.steps.buildID }} - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -185,7 +182,7 @@ jobs: uses: actions/cache@v2 with: path: /home/runner/work/RetroDECK - key: jobs.Job1_-_Prepearing_enviornment.steps.buildID + key: ${{ jobs.Job1_-_Prepearing_enviornment.steps.buildID }} - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -214,7 +211,7 @@ jobs: uses: actions/cache@v2 with: path: /home/runner/work/RetroDECK - key: jobs.Job1_-_Prepearing_enviornment.steps.buildID + key: ${{ jobs.Job1_-_Prepearing_enviornment.steps.buildID }} - name: Get date for artifacts id: date @@ -244,12 +241,9 @@ jobs: token: ${{ secrets.TRIGGER_BUILD_TOKEN }} repo: RetroDECK-cooker - - name: Regenerate global cache - id: global-cache - uses: actions/cache@v2 + - uses: actions/download-artifact@v2 with: - path: /home/runner/work/RetroDECK - key: cooker-global-cache + name: global-cache # Job8_-_Uploading_cache: # runs-on: ubuntu-latest From fd599b91c2aee59cf5a696d349d33f462f7e2826 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Mon, 2 May 2022 10:16:36 +0900 Subject: [PATCH 042/170] Second try on internal/global cache - fix --- .github/workflows/cooker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 3790b672..6ba3cfd5 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -242,8 +242,8 @@ jobs: repo: RetroDECK-cooker - uses: actions/download-artifact@v2 - with: - name: global-cache + with: + name: global-cache # Job8_-_Uploading_cache: # runs-on: ubuntu-latest From 13e217d9ca4e0f224cf0381b68a7c64408e8a686 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Mon, 2 May 2022 10:18:41 +0900 Subject: [PATCH 043/170] Second try on internal/global cache - fix2 --- .github/workflows/cooker.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 6ba3cfd5..5751a0c1 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -19,6 +19,7 @@ on: jobs: Job1_-_Prepearing_enviornment: + id: job1 runs-on: ubuntu-latest steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it+++++++++++++++++++++++++++++++++++ @@ -65,7 +66,7 @@ jobs: uses: actions/cache@v2 with: path: /home/runner/work/RetroDECK - key: ${{ jobs.Job1_-_Prepearing_enviornment.steps.buildID }} + key: ${{ jobs.job1.steps.buildID }} # - name: Continuing with previous worklow cache # if: steps.cache-cooker.outputs.cache-hit == 'true' @@ -92,7 +93,7 @@ jobs: uses: actions/cache@v2 with: path: /home/runner/work/RetroDECK - key: ${{ jobs.Job1_-_Prepearing_enviornment.steps.buildID }} + key: ${{ jobs.job1.steps.buildID }} - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -122,7 +123,7 @@ jobs: uses: actions/cache@v2 with: path: /home/runner/work/RetroDECK - key: ${{ jobs.Job1_-_Prepearing_enviornment.steps.buildID }} + key: ${{ jobs.job1.steps.buildID }} - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -152,7 +153,7 @@ jobs: uses: actions/cache@v2 with: path: /home/runner/work/RetroDECK - key: ${{ jobs.Job1_-_Prepearing_enviornment.steps.buildID }} + key: ${{ jobs.job1.steps.buildID }} - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -182,7 +183,7 @@ jobs: uses: actions/cache@v2 with: path: /home/runner/work/RetroDECK - key: ${{ jobs.Job1_-_Prepearing_enviornment.steps.buildID }} + key: ${{ jobs.job1.steps.buildID }} - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -211,7 +212,7 @@ jobs: uses: actions/cache@v2 with: path: /home/runner/work/RetroDECK - key: ${{ jobs.Job1_-_Prepearing_enviornment.steps.buildID }} + key: ${{ jobs.job1.steps.buildID }} - name: Get date for artifacts id: date From 5cd1cafd42e4e339db92c0effe7b301aa753008a Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Mon, 2 May 2022 10:23:50 +0900 Subject: [PATCH 044/170] Second try on internal/global cache - fix3 --- .github/workflows/cooker.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 5751a0c1..c291561a 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -34,8 +34,9 @@ jobs: id: extract_branch - name: Generating build ID - id: buildID - run: echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" + id: generating-buildID + outputs: + buildID: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" Job2_-_Downloading_Sources: runs-on: ubuntu-latest @@ -66,7 +67,7 @@ jobs: uses: actions/cache@v2 with: path: /home/runner/work/RetroDECK - key: ${{ jobs.job1.steps.buildID }} + key: ${{ jobs.Job1_-_Prepearing_enviornment.steps.buildID }} # - name: Continuing with previous worklow cache # if: steps.cache-cooker.outputs.cache-hit == 'true' @@ -93,7 +94,7 @@ jobs: uses: actions/cache@v2 with: path: /home/runner/work/RetroDECK - key: ${{ jobs.job1.steps.buildID }} + key: ${{ jobs.Job1_-_Prepearing_enviornment.steps.buildID }} - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -123,7 +124,7 @@ jobs: uses: actions/cache@v2 with: path: /home/runner/work/RetroDECK - key: ${{ jobs.job1.steps.buildID }} + key: ${{ jobs.Job1_-_Prepearing_enviornment.steps.buildID }} - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -153,7 +154,7 @@ jobs: uses: actions/cache@v2 with: path: /home/runner/work/RetroDECK - key: ${{ jobs.job1.steps.buildID }} + key: ${{ jobs.Job1_-_Prepearing_enviornment.steps.buildID }} - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -183,7 +184,7 @@ jobs: uses: actions/cache@v2 with: path: /home/runner/work/RetroDECK - key: ${{ jobs.job1.steps.buildID }} + key: ${{ jobs.Job1_-_Prepearing_enviornment.steps.buildID }} - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -212,7 +213,7 @@ jobs: uses: actions/cache@v2 with: path: /home/runner/work/RetroDECK - key: ${{ jobs.job1.steps.buildID }} + key: ${{ jobs.Job1_-_Prepearing_enviornment.steps.buildID }} - name: Get date for artifacts id: date From b5c0d42e5daa78c91ccf642230774777ed7dd6e5 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Mon, 2 May 2022 10:25:17 +0900 Subject: [PATCH 045/170] Second try on internal/global cache - fix4 --- .github/workflows/cooker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index c291561a..7eb61a14 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -35,6 +35,7 @@ jobs: - name: Generating build ID id: generating-buildID + run: echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" outputs: buildID: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" From 0a2919c1929fcc4af71a76bf53837367031d1ce1 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Mon, 2 May 2022 10:27:35 +0900 Subject: [PATCH 046/170] Stop build1 until dolphin-emu --- .github/workflows/cooker.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 7eb61a14..4e1f434d 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -34,7 +34,6 @@ jobs: id: extract_branch - name: Generating build ID - id: generating-buildID run: echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" outputs: buildID: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" @@ -108,11 +107,11 @@ jobs: sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo 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 - - name: Bulding part 1 - Until RetroArch Cores + - name: Bulding part 1 - Until dolphin-emu #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | cd /home/runner/work/RetroDECK/RetroDECK - sudo flatpak-builder --build-only --stop-at=retroarch-cores --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + sudo flatpak-builder --build-only --stop-at=dolphin-emu --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml Job4_-_Building_part_2: runs-on: ubuntu-latest From d72c38ecff969fbda9d4b04425356bebeb98ff5c Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Mon, 2 May 2022 10:29:59 +0900 Subject: [PATCH 047/170] Second try on internal/global cache - fix5 --- .github/workflows/cooker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 4e1f434d..f922606b 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -35,8 +35,8 @@ jobs: - name: Generating build ID run: echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" - outputs: - buildID: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" + outputs: + buildID: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" Job2_-_Downloading_Sources: runs-on: ubuntu-latest From 60dc5befe6a3a0162823241cbdcfde1b674fae06 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Mon, 2 May 2022 10:34:30 +0900 Subject: [PATCH 048/170] Second try on internal/global cache - fix6 --- .github/workflows/cooker.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index f922606b..230fb833 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -67,7 +67,7 @@ jobs: uses: actions/cache@v2 with: path: /home/runner/work/RetroDECK - key: ${{ jobs.Job1_-_Prepearing_enviornment.steps.buildID }} + key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} # - name: Continuing with previous worklow cache # if: steps.cache-cooker.outputs.cache-hit == 'true' @@ -94,7 +94,7 @@ jobs: uses: actions/cache@v2 with: path: /home/runner/work/RetroDECK - key: ${{ jobs.Job1_-_Prepearing_enviornment.steps.buildID }} + key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -124,7 +124,7 @@ jobs: uses: actions/cache@v2 with: path: /home/runner/work/RetroDECK - key: ${{ jobs.Job1_-_Prepearing_enviornment.steps.buildID }} + key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -154,7 +154,7 @@ jobs: uses: actions/cache@v2 with: path: /home/runner/work/RetroDECK - key: ${{ jobs.Job1_-_Prepearing_enviornment.steps.buildID }} + key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -184,7 +184,7 @@ jobs: uses: actions/cache@v2 with: path: /home/runner/work/RetroDECK - key: ${{ jobs.Job1_-_Prepearing_enviornment.steps.buildID }} + key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -213,7 +213,7 @@ jobs: uses: actions/cache@v2 with: path: /home/runner/work/RetroDECK - key: ${{ jobs.Job1_-_Prepearing_enviornment.steps.buildID }} + key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - name: Get date for artifacts id: date From c3710207d8253020db13aba786d7633ef63bb376 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Mon, 2 May 2022 10:35:12 +0900 Subject: [PATCH 049/170] Second try on internal/global cache - fix7 --- .github/workflows/cooker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 230fb833..42a43ed1 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -19,7 +19,6 @@ on: jobs: Job1_-_Prepearing_enviornment: - id: job1 runs-on: ubuntu-latest steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it+++++++++++++++++++++++++++++++++++ From 630341fc374d07d73bd8f13d54eeb54842e5d09c Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Mon, 2 May 2022 10:47:53 +0900 Subject: [PATCH 050/170] Second try on internal/global cache - fix8 --- .github/workflows/cooker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 42a43ed1..41cde36e 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -45,6 +45,8 @@ jobs: - uses: actions/download-artifact@v2 with: name: global-cache + workflow: workflow_name.yml + workflow_conclusion: success - uses: actions/checkout@v3 From abe845395eeff82093112832fdf42129110bfff1 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Mon, 2 May 2022 10:49:09 +0900 Subject: [PATCH 051/170] Second try on internal/global cache - fix9 --- .github/workflows/cooker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 41cde36e..dbc5c523 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -45,7 +45,7 @@ jobs: - uses: actions/download-artifact@v2 with: name: global-cache - workflow: workflow_name.yml + workflow: cooker.yml workflow_conclusion: success - uses: actions/checkout@v3 From 9a28b23411ecdc76fdb6eb67af2aa205c50f04cd Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Mon, 2 May 2022 10:51:44 +0900 Subject: [PATCH 052/170] Second try on internal/global cache - fix10 --- .github/workflows/cooker.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index dbc5c523..c1445238 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -45,8 +45,7 @@ jobs: - uses: actions/download-artifact@v2 with: name: global-cache - workflow: cooker.yml - workflow_conclusion: success + continue-on-error: true - uses: actions/checkout@v3 From 7d9ac629d7e9c49e532765c42637fb974e94b508 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Mon, 2 May 2022 12:17:04 +0900 Subject: [PATCH 053/170] Second try on internal/global cache - fix11 --- .github/workflows/cooker.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index c1445238..aeee46b2 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -85,7 +85,7 @@ jobs: Job3_-_Building_part_1: runs-on: ubuntu-latest - needs: [Job2_-_Downloading_Sources] + needs: [Job1_-_Prepearing_enviornment, Job2_-_Downloading_Sources] steps: #- uses: actions/checkout@v3 @@ -115,7 +115,7 @@ jobs: Job4_-_Building_part_2: runs-on: ubuntu-latest - needs: [Job3_-_Building_part_1] + needs: [Job1_-_Prepearing_enviornment, Job2_-_Downloading_Sources, Job3_-_Building_part_1] steps: #- uses: actions/checkout@v3 @@ -145,7 +145,7 @@ jobs: Job5_-_Finishing_build: runs-on: ubuntu-latest - needs: [Job4_-_Building_part_2] + needs: [Job1_-_Prepearing_enviornment, Job2_-_Downloading_Sources, Job3_-_Building_part_1, Job4_-_Building_part_2] steps: #- uses: actions/checkout@v3 @@ -175,7 +175,7 @@ jobs: Job6_-_Build_bundle: runs-on: ubuntu-latest - needs: [Job5_-_Finishing_build] + needs: [Job1_-_Prepearing_enviornment, Job2_-_Downloading_Sources, Job3_-_Building_part_1, Job4_-_Building_part_2, Job5_-_Finishing_build] steps: #- uses: actions/checkout@v3 @@ -205,7 +205,7 @@ jobs: Job7_-_Publishing_flatpak: runs-on: ubuntu-latest - needs: [Job6_-_Build_bundle] + needs: [Job1_-_Prepearing_enviornment, Job2_-_Downloading_Sources, Job3_-_Building_part_1, Job4_-_Building_part_2, Job5_-_Finishing_build, Job6_-_Build_bundle] steps: - name: cache-cooker @@ -245,9 +245,4 @@ jobs: - uses: actions/download-artifact@v2 with: - name: global-cache - - # Job8_-_Uploading_cache: - # runs-on: ubuntu-latest - # needs: [Job7_-_Publishing_flatpak] - # steps: + name: global-cache \ No newline at end of file From 655dbc2f487a930733a9638a47b6f14bc1ae86a1 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Mon, 2 May 2022 20:53:10 +0900 Subject: [PATCH 054/170] Removed some args --- .github/workflows/cooker.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index aeee46b2..db5f45a9 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -60,7 +60,7 @@ jobs: sudo apt install flatpak flatpak-builder p7zip-full sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo 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 - sudo flatpak-builder --download-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + sudo flatpak-builder --download-only --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - name: Generating build specific cache id: intenral-cache @@ -81,7 +81,7 @@ jobs: # sudo apt install flatpak flatpak-builder p7zip-full # sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo # sudo 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 - # sudo flatpak-builder --download-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + # sudo flatpak-builder --download-only --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml Job3_-_Building_part_1: runs-on: ubuntu-latest @@ -107,11 +107,11 @@ jobs: sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo 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 - - name: Bulding part 1 - Until dolphin-emu + - name: Bulding part 1 - Until melonds #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | cd /home/runner/work/RetroDECK/RetroDECK - sudo flatpak-builder --build-only --stop-at=dolphin-emu --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + sudo flatpak-builder --build-only --stop-at=melonds --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml Job4_-_Building_part_2: runs-on: ubuntu-latest @@ -141,7 +141,7 @@ jobs: #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | cd /home/runner/work/RetroDECK/RetroDECK - sudo flatpak-builder --build-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + sudo flatpak-builder --build-only --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml Job5_-_Finishing_build: runs-on: ubuntu-latest @@ -171,7 +171,7 @@ jobs: #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | cd /home/runner/work/RetroDECK/RetroDECK - sudo flatpak-builder --finish-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + sudo flatpak-builder --finish-only --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml Job6_-_Build_bundle: runs-on: ubuntu-latest From e580ea3c53956e2e2c3067a88869a05a0064944c Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Mon, 2 May 2022 21:17:01 +0900 Subject: [PATCH 055/170] Added start-dolphin and start-pcsx2 tools --- tools-gamelist.xml | 14 ++++++++++++++ tools/start-dolphin.sh | 7 +++++++ tools/start-pcsx2.sh | 7 +++++++ 3 files changed, 28 insertions(+) create mode 100644 tools/start-dolphin.sh create mode 100644 tools/start-pcsx2.sh diff --git a/tools-gamelist.xml b/tools-gamelist.xml index d383a568..346d6643 100644 --- a/tools-gamelist.xml +++ b/tools-gamelist.xml @@ -14,6 +14,20 @@ true true + + ./start-pcsx2.sh + Start PCSX2 + Start PCSX2 to manually tweak your settings. + true + true + + + ./start-dolphin.sh + Start Dolphin + Start Dolphin to manually tweak your settings. + true + true + ./start-melonds.sh Start MelonDS diff --git a/tools/start-dolphin.sh b/tools/start-dolphin.sh new file mode 100644 index 00000000..ed58102f --- /dev/null +++ b/tools/start-dolphin.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +kdialog --title "RetroDECK" --warningyesno "Doing some changes in the emulator's configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?" +if [ $? == 0 ] +then + dolphin-qt +fi \ No newline at end of file diff --git a/tools/start-pcsx2.sh b/tools/start-pcsx2.sh new file mode 100644 index 00000000..13fa82dc --- /dev/null +++ b/tools/start-pcsx2.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +kdialog --title "RetroDECK" --warningyesno "Doing some changes in the emulator's configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?" +if [ $? == 0 ] +then + pcsx2 +fi \ No newline at end of file From d40dff36eed947c00e9a2da4345a930e530442c7 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Mon, 2 May 2022 21:34:13 +0900 Subject: [PATCH 056/170] Tweaked PCSX2 config --- emu-configs/PCSX2_ui.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emu-configs/PCSX2_ui.ini b/emu-configs/PCSX2_ui.ini index bfbd0f6c..3d8e65f9 100644 --- a/emu-configs/PCSX2_ui.ini +++ b/emu-configs/PCSX2_ui.ini @@ -49,7 +49,7 @@ Langs=/app/share/PCSX2/resources/locale Cheats=/var/config/PCSX2/cheats CheatsWS=/var/config/PCSX2/cheats_ws Cache=/var/config/PCSX2/cache -Textures= +Textures=/var/config/PCSX2/textures RunIso=/var/config/PCSX2 RunELF=/var/config/PCSX2 RunDisc= From e776ac6374f5d2c52e0a1a06f70d6756afcfbcb0 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Mon, 2 May 2022 21:47:47 +0900 Subject: [PATCH 057/170] Temporarly removed Primehack as it cannot coexhist with Dolphin --- net.retrodeck.retrodeck.yml | 70 ++++++++++++++++++------------------- tools/start-dolphin.sh | 2 +- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 71d4e54b..b9dcea4f 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -879,41 +879,41 @@ modules: # PRIMEHACK - START # https://github.com/flathub/io.github.shiiion.primehack - - - name: primehack - buildsystem: cmake-ninja - config-opts: - - -DCMAKE_BUILD_TYPE=Release - - -DENABLE_ALSA=OFF - - -DENABLE_SDL=ON - - -DENABLE_EVDEV=ON - - -DDISTRIBUTOR=Flathub - cleanup: - - /share/man - post-install: - - install -D dolphin-emu-wrapper /app/bin/dolphin-emu-wrapper - - sed -i -e 's/"2048"/"512"/g' /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg - sources: - - type: git - url: https://github.com/shiiion/dolphin.git - commit: 9ca0eb888bd6f8ed13a4efb92d808fbf0705ffa4 - # detects whether dolphin is running in a flatpak sandbox - # and makes it use xdg directories if it is. - # prevents dolphin from attempting to write conf files - # in non-writable paths, typically happens when a user - # has leftover files from a previous non-flatpak install - - type: patch - path: rd-submodules/primehack/detectflatpak.patch - # version strings must match exactly for online multiplayer - - type: patch - path: rd-submodules/primehack/nodirtyversion.patch - - type: script - commands: - - for i in {0..9}; do - - test -S $XDG_RUNTIME_DIR/discord-ipc-$i || ln -sf {app/com.discordapp.Discord,$XDG_RUNTIME_DIR}/discord-ipc-$i; - - done - - dolphin-emu "$@" - dest-filename: dolphin-emu-wrapper + # Disabled because it's overwriting Dolphin + # - name: primehack + # buildsystem: cmake-ninja + # config-opts: + # - -DCMAKE_BUILD_TYPE=Release + # - -DENABLE_ALSA=OFF + # - -DENABLE_SDL=ON + # - -DENABLE_EVDEV=ON + # - -DDISTRIBUTOR=Flathub + # cleanup: + # - /share/man + # post-install: + # - install -D dolphin-emu-wrapper /app/bin/dolphin-emu-wrapper + # - sed -i -e 's/"2048"/"512"/g' /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg + # sources: + # - type: git + # url: https://github.com/shiiion/dolphin.git + # commit: 9ca0eb888bd6f8ed13a4efb92d808fbf0705ffa4 + # # detects whether dolphin is running in a flatpak sandbox + # # and makes it use xdg directories if it is. + # # prevents dolphin from attempting to write conf files + # # in non-writable paths, typically happens when a user + # # has leftover files from a previous non-flatpak install + # - type: patch + # path: rd-submodules/primehack/detectflatpak.patch + # # version strings must match exactly for online multiplayer + # - type: patch + # path: rd-submodules/primehack/nodirtyversion.patch + # - type: script + # commands: + # - for i in {0..9}; do + # - test -S $XDG_RUNTIME_DIR/discord-ipc-$i || ln -sf {app/com.discordapp.Discord,$XDG_RUNTIME_DIR}/discord-ipc-$i; + # - done + # - dolphin-emu "$@" + # dest-filename: dolphin-emu-wrapper # PRIMEHACK - END diff --git a/tools/start-dolphin.sh b/tools/start-dolphin.sh index ed58102f..e5943836 100644 --- a/tools/start-dolphin.sh +++ b/tools/start-dolphin.sh @@ -3,5 +3,5 @@ kdialog --title "RetroDECK" --warningyesno "Doing some changes in the emulator's configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?" if [ $? == 0 ] then - dolphin-qt + dolphin-emu fi \ No newline at end of file From 176ad02828dc44a0b2df722f33c0162072db406e Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Mon, 2 May 2022 21:59:03 +0900 Subject: [PATCH 058/170] PPSSPP: added --- net.retrodeck.retrodeck.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index b9dcea4f..1766bee8 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -917,6 +917,36 @@ modules: # PRIMEHACK - END + # PPSSPP - START + # https://github.com/flathub/org.ppsspp.PPSSPP + + - name: ppsspp + buildsystem: cmake-ninja + config-opts: + - '-DUSE_SYSTEM_FFMPEG=OFF' # turn this on? + - '-DUSE_SYSTEM_LIBZIP=ON' + - '-DUSE_SYSTEM_ZSTD=ON' + + - '-DUSE_WAYLAND_WSI=ON' + - '-DUSING_X11_VULKAN=ON' + - '-DUSING_QT_UI=OFF' + + - '-DBUILD_TESTING=OFF' + - '-DOpenGL_GL_PREFERENCE=GLVND' + build-options: + - '-DX86_64=ON' + sources: + - type: git + url: https://github.com/hrydgard/ppsspp.git + tag: v1.12.3 + commit: ce0a45cf0fcdd5bebf32208b9998f68dfc1107b7 + x-checker-data: + type: git + tag-pattern: "^v([\\d.]+)$" + is-main-source: true + + # PPSSPP - END + # External manifests end From 673518dc92f8dfe1a6f21a98bdfc88f41060015b Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Mon, 2 May 2022 22:01:27 +0900 Subject: [PATCH 059/170] PPSSPP: added tool --- tools-gamelist.xml | 15 +++++++++++---- tools/start-ppsspp.sh | 7 +++++++ 2 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 tools/start-ppsspp.sh diff --git a/tools-gamelist.xml b/tools-gamelist.xml index 346d6643..305f6631 100644 --- a/tools-gamelist.xml +++ b/tools-gamelist.xml @@ -16,28 +16,35 @@ ./start-pcsx2.sh - Start PCSX2 + Start PCSX2 (Standalone) Start PCSX2 to manually tweak your settings. true true + + ./start-ppsspp.sh + Start PPSSPP (Standalone) + Start PPSSPP to manually tweak your settings. + true + true + ./start-dolphin.sh - Start Dolphin + Start Dolphin (Standalone) Start Dolphin to manually tweak your settings. true true ./start-melonds.sh - Start MelonDS + Start MelonDS (Standalone) Start MelonDS to manually tweak your settings. true true ./start-citra.sh - Start CITRA + Start CITRA (Standalone) Start CITRA to manually tweak your settings. true true diff --git a/tools/start-ppsspp.sh b/tools/start-ppsspp.sh new file mode 100644 index 00000000..8763860c --- /dev/null +++ b/tools/start-ppsspp.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +kdialog --title "RetroDECK" --warningyesno "Doing some changes in the emulator's configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?" +if [ $? == 0 ] +then + ppsspp +fi \ No newline at end of file From d3c429a417b20ea2006cab6c06074c98e9f71217 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Mon, 2 May 2022 22:30:22 +0900 Subject: [PATCH 060/170] QUIT RETRODECK added on menu --- net.retrodeck.retrodeck.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 1766bee8..7aaf16b4 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -135,6 +135,10 @@ modules: - type: git url: https://gitlab.com/leonstyhre/emulationstation-de.git branch: 3cb464c7adcea8d020cdff92803c64b7f72fb443 + - type: shell + commands: + - sed -i 's/QUIT EMULATIONSTATION/QUIT RETRODECK/g' es-app/src/guis/GuiMenu.cpp + #- sed -i 's/"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)/"RetroDECK v--RETRODECKVERSION--, ES-DE v" + Utils::String::toUpper(PROGRAM_VERSION_STRING)/g' es-app/src/guis/GuiMenu.cpp # ES-DE - END From f18e1f05b7b6635c5f4c45bae9f32683759b581e Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Tue, 3 May 2022 10:44:44 +0900 Subject: [PATCH 061/170] Migrated cache to artifact --- .github/workflows/cooker.yml | 109 +++++++++++++++++++++++++++-------- 1 file changed, 84 insertions(+), 25 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index db5f45a9..68950613 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -42,7 +42,8 @@ jobs: needs: [Job1_-_Prepearing_enviornment] steps: - - uses: actions/download-artifact@v2 + - name: Download global cache + uses: actions/download-artifact@v2 with: name: global-cache continue-on-error: true @@ -62,12 +63,19 @@ jobs: sudo 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 sudo flatpak-builder --download-only --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - - name: Generating build specific cache - id: intenral-cache - uses: actions/cache@v2 + # - name: Generating build specific cache + # id: intenral-cache + # uses: actions/cache@v2 + # with: + # path: /home/runner/work/RetroDECK + # key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} + + - name: Upload build specific cache + uses: actions/upload-artifact@v3 with: + name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} path: /home/runner/work/RetroDECK - key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} + # - name: Continuing with previous worklow cache # if: steps.cache-cooker.outputs.cache-hit == 'true' @@ -89,12 +97,18 @@ jobs: steps: #- uses: actions/checkout@v3 - - name: cache-cooker - id: internal-cache - uses: actions/cache@v2 + # - name: cache-cooker + # id: internal-cache + # uses: actions/cache@v2 + # with: + # path: /home/runner/work/RetroDECK + # key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} + + - name: Download build specific cache + uses: actions/download-artifact@v2 with: + name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} path: /home/runner/work/RetroDECK - key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -113,6 +127,12 @@ jobs: cd /home/runner/work/RetroDECK/RetroDECK sudo flatpak-builder --build-only --stop-at=melonds --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + - name: Upload build specific cache + uses: actions/upload-artifact@v3 + with: + name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} + path: /home/runner/work/RetroDECK + Job4_-_Building_part_2: runs-on: ubuntu-latest needs: [Job1_-_Prepearing_enviornment, Job2_-_Downloading_Sources, Job3_-_Building_part_1] @@ -143,18 +163,30 @@ jobs: cd /home/runner/work/RetroDECK/RetroDECK sudo flatpak-builder --build-only --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + - name: Upload build specific cache + uses: actions/upload-artifact@v3 + with: + name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} + path: /home/runner/work/RetroDECK + Job5_-_Finishing_build: runs-on: ubuntu-latest needs: [Job1_-_Prepearing_enviornment, Job2_-_Downloading_Sources, Job3_-_Building_part_1, Job4_-_Building_part_2] steps: #- uses: actions/checkout@v3 - - name: cache-cooker - id: internal-cache - uses: actions/cache@v2 + # - name: cache-cooker + # id: internal-cache + # uses: actions/cache@v2 + # with: + # path: /home/runner/work/RetroDECK + # key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} + + - name: Download build specific cache + uses: actions/download-artifact@v2 with: + name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} path: /home/runner/work/RetroDECK - key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -173,18 +205,30 @@ jobs: cd /home/runner/work/RetroDECK/RetroDECK sudo flatpak-builder --finish-only --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + - name: Upload build specific cache + uses: actions/upload-artifact@v3 + with: + name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} + path: /home/runner/work/RetroDECK + Job6_-_Build_bundle: runs-on: ubuntu-latest needs: [Job1_-_Prepearing_enviornment, Job2_-_Downloading_Sources, Job3_-_Building_part_1, Job4_-_Building_part_2, Job5_-_Finishing_build] steps: #- uses: actions/checkout@v3 - - name: cache-cooker - id: internal-cache - uses: actions/cache@v2 + # - name: cache-cooker + # id: internal-cache + # uses: actions/cache@v2 + # with: + # path: /home/runner/work/RetroDECK + # key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} + + - name: Download build specific cache + uses: actions/download-artifact@v2 with: + name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} path: /home/runner/work/RetroDECK - key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -203,17 +247,29 @@ jobs: cd /home/runner/work/RetroDECK/RetroDECK sudo flatpak build-bundle local RetroDECK.flatpak net.retrodeck.retrodeck + - name: Upload build specific cache + uses: actions/upload-artifact@v3 + with: + name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} + path: /home/runner/work/RetroDECK + Job7_-_Publishing_flatpak: runs-on: ubuntu-latest needs: [Job1_-_Prepearing_enviornment, Job2_-_Downloading_Sources, Job3_-_Building_part_1, Job4_-_Building_part_2, Job5_-_Finishing_build, Job6_-_Build_bundle] steps: - - name: cache-cooker - id: internal-cache - uses: actions/cache@v2 - with: - path: /home/runner/work/RetroDECK - key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} + # - name: cache-cooker + # id: internal-cache + # uses: actions/cache@v2 + # with: + # path: /home/runner/work/RetroDECK + # key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} + + - name: Download build specific cache + uses: actions/download-artifact@v2 + with: + name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} + path: /home/runner/work/RetroDECK - name: Get date for artifacts id: date @@ -243,6 +299,9 @@ jobs: token: ${{ secrets.TRIGGER_BUILD_TOKEN }} repo: RetroDECK-cooker - - uses: actions/download-artifact@v2 + - name: Upload global cache + uses: actions/upload-artifact@v3 with: - name: global-cache \ No newline at end of file + name: global-cache + path: /home/runner/work/RetroDECK + continue-on-error: true \ No newline at end of file From fe1f4aab941e3bf0bbebdf3b35e9c5675e8f89f2 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 3 May 2022 10:51:01 +0900 Subject: [PATCH 062/170] Unix newlines --- .github/workflows/cooker.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 68950613..03e1c6af 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -304,4 +304,5 @@ jobs: with: name: global-cache path: /home/runner/work/RetroDECK - continue-on-error: true \ No newline at end of file + continue-on-error: true + From c6ac3b59139f9413c4b4a35581e706e9d151526f Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Tue, 3 May 2022 10:52:11 +0900 Subject: [PATCH 063/170] Migrated cache to artifact - 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 7aaf16b4..8fcaf700 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -138,7 +138,7 @@ modules: - type: shell commands: - sed -i 's/QUIT EMULATIONSTATION/QUIT RETRODECK/g' es-app/src/guis/GuiMenu.cpp - #- sed -i 's/"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)/"RetroDECK v--RETRODECKVERSION--, ES-DE v" + Utils::String::toUpper(PROGRAM_VERSION_STRING)/g' es-app/src/guis/GuiMenu.cpp + - sed -i 's/"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)/"RetroDECK v0.4.0b, ES-DE v" + Utils::String::toUpper(PROGRAM_VERSION_STRING)/g' es-app/src/guis/GuiMenu.cpp # ES-DE - END From bfb35c8d19aef6b14b0a1630cc0a113e1f59bb3a Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Tue, 3 May 2022 10:55:39 +0900 Subject: [PATCH 064/170] Migrated cache to artifact - fix4 --- .github/workflows/cooker.yml | 65 ++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 03e1c6af..36dbc59c 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -265,44 +265,43 @@ jobs: # path: /home/runner/work/RetroDECK # key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - - name: Download build specific cache + - name: Download build specific cache uses: actions/download-artifact@v2 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} path: /home/runner/work/RetroDECK - - name: Get date for artifacts - id: date - run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M')" + - name: Get date for artifacts + id: date + run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M')" - - name: Extract branch name - shell: bash - run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" - id: extract_branch + - name: Extract branch name + shell: bash + run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" + id: extract_branch - - name: Publish the flatpak in a new cooker release - #if: steps.cache-cooker.outputs.cache-hit != 'true' - uses: ncipollo/release-action@v1 - with: - tag: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" - body: | - # Release Notes (Cooker) - This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}. - - Cooker channel is provided for the community to test fixes and explore new functionality. - Please DO NOT open issues or ask support on this build. - - artifacts: "RetroDECK.flatpak" - allowUpdates: true - prerelease: true - draft: false - token: ${{ secrets.TRIGGER_BUILD_TOKEN }} - repo: RetroDECK-cooker - - - name: Upload global cache - uses: actions/upload-artifact@v3 - with: - name: global-cache - path: /home/runner/work/RetroDECK - continue-on-error: true + - name: Publish the flatpak in a new cooker release + #if: steps.cache-cooker.outputs.cache-hit != 'true' + uses: ncipollo/release-action@v1 + with: + tag: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" + body: | + # Release Notes (Cooker) + This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}. + Cooker channel is provided for the community to test fixes and explore new functionality. + Please DO NOT open issues or ask support on this build. + + artifacts: "RetroDECK.flatpak" + allowUpdates: true + prerelease: true + draft: false + token: ${{ secrets.TRIGGER_BUILD_TOKEN }} + repo: RetroDECK-cooker + + - name: Upload global cache + uses: actions/upload-artifact@v3 + with: + name: global-cache + path: /home/runner/work/RetroDECK + continue-on-error: true \ No newline at end of file From f3e38efe58f9848ed27b5dca69ea18a1d9f878e5 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Tue, 3 May 2022 14:54:39 +0900 Subject: [PATCH 065/170] Migrated cache to artifact - cache compression --- .github/workflows/cooker.yml | 74 ++++++++++++++++++++++++++---------- 1 file changed, 53 insertions(+), 21 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 36dbc59c..89c68e6e 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -47,11 +47,14 @@ jobs: with: name: global-cache continue-on-error: true + + - name: Exctracting cache + run: unzip retrodeck-cooker.zip -d /home/runner/work/RetroDECK - uses: actions/checkout@v3 + #if: steps.global-cache.outputs.cache-hit != 'true' - name: Downloading sources - #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | git pull git submodule init @@ -67,14 +70,17 @@ jobs: # id: intenral-cache # uses: actions/cache@v2 # with: - # path: /home/runner/work/RetroDECK + # retrodeck-cooker.zip # key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} + - name: Compressing cache + run: zip -r retrodeck-cooker.zip /home/runner/work/RetroDECK/* -x retrodeck-cooker.zip + - name: Upload build specific cache uses: actions/upload-artifact@v3 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: /home/runner/work/RetroDECK + retrodeck-cooker.zip # - name: Continuing with previous worklow cache @@ -101,14 +107,17 @@ jobs: # id: internal-cache # uses: actions/cache@v2 # with: - # path: /home/runner/work/RetroDECK + # retrodeck-cooker.zip # key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - name: Download build specific cache uses: actions/download-artifact@v2 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: /home/runner/work/RetroDECK + retrodeck-cooker.zip + + - name: Exctracting cache + run: unzip retrodeck-cooker.zip -d /home/runner/work/RetroDECK - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -127,11 +136,14 @@ jobs: cd /home/runner/work/RetroDECK/RetroDECK sudo flatpak-builder --build-only --stop-at=melonds --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + - name: Compressing cache + run: zip -r retrodeck-cooker.zip /home/runner/work/RetroDECK/* -x retrodeck-cooker.zip + - name: Upload build specific cache uses: actions/upload-artifact@v3 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: /home/runner/work/RetroDECK + retrodeck-cooker.zip Job4_-_Building_part_2: runs-on: ubuntu-latest @@ -139,12 +151,11 @@ jobs: steps: #- uses: actions/checkout@v3 - - name: cache-cooker - id: internal-cache - uses: actions/cache@v2 + - name: Download build specific cache + uses: actions/download-artifact@v2 with: - path: /home/runner/work/RetroDECK - key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} + name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} + retrodeck-cooker.zip - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -163,11 +174,14 @@ jobs: cd /home/runner/work/RetroDECK/RetroDECK sudo flatpak-builder --build-only --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + - name: Compressing cache + run: zip -r retrodeck-cooker.zip /home/runner/work/RetroDECK/* -x retrodeck-cooker.zip + - name: Upload build specific cache uses: actions/upload-artifact@v3 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: /home/runner/work/RetroDECK + retrodeck-cooker.zip Job5_-_Finishing_build: runs-on: ubuntu-latest @@ -179,14 +193,17 @@ jobs: # id: internal-cache # uses: actions/cache@v2 # with: - # path: /home/runner/work/RetroDECK + # retrodeck-cooker.zip # key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - name: Download build specific cache uses: actions/download-artifact@v2 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: /home/runner/work/RetroDECK + retrodeck-cooker.zip + + - name: Exctracting cache + run: unzip retrodeck-cooker.zip -d /home/runner/work/RetroDECK - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -205,11 +222,14 @@ jobs: cd /home/runner/work/RetroDECK/RetroDECK sudo flatpak-builder --finish-only --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + - name: Compressing cache + run: zip -r retrodeck-cooker.zip /home/runner/work/RetroDECK/* -x retrodeck-cooker.zip + - name: Upload build specific cache uses: actions/upload-artifact@v3 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: /home/runner/work/RetroDECK + retrodeck-cooker.zip Job6_-_Build_bundle: runs-on: ubuntu-latest @@ -221,14 +241,17 @@ jobs: # id: internal-cache # uses: actions/cache@v2 # with: - # path: /home/runner/work/RetroDECK + # retrodeck-cooker.zip # key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - name: Download build specific cache uses: actions/download-artifact@v2 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: /home/runner/work/RetroDECK + retrodeck-cooker.zip + + - name: Exctracting cache + run: unzip retrodeck-cooker.zip -d /home/runner/work/RetroDECK - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -247,11 +270,14 @@ jobs: cd /home/runner/work/RetroDECK/RetroDECK sudo flatpak build-bundle local RetroDECK.flatpak net.retrodeck.retrodeck + - name: Compressing cache + run: zip -r retrodeck-cooker.zip /home/runner/work/RetroDECK/* -x retrodeck-cooker.zip + - name: Upload build specific cache uses: actions/upload-artifact@v3 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: /home/runner/work/RetroDECK + retrodeck-cooker.zip Job7_-_Publishing_flatpak: runs-on: ubuntu-latest @@ -262,14 +288,17 @@ jobs: # id: internal-cache # uses: actions/cache@v2 # with: - # path: /home/runner/work/RetroDECK + # retrodeck-cooker.zip # key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - name: Download build specific cache uses: actions/download-artifact@v2 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: /home/runner/work/RetroDECK + retrodeck-cooker.zip + + - name: Exctracting cache + run: unzip retrodeck-cooker.zip -d /home/runner/work/RetroDECK - name: Get date for artifacts id: date @@ -299,9 +328,12 @@ jobs: token: ${{ secrets.TRIGGER_BUILD_TOKEN }} repo: RetroDECK-cooker + - name: Compressing cache + run: zip -r retrodeck-cooker.zip /home/runner/work/RetroDECK/* -x retrodeck-cooker.zip + - name: Upload global cache uses: actions/upload-artifact@v3 with: name: global-cache - path: /home/runner/work/RetroDECK + retrodeck-cooker.zip continue-on-error: true \ No newline at end of file From 1a588eabf9eb78be33841716c57847fe96591a9a Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Tue, 3 May 2022 14:56:35 +0900 Subject: [PATCH 066/170] Migrated cache to artifact - cache compression fix1 --- .github/workflows/cooker.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 89c68e6e..d5b4912c 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -80,7 +80,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - retrodeck-cooker.zip + path: retrodeck-cooker.zip # - name: Continuing with previous worklow cache @@ -114,7 +114,7 @@ jobs: uses: actions/download-artifact@v2 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - retrodeck-cooker.zip + path: retrodeck-cooker.zip - name: Exctracting cache run: unzip retrodeck-cooker.zip -d /home/runner/work/RetroDECK @@ -143,7 +143,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - retrodeck-cooker.zip + path: retrodeck-cooker.zip Job4_-_Building_part_2: runs-on: ubuntu-latest @@ -155,7 +155,7 @@ jobs: uses: actions/download-artifact@v2 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - retrodeck-cooker.zip + path: retrodeck-cooker.zip - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -181,7 +181,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - retrodeck-cooker.zip + path: retrodeck-cooker.zip Job5_-_Finishing_build: runs-on: ubuntu-latest @@ -200,7 +200,7 @@ jobs: uses: actions/download-artifact@v2 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - retrodeck-cooker.zip + path: retrodeck-cooker.zip - name: Exctracting cache run: unzip retrodeck-cooker.zip -d /home/runner/work/RetroDECK @@ -248,7 +248,7 @@ jobs: uses: actions/download-artifact@v2 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - retrodeck-cooker.zip + path: retrodeck-cooker.zip - name: Exctracting cache run: unzip retrodeck-cooker.zip -d /home/runner/work/RetroDECK @@ -277,7 +277,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - retrodeck-cooker.zip + path: retrodeck-cooker.zip Job7_-_Publishing_flatpak: runs-on: ubuntu-latest @@ -295,7 +295,7 @@ jobs: uses: actions/download-artifact@v2 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - retrodeck-cooker.zip + path: retrodeck-cooker.zip - name: Exctracting cache run: unzip retrodeck-cooker.zip -d /home/runner/work/RetroDECK @@ -335,5 +335,5 @@ jobs: uses: actions/upload-artifact@v3 with: name: global-cache - retrodeck-cooker.zip + path: retrodeck-cooker.zip continue-on-error: true \ No newline at end of file From 36024af3c221fd57808d7f9467c39d5f93b30845 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Tue, 3 May 2022 14:57:37 +0900 Subject: [PATCH 067/170] Migrated cache to artifact - cache compression fix2 --- .github/workflows/cooker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index d5b4912c..b4c73fef 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -200,7 +200,7 @@ jobs: uses: actions/download-artifact@v2 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: retrodeck-cooker.zip + path: retrodeck-cooker.zip - name: Exctracting cache run: unzip retrodeck-cooker.zip -d /home/runner/work/RetroDECK @@ -229,7 +229,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - retrodeck-cooker.zip + path: retrodeck-cooker.zip Job6_-_Build_bundle: runs-on: ubuntu-latest From cd3e669064905e2fe204042d76f80c04895e322c Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Tue, 3 May 2022 14:58:33 +0900 Subject: [PATCH 068/170] Migrated cache to artifact - cache compression fix3 --- .github/workflows/cooker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index b4c73fef..9b4e4d29 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -50,6 +50,7 @@ jobs: - name: Exctracting cache run: unzip retrodeck-cooker.zip -d /home/runner/work/RetroDECK + continue-on-error: true - uses: actions/checkout@v3 #if: steps.global-cache.outputs.cache-hit != 'true' From 88f41f1192c4a85eed7c7dda26bb9bce9258976c Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Tue, 3 May 2022 15:04:17 +0900 Subject: [PATCH 069/170] Migrated cache to artifact - removed job2 --- .github/workflows/cooker.yml | 113 +++++++++++++++++------------------ 1 file changed, 55 insertions(+), 58 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 9b4e4d29..cecf06c0 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -37,51 +37,51 @@ jobs: outputs: buildID: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" - Job2_-_Downloading_Sources: - runs-on: ubuntu-latest - needs: [Job1_-_Prepearing_enviornment] - steps: + # Job2_-_Downloading_Sources: + # runs-on: ubuntu-latest + # needs: [Job1_-_Prepearing_enviornment] + # steps: - - name: Download global cache - uses: actions/download-artifact@v2 - with: - name: global-cache - continue-on-error: true + # - name: Download global cache + # uses: actions/download-artifact@v2 + # with: + # name: global-cache + # continue-on-error: true - - name: Exctracting cache - run: unzip retrodeck-cooker.zip -d /home/runner/work/RetroDECK - continue-on-error: true + # - name: Exctracting cache + # run: unzip -n retrodeck-cooker.zip -d /home/runner/work/RetroDECK + # continue-on-error: true - - uses: actions/checkout@v3 - #if: steps.global-cache.outputs.cache-hit != 'true' + # - uses: actions/checkout@v3 + # #if: steps.global-cache.outputs.cache-hit != 'true' - - name: Downloading sources - run: | - git pull - git submodule init - git submodule update - sudo add-apt-repository ppa:alexlarsson/flatpak - sudo apt-get update - sudo apt install flatpak flatpak-builder p7zip-full - sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - sudo 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 - sudo flatpak-builder --download-only --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + # - name: Downloading sources + # run: | + # git pull + # git submodule init + # git submodule update + # sudo add-apt-repository ppa:alexlarsson/flatpak + # sudo apt-get update + # sudo apt install flatpak flatpak-builder p7zip-full + # sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + # sudo 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 + # sudo flatpak-builder --download-only --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - # - name: Generating build specific cache - # id: intenral-cache - # uses: actions/cache@v2 - # with: - # retrodeck-cooker.zip - # key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} + # # - name: Generating build specific cache + # # id: intenral-cache + # # uses: actions/cache@v2 + # # with: + # # retrodeck-cooker.zip + # # key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - - name: Compressing cache - run: zip -r retrodeck-cooker.zip /home/runner/work/RetroDECK/* -x retrodeck-cooker.zip + # - name: Compressing cache + # run: zip -r retrodeck-cooker.zip /home/runner/work/RetroDECK/* -x retrodeck-cooker.zip - - name: Upload build specific cache - uses: actions/upload-artifact@v3 - with: - name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: retrodeck-cooker.zip + # - name: Upload build specific cache + # uses: actions/upload-artifact@v3 + # with: + # name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} + # path: retrodeck-cooker.zip # - name: Continuing with previous worklow cache @@ -100,29 +100,25 @@ jobs: Job3_-_Building_part_1: runs-on: ubuntu-latest - needs: [Job1_-_Prepearing_enviornment, Job2_-_Downloading_Sources] + needs: [Job1_-_Prepearing_enviornment] steps: - #- uses: actions/checkout@v3 - # - name: cache-cooker - # id: internal-cache - # uses: actions/cache@v2 - # with: - # retrodeck-cooker.zip - # key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - - - name: Download build specific cache + - name: Download global cache uses: actions/download-artifact@v2 with: - name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: retrodeck-cooker.zip + name: global-cache + continue-on-error: true - name: Exctracting cache - run: unzip retrodeck-cooker.zip -d /home/runner/work/RetroDECK + run: unzip -n retrodeck-cooker.zip -d /home/runner/work/RetroDECK + continue-on-error: true + + - uses: actions/checkout@v3 - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | + git pull git submodule init git submodule update sudo add-apt-repository ppa:alexlarsson/flatpak @@ -130,6 +126,7 @@ jobs: sudo apt install flatpak flatpak-builder p7zip-full sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo 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 + sudo flatpak-builder --download-only --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - name: Bulding part 1 - Until melonds #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -148,7 +145,7 @@ jobs: Job4_-_Building_part_2: runs-on: ubuntu-latest - needs: [Job1_-_Prepearing_enviornment, Job2_-_Downloading_Sources, Job3_-_Building_part_1] + needs: [Job1_-_Prepearing_enviornment, Job3_-_Building_part_1] steps: #- uses: actions/checkout@v3 @@ -186,7 +183,7 @@ jobs: Job5_-_Finishing_build: runs-on: ubuntu-latest - needs: [Job1_-_Prepearing_enviornment, Job2_-_Downloading_Sources, Job3_-_Building_part_1, Job4_-_Building_part_2] + needs: [Job1_-_Prepearing_enviornment, Job3_-_Building_part_1, Job4_-_Building_part_2] steps: #- uses: actions/checkout@v3 @@ -204,7 +201,7 @@ jobs: path: retrodeck-cooker.zip - name: Exctracting cache - run: unzip retrodeck-cooker.zip -d /home/runner/work/RetroDECK + run: unzip -n retrodeck-cooker.zip -d /home/runner/work/RetroDECK - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -234,7 +231,7 @@ jobs: Job6_-_Build_bundle: runs-on: ubuntu-latest - needs: [Job1_-_Prepearing_enviornment, Job2_-_Downloading_Sources, Job3_-_Building_part_1, Job4_-_Building_part_2, Job5_-_Finishing_build] + needs: [Job1_-_Prepearing_enviornment, Job3_-_Building_part_1, Job4_-_Building_part_2, Job5_-_Finishing_build] steps: #- uses: actions/checkout@v3 @@ -252,7 +249,7 @@ jobs: path: retrodeck-cooker.zip - name: Exctracting cache - run: unzip retrodeck-cooker.zip -d /home/runner/work/RetroDECK + run: unzip -n retrodeck-cooker.zip -d /home/runner/work/RetroDECK - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -282,7 +279,7 @@ jobs: Job7_-_Publishing_flatpak: runs-on: ubuntu-latest - needs: [Job1_-_Prepearing_enviornment, Job2_-_Downloading_Sources, Job3_-_Building_part_1, Job4_-_Building_part_2, Job5_-_Finishing_build, Job6_-_Build_bundle] + needs: [Job1_-_Prepearing_enviornment, Job3_-_Building_part_1, Job4_-_Building_part_2, Job5_-_Finishing_build, Job6_-_Build_bundle] steps: # - name: cache-cooker @@ -299,7 +296,7 @@ jobs: path: retrodeck-cooker.zip - name: Exctracting cache - run: unzip retrodeck-cooker.zip -d /home/runner/work/RetroDECK + run: unzip -n retrodeck-cooker.zip -d /home/runner/work/RetroDECK - name: Get date for artifacts id: date From 28420c6f64a2757279a025ad64a00f14a492bd1b Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Tue, 3 May 2022 19:48:46 +0900 Subject: [PATCH 070/170] Migrated cache to artifact - switch to tar.gz --- .github/workflows/cooker.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index cecf06c0..7d876125 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -49,7 +49,7 @@ jobs: # continue-on-error: true # - name: Exctracting cache - # run: unzip -n retrodeck-cooker.zip -d /home/runner/work/RetroDECK + # run: mkdir -p /home/runner/work/RetroDECK/RetroDECK && tar -xzvf retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK # continue-on-error: true # - uses: actions/checkout@v3 @@ -75,7 +75,7 @@ jobs: # # key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} # - name: Compressing cache - # run: zip -r retrodeck-cooker.zip /home/runner/work/RetroDECK/* -x retrodeck-cooker.zip + # run: tar -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . # - name: Upload build specific cache # uses: actions/upload-artifact@v3 @@ -110,7 +110,7 @@ jobs: continue-on-error: true - name: Exctracting cache - run: unzip -n retrodeck-cooker.zip -d /home/runner/work/RetroDECK + run: mkdir -p /home/runner/work/RetroDECK/RetroDECK && tar -xzvf retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK continue-on-error: true - uses: actions/checkout@v3 @@ -135,7 +135,7 @@ jobs: sudo flatpak-builder --build-only --stop-at=melonds --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - name: Compressing cache - run: zip -r retrodeck-cooker.zip /home/runner/work/RetroDECK/* -x retrodeck-cooker.zip + run: tar -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -173,7 +173,7 @@ jobs: sudo flatpak-builder --build-only --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - name: Compressing cache - run: zip -r retrodeck-cooker.zip /home/runner/work/RetroDECK/* -x retrodeck-cooker.zip + run: tar -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -201,7 +201,7 @@ jobs: path: retrodeck-cooker.zip - name: Exctracting cache - run: unzip -n retrodeck-cooker.zip -d /home/runner/work/RetroDECK + run: mkdir -p /home/runner/work/RetroDECK/RetroDECK && tar -xzvf retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -221,7 +221,7 @@ jobs: sudo flatpak-builder --finish-only --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - name: Compressing cache - run: zip -r retrodeck-cooker.zip /home/runner/work/RetroDECK/* -x retrodeck-cooker.zip + run: tar -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -249,7 +249,7 @@ jobs: path: retrodeck-cooker.zip - name: Exctracting cache - run: unzip -n retrodeck-cooker.zip -d /home/runner/work/RetroDECK + run: mkdir -p /home/runner/work/RetroDECK/RetroDECK && tar -xzvf retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -269,7 +269,7 @@ jobs: sudo flatpak build-bundle local RetroDECK.flatpak net.retrodeck.retrodeck - name: Compressing cache - run: zip -r retrodeck-cooker.zip /home/runner/work/RetroDECK/* -x retrodeck-cooker.zip + run: tar -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -296,7 +296,7 @@ jobs: path: retrodeck-cooker.zip - name: Exctracting cache - run: unzip -n retrodeck-cooker.zip -d /home/runner/work/RetroDECK + run: mkdir -p /home/runner/work/RetroDECK/RetroDECK && tar -xzvf retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK - name: Get date for artifacts id: date @@ -327,7 +327,7 @@ jobs: repo: RetroDECK-cooker - name: Compressing cache - run: zip -r retrodeck-cooker.zip /home/runner/work/RetroDECK/* -x retrodeck-cooker.zip + run: tar -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . - name: Upload global cache uses: actions/upload-artifact@v3 From 4f2f5db71f605c73f9c414ebb60779ab04a93eee Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Thu, 5 May 2022 10:22:08 +0900 Subject: [PATCH 071/170] Artifacts: ignoring compression errors --- .github/workflows/cooker.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 7d876125..87cc8011 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -75,7 +75,7 @@ jobs: # # key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} # - name: Compressing cache - # run: tar -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . + # run: tar -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz --ignore-failed-read -C /home/runner/work/RetroDECK/RetroDECK . # - name: Upload build specific cache # uses: actions/upload-artifact@v3 @@ -135,7 +135,7 @@ jobs: sudo flatpak-builder --build-only --stop-at=melonds --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - name: Compressing cache - run: tar -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . + run: tar -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz --ignore-failed-read -C /home/runner/work/RetroDECK/RetroDECK . - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -173,7 +173,7 @@ jobs: sudo flatpak-builder --build-only --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - name: Compressing cache - run: tar -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . + run: tar -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz --ignore-failed-read -C /home/runner/work/RetroDECK/RetroDECK . - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -221,7 +221,7 @@ jobs: sudo flatpak-builder --finish-only --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - name: Compressing cache - run: tar -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . + run: tar -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz --ignore-failed-read -C /home/runner/work/RetroDECK/RetroDECK . - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -269,7 +269,7 @@ jobs: sudo flatpak build-bundle local RetroDECK.flatpak net.retrodeck.retrodeck - name: Compressing cache - run: tar -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . + run: tar -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz --ignore-failed-read -C /home/runner/work/RetroDECK/RetroDECK . - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -327,7 +327,7 @@ jobs: repo: RetroDECK-cooker - name: Compressing cache - run: tar -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . + run: tar -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz --ignore-failed-read -C /home/runner/work/RetroDECK/RetroDECK . - name: Upload global cache uses: actions/upload-artifact@v3 From 9c09e0dde57a7b8d368cc5ad45fad673ce7835c4 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Thu, 5 May 2022 10:32:39 +0900 Subject: [PATCH 072/170] Artifacts: renamed Cooker into cooker --- .github/workflows/cooker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 87cc8011..07231aa5 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -1,6 +1,6 @@ # Due to the changes to the build systems actually on the branch integrated, this script will fail on main until merged -name: Cooker +name: cooker # Controls when the workflow will run on: From 4ee1acba760e5189d9fb20e7127d40cef86b84da Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Thu, 5 May 2022 18:16:36 +0900 Subject: [PATCH 073/170] Artifacts: touched tar/gz before filling it --- .github/workflows/cooker.yml | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 07231aa5..def4fc0a 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -75,7 +75,9 @@ jobs: # # key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} # - name: Compressing cache - # run: tar -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz --ignore-failed-read -C /home/runner/work/RetroDECK/RetroDECK . + # run: | + touch /home/runner/work/RetroDECK/RetroDECK/retrodeck-cooker.tar.gz + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . # - name: Upload build specific cache # uses: actions/upload-artifact@v3 @@ -135,7 +137,9 @@ jobs: sudo flatpak-builder --build-only --stop-at=melonds --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - name: Compressing cache - run: tar -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz --ignore-failed-read -C /home/runner/work/RetroDECK/RetroDECK . + run: | + touch /home/runner/work/RetroDECK/RetroDECK/retrodeck-cooker.tar.gz + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -173,7 +177,9 @@ jobs: sudo flatpak-builder --build-only --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - name: Compressing cache - run: tar -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz --ignore-failed-read -C /home/runner/work/RetroDECK/RetroDECK . + run: | + touch /home/runner/work/RetroDECK/RetroDECK/retrodeck-cooker.tar.gz + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -221,7 +227,9 @@ jobs: sudo flatpak-builder --finish-only --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml - name: Compressing cache - run: tar -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz --ignore-failed-read -C /home/runner/work/RetroDECK/RetroDECK . + run: | + touch /home/runner/work/RetroDECK/RetroDECK/retrodeck-cooker.tar.gz + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -269,7 +277,9 @@ jobs: sudo flatpak build-bundle local RetroDECK.flatpak net.retrodeck.retrodeck - name: Compressing cache - run: tar -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz --ignore-failed-read -C /home/runner/work/RetroDECK/RetroDECK . + run: | + touch /home/runner/work/RetroDECK/RetroDECK/retrodeck-cooker.tar.gz + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -327,7 +337,9 @@ jobs: repo: RetroDECK-cooker - name: Compressing cache - run: tar -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz --ignore-failed-read -C /home/runner/work/RetroDECK/RetroDECK . + run: | + touch /home/runner/work/RetroDECK/RetroDECK/retrodeck-cooker.tar.gz + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . - name: Upload global cache uses: actions/upload-artifact@v3 From bef48da3eea76d35d09ca337610c0b5afa42ebc1 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Thu, 5 May 2022 18:24:16 +0900 Subject: [PATCH 074/170] Artifacts: touched tar/gz before filling it - fix1 --- .github/workflows/cooker.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index def4fc0a..935987a5 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -34,8 +34,9 @@ jobs: - name: Generating build ID run: echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" - outputs: - buildID: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" + + outputs: + buildID: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" # Job2_-_Downloading_Sources: # runs-on: ubuntu-latest @@ -76,8 +77,8 @@ jobs: # - name: Compressing cache # run: | - touch /home/runner/work/RetroDECK/RetroDECK/retrodeck-cooker.tar.gz - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . + # touch /home/runner/work/RetroDECK/RetroDECK/retrodeck-cooker.tar.gz + # tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . # - name: Upload build specific cache # uses: actions/upload-artifact@v3 From 6553f7e80cc8cff768092be86e339ca129c79dd5 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Thu, 5 May 2022 18:25:04 +0900 Subject: [PATCH 075/170] Artifacts: touched tar/gz before filling it - fix2 --- .github/workflows/cooker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 935987a5..8dd950d9 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -35,8 +35,8 @@ jobs: - name: Generating build ID run: echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" - outputs: - buildID: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" + outputs: + buildID: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" # Job2_-_Downloading_Sources: # runs-on: ubuntu-latest From 8cbf488c494e3cb3459d0ddea9f136efc5e6ece1 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Thu, 5 May 2022 19:25:51 +0900 Subject: [PATCH 076/170] Artifacts: including only flatpak-builder cache, added checkout to all jobs --- .github/workflows/cooker.yml | 65 +++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 8dd950d9..c87e6e8d 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -66,25 +66,25 @@ jobs: # sudo apt install flatpak flatpak-builder p7zip-full # sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo # sudo 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 - # sudo flatpak-builder --download-only --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + # sudo flatpak-builder --download-only --user --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml # # - name: Generating build specific cache # # id: intenral-cache # # uses: actions/cache@v2 # # with: - # # retrodeck-cooker.zip + # # retrodeck-cooker.tar.gz # # key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} # - name: Compressing cache # run: | # touch /home/runner/work/RetroDECK/RetroDECK/retrodeck-cooker.tar.gz - # tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . + # tar --ignore-failed-read -cfz retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK .flatpak-builder retrodeck-flatpak-cooker # - name: Upload build specific cache # uses: actions/upload-artifact@v3 # with: # name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - # path: retrodeck-cooker.zip + # path: retrodeck-cooker.tar.gz # - name: Continuing with previous worklow cache @@ -99,13 +99,15 @@ jobs: # sudo apt install flatpak flatpak-builder p7zip-full # sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo # sudo 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 - # sudo flatpak-builder --download-only --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + # sudo flatpak-builder --download-only --user --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml Job3_-_Building_part_1: runs-on: ubuntu-latest needs: [Job1_-_Prepearing_enviornment] steps: + - uses: actions/checkout@v3 + - name: Download global cache uses: actions/download-artifact@v2 with: @@ -116,8 +118,6 @@ jobs: run: mkdir -p /home/runner/work/RetroDECK/RetroDECK && tar -xzvf retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK continue-on-error: true - - uses: actions/checkout@v3 - - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | @@ -129,36 +129,37 @@ jobs: sudo apt install flatpak flatpak-builder p7zip-full sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo 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 - sudo flatpak-builder --download-only --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + sudo flatpak-builder --download-only --user --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Bulding part 1 - Until melonds #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | cd /home/runner/work/RetroDECK/RetroDECK - sudo flatpak-builder --build-only --stop-at=melonds --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + sudo flatpak-builder --build-only --stop-at=melonds --user --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Compressing cache run: | touch /home/runner/work/RetroDECK/RetroDECK/retrodeck-cooker.tar.gz - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . + tar --ignore-failed-read -cfz retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK .flatpak-builder retrodeck-flatpak-cooker - name: Upload build specific cache uses: actions/upload-artifact@v3 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: retrodeck-cooker.zip + path: retrodeck-cooker.tar.gz Job4_-_Building_part_2: runs-on: ubuntu-latest needs: [Job1_-_Prepearing_enviornment, Job3_-_Building_part_1] steps: - #- uses: actions/checkout@v3 + + - uses: actions/checkout@v3 - name: Download build specific cache uses: actions/download-artifact@v2 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: retrodeck-cooker.zip + path: retrodeck-cooker.tar.gz - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -175,37 +176,38 @@ jobs: #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | cd /home/runner/work/RetroDECK/RetroDECK - sudo flatpak-builder --build-only --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + sudo flatpak-builder --build-only --user --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Compressing cache run: | touch /home/runner/work/RetroDECK/RetroDECK/retrodeck-cooker.tar.gz - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . + tar --ignore-failed-read -cfz retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK .flatpak-builder retrodeck-flatpak-cooker - name: Upload build specific cache uses: actions/upload-artifact@v3 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: retrodeck-cooker.zip + path: retrodeck-cooker.tar.gz Job5_-_Finishing_build: runs-on: ubuntu-latest needs: [Job1_-_Prepearing_enviornment, Job3_-_Building_part_1, Job4_-_Building_part_2] steps: - #- uses: actions/checkout@v3 + + - uses: actions/checkout@v3 # - name: cache-cooker # id: internal-cache # uses: actions/cache@v2 # with: - # retrodeck-cooker.zip + # retrodeck-cooker.tar.gz # key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - name: Download build specific cache uses: actions/download-artifact@v2 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: retrodeck-cooker.zip + path: retrodeck-cooker.tar.gz - name: Exctracting cache run: mkdir -p /home/runner/work/RetroDECK/RetroDECK && tar -xzvf retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK @@ -225,37 +227,38 @@ jobs: #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | cd /home/runner/work/RetroDECK/RetroDECK - sudo flatpak-builder --finish-only --user --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml + sudo flatpak-builder --finish-only --user --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Compressing cache run: | touch /home/runner/work/RetroDECK/RetroDECK/retrodeck-cooker.tar.gz - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . + tar --ignore-failed-read -cfz retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK .flatpak-builder retrodeck-flatpak-cooker - name: Upload build specific cache uses: actions/upload-artifact@v3 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: retrodeck-cooker.zip + path: retrodeck-cooker.tar.gz Job6_-_Build_bundle: runs-on: ubuntu-latest needs: [Job1_-_Prepearing_enviornment, Job3_-_Building_part_1, Job4_-_Building_part_2, Job5_-_Finishing_build] steps: - #- uses: actions/checkout@v3 + + - uses: actions/checkout@v3 # - name: cache-cooker # id: internal-cache # uses: actions/cache@v2 # with: - # retrodeck-cooker.zip + # retrodeck-cooker.tar.gz # key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - name: Download build specific cache uses: actions/download-artifact@v2 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: retrodeck-cooker.zip + path: retrodeck-cooker.tar.gz - name: Exctracting cache run: mkdir -p /home/runner/work/RetroDECK/RetroDECK && tar -xzvf retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK @@ -280,13 +283,13 @@ jobs: - name: Compressing cache run: | touch /home/runner/work/RetroDECK/RetroDECK/retrodeck-cooker.tar.gz - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . + tar --ignore-failed-read -cfz retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK .flatpak-builder retrodeck-flatpak-cooker - name: Upload build specific cache uses: actions/upload-artifact@v3 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: retrodeck-cooker.zip + path: retrodeck-cooker.tar.gz Job7_-_Publishing_flatpak: runs-on: ubuntu-latest @@ -297,14 +300,14 @@ jobs: # id: internal-cache # uses: actions/cache@v2 # with: - # retrodeck-cooker.zip + # retrodeck-cooker.tar.gz # key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - name: Download build specific cache uses: actions/download-artifact@v2 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: retrodeck-cooker.zip + path: retrodeck-cooker.tar.gz - name: Exctracting cache run: mkdir -p /home/runner/work/RetroDECK/RetroDECK && tar -xzvf retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK @@ -340,11 +343,11 @@ jobs: - name: Compressing cache run: | touch /home/runner/work/RetroDECK/RetroDECK/retrodeck-cooker.tar.gz - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz --exclude=retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK . + tar --ignore-failed-read -cfz retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK .flatpak-builder retrodeck-flatpak-cooker - name: Upload global cache uses: actions/upload-artifact@v3 with: name: global-cache - path: retrodeck-cooker.zip + path: retrodeck-cooker.tar.gz continue-on-error: true \ No newline at end of file From 2269ee99e6c0bf6db5ea033bf5f649911e39d2bf Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Thu, 5 May 2022 19:28:22 +0900 Subject: [PATCH 077/170] Artifacts: skipping already existing files when extracting --- .github/workflows/cooker.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index c87e6e8d..de75c361 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -50,7 +50,7 @@ jobs: # continue-on-error: true # - name: Exctracting cache - # run: mkdir -p /home/runner/work/RetroDECK/RetroDECK && tar -xzvf retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK + # run: mkdir -p /home/runner/work/RetroDECK/RetroDECK && tar -xzvf --skip-old-files retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK # continue-on-error: true # - uses: actions/checkout@v3 @@ -115,7 +115,7 @@ jobs: continue-on-error: true - name: Exctracting cache - run: mkdir -p /home/runner/work/RetroDECK/RetroDECK && tar -xzvf retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK + run: mkdir -p /home/runner/work/RetroDECK/RetroDECK && tar -xzvf --skip-old-files retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK continue-on-error: true - name: Initializing enviornment @@ -210,7 +210,7 @@ jobs: path: retrodeck-cooker.tar.gz - name: Exctracting cache - run: mkdir -p /home/runner/work/RetroDECK/RetroDECK && tar -xzvf retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK + run: mkdir -p /home/runner/work/RetroDECK/RetroDECK && tar -xzvf --skip-old-files retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -261,7 +261,7 @@ jobs: path: retrodeck-cooker.tar.gz - name: Exctracting cache - run: mkdir -p /home/runner/work/RetroDECK/RetroDECK && tar -xzvf retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK + run: mkdir -p /home/runner/work/RetroDECK/RetroDECK && tar -xzvf --skip-old-files retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -310,7 +310,7 @@ jobs: path: retrodeck-cooker.tar.gz - name: Exctracting cache - run: mkdir -p /home/runner/work/RetroDECK/RetroDECK && tar -xzvf retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK + run: mkdir -p /home/runner/work/RetroDECK/RetroDECK && tar -xzvf --skip-old-files retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK - name: Get date for artifacts id: date From e70a9ebd3fb6c8af8974944508a3abf417635667 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Thu, 5 May 2022 20:03:15 +0900 Subject: [PATCH 078/170] RPCS3: removed "branch master" --- net.retrodeck.retrodeck.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 8fcaf700..6d7af349 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -833,7 +833,6 @@ modules: sources: - type: git url: https://github.com/RPCS3/llvm-mirror.git - branch: master commit: 509d31ad89676522f7121b3bb8688f7d29b7ee60 - type: git url: https://github.com/intel/ittapi.git From a9735710e29d35029394b225cac763b1a5be772f Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Fri, 6 May 2022 09:23:17 +0900 Subject: [PATCH 079/170] Artifacts:added removal workflow --- .github/workflows/remove-artifacts.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/remove-artifacts.yml diff --git a/.github/workflows/remove-artifacts.yml b/.github/workflows/remove-artifacts.yml new file mode 100644 index 00000000..98b59866 --- /dev/null +++ b/.github/workflows/remove-artifacts.yml @@ -0,0 +1,22 @@ +name: Remove artifacts + +on: + #schedule: + # Every day at 1am + # - cron: '0 1 * * *' + + workflow_dispatch: + +jobs: + remove-old-artifacts: + runs-on: ubuntu-latest + timeout-minutes: 10 + + steps: + - name: Remove old artifacts + uses: c-hive/gha-remove-artifacts@v1 + #with: + #age: '1 month' # ' ', e.g. 5 days, 2 years, 90 seconds, parsed by Moment.js + # Optional inputs + # skip-tags: true + # skip-recent: 5 \ No newline at end of file From a3f3bc83278375a824eef7ada60c8177dd2ced93 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Fri, 6 May 2022 09:28:03 +0900 Subject: [PATCH 080/170] Artifacts - Re-added dispatch --- .github/workflows/remove-artifacts.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/remove-artifacts.yml b/.github/workflows/remove-artifacts.yml index 98b59866..91eb2139 100644 --- a/.github/workflows/remove-artifacts.yml +++ b/.github/workflows/remove-artifacts.yml @@ -1,11 +1,14 @@ name: Remove artifacts on: + workflow_dispatch: + +#on: #schedule: # Every day at 1am # - cron: '0 1 * * *' - workflow_dispatch: +# workflow_dispatch: jobs: remove-old-artifacts: @@ -19,4 +22,4 @@ jobs: #age: '1 month' # ' ', e.g. 5 days, 2 years, 90 seconds, parsed by Moment.js # Optional inputs # skip-tags: true - # skip-recent: 5 \ No newline at end of file + # skip-recent: 5 From 371668765762b581983a0368721078e9501adc16 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Fri, 6 May 2022 09:31:51 +0900 Subject: [PATCH 081/170] Artifacts: added dash in the name --- .github/workflows/remove-artifacts.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/remove-artifacts.yml b/.github/workflows/remove-artifacts.yml index 91eb2139..7cadf4e8 100644 --- a/.github/workflows/remove-artifacts.yml +++ b/.github/workflows/remove-artifacts.yml @@ -1,14 +1,11 @@ -name: Remove artifacts +name: Remove-artifacts on: - workflow_dispatch: - -#on: #schedule: # Every day at 1am # - cron: '0 1 * * *' -# workflow_dispatch: + workflow_dispatch: jobs: remove-old-artifacts: From 35bcc58ede4166c93a8e80bb19361cafe5ea012e Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Fri, 6 May 2022 09:37:11 +0900 Subject: [PATCH 082/170] Artifacts: added 1 seconds --- .github/workflows/remove-artifacts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/remove-artifacts.yml b/.github/workflows/remove-artifacts.yml index 7cadf4e8..84c41e8e 100644 --- a/.github/workflows/remove-artifacts.yml +++ b/.github/workflows/remove-artifacts.yml @@ -15,8 +15,8 @@ jobs: steps: - name: Remove old artifacts uses: c-hive/gha-remove-artifacts@v1 - #with: - #age: '1 month' # ' ', e.g. 5 days, 2 years, 90 seconds, parsed by Moment.js + with: + age: '2 seconds' # ' ', e.g. 5 days, 2 years, 90 seconds, parsed by Moment.js # Optional inputs # skip-tags: true # skip-recent: 5 From 49c88fa3a9089750cdf48edb35e4145a678c8b38 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Fri, 6 May 2022 12:12:35 +0900 Subject: [PATCH 083/170] Artifacts: finally fixed cooker.yml once and for all? --- .github/workflows/cooker.yml | 70 +++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 33 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index de75c361..122dbfeb 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -49,8 +49,10 @@ jobs: # name: global-cache # continue-on-error: true - # - name: Exctracting cache - # run: mkdir -p /home/runner/work/RetroDECK/RetroDECK && tar -xzvf --skip-old-files retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK + # - name: Extracting cache + # run: | + tar --skip-old-files -xzvf retrodeck-cooker.tar.gz + rm -f retrodeck-cooker.tar.gz # continue-on-error: true # - uses: actions/checkout@v3 @@ -77,8 +79,8 @@ jobs: # - name: Compressing cache # run: | - # touch /home/runner/work/RetroDECK/RetroDECK/retrodeck-cooker.tar.gz - # tar --ignore-failed-read -cfz retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK .flatpak-builder retrodeck-flatpak-cooker + # touch $GITHUB_WORKSPACE/retrodeck-cooker.tar.gz + # tar --ignore-failed-read -cfz retrodeck-cooker.tar.gz -C $GITHUB_WORKSPACE .flatpak-builder retrodeck-flatpak-cooker # - name: Upload build specific cache # uses: actions/upload-artifact@v3 @@ -90,7 +92,7 @@ jobs: # - name: Continuing with previous worklow cache # if: steps.cache-cooker.outputs.cache-hit == 'true' # run: | - # cd /home/runner/work/RetroDECK/RetroDECK + # cd $GITHUB_WORKSPACE # git pull # git submodule init # git submodule update @@ -114,8 +116,10 @@ jobs: name: global-cache continue-on-error: true - - name: Exctracting cache - run: mkdir -p /home/runner/work/RetroDECK/RetroDECK && tar -xzvf --skip-old-files retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK + - name: Extracting cache + run: | + tar --skip-old-files -xzvf retrodeck-cooker.tar.gz + rm -f retrodeck-cooker.tar.gz continue-on-error: true - name: Initializing enviornment @@ -133,14 +137,12 @@ jobs: - name: Bulding part 1 - Until melonds #if: steps.cache-cooker.outputs.cache-hit != 'true' - run: | - cd /home/runner/work/RetroDECK/RetroDECK - sudo flatpak-builder --build-only --stop-at=melonds --user --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + run: sudo flatpak-builder --build-only --stop-at=melonds --user --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Compressing cache run: | - touch /home/runner/work/RetroDECK/RetroDECK/retrodeck-cooker.tar.gz - tar --ignore-failed-read -cfz retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK .flatpak-builder retrodeck-flatpak-cooker + touch retrodeck-cooker.tar.gz + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -159,7 +161,6 @@ jobs: uses: actions/download-artifact@v2 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: retrodeck-cooker.tar.gz - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -175,13 +176,13 @@ jobs: - name: Bulding part 1 - Until the end #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | - cd /home/runner/work/RetroDECK/RetroDECK + cd $GITHUB_WORKSPACE sudo flatpak-builder --build-only --user --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Compressing cache run: | - touch /home/runner/work/RetroDECK/RetroDECK/retrodeck-cooker.tar.gz - tar --ignore-failed-read -cfz retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK .flatpak-builder retrodeck-flatpak-cooker + touch retrodeck-cooker.tar.gz + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -207,10 +208,11 @@ jobs: uses: actions/download-artifact@v2 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: retrodeck-cooker.tar.gz - - name: Exctracting cache - run: mkdir -p /home/runner/work/RetroDECK/RetroDECK && tar -xzvf --skip-old-files retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK + - name: Extracting cache + run: | + tar --skip-old-files -xzvf retrodeck-cooker.tar.gz + rm -f retrodeck-cooker.tar.gz - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -226,13 +228,13 @@ jobs: - name: Finishing build #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | - cd /home/runner/work/RetroDECK/RetroDECK + cd $GITHUB_WORKSPACE sudo flatpak-builder --finish-only --user --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Compressing cache run: | - touch /home/runner/work/RetroDECK/RetroDECK/retrodeck-cooker.tar.gz - tar --ignore-failed-read -cfz retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK .flatpak-builder retrodeck-flatpak-cooker + touch retrodeck-cooker.tar.gz + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -258,10 +260,11 @@ jobs: uses: actions/download-artifact@v2 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: retrodeck-cooker.tar.gz - - name: Exctracting cache - run: mkdir -p /home/runner/work/RetroDECK/RetroDECK && tar -xzvf --skip-old-files retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK + - name: Extracting cache + run: | + tar --skip-old-files -xzvf retrodeck-cooker.tar.gz + rm -f retrodeck-cooker.tar.gz - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' @@ -277,13 +280,13 @@ jobs: - name: Build bundle #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | - cd /home/runner/work/RetroDECK/RetroDECK + cd $GITHUB_WORKSPACE sudo flatpak build-bundle local RetroDECK.flatpak net.retrodeck.retrodeck - name: Compressing cache run: | - touch /home/runner/work/RetroDECK/RetroDECK/retrodeck-cooker.tar.gz - tar --ignore-failed-read -cfz retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK .flatpak-builder retrodeck-flatpak-cooker + touch retrodeck-cooker.tar.gz + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -307,10 +310,11 @@ jobs: uses: actions/download-artifact@v2 with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: retrodeck-cooker.tar.gz - - name: Exctracting cache - run: mkdir -p /home/runner/work/RetroDECK/RetroDECK && tar -xzvf --skip-old-files retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK + - name: Extracting cache + run: | + tar --skip-old-files -xzvf retrodeck-cooker.tar.gz + rm -f retrodeck-cooker.tar.gz - name: Get date for artifacts id: date @@ -342,8 +346,8 @@ jobs: - name: Compressing cache run: | - touch /home/runner/work/RetroDECK/RetroDECK/retrodeck-cooker.tar.gz - tar --ignore-failed-read -cfz retrodeck-cooker.tar.gz -C /home/runner/work/RetroDECK/RetroDECK .flatpak-builder retrodeck-flatpak-cooker + touch retrodeck-cooker.tar.gz + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker - name: Upload global cache uses: actions/upload-artifact@v3 From fed2a07a62fe47490120fdd036b51c0f2dbe7ca0 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Fri, 6 May 2022 12:12:38 +0900 Subject: [PATCH 084/170] Artifacts: finally fixed cooker.yml once and for all? --- .github/workflows/cooker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 122dbfeb..d9769155 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -51,8 +51,8 @@ jobs: # - name: Extracting cache # run: | - tar --skip-old-files -xzvf retrodeck-cooker.tar.gz - rm -f retrodeck-cooker.tar.gz + # tar --skip-old-files -xzvf retrodeck-cooker.tar.gz + # rm -f retrodeck-cooker.tar.gz # continue-on-error: true # - uses: actions/checkout@v3 From 577fd2d4084cc40a224ba89f1edb1ba5381247f2 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Fri, 6 May 2022 17:07:55 +0900 Subject: [PATCH 085/170] ARTIFACTS: whoops, Job4 was not extracting the cache --- .github/workflows/cooker.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index d9769155..d256a3e3 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -162,6 +162,12 @@ jobs: with: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} + - name: Extracting cache + run: | + tar --skip-old-files -xzvf retrodeck-cooker.tar.gz + rm -f retrodeck-cooker.tar.gz + continue-on-error: true + - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | From 7a6a8409e68b3485900780e0d82542592dff88c2 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Fri, 6 May 2022 17:10:28 +0900 Subject: [PATCH 086/170] ARTIFACTS: removed maybe unuseful cd commands --- .github/workflows/cooker.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index d256a3e3..b790299d 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -182,7 +182,7 @@ jobs: - name: Bulding part 1 - Until the end #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | - cd $GITHUB_WORKSPACE + #cd $GITHUB_WORKSPACE sudo flatpak-builder --build-only --user --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Compressing cache @@ -234,7 +234,7 @@ jobs: - name: Finishing build #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | - cd $GITHUB_WORKSPACE + #cd $GITHUB_WORKSPACE sudo flatpak-builder --finish-only --user --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Compressing cache @@ -286,7 +286,7 @@ jobs: - name: Build bundle #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | - cd $GITHUB_WORKSPACE + #cd $GITHUB_WORKSPACE sudo flatpak build-bundle local RetroDECK.flatpak net.retrodeck.retrodeck - name: Compressing cache From 1d8c9eff218683a20979528d78e81212a4547eb7 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Fri, 6 May 2022 21:49:15 +0900 Subject: [PATCH 087/170] ARTIFACTS: the force clean is needed --- .github/workflows/cooker.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index b790299d..7c7f4181 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -68,7 +68,7 @@ jobs: # sudo apt install flatpak flatpak-builder p7zip-full # sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo # sudo 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 - # sudo flatpak-builder --download-only --user --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + # sudo flatpak-builder --download-only --user --force-clean --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml # # - name: Generating build specific cache # # id: intenral-cache @@ -101,7 +101,7 @@ jobs: # sudo apt install flatpak flatpak-builder p7zip-full # sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo # sudo 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 - # sudo flatpak-builder --download-only --user --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + # sudo flatpak-builder --download-only --user --force-clean --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml Job3_-_Building_part_1: runs-on: ubuntu-latest @@ -133,11 +133,11 @@ jobs: sudo apt install flatpak flatpak-builder p7zip-full sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo 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 - sudo flatpak-builder --download-only --user --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + sudo flatpak-builder --download-only --user --force-clean --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Bulding part 1 - Until melonds #if: steps.cache-cooker.outputs.cache-hit != 'true' - run: sudo flatpak-builder --build-only --stop-at=melonds --user --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + run: sudo flatpak-builder --build-only --stop-at=melonds --user --force-clean --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Compressing cache run: | @@ -183,7 +183,7 @@ jobs: #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | #cd $GITHUB_WORKSPACE - sudo flatpak-builder --build-only --user --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + sudo flatpak-builder --build-only --user --force-clean --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Compressing cache run: | @@ -235,7 +235,7 @@ jobs: #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | #cd $GITHUB_WORKSPACE - sudo flatpak-builder --finish-only --user --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + sudo flatpak-builder --finish-only --user --force-clean --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Compressing cache run: | From d93818f027b4d0b5453e57673abe0a9b6a7dffcd Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Sat, 7 May 2022 08:55:06 +0900 Subject: [PATCH 088/170] Fixed appdata: screenshot tag --- 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 d9fe5815..3061ff1b 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -16,6 +16,7 @@ https://github.com/XargonWan/RetroDECK/blob/main/res/logo.png?raw=true + https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen02.png?raw=true From 15a6b3fa91cab096fabf08cbc641634ae4bde0b6 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Sat, 7 May 2022 15:00:14 +0900 Subject: [PATCH 089/170] Fixed appdata: p tag duplicate --- net.retrodeck.retrodeck.appdata.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 3061ff1b..3e8d53b3 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -30,14 +30,13 @@ -

+

RetroDECK brings an environment to catalog and play your retro games directly from SteamOS and it's tailored specifically for the Steam Deck.
It's inspired by embedded emulation systems like AmberELEC, EmuELEC, CoreELEC, Lakka, and Batocera. -

-

+
Powered by EmulationStation Desktop Edition, which uses RetroArch and other standalone emulators to allow you to import and play your favorite retro (and even not-so-retro) games in a tidy environment without flooding your Steam library.
No other software is needed as everything it's already included! -

+

GPL-3.0 CC0-1.0 From 73e4df0ee82aff7217357f2c0362cf23ee86e760 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Sat, 7 May 2022 18:18:38 +0900 Subject: [PATCH 090/170] APPDATA test: removed br tags --- net.retrodeck.retrodeck.appdata.xml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 3e8d53b3..ce77df9a 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -31,12 +31,11 @@

- RetroDECK brings an environment to catalog and play your retro games directly from SteamOS and it's tailored specifically for the Steam Deck.
- It's inspired by embedded emulation systems like AmberELEC, EmuELEC, CoreELEC, Lakka, and Batocera. -
- Powered by EmulationStation Desktop Edition, which uses RetroArch and other standalone emulators to allow you to import and play your favorite retro (and even not-so-retro) games in a tidy environment without flooding your Steam library.
- No other software is needed as everything it's already included! -

+ RetroDECK brings an environment to catalog and play your retro games directly from SteamOS and it's tailored specifically for the Steam Deck. + It's inspired by embedded emulation systems like AmberELEC, EmuELEC, CoreELEC, Lakka, and Batocera.

+

+ Powered by EmulationStation Desktop Edition, which uses RetroArch and other standalone emulators to allow you to import and play your favorite retro (and even not-so-retro) games in a tidy environment without flooding your Steam library. + No other software is needed as everything it's already included!

 GPL-3.0 CC0-1.0 From 0c87bf4a4cb731f8b28535381389692680515b32 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Sun, 8 May 2022 10:58:46 +0900 Subject: [PATCH 091/170] ARTIFACTS: added local repo to cache --- .github/workflows/cooker.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 7c7f4181..120ecd1f 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -68,7 +68,7 @@ jobs: # sudo apt install flatpak flatpak-builder p7zip-full # sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo # sudo 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 - # sudo flatpak-builder --download-only --user --force-clean --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + # sudo flatpak-builder --download-only --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml # # - name: Generating build specific cache # # id: intenral-cache @@ -101,7 +101,7 @@ jobs: # sudo apt install flatpak flatpak-builder p7zip-full # sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo # sudo 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 - # sudo flatpak-builder --download-only --user --force-clean --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + # sudo flatpak-builder --download-only --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml Job3_-_Building_part_1: runs-on: ubuntu-latest @@ -133,16 +133,16 @@ jobs: sudo apt install flatpak flatpak-builder p7zip-full sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo 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 - sudo flatpak-builder --download-only --user --force-clean --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + sudo flatpak-builder --download-only --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Bulding part 1 - Until melonds #if: steps.cache-cooker.outputs.cache-hit != 'true' - run: sudo flatpak-builder --build-only --stop-at=melonds --user --force-clean --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + run: sudo flatpak-builder --build-only --stop-at=melonds --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Compressing cache run: | touch retrodeck-cooker.tar.gz - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker local - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -183,12 +183,12 @@ jobs: #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | #cd $GITHUB_WORKSPACE - sudo flatpak-builder --build-only --user --force-clean --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + sudo flatpak-builder --build-only --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Compressing cache run: | touch retrodeck-cooker.tar.gz - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker local - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -235,12 +235,12 @@ jobs: #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | #cd $GITHUB_WORKSPACE - sudo flatpak-builder --finish-only --user --force-clean --repo=local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + sudo flatpak-builder --finish-only --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Compressing cache run: | touch retrodeck-cooker.tar.gz - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker local - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -292,7 +292,7 @@ jobs: - name: Compressing cache run: | touch retrodeck-cooker.tar.gz - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker local - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -353,7 +353,7 @@ jobs: - name: Compressing cache run: | touch retrodeck-cooker.tar.gz - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker local - name: Upload global cache uses: actions/upload-artifact@v3 From 2423463ba17dff322b39c98b281183bfc17527ed Mon Sep 17 00:00:00 2001 From: xargon Date: Mon, 9 May 2022 15:46:46 +0900 Subject: [PATCH 092/170] ARTIFACTS: removed local repo from cache, removed a job --- .github/workflows/cooker.yml | 94 ++++++++++++++++++------------------ 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 120ecd1f..e2b86ed5 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -142,7 +142,7 @@ jobs: - name: Compressing cache run: | touch retrodeck-cooker.tar.gz - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker local + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -150,55 +150,55 @@ jobs: name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} path: retrodeck-cooker.tar.gz - Job4_-_Building_part_2: - runs-on: ubuntu-latest - needs: [Job1_-_Prepearing_enviornment, Job3_-_Building_part_1] - steps: + # Job4_-_Building_part_2: + # runs-on: ubuntu-latest + # needs: [Job1_-_Prepearing_enviornment, Job3_-_Building_part_1] + # steps: - - uses: actions/checkout@v3 + # - uses: actions/checkout@v3 - - name: Download build specific cache - uses: actions/download-artifact@v2 - with: - name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} + # - name: Download build specific cache + # uses: actions/download-artifact@v2 + # with: + # name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - - name: Extracting cache - run: | - tar --skip-old-files -xzvf retrodeck-cooker.tar.gz - rm -f retrodeck-cooker.tar.gz - continue-on-error: true + # - name: Extracting cache + # run: | + # tar --skip-old-files -xzvf retrodeck-cooker.tar.gz + # rm -f retrodeck-cooker.tar.gz + # continue-on-error: true - - name: Initializing enviornment - #if: steps.cache-cooker.outputs.cache-hit != 'true' - run: | - git submodule init - git submodule update - sudo add-apt-repository ppa:alexlarsson/flatpak - sudo apt-get update - sudo apt install flatpak flatpak-builder p7zip-full - sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - sudo 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 + # - name: Initializing enviornment + # #if: steps.cache-cooker.outputs.cache-hit != 'true' + # run: | + # git submodule init + # git submodule update + # sudo add-apt-repository ppa:alexlarsson/flatpak + # sudo apt-get update + # sudo apt install flatpak flatpak-builder p7zip-full + # sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + # sudo 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 - - name: Bulding part 1 - Until the end - #if: steps.cache-cooker.outputs.cache-hit != 'true' - run: | - #cd $GITHUB_WORKSPACE - sudo flatpak-builder --build-only --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + # - name: Bulding part 1 - Until the end + # #if: steps.cache-cooker.outputs.cache-hit != 'true' + # run: | + # cd $GITHUB_WORKSPACE + # sudo flatpak-builder --build-only --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - - name: Compressing cache - run: | - touch retrodeck-cooker.tar.gz - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker local + # - name: Compressing cache + # run: | + # touch retrodeck-cooker.tar.gz + # tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker - - name: Upload build specific cache - uses: actions/upload-artifact@v3 - with: - name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: retrodeck-cooker.tar.gz + # - name: Upload build specific cache + # uses: actions/upload-artifact@v3 + # with: + # name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} + # path: retrodeck-cooker.tar.gz Job5_-_Finishing_build: runs-on: ubuntu-latest - needs: [Job1_-_Prepearing_enviornment, Job3_-_Building_part_1, Job4_-_Building_part_2] + needs: [Job1_-_Prepearing_enviornment, Job3_-_Building_part_1] steps: - uses: actions/checkout@v3 @@ -234,13 +234,13 @@ jobs: - name: Finishing build #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | - #cd $GITHUB_WORKSPACE - sudo flatpak-builder --finish-only --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml +#cd $GITHUB_WORKSPACE + sudo flatpak-builder --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Compressing cache run: | touch retrodeck-cooker.tar.gz - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker local + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -250,7 +250,7 @@ jobs: Job6_-_Build_bundle: runs-on: ubuntu-latest - needs: [Job1_-_Prepearing_enviornment, Job3_-_Building_part_1, Job4_-_Building_part_2, Job5_-_Finishing_build] + needs: [Job1_-_Prepearing_enviornment, Job3_-_Building_part_1, Job5_-_Finishing_build] steps: - uses: actions/checkout@v3 @@ -292,7 +292,7 @@ jobs: - name: Compressing cache run: | touch retrodeck-cooker.tar.gz - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker local + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -302,7 +302,7 @@ jobs: Job7_-_Publishing_flatpak: runs-on: ubuntu-latest - needs: [Job1_-_Prepearing_enviornment, Job3_-_Building_part_1, Job4_-_Building_part_2, Job5_-_Finishing_build, Job6_-_Build_bundle] + needs: [Job1_-_Prepearing_enviornment, Job3_-_Building_part_1, Job5_-_Finishing_build, Job6_-_Build_bundle] steps: # - name: cache-cooker @@ -353,7 +353,7 @@ jobs: - name: Compressing cache run: | touch retrodeck-cooker.tar.gz - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker local + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker - name: Upload global cache uses: actions/upload-artifact@v3 From 5fccd83c4dc135419496f2e75f027854de99e240 Mon Sep 17 00:00:00 2001 From: xargon Date: Mon, 9 May 2022 16:05:30 +0900 Subject: [PATCH 093/170] ARTIFACTS: comment alignement broke the yaml --- .github/workflows/cooker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index e2b86ed5..9a457e5b 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -234,7 +234,6 @@ jobs: - name: Finishing build #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | -#cd $GITHUB_WORKSPACE sudo flatpak-builder --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Compressing cache From f3d904d3ab5f291e0e0b67217a9cf5198fadc8a2 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Tue, 10 May 2022 18:04:01 +0900 Subject: [PATCH 094/170] ARTIFACTS: trying to --disable-download for the jobs except the first one --- .github/workflows/cooker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 9a457e5b..08a45271 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -137,7 +137,7 @@ jobs: - name: Bulding part 1 - Until melonds #if: steps.cache-cooker.outputs.cache-hit != 'true' - run: sudo flatpak-builder --build-only --stop-at=melonds --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + run: sudo flatpak-builder --build-only --disable-download --stop-at=melonds --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Compressing cache run: | @@ -234,7 +234,7 @@ jobs: - name: Finishing build #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | - sudo flatpak-builder --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + sudo flatpak-builder --user --force-clean --disable-download --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Compressing cache run: | From 1bfd3c0edb54a775c3804a6b2ff6987d2cf704f5 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Wed, 11 May 2022 10:34:18 +0900 Subject: [PATCH 095/170] ARTIFACTS: cleaned up old build dirs --- .github/workflows/cooker.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 08a45271..4dc25ebf 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -133,15 +133,15 @@ jobs: sudo apt install flatpak flatpak-builder p7zip-full sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo 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 - sudo flatpak-builder --download-only --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Bulding part 1 - Until melonds #if: steps.cache-cooker.outputs.cache-hit != 'true' - run: sudo flatpak-builder --build-only --disable-download --stop-at=melonds --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + run: sudo flatpak-builder --build-only --stop-at=melonds --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Compressing cache run: | touch retrodeck-cooker.tar.gz + rm -rf .flatpak-builder/build/*-{2,3,4,5,6} tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker - name: Upload build specific cache @@ -188,6 +188,7 @@ jobs: # - name: Compressing cache # run: | # touch retrodeck-cooker.tar.gz + rm -rf .flatpak-builder/build/*-{2,3,4,5,6} # tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker # - name: Upload build specific cache @@ -234,11 +235,12 @@ jobs: - name: Finishing build #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | - sudo flatpak-builder --user --force-clean --disable-download --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + sudo flatpak-builder --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Compressing cache run: | touch retrodeck-cooker.tar.gz + rm -rf .flatpak-builder/build/*-{2,3,4,5,6} tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker - name: Upload build specific cache @@ -291,6 +293,7 @@ jobs: - name: Compressing cache run: | touch retrodeck-cooker.tar.gz + rm -rf .flatpak-builder/build/*-{2,3,4,5,6} tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker - name: Upload build specific cache @@ -352,6 +355,7 @@ jobs: - name: Compressing cache run: | touch retrodeck-cooker.tar.gz + rm -rf .flatpak-builder/build/*-{2,3,4,5,6} tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker - name: Upload global cache From 698f2ef7dfe65a599f3242ba5ffb82097d3a54f7 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Wed, 11 May 2022 10:34:29 +0900 Subject: [PATCH 096/170] ARTIFACTS: removed broken symlinks --- .github/workflows/cooker.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 4dc25ebf..7ba092cb 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -142,6 +142,7 @@ jobs: run: | touch retrodeck-cooker.tar.gz rm -rf .flatpak-builder/build/*-{2,3,4,5,6} + find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker - name: Upload build specific cache @@ -189,6 +190,7 @@ jobs: # run: | # touch retrodeck-cooker.tar.gz rm -rf .flatpak-builder/build/*-{2,3,4,5,6} + find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks # tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker # - name: Upload build specific cache @@ -241,6 +243,7 @@ jobs: run: | touch retrodeck-cooker.tar.gz rm -rf .flatpak-builder/build/*-{2,3,4,5,6} + find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker - name: Upload build specific cache @@ -294,6 +297,7 @@ jobs: run: | touch retrodeck-cooker.tar.gz rm -rf .flatpak-builder/build/*-{2,3,4,5,6} + find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker - name: Upload build specific cache @@ -356,6 +360,7 @@ jobs: run: | touch retrodeck-cooker.tar.gz rm -rf .flatpak-builder/build/*-{2,3,4,5,6} + find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker - name: Upload global cache From 9a19d88d238f9c243d53de755596fcaf575ff5db Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Wed, 11 May 2022 10:37:57 +0900 Subject: [PATCH 097/170] ARTIFACTS: commented unuseful parts --- .github/workflows/cooker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 7ba092cb..35596da5 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -189,8 +189,8 @@ jobs: # - name: Compressing cache # run: | # touch retrodeck-cooker.tar.gz - rm -rf .flatpak-builder/build/*-{2,3,4,5,6} - find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks + # rm -rf .flatpak-builder/build/*-{2,3,4,5,6} + # find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks # tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker # - name: Upload build specific cache From 795f082c4219bf762d86fd97167c99c21c5d547c Mon Sep 17 00:00:00 2001 From: xargon Date: Wed, 11 May 2022 17:20:12 +0900 Subject: [PATCH 098/170] ARTIFACT: removing files while compressing to save space --- .github/workflows/cooker.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 35596da5..f50ee7ea 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -143,7 +143,7 @@ jobs: touch retrodeck-cooker.tar.gz rm -rf .flatpak-builder/build/*-{2,3,4,5,6} find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker + tar --ignore-failed-read --remove-files -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -191,7 +191,7 @@ jobs: # touch retrodeck-cooker.tar.gz # rm -rf .flatpak-builder/build/*-{2,3,4,5,6} # find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - # tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker + # tar --ignore-failed-read --remove-files -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker # - name: Upload build specific cache # uses: actions/upload-artifact@v3 @@ -244,7 +244,7 @@ jobs: touch retrodeck-cooker.tar.gz rm -rf .flatpak-builder/build/*-{2,3,4,5,6} find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker + tar --ignore-failed-read --remove-files -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -298,7 +298,7 @@ jobs: touch retrodeck-cooker.tar.gz rm -rf .flatpak-builder/build/*-{2,3,4,5,6} find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker + tar --ignore-failed-read --remove-files -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -361,7 +361,7 @@ jobs: touch retrodeck-cooker.tar.gz rm -rf .flatpak-builder/build/*-{2,3,4,5,6} find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker + tar --ignore-failed-read --remove-files -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker - name: Upload global cache uses: actions/upload-artifact@v3 From 35c6d7e0e976ffa38b27aa54bd2e683f807fbbed Mon Sep 17 00:00:00 2001 From: xargon Date: Wed, 11 May 2022 20:43:15 +0900 Subject: [PATCH 099/170] Added logfile --- retrodeck.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/retrodeck.sh b/retrodeck.sh index 5aa584fe..c6a00106 100755 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -2,6 +2,9 @@ # Steam Deck SD path: /run/media/mmcblk0p1 +# Create log +exec > ~/retrodeck/retrodeck.log 2>&1 + is_mounted() { mount | awk -v DIR="$1" '{if ($3 == DIR) { exit 0}} ENDFILE{exit -1}' } From be4a777ced5b68a189a87d3c57c5c2032537c0d5 Mon Sep 17 00:00:00 2001 From: xargon Date: Thu, 12 May 2022 11:35:42 +0900 Subject: [PATCH 100/170] ARTIFACTS: test - removing .flatpak-builder dir, plus removal of --remove-files --- .github/workflows/cooker.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index f50ee7ea..980c2f28 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -143,7 +143,7 @@ jobs: touch retrodeck-cooker.tar.gz rm -rf .flatpak-builder/build/*-{2,3,4,5,6} find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - tar --ignore-failed-read --remove-files -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -191,7 +191,7 @@ jobs: # touch retrodeck-cooker.tar.gz # rm -rf .flatpak-builder/build/*-{2,3,4,5,6} # find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - # tar --ignore-failed-read --remove-files -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker + # tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker # - name: Upload build specific cache # uses: actions/upload-artifact@v3 @@ -244,7 +244,7 @@ jobs: touch retrodeck-cooker.tar.gz rm -rf .flatpak-builder/build/*-{2,3,4,5,6} find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - tar --ignore-failed-read --remove-files -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -298,7 +298,7 @@ jobs: touch retrodeck-cooker.tar.gz rm -rf .flatpak-builder/build/*-{2,3,4,5,6} find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - tar --ignore-failed-read --remove-files -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -361,7 +361,7 @@ jobs: touch retrodeck-cooker.tar.gz rm -rf .flatpak-builder/build/*-{2,3,4,5,6} find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - tar --ignore-failed-read --remove-files -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker - name: Upload global cache uses: actions/upload-artifact@v3 From 8a910270f3a88c19e1a8516e70f9f95857fb055e Mon Sep 17 00:00:00 2001 From: Xargon Date: Fri, 13 May 2022 00:21:47 +0900 Subject: [PATCH 101/170] Job6 - Specified local repo location --- .github/workflows/cooker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 980c2f28..afd05f77 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -291,7 +291,7 @@ jobs: #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | #cd $GITHUB_WORKSPACE - sudo flatpak build-bundle local RetroDECK.flatpak net.retrodeck.retrodeck + sudo flatpak build-bundle $GITHUB_WORKSPACE/local RetroDECK.flatpak net.retrodeck.retrodeck - name: Compressing cache run: | From a8556b6abd4c73d2a3eb116c74a3874b8182f157 Mon Sep 17 00:00:00 2001 From: Xargon Date: Fri, 13 May 2022 09:42:36 +0900 Subject: [PATCH 102/170] ARTIFACTS: Building first part longer, reduced the number of Jobs --- .github/workflows/cooker.yml | 70 +++++------------------------------- 1 file changed, 9 insertions(+), 61 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index afd05f77..c7cecad3 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -134,9 +134,10 @@ jobs: sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo 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 - - name: Bulding part 1 - Until melonds + - name: Bulding part 1 - Until rpcs3 #if: steps.cache-cooker.outputs.cache-hit != 'true' - run: sudo flatpak-builder --build-only --stop-at=melonds --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + run: | + sudo flatpak-builder --build-only --stop-at=rpcs3 --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Compressing cache run: | @@ -199,62 +200,9 @@ jobs: # name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} # path: retrodeck-cooker.tar.gz - Job5_-_Finishing_build: - runs-on: ubuntu-latest - needs: [Job1_-_Prepearing_enviornment, Job3_-_Building_part_1] - steps: - - - uses: actions/checkout@v3 - - # - name: cache-cooker - # id: internal-cache - # uses: actions/cache@v2 - # with: - # retrodeck-cooker.tar.gz - # key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - - - name: Download build specific cache - uses: actions/download-artifact@v2 - with: - name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - - - name: Extracting cache - run: | - tar --skip-old-files -xzvf retrodeck-cooker.tar.gz - rm -f retrodeck-cooker.tar.gz - - - name: Initializing enviornment - #if: steps.cache-cooker.outputs.cache-hit != 'true' - run: | - git submodule init - git submodule update - sudo add-apt-repository ppa:alexlarsson/flatpak - sudo apt-get update - sudo apt install flatpak flatpak-builder p7zip-full - sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - sudo 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 - - - name: Finishing build - #if: steps.cache-cooker.outputs.cache-hit != 'true' - run: | - sudo flatpak-builder --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - - - name: Compressing cache - run: | - touch retrodeck-cooker.tar.gz - rm -rf .flatpak-builder/build/*-{2,3,4,5,6} - find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker - - - name: Upload build specific cache - uses: actions/upload-artifact@v3 - with: - name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: retrodeck-cooker.tar.gz - Job6_-_Build_bundle: runs-on: ubuntu-latest - needs: [Job1_-_Prepearing_enviornment, Job3_-_Building_part_1, Job5_-_Finishing_build] + needs: [Job1_-_Prepearing_enviornment, Job3_-_Building_part_1] steps: - uses: actions/checkout@v3 @@ -279,6 +227,7 @@ jobs: - name: Initializing enviornment #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | + git pull git submodule init git submodule update sudo add-apt-repository ppa:alexlarsson/flatpak @@ -287,18 +236,17 @@ jobs: sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo 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 - - name: Build bundle - #if: steps.cache-cooker.outputs.cache-hit != 'true' + - name: Creating Bundle run: | - #cd $GITHUB_WORKSPACE + sudo flatpak-builder --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml sudo flatpak build-bundle $GITHUB_WORKSPACE/local RetroDECK.flatpak net.retrodeck.retrodeck - - name: Compressing cache + - name: Compressing cache + RetroDECK.flatpak run: | touch retrodeck-cooker.tar.gz rm -rf .flatpak-builder/build/*-{2,3,4,5,6} find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker RetroDECK.flatpak - name: Upload build specific cache uses: actions/upload-artifact@v3 From 7f038d7c3ff2f625a3d81f49e8164644a9f8034c Mon Sep 17 00:00:00 2001 From: Xargon Date: Fri, 13 May 2022 09:43:49 +0900 Subject: [PATCH 103/170] ARTIFACTS: Removed Job dependencies --- .github/workflows/cooker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index c7cecad3..809dd68b 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -256,7 +256,7 @@ jobs: Job7_-_Publishing_flatpak: runs-on: ubuntu-latest - needs: [Job1_-_Prepearing_enviornment, Job3_-_Building_part_1, Job5_-_Finishing_build, Job6_-_Build_bundle] + needs: [Job1_-_Prepearing_enviornment, Job3_-_Building_part_1, Job6_-_Build_bundle] steps: # - name: cache-cooker From 93bdcd92ad07f6412c87859f87b79cf66efc20e3 Mon Sep 17 00:00:00 2001 From: Xargon Date: Fri, 13 May 2022 20:00:18 +0900 Subject: [PATCH 104/170] ARTIFACTS: almost there! Maybe? --- .github/workflows/cooker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 809dd68b..1ffdd639 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -310,6 +310,7 @@ jobs: rm -rf .flatpak-builder/build/*-{2,3,4,5,6} find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker + continue-on-error: true - name: Upload global cache uses: actions/upload-artifact@v3 From 12d4d363058942d1d4f3b9648bc05e0769e0e6ab Mon Sep 17 00:00:00 2001 From: Xargon Date: Sun, 15 May 2022 23:41:20 +0900 Subject: [PATCH 105/170] Updated ES-DE repo --- 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 6d7af349..97ac71c1 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -133,7 +133,7 @@ modules: - es-core sources: - type: git - url: https://gitlab.com/leonstyhre/emulationstation-de.git + url: https://gitlab.com/es-de/emulationstation-de branch: 3cb464c7adcea8d020cdff92803c64b7f72fb443 - type: shell commands: From 0920e1f7f029e2e03162c312aca4372ac24f0f36 Mon Sep 17 00:00:00 2001 From: Xargon Date: Mon, 16 May 2022 17:57:15 +0900 Subject: [PATCH 106/170] Cooker workflow: optimized --- .github/workflows/cooker.yml | 262 ++++++----------------------------- 1 file changed, 46 insertions(+), 216 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 1ffdd639..0f4e6564 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -1,10 +1,6 @@ -# Due to the changes to the build systems actually on the branch integrated, this script will fail on main until merged - name: cooker -# Controls when the workflow will run on: - # Triggers the workflow on push or pull request events but only for the main branch push: branches: - cooker* @@ -12,16 +8,14 @@ on: branches: - cooker* -# Allows you to run this workflow manually from the Actions tab workflow_dispatch: jobs: - Job1_-_Prepearing_enviornment: + Job1_-_Building_P1: runs-on: ubuntu-latest steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it+++++++++++++++++++++++++++++++++++ - name: Get date for artifacts id: date @@ -35,185 +29,58 @@ jobs: - name: Generating build ID run: echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" + - uses: actions/checkout@v3 + + - name: Download global cache + uses: actions/download-artifact@v2 + with: + name: global-cache + continue-on-error: true + + - name: Extracting cache + run: | + tar --skip-old-files -xzvf retrodeck-cooker.tar.gz + rm -f retrodeck-cooker.tar.gz + continue-on-error: true + + - name: Initializing enviornment + run: | + git pull + git submodule init + git submodule update + sudo add-apt-repository ppa:alexlarsson/flatpak + sudo apt-get update + sudo apt install flatpak flatpak-builder p7zip-full + sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + sudo 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 + + - name: Bulding part 1 - Until rpcs3 + run: | + sudo flatpak-builder --build-only --stop-at=rpcs3 --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + + - name: Compressing cache + run: | + touch retrodeck-cooker.tar.gz + rm -rf .flatpak-builder/build/*-{2,3,4,5,6} + find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker + + - name: Upload build specific cache + uses: actions/upload-artifact@v3 + with: + name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} + path: retrodeck-cooker.tar.gz + outputs: buildID: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" - # Job2_-_Downloading_Sources: - # runs-on: ubuntu-latest - # needs: [Job1_-_Prepearing_enviornment] - # steps: - - # - name: Download global cache - # uses: actions/download-artifact@v2 - # with: - # name: global-cache - # continue-on-error: true - - # - name: Extracting cache - # run: | - # tar --skip-old-files -xzvf retrodeck-cooker.tar.gz - # rm -f retrodeck-cooker.tar.gz - # continue-on-error: true - - # - uses: actions/checkout@v3 - # #if: steps.global-cache.outputs.cache-hit != 'true' - - # - name: Downloading sources - # run: | - # git pull - # git submodule init - # git submodule update - # sudo add-apt-repository ppa:alexlarsson/flatpak - # sudo apt-get update - # sudo apt install flatpak flatpak-builder p7zip-full - # sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - # sudo 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 - # sudo flatpak-builder --download-only --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - - # # - name: Generating build specific cache - # # id: intenral-cache - # # uses: actions/cache@v2 - # # with: - # # retrodeck-cooker.tar.gz - # # key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - - # - name: Compressing cache - # run: | - # touch $GITHUB_WORKSPACE/retrodeck-cooker.tar.gz - # tar --ignore-failed-read -cfz retrodeck-cooker.tar.gz -C $GITHUB_WORKSPACE .flatpak-builder retrodeck-flatpak-cooker - - # - name: Upload build specific cache - # uses: actions/upload-artifact@v3 - # with: - # name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - # path: retrodeck-cooker.tar.gz - - - # - name: Continuing with previous worklow cache - # if: steps.cache-cooker.outputs.cache-hit == 'true' - # run: | - # cd $GITHUB_WORKSPACE - # git pull - # git submodule init - # git submodule update - # sudo add-apt-repository ppa:alexlarsson/flatpak - # sudo apt-get update - # sudo apt install flatpak flatpak-builder p7zip-full - # sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - # sudo 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 - # sudo flatpak-builder --download-only --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - - Job3_-_Building_part_1: + Job2_-_Build_P2_and_publish: runs-on: ubuntu-latest - needs: [Job1_-_Prepearing_enviornment] + needs: [Job1_-_Building_P1] steps: - uses: actions/checkout@v3 - - name: Download global cache - uses: actions/download-artifact@v2 - with: - name: global-cache - continue-on-error: true - - - name: Extracting cache - run: | - tar --skip-old-files -xzvf retrodeck-cooker.tar.gz - rm -f retrodeck-cooker.tar.gz - continue-on-error: true - - - name: Initializing enviornment - #if: steps.cache-cooker.outputs.cache-hit != 'true' - run: | - git pull - git submodule init - git submodule update - sudo add-apt-repository ppa:alexlarsson/flatpak - sudo apt-get update - sudo apt install flatpak flatpak-builder p7zip-full - sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - sudo 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 - - - name: Bulding part 1 - Until rpcs3 - #if: steps.cache-cooker.outputs.cache-hit != 'true' - run: | - sudo flatpak-builder --build-only --stop-at=rpcs3 --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - - - name: Compressing cache - run: | - touch retrodeck-cooker.tar.gz - rm -rf .flatpak-builder/build/*-{2,3,4,5,6} - find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker - - - name: Upload build specific cache - uses: actions/upload-artifact@v3 - with: - name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: retrodeck-cooker.tar.gz - - # Job4_-_Building_part_2: - # runs-on: ubuntu-latest - # needs: [Job1_-_Prepearing_enviornment, Job3_-_Building_part_1] - # steps: - - # - uses: actions/checkout@v3 - - # - name: Download build specific cache - # uses: actions/download-artifact@v2 - # with: - # name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - - # - name: Extracting cache - # run: | - # tar --skip-old-files -xzvf retrodeck-cooker.tar.gz - # rm -f retrodeck-cooker.tar.gz - # continue-on-error: true - - # - name: Initializing enviornment - # #if: steps.cache-cooker.outputs.cache-hit != 'true' - # run: | - # git submodule init - # git submodule update - # sudo add-apt-repository ppa:alexlarsson/flatpak - # sudo apt-get update - # sudo apt install flatpak flatpak-builder p7zip-full - # sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - # sudo 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 - - # - name: Bulding part 1 - Until the end - # #if: steps.cache-cooker.outputs.cache-hit != 'true' - # run: | - # cd $GITHUB_WORKSPACE - # sudo flatpak-builder --build-only --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - - # - name: Compressing cache - # run: | - # touch retrodeck-cooker.tar.gz - # rm -rf .flatpak-builder/build/*-{2,3,4,5,6} - # find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - # tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker - - # - name: Upload build specific cache - # uses: actions/upload-artifact@v3 - # with: - # name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - # path: retrodeck-cooker.tar.gz - - Job6_-_Build_bundle: - runs-on: ubuntu-latest - needs: [Job1_-_Prepearing_enviornment, Job3_-_Building_part_1] - steps: - - - uses: actions/checkout@v3 - - # - name: cache-cooker - # id: internal-cache - # uses: actions/cache@v2 - # with: - # retrodeck-cooker.tar.gz - # key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - - name: Download build specific cache uses: actions/download-artifact@v2 with: @@ -225,7 +92,6 @@ jobs: rm -f retrodeck-cooker.tar.gz - name: Initializing enviornment - #if: steps.cache-cooker.outputs.cache-hit != 'true' run: | git pull git submodule init @@ -241,41 +107,6 @@ jobs: sudo flatpak-builder --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml sudo flatpak build-bundle $GITHUB_WORKSPACE/local RetroDECK.flatpak net.retrodeck.retrodeck - - name: Compressing cache + RetroDECK.flatpak - run: | - touch retrodeck-cooker.tar.gz - rm -rf .flatpak-builder/build/*-{2,3,4,5,6} - find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker RetroDECK.flatpak - - - name: Upload build specific cache - uses: actions/upload-artifact@v3 - with: - name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - path: retrodeck-cooker.tar.gz - - Job7_-_Publishing_flatpak: - runs-on: ubuntu-latest - needs: [Job1_-_Prepearing_enviornment, Job3_-_Building_part_1, Job6_-_Build_bundle] - steps: - - # - name: cache-cooker - # id: internal-cache - # uses: actions/cache@v2 - # with: - # retrodeck-cooker.tar.gz - # key: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - - - name: Download build specific cache - uses: actions/download-artifact@v2 - with: - name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} - - - name: Extracting cache - run: | - tar --skip-old-files -xzvf retrodeck-cooker.tar.gz - rm -f retrodeck-cooker.tar.gz - - name: Get date for artifacts id: date run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M')" @@ -286,7 +117,6 @@ jobs: id: extract_branch - name: Publish the flatpak in a new cooker release - #if: steps.cache-cooker.outputs.cache-hit != 'true' uses: ncipollo/release-action@v1 with: tag: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" @@ -304,7 +134,7 @@ jobs: token: ${{ secrets.TRIGGER_BUILD_TOKEN }} repo: RetroDECK-cooker - - name: Compressing cache + - name: Compressing global cache run: | touch retrodeck-cooker.tar.gz rm -rf .flatpak-builder/build/*-{2,3,4,5,6} From 845a853f0667ddf9c05cb007b2a215897331734d Mon Sep 17 00:00:00 2001 From: Xargon Date: Mon, 16 May 2022 22:17:29 +0900 Subject: [PATCH 107/170] ES-DE: updated es_systems.xml --- es_systems.xml | 122 ++++++++++++++++++++++++++++--------------------- 1 file changed, 69 insertions(+), 53 deletions(-) diff --git a/es_systems.xml b/es_systems.xml index b6238899..c3a50384 100644 --- a/es_systems.xml +++ b/es_systems.xml @@ -36,6 +36,7 @@ %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 %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae2021_libretro.so %ROM% amiga amiga @@ -45,6 +46,7 @@ %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 @@ -54,6 +56,7 @@ %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 %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae2021_libretro.so %ROM% amiga amiga1200 @@ -63,6 +66,7 @@ %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 %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae2021_libretro.so %ROM% amigacd32 amigacd32 @@ -109,22 +113,23 @@ %ROMPATH%/arcade .cmd .CMD .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2000_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2003_plus_libretro.so %ROM% %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_MAME% %ROM% arcade arcade - astrocade + astrocde Bally Astrocade - %ROMPATH%/astrocade + %ROMPATH%/astrocde .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - astrocade + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% + %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %ROMPATH%/astrocde astrocde -cart %BASENAME% + astrocde astrocade @@ -161,7 +166,8 @@ Atari 800 %ROMPATH%/atari800 .xfd .XFD .atr .ATR .atx .ATX .cdm .CDM .cas .CAS .bin .BIN .a52 .A52 .xex .XEX .rom .ROM .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.so %ROM% + %EMULATOR_ATARI800% %ROM% atari800 atari800 @@ -256,8 +262,9 @@ cdimono1 Philips CD-i %ROMPATH%/cdimono1 - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% + .chd .CHD .cue .CUE .iso .ISO + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/same_cdi_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/cdi2015_libretro.so %ROM% cdimono1 cdimono1 @@ -326,10 +333,14 @@ dos - DOS + DOS (PC) %ROMPATH%/dos - .dosz .DOSZ - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_pure_libretro.so %ROM% + .bat .BAT .com .COM .conf .CONF .cue .CUE .dosz .DOSZ .exe .EXE .iso .ISO .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_pure_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_svn_libretro.so %ROM% + %EMULATOR_DOSBOX-X% %ROM% + %EMULATOR_DOSBOX-STAGING% %ROM% dos dos @@ -358,9 +369,9 @@ Nintendo Family Computer %ROMPATH%/famicom .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_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quicknes_libretro.so %ROM% famicom famicom @@ -392,9 +403,9 @@ Nintendo Famicom Disk System %ROMPATH%/fds .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_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM% fds fds @@ -412,10 +423,10 @@ Sega Game Gear %ROMPATH%/gamegear .68k .68K .bin .BIN .bms .BMS .chd .CHD .col .COL .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx .MDX .rom .ROM .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/smsplus_libretro.so %ROM% %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%/gearsystem_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/smsplus_libretro.so %ROM% gamegear gamegear @@ -424,8 +435,8 @@ Nintendo Game Boy %ROMPATH%/gb .bs .BS .cgb .CGB .dmg .DMG .gb .GB .gbc .GBC .sgb .SGB .sfc .SFC .smc .SMC .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/sameboy_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gambatte_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/sameboy_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearboy_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tgbdual_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% @@ -456,8 +467,8 @@ Nintendo Game Boy Color %ROMPATH%/gbc .bs .BS .cgb .CGB .dmg .DMG .gb .GB .gbc .GBC .sgb .SGB .sfc .SFC .smc .SMC .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/sameboy_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gambatte_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/sameboy_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearboy_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tgbdual_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% @@ -489,6 +500,7 @@ %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 @@ -519,15 +531,6 @@ android j2me - - lutris - Lutris Open Gaming Platform - %ROMPATH%/lutris - .sh - bash %ROM% - pc - lutris - lutro Lutro Game Engine @@ -542,13 +545,13 @@ Multiple Arcade Machine Emulator %ROMPATH%/mame .cmd .CMD .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% + %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% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2010_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_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_MAME% %ROM% arcade mame @@ -614,6 +617,7 @@ %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 @@ -720,7 +724,7 @@ %ROMPATH%/naomi .chd .CHD .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM% - %EMULATOR_FLYCAST% %ROM% + %EMULATOR_FLYCAST% %ROM% naomi naomi @@ -778,9 +782,9 @@ Nintendo Entertainment System %ROMPATH%/nes .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_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quicknes_libretro.so %ROM% nes nes @@ -819,7 +823,7 @@ OpenBOR Game Engine %ROMPATH%/openbor .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% + %STARTDIR%=%GAMEDIR% %EMULATOR_OS-SHELL% -c "%ROM%" openbor openbor @@ -898,6 +902,15 @@ pokemini pokemini + + ports + Ports + %ROMPATH%/ports + .sh + %EMULATOR_OS-SHELL% %ROM% + pc + ports + ps2 Sony PlayStation 2 @@ -905,6 +918,7 @@ .bin .BIN .chd .CHD .cso .CSO .elf .ELF .iso .ISO .isz .ISZ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM% %EMULATOR_PCSX2% --nogui %ROM% + %EMULATOR_PLAY!% --disc %ROM% ps2 ps2 @@ -932,7 +946,7 @@ %ROMPATH%/psp .elf .ELF .iso .ISO .cso .CSO .prx .PRX .pbp .PBP .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/ppsspp_libretro.so %ROM% - %EMULATOR_PPSSPP% --escape-exit %ROM% + %EMULATOR_PPSSPP% %ROM% psp psp @@ -953,9 +967,8 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_psx_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_psx_hw_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx_rearmed_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/swanstation_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/duckstation_libretro.so %ROM% - %EMULATOR_DUCKSTATION% -batch %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/swanstation_libretro.so %ROM% + %EMULATOR_DUCKSTATION% -batch %ROM% psx psx @@ -976,7 +989,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% satellaview @@ -1060,6 +1073,7 @@ .bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC .smc .SMC .st .ST .swc .SWC .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM% + %EMULATOR_SNES9X% %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM% @@ -1068,7 +1082,7 @@ snes sfc - + sg-1000 Sega SG-1000 %ROMPATH%/sg-1000 @@ -1087,8 +1101,9 @@ .bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC .smc .SMC .st .ST .swc .SWC .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM% + %EMULATOR_SNES9X% %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supafaust_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% @@ -1102,8 +1117,9 @@ .bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC .smc .SMC .st .ST .swc .SWC .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM% + %EMULATOR_SNES9X% %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supafaust_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% @@ -1145,7 +1161,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM% sufami sufami @@ -1401,14 +1417,14 @@ pico-8 - Pico-8 - Lexaloffle - 2015 - console - %ROMPATH%/pico-8 - .p8 .png - %EMULATOR_PICO-8% -desktop ~/retrodeck/screenshots -windowed 0 -root_path %ROMPATH%/pico-8 -run %ROM% - pico-8 - pico-8 + Pico-8 + Lexaloffle + 2015 + console + %ROMPATH%/pico-8 + .p8 .png + %EMULATOR_PICO-8% -desktop ~/retrodeck/screenshots -windowed 0 -root_path %ROMPATH%/pico-8 -run %ROM% + pico-8 + pico-8 - \ No newline at end of file + From 730003e3b29f4a7bdb34de021878513ea82de82a Mon Sep 17 00:00:00 2001 From: Xargon Date: Mon, 16 May 2022 22:26:10 +0900 Subject: [PATCH 108/170] ES-DE: updated es_find_rules.xml --- es_find_rules.xml | 100 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 69 insertions(+), 31 deletions(-) diff --git a/es_find_rules.xml b/es_find_rules.xml index d0ed22ca..35a091a4 100644 --- a/es_find_rules.xml +++ b/es_find_rules.xml @@ -2,6 +2,13 @@ + + + + bash + sh + + retroarch @@ -10,7 +17,7 @@ /var/lib/flatpak/exports/bin/org.libretro.RetroArch - ~/.local/share/flatpak/exports/bin/org.libretro.RetroArch + ~/.local/share/flatpak/exports/bin/org.libretro.RetroArch ~/Applications/RetroArch-Linux-x86_64.AppImage ~/.local/bin/RetroArch-Linux-x86_64.AppImage ~/bin/RetroArch-Linux-x86_64.AppImage @@ -47,7 +54,7 @@ /var/lib/flatpak/exports/bin/org.citra_emu.citra - ~/.local/share/flatpak/exports/bin/org.citra_emu.citra + ~/.local/share/flatpak/exports/bin/org.citra_emu.citra @@ -58,10 +65,10 @@ /var/lib/flatpak/exports/bin/org.DolphinEmu.dolphin-emu - ~/.local/share/flatpak/exports/bin/org.DolphinEmu.dolphin-emu - ~/Applications/Dolphin_Emulator*.AppImage - ~/.local/bin/Dolphin_Emulator*.AppImage - ~/bin/Dolphin_Emulator*.AppImage + ~/.local/share/flatpak/exports/bin/org.DolphinEmu.dolphin-emu + ~/Applications/Dolphin_Emulator.AppImage + ~/.local/bin/Dolphin_Emulator.AppImage + ~/bin/Dolphin_Emulator.AppImage @@ -75,6 +82,17 @@ ~/.local/share/flatpak/exports/bin/io.github.dosbox-staging + + + + dosbox-x + com.dosbox_x.DOSBox-X + + + /var/lib/flatpak/exports/bin/com.dosbox_x.DOSBox-X + ~/.local/share/flatpak/exports/bin/com.dosbox_x.DOSBox-X + + @@ -103,7 +121,7 @@ /var/lib/flatpak/exports/bin/org.flycast.Flycast ~/.local/share/flatpak/exports/bin/org.flycast.Flycast - + @@ -113,7 +131,7 @@ /var/lib/flatpak/exports/bin/net.fsuae.FS-UAE - ~/.local/share/flatpak/exports/bin/net.fsuae.FS-UAE + ~/.local/share/flatpak/exports/bin/net.fsuae.FS-UAE @@ -133,7 +151,7 @@ /var/lib/flatpak/exports/bin/net.kuribo64.melonDS ~/.local/share/flatpak/exports/bin/net.kuribo64.melonDS - + @@ -142,10 +160,10 @@ /var/lib/flatpak/exports/bin/io.mgba.mGBA - ~/.local/share/flatpak/exports/bin/io.mgba.mGBA - ~/Applications/mGBA*.AppImage - ~/.local/bin/mGBA*.AppImage - ~/bin/mGBA*.AppImage + ~/.local/share/flatpak/exports/bin/io.mgba.mGBA + ~/Applications/mGBA.AppImage + ~/.local/bin/mGBA.AppImage + ~/bin/mGBA.AppImage @@ -156,7 +174,7 @@ /var/lib/flatpak/exports/bin/io.github.m64p.m64p - ~/.local/share/flatpak/exports/bin/io.github.m64p.m64p + ~/.local/share/flatpak/exports/bin/io.github.m64p.m64p @@ -168,7 +186,17 @@ /var/lib/flatpak/exports/bin/net.pcsx2.PCSX2 - ~/.local/share/flatpak/exports/bin/net.pcsx2.PCSX2 + ~/.local/share/flatpak/exports/bin/net.pcsx2.PCSX2 + + + + + + /var/lib/flatpak/exports/bin/org.purei.Play + ~/.local/share/flatpak/exports/bin/org.purei.Play + ~/Applications/Play!.AppImage + ~/.local/bin/Play!.AppImage + ~/bin/Play!.AppImage @@ -179,7 +207,7 @@ /var/lib/flatpak/exports/bin/org.ppsspp.PPSSPP - ~/.local/share/flatpak/exports/bin/org.ppsspp.PPSSPP + ~/.local/share/flatpak/exports/bin/org.ppsspp.PPSSPP @@ -203,7 +231,7 @@ ~/.local/bin/redream ~/bin/redream - + @@ -214,10 +242,20 @@ /var/lib/flatpak/exports/bin/net.rpcs3.RPCS3 - ~/.local/share/flatpak/exports/bin/net.rpcs3.RPCS3 - ~/Applications/rpcs3*.AppImage - ~/.local/bin/rpcs3*.AppImage - ~/bin/rpcs3*.AppImage + ~/.local/share/flatpak/exports/bin/net.rpcs3.RPCS3 + ~/Applications/rpcs3.AppImage + ~/.local/bin/rpcs3.AppImage + ~/bin/rpcs3.AppImage + + + + + + snes9x + + + /var/lib/flatpak/exports/bin/com.snes9x.Snes9x + ~/.local/share/flatpak/exports/bin/com.snes9x.Snes9x @@ -233,7 +271,7 @@ ~/.local/bin/publish/Ryujinx ~/bin/publish/Ryujinx - + @@ -249,9 +287,9 @@ /var/lib/flatpak/exports/bin/app.xemu.xemu ~/.local/share/flatpak/exports/bin/app.xemu.xemu - ~/Applications/Xemu*.AppImage - ~/.local/bin/Xemu*.AppImage - ~/bin/Xemu*.AppImage + ~/Applications/Xemu.AppImage + ~/.local/bin/Xemu.AppImage + ~/bin/Xemu.AppImage @@ -264,17 +302,17 @@ /var/lib/flatpak/exports/bin/org.yuzu_emu.yuzu ~/.local/share/flatpak/exports/bin/org.yuzu_emu.yuzu - ~/Applications/yuzu*.AppImage - ~/.local/bin/yuzu*.AppImage - ~/bin/yuzu*.AppImage + ~/Applications/yuzu.AppImage + ~/.local/bin/yuzu.AppImage + ~/bin/yuzu.AppImage - pico8 + pico8 - ~/retrodeck/bios/pico-8/pico8 + ~/retrodeck/bios/pico-8/pico8 - \ No newline at end of file + From 05bee15e7b2a6d38e50e255417154cc33c513980 Mon Sep 17 00:00:00 2001 From: Xargon Date: Mon, 16 May 2022 22:29:24 +0900 Subject: [PATCH 109/170] ES-DE: es_systems.xml migrated OpenBOR to .AppImage --- es_systems.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es_systems.xml b/es_systems.xml index c3a50384..8f60c7d1 100644 --- a/es_systems.xml +++ b/es_systems.xml @@ -822,7 +822,7 @@ openbor OpenBOR Game Engine %ROMPATH%/openbor - .7z .7Z .zip .ZIP + .AppImage %STARTDIR%=%GAMEDIR% %EMULATOR_OS-SHELL% -c "%ROM%" openbor openbor From 1327820ebfeacf78cacd07edee610e2416ffdd33 Mon Sep 17 00:00:00 2001 From: Xargon Date: Mon, 16 May 2022 22:30:35 +0900 Subject: [PATCH 110/170] Updated ES-DE to stable-1.2.4 --- 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 97ac71c1..b74cd790 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -134,7 +134,7 @@ modules: sources: - type: git url: https://gitlab.com/es-de/emulationstation-de - branch: 3cb464c7adcea8d020cdff92803c64b7f72fb443 + branch: d89cedd25f1bbb9a38c1f66bca18b74d5332cad1 - type: shell commands: - sed -i 's/QUIT EMULATIONSTATION/QUIT RETRODECK/g' es-app/src/guis/GuiMenu.cpp From af53f954bd1032cc7105ab36faf1a680fd608072 Mon Sep 17 00:00:00 2001 From: Xargon Date: Mon, 16 May 2022 22:55:09 +0900 Subject: [PATCH 111/170] Moved themes folder in ~/retrodeck/.themes --- retrodeck.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/retrodeck.sh b/retrodeck.sh index c6a00106..e01d3608 100755 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -50,9 +50,11 @@ then kdialog --title "RetroDECK" --msgbox "RetroDECK will now install the needed files, please wait one minute, another message will notify when the process will be finished.\n\nPress OK to continue." + # Initializing ROMs folder - Original in ~/retrodeck (or SD Card) mv -f /var/config/emulationstation/ROMs /var/config/emulationstation/ROMs.bak ln -s $roms_folder /var/config/emulationstation/ROMs mv -f /var/config/emulationstation/ROMs.bak/* $roms_folder/ + rm -rf /var/config/emulationstation/ROMs.bak # XMLSTARLET HERE cp /app/retrodeck/es_settings.xml /var/config/emulationstation/.emulationstation/es_settings.xml @@ -66,12 +68,18 @@ then cp -r /app/retrodeck/tools/* /var/config/retrodeck/tools/ mkdir -p /var/config/emulationstation/.emulationstation/custom_systems/tools/ cp /app/retrodeck/tools-gamelist.xml /var/config/retrodeck/tools/gamelist.xml - # ES-DE scraped folder + # ES-DE scraped folder - Original in ~/retrodeck mv -f /var/config/emulationstation/.emulationstation/downloaded_media /var/config/emulationstation/.emulationstation/downloaded_media.old mkdir ~/retrodeck/.downloaded_media ln -s ~/retrodeck/.downloaded_media /var/config/emulationstation/.emulationstation/downloaded_media mv -f /var/config/emulationstation/.emulationstation/downloaded_media.old/* ~/retrodeck/.downloaded_media rm -rf /var/config/emulationstation/.emulationstation/downloaded_media.old + # ES-DE themes folder - Original in ~/retrodeck + mv -f /var/config/emulationstation/.emulationstation/themes /var/config/emulationstation/.emulationstation/themes.old + mkdir ~/retrodeck/.themes + ln -s ~/retrodeck/.themes /var/config/emulationstation/.emulationstation/themes + mv -f /var/config/emulationstation/.emulationstation/themes.old/* ~/retrodeck/.themes + rm -rf /var/config/emulationstation/.emulationstation/themes.old # Initializing emulators configs emuconfigs=/app/retrodeck/emu-configs/ From 92e1bf13f7c05dc002b0257df20a6dba5aec966a Mon Sep 17 00:00:00 2001 From: Xargon Date: Mon, 16 May 2022 23:03:15 +0900 Subject: [PATCH 112/170] ArtBook - Bump to update n3ds theme --- 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 b74cd790..2b004530 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -150,7 +150,7 @@ modules: sources: - type: git url: https://github.com/anthonycaccese/art-book-next-de.git - commit: 4452f8356819d3cd079549b113fb15edb919a0df + commit: c3563ab31c628774904ca51776c114c537ac0c33 # External manifests start From 2bf77c6dd3b57dcd8be67c7e18b9def70ac57ea6 Mon Sep 17 00:00:00 2001 From: Xargon Date: Mon, 16 May 2022 23:09:54 +0900 Subject: [PATCH 113/170] CITRA (Standalone) - Fullscreen defaulted --- emu-configs/citra-qt-config.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emu-configs/citra-qt-config.ini b/emu-configs/citra-qt-config.ini index da18f038..8de23ae3 100644 --- a/emu-configs/citra-qt-config.ini +++ b/emu-configs/citra-qt-config.ini @@ -448,7 +448,7 @@ enable_discord_presence=true enable_discord_presence\default=true firstStart=false firstStart\default=false -fullscreen=false +fullscreen=true fullscreen\default=true hideInactiveMouse=false hideInactiveMouse\default=true From 214c53eed38654f9c7eb2bea47808ef25ec6cea7 Mon Sep 17 00:00:00 2001 From: Xargon Date: Mon, 16 May 2022 23:14:20 +0900 Subject: [PATCH 114/170] DOLPHIN: standalone has issues, put libretro as default for now --- es_systems.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es_systems.xml b/es_systems.xml index 8f60c7d1..41f00e31 100644 --- a/es_systems.xml +++ b/es_systems.xml @@ -485,8 +485,8 @@ 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% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM% + %EMULATOR_DOLPHIN% -b -e %ROM% %EMULATOR_PRIMEHACK% -b -e %ROM% gc gc @@ -1310,8 +1310,8 @@ 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% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM% + %EMULATOR_DOLPHIN% -b -e %ROM% %EMULATOR_PRIMEHACK% -b -e %ROM% wii wii From 113b8316bf5e63c1d6939880ee5f4fa12473f98c Mon Sep 17 00:00:00 2001 From: Xargon Date: Mon, 16 May 2022 15:32:00 +0100 Subject: [PATCH 115/170] NSW: fixed registered folder --- retrodeck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retrodeck.sh b/retrodeck.sh index e01d3608..672fc885 100755 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -97,7 +97,7 @@ then ln -s ~/retrodeck/bios/switch/keys /var/data/yuzu/keys mkdir -p /var/data/yuzu/nand/system/Contents/registered/ rm ~/retrodeck/bios/switch/registered - ln -s data/yuzu/nand/system/Contents/registered/ ~/retrodeck/bios/switch/registered + ln -s /var/data/yuzu/nand/system/Contents/registered/ ~/retrodeck/bios/switch/registered cp $emuconfigs/yuzu-qt-config.ini /var/config/yuzu/qt-config.ini # Dolphin From 190d5db67f76faed251c7a80be738834310cadc5 Mon Sep 17 00:00:00 2001 From: Xargon Date: Tue, 17 May 2022 00:30:11 +0900 Subject: [PATCH 116/170] LOG: improved --- retrodeck.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/retrodeck.sh b/retrodeck.sh index 672fc885..f5c44635 100755 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -3,7 +3,11 @@ # Steam Deck SD path: /run/media/mmcblk0p1 # Create log -exec > ~/retrodeck/retrodeck.log 2>&1 +#exec > ~/retrodeck/.retrodeck.log 2>&1 +exec 3>&1 4>&2 +trap 'exec 2>&4 1>&3' 0 1 2 3 +echo "$(date) : part 1 - start" >&3 +exec 1>~/retrodeck/.retrodeck.log 2>&1 is_mounted() { mount | awk -v DIR="$1" '{if ($3 == DIR) { exit 0}} ENDFILE{exit -1}' @@ -92,12 +96,16 @@ then cp $emuconfigs/retroarch.cfg /var/config/retroarch/ # Yuzu + find ~/retrodeck/bios/switch -xtype l -exec rm {} \; # removing dead symlinks + # initializing the keys folder mkdir -p ~/retrodeck/bios/switch/keys rm -rf /var/data/yuzu/keys ln -s ~/retrodeck/bios/switch/keys /var/data/yuzu/keys - mkdir -p /var/data/yuzu/nand/system/Contents/registered/ - rm ~/retrodeck/bios/switch/registered - ln -s /var/data/yuzu/nand/system/Contents/registered/ ~/retrodeck/bios/switch/registered + # nitializing the firmware folder + mkdir -p ~/retrodeck/bios/switch/registered + rm -rf /var/data/yuzu/nand/system/Contents/registered/ + ln -s ~/retrodeck/bios/switch/registered /var/data/yuzu/nand/system/Contents/registered/ + # configuring Yuzu cp $emuconfigs/yuzu-qt-config.ini /var/config/yuzu/qt-config.ini # Dolphin From 59dae86522c60cbdd1abc8cd81cd8a6c4c881fbf Mon Sep 17 00:00:00 2001 From: Xargon Date: Tue, 17 May 2022 00:30:36 +0900 Subject: [PATCH 117/170] Cooke workflow: fixed --- .github/workflows/cooker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 0f4e6564..dd46c0f6 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -68,7 +68,7 @@ jobs: - name: Upload build specific cache uses: actions/upload-artifact@v3 with: - name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} + name: ${{ needs.Job1_-_Building_P1.outputs.buildID }} path: retrodeck-cooker.tar.gz outputs: @@ -84,7 +84,7 @@ jobs: - name: Download build specific cache uses: actions/download-artifact@v2 with: - name: ${{ needs.Job1_-_Prepearing_enviornment.outputs.buildID }} + name: ${{ needs.Job1_-_Building_P1.outputs.buildID }} - name: Extracting cache run: | From fa08ee52b6871ad98ea38fd1918ffd874751a749 Mon Sep 17 00:00:00 2001 From: Xargon Date: Tue, 17 May 2022 00:32:57 +0900 Subject: [PATCH 118/170] Logs: little tweak --- retrodeck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retrodeck.sh b/retrodeck.sh index f5c44635..6f2b9c6a 100755 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -6,7 +6,7 @@ #exec > ~/retrodeck/.retrodeck.log 2>&1 exec 3>&1 4>&2 trap 'exec 2>&4 1>&3' 0 1 2 3 -echo "$(date) : part 1 - start" >&3 +echo "$(date) : RetroDECK started" >&3 exec 1>~/retrodeck/.retrodeck.log 2>&1 is_mounted() { From f01633de15e9391c420c2adb7585f646a8cf6cbd Mon Sep 17 00:00:00 2001 From: Xargon Date: Tue, 17 May 2022 00:33:58 +0900 Subject: [PATCH 119/170] Fixed a comment typo --- retrodeck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retrodeck.sh b/retrodeck.sh index 6f2b9c6a..e10ea574 100755 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -101,7 +101,7 @@ then mkdir -p ~/retrodeck/bios/switch/keys rm -rf /var/data/yuzu/keys ln -s ~/retrodeck/bios/switch/keys /var/data/yuzu/keys - # nitializing the firmware folder + # initializing the firmware folder mkdir -p ~/retrodeck/bios/switch/registered rm -rf /var/data/yuzu/nand/system/Contents/registered/ ln -s ~/retrodeck/bios/switch/registered /var/data/yuzu/nand/system/Contents/registered/ From 88b200e873902f44c3390d515070bd88ebdf2a33 Mon Sep 17 00:00:00 2001 From: Xargon Date: Tue, 17 May 2022 09:21:50 +0900 Subject: [PATCH 120/170] Fixed workflow, minor comments edits in wrapper --- .github/workflows/cooker.yml | 6 +++--- retrodeck.sh | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index dd46c0f6..3ea06ebf 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -28,6 +28,9 @@ jobs: - name: Generating build ID run: echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" + + outputs: + buildID: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" - uses: actions/checkout@v3 @@ -71,9 +74,6 @@ jobs: name: ${{ needs.Job1_-_Building_P1.outputs.buildID }} path: retrodeck-cooker.tar.gz - outputs: - buildID: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" - Job2_-_Build_P2_and_publish: runs-on: ubuntu-latest needs: [Job1_-_Building_P1] diff --git a/retrodeck.sh b/retrodeck.sh index e10ea574..c35c9d03 100755 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -3,7 +3,6 @@ # Steam Deck SD path: /run/media/mmcblk0p1 # Create log -#exec > ~/retrodeck/.retrodeck.log 2>&1 exec 3>&1 4>&2 trap 'exec 2>&4 1>&3' 0 1 2 3 echo "$(date) : RetroDECK started" >&3 @@ -68,6 +67,8 @@ then mkdir -p ~/retrodeck/screenshots mkdir -p ~/retrodeck/bios/pico-8 + # TODO: write a function for these stuff below + # ES-DE cp -r /app/retrodeck/tools/* /var/config/retrodeck/tools/ mkdir -p /var/config/emulationstation/.emulationstation/custom_systems/tools/ From 66cdac09de7ea9aac4755302cf477e57d6b79326 Mon Sep 17 00:00:00 2001 From: Xargon Date: Tue, 17 May 2022 09:41:07 +0900 Subject: [PATCH 121/170] TOOLS: fixed PPSSPP --- tools/start-ppsspp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/start-ppsspp.sh b/tools/start-ppsspp.sh index 8763860c..6644c8ad 100644 --- a/tools/start-ppsspp.sh +++ b/tools/start-ppsspp.sh @@ -3,5 +3,5 @@ kdialog --title "RetroDECK" --warningyesno "Doing some changes in the emulator's configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?" if [ $? == 0 ] then - ppsspp + PPSSPPSDL fi \ No newline at end of file From 670581d7f67aaf49b8f7e4b3d92705bdcd2da344 Mon Sep 17 00:00:00 2001 From: Xargon Date: Tue, 17 May 2022 10:00:36 +0900 Subject: [PATCH 122/170] Removed recursive bios folder --- retrodeck.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/retrodeck.sh b/retrodeck.sh index c35c9d03..f5ca904e 100755 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -95,6 +95,7 @@ then ln -s ~/retrodeck/bios /var/config/retroarch/system cp /app/share/libretro/cores/* /var/config/retroarch/cores/ cp $emuconfigs/retroarch.cfg /var/config/retroarch/ + rm -f ~/retrodeck/bios/bios # in some situations a double bios link is creted # Yuzu find ~/retrodeck/bios/switch -xtype l -exec rm {} \; # removing dead symlinks From 2e08a90559ca7dc320790a390e803309e90735fc Mon Sep 17 00:00:00 2001 From: Xargon Date: Tue, 17 May 2022 10:00:59 +0900 Subject: [PATCH 123/170] Removed recursive bios folder - comment fix --- retrodeck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retrodeck.sh b/retrodeck.sh index f5ca904e..4edce33f 100755 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -95,7 +95,7 @@ then ln -s ~/retrodeck/bios /var/config/retroarch/system cp /app/share/libretro/cores/* /var/config/retroarch/cores/ cp $emuconfigs/retroarch.cfg /var/config/retroarch/ - rm -f ~/retrodeck/bios/bios # in some situations a double bios link is creted + rm -f ~/retrodeck/bios/bios # in some situations a double bios link is created # Yuzu find ~/retrodeck/bios/switch -xtype l -exec rm {} \; # removing dead symlinks From d241d11edb8d51ab4564b33152fb4ec86cec3946 Mon Sep 17 00:00:00 2001 From: Xargon Date: Tue, 17 May 2022 10:26:29 +0900 Subject: [PATCH 124/170] TOOLS: updated rpcs3 desc --- tools-gamelist.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools-gamelist.xml b/tools-gamelist.xml index 305f6631..19a4c294 100644 --- a/tools-gamelist.xml +++ b/tools-gamelist.xml @@ -48,6 +48,13 @@ Start CITRA to manually tweak your settings. true true + + + ./start-rpcs3.sh + Start RPCS3 (Standalone) + Start RPCS3 to manually tweak your settings. + true + true ./start-splore.sh From d79428f8ee4d2d63901763cad828d6cc5762eb0b Mon Sep 17 00:00:00 2001 From: Xargon Date: Tue, 17 May 2022 11:53:12 +0900 Subject: [PATCH 125/170] PICO-8: some fixes, still not fully working --- retrodeck.sh | 3 +++ tools/start-splore.sh | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/retrodeck.sh b/retrodeck.sh index 4edce33f..5b00a034 100755 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -130,6 +130,9 @@ then # RPCS3 mkdir -p /var/config/rpcs3/ cp $emuconfigs/config.yml /var/config/rpcs3/ + + # PICO-8 + mkdir -p $roms_folder/pico-8 # Locking RetroDECK diff --git a/tools/start-splore.sh b/tools/start-splore.sh index 5de224bc..74dd11de 100644 --- a/tools/start-splore.sh +++ b/tools/start-splore.sh @@ -1,3 +1,10 @@ #!/bin/bash -~/retrodeck/bios/pico-8/pico8 -desktop ~/retrodeck/screenshots -windowed 0 -root_path %ROMPATH%/pico-8 -splore \ No newline at end of file +if [ -d ~/retrodeck/roms/pico-8 ]; then + pico_folder=~/retrodeck/roms/pico-8 +elif [ -d /run/media/mmcblk0p1/retrodeck/roms/pico-8 ]; then + pico_folder=/run/media/mmcblk0p1/retrodeck/roms/pico-8 +fi + +echo $pico_folder >> ~/retrodeck/.retrodeck.log +~/retrodeck/bios/pico-8/pico8 -desktop ~/retrodeck/screenshots -windowed 0 -home ~/retrodeck/bios/pico-8 -root_path $pico_folder -splore >> ~/retrodeck/.retrodeck.log From 36faa0e72d0fd8af5aa19dc4075b027e382c04a3 Mon Sep 17 00:00:00 2001 From: Xargon Date: Tue, 17 May 2022 12:11:31 +0900 Subject: [PATCH 126/170] WORKFLOW: fixed yaml syntax --- .github/workflows/cooker.yml | 94 ++++++++++++++++++------------------ 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 3ea06ebf..8529a198 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -17,62 +17,62 @@ jobs: runs-on: ubuntu-latest steps: - - name: Get date for artifacts - id: date - run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M%S')" + - name: Get date for artifacts + id: date + run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M%S')" - - name: Extract branch name - shell: bash - run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" - id: extract_branch + - name: Extract branch name + shell: bash + run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" + id: extract_branch - - name: Generating build ID - run: echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" + - name: Generating build ID + run: echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" - outputs: - buildID: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" - - - uses: actions/checkout@v3 + outputs: + buildID: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" + + - uses: actions/checkout@v3 - - name: Download global cache - uses: actions/download-artifact@v2 - with: - name: global-cache - continue-on-error: true + - name: Download global cache + uses: actions/download-artifact@v2 + with: + name: global-cache + continue-on-error: true - - name: Extracting cache - run: | - tar --skip-old-files -xzvf retrodeck-cooker.tar.gz - rm -f retrodeck-cooker.tar.gz - continue-on-error: true + - name: Extracting cache + run: | + tar --skip-old-files -xzvf retrodeck-cooker.tar.gz + rm -f retrodeck-cooker.tar.gz + continue-on-error: true - - name: Initializing enviornment - run: | - git pull - git submodule init - git submodule update - sudo add-apt-repository ppa:alexlarsson/flatpak - sudo apt-get update - sudo apt install flatpak flatpak-builder p7zip-full - sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - sudo 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 + - name: Initializing enviornment + run: | + git pull + git submodule init + git submodule update + sudo add-apt-repository ppa:alexlarsson/flatpak + sudo apt-get update + sudo apt install flatpak flatpak-builder p7zip-full + sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + sudo 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 - - name: Bulding part 1 - Until rpcs3 - run: | - sudo flatpak-builder --build-only --stop-at=rpcs3 --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + - name: Bulding part 1 - Until rpcs3 + run: | + sudo flatpak-builder --build-only --stop-at=rpcs3 --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - - name: Compressing cache - run: | - touch retrodeck-cooker.tar.gz - rm -rf .flatpak-builder/build/*-{2,3,4,5,6} - find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker + - name: Compressing cache + run: | + touch retrodeck-cooker.tar.gz + rm -rf .flatpak-builder/build/*-{2,3,4,5,6} + find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker - - name: Upload build specific cache - uses: actions/upload-artifact@v3 - with: - name: ${{ needs.Job1_-_Building_P1.outputs.buildID }} - path: retrodeck-cooker.tar.gz + - name: Upload build specific cache + uses: actions/upload-artifact@v3 + with: + name: ${{ needs.Job1_-_Building_P1.outputs.buildID }} + path: retrodeck-cooker.tar.gz Job2_-_Build_P2_and_publish: runs-on: ubuntu-latest From 9413504fab4cbf8eccfc8bd89d24ee6e4d247443 Mon Sep 17 00:00:00 2001 From: Xargon Date: Tue, 17 May 2022 12:17:45 +0900 Subject: [PATCH 127/170] WORKFLOW: fixing build-id --- .github/workflows/cooker.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 8529a198..ce2095ae 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -27,10 +27,8 @@ jobs: id: extract_branch - name: Generating build ID - run: echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" - - outputs: - buildID: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" + id: generating_buildid + run: echo "##[set-output name=build-id;]$(echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" - uses: actions/checkout@v3 @@ -71,9 +69,12 @@ jobs: - name: Upload build specific cache uses: actions/upload-artifact@v3 with: - name: ${{ needs.Job1_-_Building_P1.outputs.buildID }} + name: "${{ steps.generating_buildid.outputs.build-id }}" path: retrodeck-cooker.tar.gz + outputs: + buildID: "${{ steps.generating_buildid.outputs.build-id }}" + Job2_-_Build_P2_and_publish: runs-on: ubuntu-latest needs: [Job1_-_Building_P1] From 91305492d77aa0b0da8d2691ea7c3451bbba4137 Mon Sep 17 00:00:00 2001 From: Xargon Date: Tue, 17 May 2022 12:19:25 +0900 Subject: [PATCH 128/170] WORKFLOW: fixing build-id - fix1 --- .github/workflows/cooker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index ce2095ae..0cab6dd8 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -28,7 +28,7 @@ jobs: - name: Generating build ID id: generating_buildid - run: echo "##[set-output name=build-id;]$(echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" + run: echo "##[set-output name=build-id;]$(echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }})" - uses: actions/checkout@v3 From a62ac23da769e87bfb08592bc88a6fafb4b2d2ee Mon Sep 17 00:00:00 2001 From: Xargon Date: Tue, 17 May 2022 12:20:22 +0900 Subject: [PATCH 129/170] WORKFLOW: fixing build-id - fix2 --- .github/workflows/cooker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 0cab6dd8..2a29289a 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -28,7 +28,7 @@ jobs: - name: Generating build ID id: generating_buildid - run: echo "##[set-output name=build-id;]$(echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }})" + run: echo "##[set-output name=build-id;]$(echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}")" - uses: actions/checkout@v3 From d7202e2df68645185fd37a5e6201adc70c648143 Mon Sep 17 00:00:00 2001 From: Xargon Date: Wed, 18 May 2022 23:10:32 +0900 Subject: [PATCH 130/170] VERSIONING: added versioning and CLI parameters --- .github/workflows/cooker.yml | 16 ++++++------- net.retrodeck.retrodeck.yml | 10 +++++++- retrodeck.sh | 44 ++++++++++++++++++++++++++++++++---- 3 files changed, 57 insertions(+), 13 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 2a29289a..8e8812c9 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -108,19 +108,19 @@ jobs: sudo flatpak-builder --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml sudo flatpak build-bundle $GITHUB_WORKSPACE/local RetroDECK.flatpak net.retrodeck.retrodeck - - name: Get date for artifacts - id: date - run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M')" + # - name: Get date for artifacts + # id: date + # run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M')" - - name: Extract branch name - shell: bash - run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" - id: extract_branch + # - name: Extract branch name + # shell: bash + # run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" + # id: extract_branch - name: Publish the flatpak in a new cooker release uses: ncipollo/release-action@v1 with: - tag: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" + tag: "$(flatpak run net.retrodeck.retrodeck -v)" body: | # Release Notes (Cooker) This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}. diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 2b004530..199e96c9 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -60,6 +60,15 @@ cleanup-commands: modules: + - name: version-initialization + sources: + - type: shell + commands: + - mkdir -p ${FLATPAK_DEST}/retrodeck/ + - VERSION="cooker" # REMEMBER TO CHANGE THE VERSION BEFORE PUBLISHING (AND UPDATE THE APPDATA) + - if [ $VERSION == "cooker" ]; then VERSION=$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/')-$(date +'%Y%m%d_%H%M'); fi + - $VERSION >> ${FLATPAK_DEST}/retrodeck/version + - name: xmlstarlet config-opts: - --disable-static-libs @@ -963,7 +972,6 @@ modules: - rm -rf /app/share/emulationstation/resources/systems/unix/es_systems.xml - cp es_systems.xml /app/share/emulationstation/resources/systems/unix/ # These must be put in home folder, managed by retrodeck.sh - - mkdir -p ${FLATPAK_DEST}/retrodeck/ - cp es_settings.xml ${FLATPAK_DEST}/retrodeck/es_settings.xml # Logo, res diff --git a/retrodeck.sh b/retrodeck.sh index 5b00a034..a8416931 100755 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -3,15 +3,51 @@ # Steam Deck SD path: /run/media/mmcblk0p1 # Create log -exec 3>&1 4>&2 -trap 'exec 2>&4 1>&3' 0 1 2 3 -echo "$(date) : RetroDECK started" >&3 -exec 1>~/retrodeck/.retrodeck.log 2>&1 +# exec 3>&1 4>&2 +# trap 'exec 2>&4 1>&3' 0 1 2 3 +# echo "$(date) : RetroDECK started" >&3 +# exec 1>~/retrodeck/.retrodeck.log 2>&1 is_mounted() { mount | awk -v DIR="$1" '{if ($3 == DIR) { exit 0}} ENDFILE{exit -1}' } +for i in "$@"; do + case $i in + -h*|--help*) + echo "RetroDECK v"$(cat /var/config/retrodeck/version) + echo " + Usage: +flatpak run [FLATPAK-RUN-OPTION] net.retrodeck-retrodeck [ARGUMENTS] + +Arguments: + -h, --help Print this help + -v, --version Print RetroDECK version + --reset Starts the initial RetroDECK installer (backup your data first!) + +For flatpak run specific options please run: flatpak run -h + +https://retrodeck.net +" + exit + ;; + --version*|-v*) + cat /var/config/retrodeck/version + exit + ;; + --reset) + rm -f ~/retrodeck/.lock + shift # past argument with no value + ;; + -*|--*) + echo "Unknown option $i" + exit 1 + ;; + *) + ;; + esac +done + # if we got the .lock file it means that it's not a first run if [ ! -f ~/retrodeck/.lock ] then From be386b190be0d1633f2b87449aecc7b63a167f74 Mon Sep 17 00:00:00 2001 From: Xargon Date: Wed, 18 May 2022 23:26:50 +0900 Subject: [PATCH 131/170] VERSIONING: ES-DE menu now reads the versiion from file --- 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 199e96c9..748e0cff 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -147,7 +147,7 @@ modules: - type: shell commands: - sed -i 's/QUIT EMULATIONSTATION/QUIT RETRODECK/g' es-app/src/guis/GuiMenu.cpp - - sed -i 's/"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)/"RetroDECK v0.4.0b, ES-DE v" + Utils::String::toUpper(PROGRAM_VERSION_STRING)/g' es-app/src/guis/GuiMenu.cpp + - sed -i 's/"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)/"RetroDECK v$(cat ${FLATPAK_DEST}/retrodeck/version), ES-DE v" + Utils::String::toUpper(PROGRAM_VERSION_STRING)/g' es-app/src/guis/GuiMenu.cpp # ES-DE - END From 2eff0b66b05e2434d7a706474ef139708ac875c0 Mon Sep 17 00:00:00 2001 From: Xargon Date: Wed, 18 May 2022 23:43:19 +0900 Subject: [PATCH 132/170] VERSIONING: module version-initialization - fix1 --- net.retrodeck.retrodeck.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 748e0cff..bca58e52 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -61,6 +61,7 @@ cleanup-commands: modules: - name: version-initialization + buildsystem: simple sources: - type: shell commands: From af56a4c7345c147df7df6d276b91fb279ffb4b8c Mon Sep 17 00:00:00 2001 From: Xargon Date: Thu, 19 May 2022 12:03:43 +0900 Subject: [PATCH 133/170] VERSIONING: fixed module --- net.retrodeck.retrodeck.yml | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index bca58e52..9a236756 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -28,11 +28,11 @@ finish-args: - --talk-name=org.freedesktop.login1 - --filesystem=xdg-run/app/com.discordapp.Discord:create # Yuzu - - --filesystem=home:ro + # - --filesystem=home:ro # This may break Yuzu, let's see # - --filesystem=/run/media:ro # Dolphin - --allow=bluetooth - #- --env=QT_QPA_PLATFORM=xcb not sure if this will break something + #- --env=QT_QPA_PLATFORM=xcb #not sure if this will break something # rpcs3 - --socket=fallback-x11 @@ -60,15 +60,22 @@ cleanup-commands: 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 + # + # UPDATE STEPS FOR MAIN: + # [ ] Update the VERSION variable + # [ ] Update the appdata.xml with the version number and notes + # - name: version-initialization buildsystem: simple - sources: - - type: shell - commands: - - mkdir -p ${FLATPAK_DEST}/retrodeck/ - - VERSION="cooker" # REMEMBER TO CHANGE THE VERSION BEFORE PUBLISHING (AND UPDATE THE APPDATA) - - if [ $VERSION == "cooker" ]; then VERSION=$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/')-$(date +'%Y%m%d_%H%M'); fi - - $VERSION >> ${FLATPAK_DEST}/retrodeck/version + build-commands: + - mkdir -p ${FLATPAK_DEST}/retrodeck/ + - VERSION="cooker" + - if [ $VERSION == "cooker" ]; then VERSION=$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/')-$(date +'%Y%m%d_%H%M'); fi + - $VERSION >> ${FLATPAK_DEST}/retrodeck/version - name: xmlstarlet config-opts: @@ -1019,8 +1026,6 @@ modules: - mkdir -p ${FLATPAK_DEST}/share/appdata - cp net.retrodeck.retrodeck.appdata.xml ${FLATPAK_DEST}/share/appdata - - #cleanup: ['*'] sources: - type: file path: es_find_rules.xml From bffa33ca8195058fede9fa32ad5ec40952d6571a Mon Sep 17 00:00:00 2001 From: Xargon Date: Thu, 19 May 2022 12:08:47 +0900 Subject: [PATCH 134/170] Structural adjustments --- es_configs/es_find_rules.xml | 318 ++++++++ es_configs/es_settings.xml | 121 +++ es_configs/es_systems.xml | 1430 +++++++++++++++++++++++++++++++++ es_configs/tools-gamelist.xml | 73 ++ net.retrodeck.retrodeck.yml | 16 +- 5 files changed, 1947 insertions(+), 11 deletions(-) create mode 100644 es_configs/es_find_rules.xml create mode 100644 es_configs/es_settings.xml create mode 100644 es_configs/es_systems.xml create mode 100644 es_configs/tools-gamelist.xml diff --git a/es_configs/es_find_rules.xml b/es_configs/es_find_rules.xml new file mode 100644 index 00000000..35a091a4 --- /dev/null +++ b/es_configs/es_find_rules.xml @@ -0,0 +1,318 @@ + + + + + + + + bash + sh + + + + + retroarch + org.libretro.RetroArch + RetroArch-Linux-x86_64.AppImage + + + /var/lib/flatpak/exports/bin/org.libretro.RetroArch + ~/.local/share/flatpak/exports/bin/org.libretro.RetroArch + ~/Applications/RetroArch-Linux-x86_64.AppImage + ~/.local/bin/RetroArch-Linux-x86_64.AppImage + ~/bin/RetroArch-Linux-x86_64.AppImage + + + + + + ~/snap/retroarch/current/.config/retroarch/cores + + ~/.var/app/org.libretro.RetroArch/config/retroarch/cores + + ~/.config/retroarch/cores + + /usr/lib/x86_64-linux-gnu/libretro + + /usr/lib64/libretro + + /usr/lib/libretro + + /usr/local/lib/libretro + + /usr/pkg/lib/libretro + + /app/share/libretro/cores + + + + + + citra-emu.citra-nightly + org.citra_emu.citra + citra-qt + + + /var/lib/flatpak/exports/bin/org.citra_emu.citra + ~/.local/share/flatpak/exports/bin/org.citra_emu.citra + + + + + + dolphin-emu + org.DolphinEmu.dolphin-emu + + + /var/lib/flatpak/exports/bin/org.DolphinEmu.dolphin-emu + ~/.local/share/flatpak/exports/bin/org.DolphinEmu.dolphin-emu + ~/Applications/Dolphin_Emulator.AppImage + ~/.local/bin/Dolphin_Emulator.AppImage + ~/bin/Dolphin_Emulator.AppImage + + + + + + dosbox-staging + io.github.dosbox-staging + + + /var/lib/flatpak/exports/bin/io.github.dosbox-staging + ~/.local/share/flatpak/exports/bin/io.github.dosbox-staging + + + + + + dosbox-x + com.dosbox_x.DOSBox-X + + + /var/lib/flatpak/exports/bin/com.dosbox_x.DOSBox-X + ~/.local/share/flatpak/exports/bin/com.dosbox_x.DOSBox-X + + + + + + duckstation-nogui + duckstation-qt + org.duckstation.DuckStation + + + /var/lib/flatpak/exports/bin/org.duckstation.DuckStation + ~/.local/share/flatpak/exports/bin/org.duckstation.DuckStation + ~/Applications/duckstation-nogui-x64.AppImage + ~/.local/bin/duckstation-nogui-x64.AppImage + ~/bin/duckstation-nogui-x64.AppImage + ~/Applications/duckstation-qt-x64.AppImage + ~/.local/bin/duckstation-qt-x64.AppImage + ~/bin/duckstation-qt-x64.AppImage + + + + + + flycast + org.flycast.Flycast + + + /var/lib/flatpak/exports/bin/org.flycast.Flycast + ~/.local/share/flatpak/exports/bin/org.flycast.Flycast + + + + + + fs-uae + fsuae.fs-uae + net.fsuae.FS-UAE + + + /var/lib/flatpak/exports/bin/net.fsuae.FS-UAE + ~/.local/share/flatpak/exports/bin/net.fsuae.FS-UAE + + + + + + mame + + + + + + melonds + melonDS + net.kuribo64.melonDS + + + /var/lib/flatpak/exports/bin/net.kuribo64.melonDS + ~/.local/share/flatpak/exports/bin/net.kuribo64.melonDS + + + + + + mgba + io.mgba.mGBA + + + /var/lib/flatpak/exports/bin/io.mgba.mGBA + ~/.local/share/flatpak/exports/bin/io.mgba.mGBA + ~/Applications/mGBA.AppImage + ~/.local/bin/mGBA.AppImage + ~/bin/mGBA.AppImage + + + + + + m64p + io.github.m64p.m64p + + + /var/lib/flatpak/exports/bin/io.github.m64p.m64p + ~/.local/share/flatpak/exports/bin/io.github.m64p.m64p + + + + + + PCSX2 + pcsx2 + net.pcsx2.PCSX2 + + + /var/lib/flatpak/exports/bin/net.pcsx2.PCSX2 + ~/.local/share/flatpak/exports/bin/net.pcsx2.PCSX2 + + + + + + /var/lib/flatpak/exports/bin/org.purei.Play + ~/.local/share/flatpak/exports/bin/org.purei.Play + ~/Applications/Play!.AppImage + ~/.local/bin/Play!.AppImage + ~/bin/Play!.AppImage + + + + + + ppsspp-emu.ppsspp-sdl + org.ppsspp.PPSSPP + + + /var/lib/flatpak/exports/bin/org.ppsspp.PPSSPP + ~/.local/share/flatpak/exports/bin/org.ppsspp.PPSSPP + + + + + + primehack + io.github.shiiion.primehack + + + /var/lib/flatpak/exports/bin/io.github.shiiion.primehack + ~/.local/share/flatpak/exports/bin/io.github.shiiion.primehack + + + + + + redream + + + ~/Applications/redream + ~/.local/bin/redream + ~/bin/redream + + + + + + rpcs3 + rpcs3-emu.rpcs3 + net.rpcs3.RPCS3 + rpcs3.AppImage + + + /var/lib/flatpak/exports/bin/net.rpcs3.RPCS3 + ~/.local/share/flatpak/exports/bin/net.rpcs3.RPCS3 + ~/Applications/rpcs3.AppImage + ~/.local/bin/rpcs3.AppImage + ~/bin/rpcs3.AppImage + + + + + + snes9x + + + /var/lib/flatpak/exports/bin/com.snes9x.Snes9x + ~/.local/share/flatpak/exports/bin/com.snes9x.Snes9x + + + + + + Ryujinx + org.ryujinx.Ryujinx + + + /var/lib/flatpak/exports/bin/org.ryujinx.Ryujinx + ~/.local/share/flatpak/exports/bin/org.ryujinx.Ryujinx + ~/Applications/publish/Ryujinx + ~/.local/bin/publish/Ryujinx + ~/bin/publish/Ryujinx + + + + + + visualboyadvance-m + + + + + + xemu + app.xemu.xemu + + + /var/lib/flatpak/exports/bin/app.xemu.xemu + ~/.local/share/flatpak/exports/bin/app.xemu.xemu + ~/Applications/Xemu.AppImage + ~/.local/bin/Xemu.AppImage + ~/bin/Xemu.AppImage + + + + + + yuzu + org.yuzu_emu.yuzu + yuzu.AppImage + + + /var/lib/flatpak/exports/bin/org.yuzu_emu.yuzu + ~/.local/share/flatpak/exports/bin/org.yuzu_emu.yuzu + ~/Applications/yuzu.AppImage + ~/.local/bin/yuzu.AppImage + ~/bin/yuzu.AppImage + + + + + pico8 + + + ~/retrodeck/bios/pico-8/pico8 + + + diff --git a/es_configs/es_settings.xml b/es_configs/es_settings.xml new file mode 100644 index 00000000..8573537d --- /dev/null +++ b/es_configs/es_settings.xml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/es_configs/es_systems.xml b/es_configs/es_systems.xml new file mode 100644 index 00000000..41f00e31 --- /dev/null +++ b/es_configs/es_systems.xml @@ -0,0 +1,1430 @@ + + + + + 3do + 3DO + %ROMPATH%/3do + .iso .ISO .bin .BIN .chd .CHD .cue .CUE .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/opera_libretro.so %ROM% + 3do + 3do + + + 64dd + Nintendo 64DD + %ROMPATH%/64dd + .n64 .N64 .v64 .V64 .z64 .Z64 .bin .BIN .u1 .U1 .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 + 64dd + + + ags + Adventure Game Studio Game Engine + %ROMPATH%/ags + .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + ags + ags + + + 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 + %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 + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae2021_libretro.so %ROM% + amiga + amiga1200 + + + 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 + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae2021_libretro.so %ROM% + amigacd32 + amigacd32 + + + amstradcpc + Amstrad CPC + %ROMPATH%/amstradcpc + .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% + amstradcpc + amstradcpc + + + android + Google Android + %ROMPATH%/android + .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + android + android + + + apple2 + Apple II + %ROMPATH%/apple2 + .nib .NIB .do .DO .po .PO .dsk .DSK .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + apple2 + apple2 + + + apple2gs + Apple IIGS + %ROMPATH%/apple2gs + .nib .NIB .do .DO .po .PO .dsk .DSK .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + apple2gs + apple2gs + + + arcade + Arcade + %ROMPATH%/arcade + .cmd .CMD .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% + %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% + arcade + arcade + + + astrocde + Bally Astrocade + %ROMPATH%/astrocde + .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% + %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %ROMPATH%/astrocde astrocde -cart %BASENAME% + astrocde + astrocade + + + atari2600 + Atari 2600 + %ROMPATH%/atari2600 + .a26 .A26 .bin .BIN .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/stella_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/stella2014_libretro.so %ROM% + atari2600 + atari2600 + + + atari5200 + Atari 5200 + %ROMPATH%/atari5200 + .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 + + + atari7800 + Atari 7800 ProSystem + %ROMPATH%/atari7800 + .a78 .A78 .bin .BIN .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prosystem_libretro.so %ROM% + atari7800 + atari7800 + + + atari800 + Atari 800 + %ROMPATH%/atari800 + .xfd .XFD .atr .ATR .atx .ATX .cdm .CDM .cas .CAS .bin .BIN .a52 .A52 .xex .XEX .rom .ROM .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.so %ROM% + %EMULATOR_ATARI800% %ROM% + atari800 + atari800 + + + atarijaguar + Atari Jaguar + %ROMPATH%/atarijaguar + .j64 .J64 .jag .JAG .rom .ROM .abs .ABS .cof .COF .bin .BIN .prg .PRG .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/virtualjaguar_libretro.so %ROM% + atarijaguar, atarijaguarcd + atarijaguar + + + atarijaguarcd + Atari Jaguar CD + %ROMPATH%/atarijaguarcd + .j64 .J64 .jag .JAG .rom .ROM .abs .ABS .cof .COF .bin .BIN .prg .PRG .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/virtualjaguar_libretro.so %ROM% + atarijaguarcd + atarijaguarcd + + + atarilynx + Atari Lynx + %ROMPATH%/atarilynx + .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 + + + atarist + Atari ST + %ROMPATH%/atarist + .st .ST .msa .MSA .stx .STX .dim .DIM .ipf .IPF .m3u .M3U .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/hatari_libretro.so %ROM% + atarist + atarist + + + atarixe + Atari XE + %ROMPATH%/atarixe + .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%/atari800_libretro.so %ROM% + atarixe + atarixe + + + atomiswave + Atomiswave + %ROMPATH%/atomiswave + .chd .CHD .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM% + %EMULATOR_FLYCAST% %ROM% + atomiswave + atomiswave + + + bbcmicro + BBC Micro + %ROMPATH%/bbcmicro + .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + bbcmicro + bbcmicro + + + c64 + Commodore 64 + %ROMPATH%/c64 + .bin .BIN .cmd .CMD .crt .CRT .d2m .D2M .d4m .D4M .d64 .D64 .d6z .D6Z .d71 .D71 .d7z .D7Z .d80 .D80 .d81 .D81 .d82 .D82 .d8z .D8Z .g41 .G41 .g4z .G4Z .g64 .G64 .g6z .G6Z .gz .GZ .lnx .LNX .m3u .M3U .nbz .NBZ .nib .NIB .p00 .P00 .prg .PRG .t64 .T64 .tap .TAP .vfl .VFL .vsf .VSF .x64 .X64 .x6z .X6Z .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x64sc_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x64_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_xscpu64_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x128_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/frodo_libretro.so %ROM% + c64 + c64 + + + cavestory + Cave Story (NXEngine) + %ROMPATH%/cavestory + .exe .EXE .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nxengine_libretro.so %ROM% + cavestory + cavestory + + + cdimono1 + Philips CD-i + %ROMPATH%/cdimono1 + .chd .CHD .cue .CUE .iso .ISO + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/same_cdi_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/cdi2015_libretro.so %ROM% + cdimono1 + cdimono1 + + + cdtv + Commodore CDTV + %ROMPATH%/cdtv + .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + cdtv + cdtv + + + chailove + ChaiLove Game Engine + %ROMPATH%/chailove + .chai .CHAI .chailove .CHAILOVE .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/chailove_libretro.so %ROM% + love + chailove + + + channelf + Fairchild Channel F + %ROMPATH%/channelf + .bin .BIN .chf .CHF .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freechaf_libretro.so %ROM% + channelf + channelf + + + coco + Tandy Color Computer + %ROMPATH%/coco + .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + coco + coco + + + colecovision + ColecoVision + %ROMPATH%/coleco + .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM% + colecovision + colecovision + + + daphne + Daphne Arcade LaserDisc Emulator + %ROMPATH%/daphne + .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + daphne + daphne + + + doom + Doom + %ROMPATH%/doom + .wad .WAD .iwad .IWAD .pwad .PWAD + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prboom_libretro.so %ROM% + pc + doom + + + dos + DOS (PC) + %ROMPATH%/dos + .bat .BAT .com .COM .conf .CONF .cue .CUE .dosz .DOSZ .exe .EXE .iso .ISO .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_pure_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_svn_libretro.so %ROM% + %EMULATOR_DOSBOX-X% %ROM% + %EMULATOR_DOSBOX-STAGING% %ROM% + dos + dos + + + dragon32 + Dragon 32 + %ROMPATH%/dragon32 + .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + dragon32 + dragon32 + + + dreamcast + Sega Dreamcast + %ROMPATH%/dreamcast + .chd .CHD .cdi .CDI .iso .ISO .elf .ELF .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM% + %EMULATOR_FLYCAST% %ROM% + %EMULATOR_REDREAM% %ROM% + dreamcast + dreamcast + + + famicom + Nintendo Family Computer + %ROMPATH%/famicom + .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_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quicknes_libretro.so %ROM% + famicom + famicom + + + fba + FinalBurn Alpha + %ROMPATH%/fba + .iso .ISO .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_neogeo_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps1_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps2_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps3_libretro.so %ROM% + arcade + fba + + + fbneo + FinalBurn Neo + %ROMPATH%/fbneo + .ccd .CCD .cue .CUE .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM% + arcade + fbneo + + + fds + Nintendo Famicom Disk System + %ROMPATH%/fds + .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_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM% + fds + fds + + + gameandwatch + Nintendo Game and Watch + %ROMPATH%/gameandwatch + .mgw .MGW .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gw_libretro.so %ROM% + gameandwatch + gameandwatch + + + gamegear + Sega Game Gear + %ROMPATH%/gamegear + .68k .68K .bin .BIN .bms .BMS .chd .CHD .col .COL .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx .MDX .rom .ROM .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%/gearsystem_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/smsplus_libretro.so %ROM% + gamegear + gamegear + + + gb + Nintendo Game Boy + %ROMPATH%/gb + .bs .BS .cgb .CGB .dmg .DMG .gb .GB .gbc .GBC .sgb .SGB .sfc .SFC .smc .SMC .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gambatte_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/sameboy_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearboy_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tgbdual_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mgba_libretro.so %ROM% + %EMULATOR_MGBA% -f %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vbam_libretro.so %ROM% + %EMULATOR_VBA-M% -f %ROM% + gb + gb + + + gba + Nintendo Game Boy Advance + %ROMPATH%/gba + .agb .AGB .bin .BIN .cgb .CGB .dmg .DMG .gb .GB .gba .GBA .gbc .GBC .sgb .SGB .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mgba_libretro.so %ROM% + %EMULATOR_MGBA% -f %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vbam_libretro.so %ROM% + %EMULATOR_VBA-M% -f %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vba_next_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gpsp_libretro.so %ROM% + gba + gba + + + gbc + Nintendo Game Boy Color + %ROMPATH%/gbc + .bs .BS .cgb .CGB .dmg .DMG .gb .GB .gbc .GBC .sgb .SGB .sfc .SFC .smc .SMC .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gambatte_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/sameboy_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearboy_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tgbdual_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mgba_libretro.so %ROM% + %EMULATOR_MGBA% -f %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vbam_libretro.so %ROM% + %EMULATOR_VBA-M% -f %ROM% + gbc + gbc + + + 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_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM% + %EMULATOR_DOLPHIN% -b -e %ROM% + %EMULATOR_PRIMEHACK% -b -e %ROM% + gc + gc + + + 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 + %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 + + + gx4000 + Amstrad GX4000 + %ROMPATH%/gx4000 + .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + gx4000 + gx4000 + + + intellivision + Mattel Electronics Intellivision + %ROMPATH%/intellivision + .int .INT .bin .BIN .rom .ROM .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freeintv_libretro.so %ROM% + intellivision + intellivision + + + j2me + Java 2 Micro Edition (J2ME) + %ROMPATH%/j2me + .jar .JAR .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/squirreljme_libretro.so %ROM% + android + j2me + + + lutro + Lutro Game Engine + %ROMPATH%/lutro + .lua .LUA .lutro .LUTRO .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/lutro_libretro.so %ROM% + lutro + lutro + + + mame + Multiple Arcade Machine Emulator + %ROMPATH%/mame + .cmd .CMD .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% + %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% + arcade + mame + + + mame-advmame + AdvanceMAME + %ROMPATH%/mame-advmame + .chd .cue .CUE .CHD .cmd .CMD .fba .FBA .iso .ISO .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + arcade + mame-advmame + + + mame-mame4all + MAME4ALL + %ROMPATH%/mame-mame4all + .chd .cue .CUE .CHD .cmd .CMD .fba .FBA .iso .ISO .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + arcade + mame-mame4all + + + mastersystem + Sega Master System + %ROMPATH%/mastersystem + .68k .68K .bin .BIN .bms .BMS .chd .CHD .col .COL .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx .MDX .rom .ROM .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%/smsplus_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% + mastersystem + mastersystem + + + megacd + Sega Mega-CD + %ROMPATH%/megacd + .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% + segacd + megacd + + + megacdjp + Sega Mega-CD + %ROMPATH%/megacdjp + .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% + segacd + megacdjp + + + 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 + %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 + + + mess + Multi Emulator Super System + %ROMPATH%/mess + .chd .CHD .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mess2015_libretro.so %ROM% + mess + mess + + + moonlight + Moonlight Game Streaming + %ROMPATH%/moonlight + .moonlight .MOONLIGHT .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + moonlight + moonlight + + + moto + Thomson MO/TO Series + %ROMPATH%/moto + .fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.so %ROM% + moto + moto + + + msx + MSX + %ROMPATH%/msx + .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fmsx_libretro.so %ROM% + msx + msx + + + msx1 + MSX1 + %ROMPATH%/msx1 + .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fmsx_libretro.so %ROM% + msx + msx1 + + + msx2 + MSX2 + %ROMPATH%/msx2 + .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fmsx_libretro.so %ROM% + msx2 + msx2 + + + msxturbor + MSX Turbo R + %ROMPATH%/msxturbor + .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM% + msxturbor + msxturbor + + + multivision + Othello Multivision + %ROMPATH%/multivision + .bin .BIN .gg .GG .rom .ROM .sg .SG .sms .SMS .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM% + sg-1000 + multivision + + + n3ds + Nintendo 3DS + %ROMPATH%/n3ds + .3ds .3DS .3dsx .3DSX .app .APP .axf .AXF .cci .CCI .cxi .CXI .elf .ELF .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra2018_libretro.so %ROM% + %EMULATOR_CITRA% %ROM% + n3ds + n3ds + + + n64 + Nintendo 64 + %ROMPATH%/n64 + .n64 .N64 .v64 .V64 .z64 .Z64 .bin .BIN .u1 .U1 .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 + + + naomi + Sega NAOMI + %ROMPATH%/naomi + .chd .CHD .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM% + %EMULATOR_FLYCAST% %ROM% + naomi + naomi + + + naomigd + Sega NAOMI GD-ROM + %ROMPATH%/naomigd + .chd .CHD .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM% + %EMULATOR_FLYCAST% %ROM% + naomi + naomigd + + + nds + Nintendo DS + %ROMPATH%/nds + .bin .BIN .nds .NDS .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/desmume_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/desmume2015_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/melonds_libretro.so %ROM% + %EMULATOR_MELONDS% %ROM% + nds + nds + + + neogeo + SNK Neo Geo + %ROMPATH%/neogeo + .chd .CHD .cue .CUE .iso .ISO .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM% + neogeo + neogeo + + + neogeocd + SNK Neo Geo CD + %ROMPATH%/neogeocd + .chd .CHD .cue .CUE .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/neocd_libretro.so %ROM% + neogeocd + neogeocd + + + neogeocdjp + SNK Neo Geo CD + %ROMPATH%/neogeocdjp + .chd .CHD .cue .CUE .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/neocd_libretro.so %ROM% + neogeocd + neogeocdjp + + + nes + Nintendo Entertainment System + %ROMPATH%/nes + .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_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quicknes_libretro.so %ROM% + nes + nes + + + ngp + SNK Neo Geo Pocket + %ROMPATH%/ngp + .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 + + + ngpc + SNK Neo Geo Pocket Color + %ROMPATH%/ngpc + .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 + + + odyssey2 + Magnavox Odyssey2 + %ROMPATH%/odyssey2 + .bin .BIN .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.so %ROM% + odyssey2 + odyssey2 + + + openbor + OpenBOR Game Engine + %ROMPATH%/openbor + .AppImage + %STARTDIR%=%GAMEDIR% %EMULATOR_OS-SHELL% -c "%ROM%" + openbor + openbor + + + oric + Tangerine Computer Systems Oric + %ROMPATH%/oric + .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + oric + oric + + + palm + Palm OS + %ROMPATH%/palm + .prc .PRC .pqa .PQA .img .IMG .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mu_libretro.so %ROM% + palm + palm + + + pc88 + NEC PC-8800 Series + %ROMPATH%/pc88 + .d88 .D88 .u88 .U88 .m3u .M3U .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quasi88_libretro.so %ROM% + pc88 + pc88 + + + pc98 + NEC PC-9800 Series + %ROMPATH%/pc98 + .2hd .2HD .88d .88D .98d .98D .d88 .D88 .d98 .D98 .cmd .CMD .dup .DUP .fdd .FDD .fdi .FDI .hdd .HDD .hdi .HDI .hdm .HDM .hdn .HDN .nhd .NHD .tfd .TFD .thd .THD . xdf .XDF .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/np2kai_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nekop2_libretro.so %ROM% + pc98 + pc98 + + + pcengine + NEC PC Engine + %ROMPATH%/pcengine + .bin .BIN .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 + + + pcenginecd + NEC PC Engine CD + %ROMPATH%/pcenginecd + .bin .BIN .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 + + + pcfx + 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% + pcfx + pcfx + + + pokemini + Nintendo Pokémon Mini + %ROMPATH%/pokemini + .min .MIN .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pokemini_libretro.so %ROM% + pokemini + pokemini + + + ports + Ports + %ROMPATH%/ports + .sh + %EMULATOR_OS-SHELL% %ROM% + pc + ports + + + ps2 + Sony PlayStation 2 + %ROMPATH%/ps2 + .bin .BIN .chd .CHD .cso .CSO .elf .ELF .iso .ISO .isz .ISZ + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM% + %EMULATOR_PCSX2% --nogui %ROM% + %EMULATOR_PLAY!% --disc %ROM% + ps2 + ps2 + + + ps3 + Sony PlayStation 3 + %ROMPATH%/ps3 + .ps3 .PS3 .ps3dir .PS3DIR + %EMULATOR_RPCS3% --no-gui %ROM% + ps3 + ps3 + + + ps4 + Sony PlayStation 4 + %ROMPATH%/ps4 + .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + ps4 + ps4 + + + psp + Sony PlayStation Portable + %ROMPATH%/psp + .elf .ELF .iso .ISO .cso .CSO .prx .PRX .pbp .PBP .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/ppsspp_libretro.so %ROM% + %EMULATOR_PPSSPP% %ROM% + psp + psp + + + psvita + Sony PlayStation Vita + %ROMPATH%/psvita + .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + psvita + psvita + + + psx + Sony PlayStation + %ROMPATH%/psx + .bin .BIN .cbn .CBN .ccd .CCD .chd .CHD .cue .CUE .ecm .ECM .exe .EXE .img .IMG .iso .ISO .m3u .M3U .mdf .MDF .mds .MDS .pbp .PBP .psexe .PSEXE .psf .PSF .toc .TOC .z .Z .znx .ZNX .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_psx_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_psx_hw_libretro.so %ROM% + %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 + + + samcoupe + SAM Coupé + %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 + + + satellaview + Nintendo Satellaview + %ROMPATH%/satellaview + .bml .BML .bs .BS .fig .FIG .sfc .SFC .smc .SMC .swc .SWC .st .ST .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% + satellaview + satellaview + + + saturn + Sega Saturn + %ROMPATH%/saturn + .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .iso .ISO .mds .MDS .toc .TOC .m3u .M3U .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_saturn_libretro.so %ROM% + %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 + + + saturnjp + Sega Saturn + %ROMPATH%/saturnjp + .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .iso .ISO .mds .MDS .toc .TOC .m3u .M3U .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_saturn_libretro.so %ROM% + %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 + + + scummvm + ScummVM Game Engine + %ROMPATH%/scummvm + .scummvm .SCUMMVM .svm .SVM + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/scummvm_libretro.so %ROM% + scummvm + scummvm + + + sega32x + Sega Mega Drive 32X + %ROMPATH%/sega32x + .bin .BIN .gen .GEN .smd .SMD .md .MD .32x .32X .cue .CUE .iso .ISO .sms .SMS .68k .68K .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% + sega32x + sega32x + + + sega32xjp + Sega Super 32X + %ROMPATH%/sega32xjp + .bin .BIN .gen .GEN .smd .SMD .md .MD .32x .32X .cue .CUE .iso .ISO .sms .SMS .68k .68K .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% + sega32x + sega32xjp + + + sega32xna + Sega Genesis 32X + %ROMPATH%/sega32xna + .bin .BIN .gen .GEN .smd .SMD .md .MD .32x .32X .cue .CUE .iso .ISO .sms .SMS .68k .68K .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% + sega32x + sega32xna + + + segacd + Sega CD + %ROMPATH%/segacd + .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% + segacd + segacd + + + sfc + Nintendo SFC (Super Famicom) + %ROMPATH%/sfc + .bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC .smc .SMC .st .ST .swc .SWC .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM% + %EMULATOR_SNES9X% %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supafaust_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% + snes + sfc + + + sg-1000 + Sega SG-1000 + %ROMPATH%/sg-1000 + .68k .68K .bin .BIN .bms .BMS .chd .CHD .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx .MDX .ri .RI .rom .ROM .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM% + %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%/bluemsx_libretro.so %ROM% + sg-1000 + sg-1000 + + + snes + Nintendo SNES (Super Nintendo) + %ROMPATH%/snes + .bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC .smc .SMC .st .ST .swc .SWC .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM% + %EMULATOR_SNES9X% %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supafaust_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% + snes + snes + + + snesna + Nintendo SNES (Super Nintendo) + %ROMPATH%/snesna + .bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC .smc .SMC .st .ST .swc .SWC .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM% + %EMULATOR_SNES9X% %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supafaust_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% + snes + snesna + + + solarus + Solarus Game Engine + %ROMPATH%/solarus + .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + solarus + solarus + + + spectravideo + Spectravideo + %ROMPATH%/spectravideo + .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM% + spectravideo + spectravideo + + + stratagus + Stratagus Game Engine + %ROMPATH%/stratagus + .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + stratagus + stratagus + + + sufami + Bandai SuFami Turbo + %ROMPATH%/sufami + .bml .BML .bs .BS .fig .FIG .sfc .SFC .smc .SMC .st .ST .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM% + sufami + sufami + + + supergrafx + NEC SuperGrafx + %ROMPATH%/supergrafx + .pce .PCE .sgx .SGX .cue .CUE .ccd .CCD .chd .CHD .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supergrafx_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM% + supergrafx + supergrafx + + + switch + Nintendo Switch + %ROMPATH%/switch + .nca .NCA .nro .NRO .nso .NSO .nsp .NSP .xci .XCI .7z .7Z .zip .ZIP + %EMULATOR_YUZU% -f -g %ROM% + %EMULATOR_RYUJINX% %ROM% + switch + switch + + + symbian + Symbian + %ROMPATH%/symbian + .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + android + symbian + + + tanodragon + Tano Dragon + %ROMPATH%/tanodragon + .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + dragon32 + tanodragon + + + tg16 + NEC TurboGrafx-16 + %ROMPATH%/tg16 + .bin .BIN .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 + + + tg-cd + NEC TurboGrafx-CD + %ROMPATH%/tg-cd + .bin .BIN .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 + + + ti99 + Texas Instruments TI-99 + %ROMPATH%/ti99 + .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + ti99 + ti99 + + + tic80 + TIC-80 Game Engine + %ROMPATH%/tic80 + .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + tic80 + tic80 + + + to8 + Thomson TO8 + %ROMPATH%/to8 + .fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.so %ROM% + moto + to8 + + + trs-80 + Tandy TRS-80 + %ROMPATH%/trs-80 + .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + trs-80 + trs-80 + + + uzebox + Uzebox + %ROMPATH%/uzebox + .uze .UZE .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/uzem_libretro.so %ROM% + uzebox + uzebox + + + vectrex + Vectrex + %ROMPATH%/vectrex + .bin .BIN .vec .VEC .gam .GAM .vc .VC .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vecx_libretro.so %ROM% + vectrex + vectrex + + + vic20 + Commodore VIC-20 + %ROMPATH%/vic20 + .bin .BIN .cmd .CMD .crt .CRT .d2m .D2M .d4m .D4M .d64 .D64 .d6z .D6Z .d71 .D71 .d7z .D7Z .d80 .D80 .d81 .D81 .d82 .D82 .d8z .D8Z .g41 .G41 .g4z .G4Z .g64 .G64 .g6z .G6Z .gz .GZ .lnx .LNX .m3u .M3U .nbz .NBZ .nib .NIB .p00 .P00 .prg .PRG .t64 .T64 .tap .TAP .vfl .VFL .vsf .VSF .x64 .X64 .x6z .X6Z .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_xvic_libretro.so %ROM% + vic20 + vic20 + + + videopac + Philips Videopac G7000 + %ROMPATH%/videopac + .bin .BIN .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.so %ROM% + videopac + videopac + + + virtualboy + 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% + virtualboy + virtualboy + + + 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_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM% + %EMULATOR_DOLPHIN% -b -e %ROM% + %EMULATOR_PRIMEHACK% -b -e %ROM% + wii + wii + + + wiiu + Nintendo Wii U + %ROMPATH%/wiiu + .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + wiiu + wiiu + + + wonderswan + Bandai WonderSwan + %ROMPATH%/wonderswan + .ws .WS .pc2 .PC2 .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_wswan_libretro.so %ROM% + wonderswan + wonderswan + + + wonderswancolor + 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% + wonderswancolor + wonderswancolor + + + x1 + Sharp X1 + %ROMPATH%/x1 + .dx1 .DX1 .2d .2D .2hd .2HD .tfd .TFD .d88 .D88 .88d .88D .hdm .HDM .xdf .XDF .dup .DUP .tap .TAP .cmd .CMD .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/x1_libretro.so %ROM% + x1 + x1 + + + x68000 + Sharp X68000 + %ROMPATH%/x68000 + .dim .DIM .img .IMG .d88 .D88 .88d .88D .hdm .HDM .dup .DUP .2hd .2HD .xdf .XDF .hdf .HDF .cmd .CMD .m3u .M3U .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/px68k_libretro.so %ROM% + x68000 + x68000 + + + xbox + Microsoft Xbox + %ROMPATH%/xbox + .iso .ISO + %EMULATOR_XEMU% -full-screen -dvd_path %ROM% + xbox + xbox + + + xbox360 + Microsoft Xbox 360 + %ROMPATH%/xbox360 + .iso .ISO .xex .XEX + PLACEHOLDER %ROM% + xbox360 + xbox360 + + + zmachine + Infocom Z-machine + %ROMPATH%/zmachine + .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + zmachine + zmachine + + + zx81 + Sinclair ZX81 + %ROMPATH%/zx81 + .tzx .TZX .p .P .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/81_libretro.so %ROM% + zx81 + zx81 + + + zxspectrum + Sinclair ZX Spectrum + %ROMPATH%/zxspectrum + .tzx .TZX .tap .TAP .z80 .Z80 .rzx .RZX .scl .SCL .trd .TRD .sh .SH .sna .SNA .szx .SZX .udi .UDI .mgt .MGT .img .IMG .dsk .DSK .gz .GZ .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fuse_libretro.so %ROM% + zxspectrum + zxspectrum + + + tools + RetroDECK Tools + /var/config/retrodeck/tools + .sh .SH + bash %ROM% + tools + tools + + + pico-8 + Pico-8 + Lexaloffle + 2015 + console + %ROMPATH%/pico-8 + .p8 .png + %EMULATOR_PICO-8% -desktop ~/retrodeck/screenshots -windowed 0 -root_path %ROMPATH%/pico-8 -run %ROM% + pico-8 + pico-8 + + diff --git a/es_configs/tools-gamelist.xml b/es_configs/tools-gamelist.xml new file mode 100644 index 00000000..19a4c294 --- /dev/null +++ b/es_configs/tools-gamelist.xml @@ -0,0 +1,73 @@ + + + + ./start-retroarch.sh + Start RetroArch + Start RetroArch to manually tweak your settings. + true + true + + + ./start-yuzu.sh + Start Yuzu + Start Yuzu to manually tweak your settings. + true + true + + + ./start-pcsx2.sh + Start PCSX2 (Standalone) + Start PCSX2 to manually tweak your settings. + true + true + + + ./start-ppsspp.sh + Start PPSSPP (Standalone) + Start PPSSPP to manually tweak your settings. + true + true + + + ./start-dolphin.sh + Start Dolphin (Standalone) + Start Dolphin to manually tweak your settings. + true + true + + + ./start-melonds.sh + Start MelonDS (Standalone) + Start MelonDS to manually tweak your settings. + true + true + + + ./start-citra.sh + Start CITRA (Standalone) + Start CITRA to manually tweak your settings. + true + true + + + ./start-rpcs3.sh + Start RPCS3 (Standalone) + Start RPCS3 to manually tweak your settings. + true + true + + + ./start-splore.sh + Start Splore + Start PICO-8's splore + true + true + + + ./move-roms.sh + Move roms folder + Move roms folder from internal to external and vice versa. + true + true + + diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 2b004530..e3ad8c8f 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -957,12 +957,12 @@ modules: buildsystem: simple build-commands: - # Prep the ES-DE and RetroArch config files + # Prep the ES-DE and RetroArch config files - I will have to SED/XMLSTARLET them soon - rm -rf /app/share/emulationstation/resources/systems/unix/es_find_rules.xml - cp es_find_rules.xml /app/share/emulationstation/resources/systems/unix/ - rm -rf /app/share/emulationstation/resources/systems/unix/es_systems.xml - cp es_systems.xml /app/share/emulationstation/resources/systems/unix/ - # These must be put in home folder, managed by retrodeck.sh + # These must be put in home folder, managed by retrodeck.sh - Same as above - mkdir -p ${FLATPAK_DEST}/retrodeck/ - cp es_settings.xml ${FLATPAK_DEST}/retrodeck/es_settings.xml @@ -983,7 +983,7 @@ modules: # Desktop entry - cp net.retrodeck.retrodeck.desktop /app/share/applications/net.retrodeck.retrodeck.desktop - # Steam Grids + # Steam Grids - When BoilR comes it will be deprecated - mkdir -p ${FLATPAK_DEST}/retrodeck/steam/ - cp banner_main.png ${FLATPAK_DEST}/retrodeck/steam/ - cp poster_main.png ${FLATPAK_DEST}/retrodeck/steam/ @@ -1013,18 +1013,12 @@ modules: #cleanup: ['*'] sources: - - type: file - path: es_find_rules.xml - - type: file - path: es_settings.xml - - type: file - path: es_systems.xml + - type: dir + path: es_configs - type: file path: retrodeck.sh - type: dir path: emu-configs - - type: file - path: tools-gamelist.xml - type: dir path: res - type: dir From 1fc295666863e4d4cc9544870cfe042dd4beeebf Mon Sep 17 00:00:00 2001 From: Xargon Date: Thu, 19 May 2022 23:30:43 +0900 Subject: [PATCH 135/170] WRAPPER: complete rewrite, removed kdialog in favor of zenity --- net.retrodeck.retrodeck.yml | 11 +- retrodeck.sh | 391 +++++++++++++++++++++++------------- 2 files changed, 253 insertions(+), 149 deletions(-) mode change 100755 => 100644 retrodeck.sh diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 9a236756..3d75e032 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -94,13 +94,6 @@ modules: - ln -s "xml" "${FLATPAK_DEST}/bin/xmlstarlet" ||: cleanup: ["*"] - - name: kdialog - buildsystem: cmake-ninja - sources: - - type: git - url: https://github.com/KDE/kdialog.git - tag: v22.03.80 - # ES-DE - name: ffmpeg @@ -154,8 +147,8 @@ modules: branch: d89cedd25f1bbb9a38c1f66bca18b74d5332cad1 - type: shell commands: - - sed -i 's/QUIT EMULATIONSTATION/QUIT RETRODECK/g' es-app/src/guis/GuiMenu.cpp - - sed -i 's/"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)/"RetroDECK v$(cat ${FLATPAK_DEST}/retrodeck/version), ES-DE v" + Utils::String::toUpper(PROGRAM_VERSION_STRING)/g' es-app/src/guis/GuiMenu.cpp + - sed -i "s/QUIT EMULATIONSTATION/QUIT RETRODECK/g" es-app/src/guis/GuiMenu.cpp + - sed -i "s/"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)/"RetroDECK v$(cat ${FLATPAK_DEST}/retrodeck/version), ES-DE v" + Utils::String::toUpper(PROGRAM_VERSION_STRING)/g" es-app/src/guis/GuiMenu.cpp # ES-DE - END diff --git a/retrodeck.sh b/retrodeck.sh old mode 100755 new mode 100644 index a8416931..80969825 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -1,29 +1,237 @@ #!/bin/bash -# Steam Deck SD path: /run/media/mmcblk0p1 +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 -# Create log -# exec 3>&1 4>&2 -# trap 'exec 2>&4 1>&3' 0 1 2 3 -# echo "$(date) : RetroDECK started" >&3 -# exec 1>~/retrodeck/.retrodeck.log 2>&1 +# Functions area + +dir_prep() { + # This script is creating a symlink preserving old folder contents and moving them in the new one + + # Call me with: + # dir prep "real dir" "symlink location" + real="$1" + symlink="$2" + + echo -e "\nDIR PREP: Moving $symlink in $real" #DEBUG + + # if the dest dir exists we want to backup it + if [ -d "$symlink" ]; + then + echo "$symlink found" #DEBUG + mv -fv "$symlink" "$symlink.old" + fi + + # if the real dir doesn't exist we create it + if [ ! -d "$real" ]; + then + echo "$real not found, creating it" #DEBUG + mkdir -pv "$real" + fi + + # creating the symlink + echo "linking $real in $symlink" #DEBUG + mkdir -pv "$symlink" # creating the full path... + previous_dir=$PWD + cd "$symlink" + cd .. + echo "We are in $PWD" #DEBUG + ls -ln #DEBUG + rmdir -v "$symlink" + ln -sv "$real" . + echo "We are in $PWD" #DEBUG + ls -ln #DEBUG + cd $previous_dir + + # moving everything from the old folder to the new one, delete the old one + if [ -d "$symlink.old" ]; + then + echo "Moving the data from $symlink.old to $real" #DEBUG + mv -fv "$symlink.old/*" "$real" + echo "Removing $symlink.old" #DEBUG + rm -rf "$symlink.old" + fi + + #DEBUG + previous_dir=$PWD + cd $real + cd .. + echo "We are in $PWD" #DEBUG + ls -ln + cd $previous_dir + #DEBUG + + echo $symlink is now $real +} is_mounted() { + # This script checks if the provided path in $1 is mounted mount | awk -v DIR="$1" '{if ($3 == DIR) { exit 0}} ENDFILE{exit -1}' } +tools_init() { + rm -rfv /var/config/retrodeck/tools/ + mkdir -pv /var/config/retrodeck/tools/ + cp -r /app/retrodeck/tools/* /var/config/retrodeck/tools/ + mkdir -pv /var/config/emulationstation/.emulationstation/custom_systems/tools/ + cp /app/retrodeck/tools-gamelist.xml /var/config/retrodeck/tools/gamelist.xml +} + +standalones_init() { + # This script is configuring the standalone emulators with the default files present in emuconfigs folder + + echo "Initializing standalone emulators" + + # Yuzu + # removing dead symlinks as they were present in a past version + if [ -d $rdhome/bios/switch ]; then + find $rdhome/bios/switch -xtype l -exec rm {} \; + fi + # initializing the keys folder + dir_prep "$rdhome/bios/switch/keys" "/var/data/yuzu/keys" + # initializing the firmware folder + dir_prep "$rdhome/bios/switch/registered" "/var/data/yuzu/nand/system/Contents/registered/" + # configuring Yuzu + mkdir -pv /var/config/yuzu/ + cp -fv $emuconfigs/yuzu-qt-config.ini /var/config/yuzu/qt-config.ini + + # Dolphin + mkdir -pv /var/config/dolphin-emu/ + cp -fv $emuconfigs/Dolphin.ini /var/config/dolphin-emu/ + + # pcsx2 + mkdir -pv /var/config/PCSX2/inis/ + cp -fv $emuconfigs/PCSX2_ui.ini /var/config/PCSX2/inis/ + + # MelonDS + mkdir -pv /var/config/melonDS/ + dir_prep "$rdhome/bios" "/var/config/melonDS/bios" + cp -fv $emuconfigs/melonDS.ini /var/config/melonDS/ + + # CITRA + mkdir -pv /var/config/citra-emu/ + cp -fv $emuconfigs/citra-qt-config.ini /var/config/citra-emu/qt-config.ini + + # RPCS3 + mkdir -pv /var/config/rpcs3/ + cp -fv $emuconfigs/config.yml /var/config/rpcs3/ + + # PICO-8 + mkdir -pv $roms_folder/pico-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/ + #rm -rf $rdhome/bios/bios # in some situations a double bios symlink is created +} + +create_lock() { + # creating RetroDECK's lock file and writing the version number in it + echo "$version" > "$lockfile" +} + +post_update() { + # post update script + echo "Executing post-update script" + + # Doing the dir prep as we don know from which version we came + dir_prep "$rdhome/.downloaded_media" "/var/config/emulationstation/.emulationstation/downloaded_media" + dir_prep "$rdhome/.themes" "/var/config/emulationstation/.emulationstation/themes" + ra_init + standalones_init + tools_init + + create_lock +} + +start_retrodeck() { + # normal startup + echo "Starting RetroDECK v$version" + emulationstation --home /var/config/emulationstation +} + +finit() { + # Force/First init, depending on the situation + + echo "Executing finit" + + # Internal or SD Card? + zenity --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 [ is_mounted "$sdcard" ]; + then + roms_folder="$sdcard/retrodeck/roms" + else + zenity --error --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="SD Card is not readable.\nPlease check if it's inserted or mounted correctly and run RetroDECK again." + exit 0 + fi + fi + + mkdir -pv $roms_folder + + # TODO: after the next update of ES-DE this will not be needed + zenity --info --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="EmulationStation will now initialize the system.\nPlease DON'T EDIT THE ROMS LOCATION, just select:\n\nCREATE DIRECTORIES\nYES\nOK\nQUIT\n\nRetroDECK will manage the rest." + + # Recreating the folder + /var/config/retrodeck/tools/ + mkdir -pv /var/config/emulationstation/ + # Initializing ES-DE + # TODO: after the next update of ES-DE this will not be needed + start_retrodeck + + zenity --info --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="RetroDECK will now install the needed files.\nPlease wait up to one minute,\nanother message will notify when the process will be finished.\n\nPress OK to continue." + + # Initializing ROMs folder - Original in retrodeck home (or SD Card) + dir_prep $roms_folder "/var/config/emulationstation/ROMs" + + mkdir -pv $rdhome/saves + mkdir -pv $rdhome/states + mkdir -pv $rdhome/screenshots + mkdir -pv $rdhome/bios/pico-8 + + # XMLSTARLET HERE + cp -f /app/retrodeck/es_settings.xml /var/config/emulationstation/.emulationstation/es_settings.xml + + # ES-DE preparing themes and scraped folders + dir_prep "$rdhome/.downloaded_media" "/var/config/emulationstation/.emulationstation/downloaded_media" + dir_prep "$rdhome/.themes" "/var/config/emulationstation/.emulationstation/themes" + + ra_init + standalones_init + tools_init + create_lock + + zenity --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\nIt's suggested to add RetroDECK to your Steam Library for a quick access." + # TODO: Replace the stuff above with BoilR code when ready +} + +# Arguments section + for i in "$@"; do case $i in -h*|--help*) - echo "RetroDECK v"$(cat /var/config/retrodeck/version) + echo "RetroDECK v""$(cat /var/config/retrodeck/version)" echo " Usage: flatpak run [FLATPAK-RUN-OPTION] net.retrodeck-retrodeck [ARGUMENTS] Arguments: - -h, --help Print this help - -v, --version Print RetroDECK version - --reset Starts the initial RetroDECK installer (backup your data first!) + -h, --help Print this help + -v, --version Print RetroDECK version + --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 + --reset-tools Recreate the tools section For flatpak run specific options please run: flatpak run -h @@ -35,8 +243,20 @@ https://retrodeck.net cat /var/config/retrodeck/version exit ;; - --reset) - rm -f ~/retrodeck/.lock + --reset*) + rm -f "$lockfile" + shift # past argument with no value + ;; + --reset-ra*) + ra_init + shift # past argument with no value + ;; + --reset-sa*) + standalones_init + shift # past argument with no value + ;; + --reset-tools*) + tools_init shift # past argument with no value ;; -*|--*) @@ -48,133 +268,24 @@ https://retrodeck.net esac done -# if we got the .lock file it means that it's not a first run -if [ ! -f ~/retrodeck/.lock ] +# UPDATE TRIGGERED +# if lockfile exists but the version doesn't match +if [ -f "$lockfile" ] && [ "$(cat "$lockfile")" != "$version" ]; then - kdialog --title "RetroDECK" --yes-label "Yes" --no-label "Quit" --yesno "Welcome to the first configuration of RetroDECK.\n\nBefore starting, are you in Desktop Mode?\nIf not the program will quit as the first setup MUST be done in Desktop Mode." - if [ $? == 1 ] #quit - then - exit 0 - fi - kdialog --title "RetroDECK" --yes-label "Internal" --no-label "SD Card" --yesno "Where do you want your roms folder to be located?" - if [ $? == 0 ] #yes - Internal - then - roms_folder=~/retrodeck/roms - else #no - SD Card - if is_mounted "/run/media/mmcblk0p1" - then - roms_folder=/run/media/mmcblk0p1/retrodeck/roms - else - kdialog --title "RetroDECK" --error "SD Card is not readable, please check if it inserted or mounted correctly and run RetroDECK again." - exit 0 - fi - fi - - mkdir -p $roms_folder - - # initializing ES-DE - - mkdir -p /var/config/retrodeck/tools - - # Cleaning - rm -rf /var/config/emulationstation/ - rm /var/config/retrodeck/tools/* - rm -f /var/config/yuzu/qt-config.ini - - kdialog --title "RetroDECK" --msgbox "EmulationStation will now initialize the system, please don't edit the roms location, just select:\n\nCREATE DIRECTORIES, YES, QUIT\n\nRetroDECK will manage the rest." - - mkdir -p /var/config/emulationstation/ - - emulationstation --home /var/config/emulationstation - - kdialog --title "RetroDECK" --msgbox "RetroDECK will now install the needed files, please wait one minute, another message will notify when the process will be finished.\n\nPress OK to continue." - - # Initializing ROMs folder - Original in ~/retrodeck (or SD Card) - mv -f /var/config/emulationstation/ROMs /var/config/emulationstation/ROMs.bak - ln -s $roms_folder /var/config/emulationstation/ROMs - mv -f /var/config/emulationstation/ROMs.bak/* $roms_folder/ - rm -rf /var/config/emulationstation/ROMs.bak - - # XMLSTARLET HERE - cp /app/retrodeck/es_settings.xml /var/config/emulationstation/.emulationstation/es_settings.xml - - mkdir -p ~/retrodeck/saves - mkdir -p ~/retrodeck/states - mkdir -p ~/retrodeck/screenshots - mkdir -p ~/retrodeck/bios/pico-8 - - # TODO: write a function for these stuff below - - # ES-DE - cp -r /app/retrodeck/tools/* /var/config/retrodeck/tools/ - mkdir -p /var/config/emulationstation/.emulationstation/custom_systems/tools/ - cp /app/retrodeck/tools-gamelist.xml /var/config/retrodeck/tools/gamelist.xml - # ES-DE scraped folder - Original in ~/retrodeck - mv -f /var/config/emulationstation/.emulationstation/downloaded_media /var/config/emulationstation/.emulationstation/downloaded_media.old - mkdir ~/retrodeck/.downloaded_media - ln -s ~/retrodeck/.downloaded_media /var/config/emulationstation/.emulationstation/downloaded_media - mv -f /var/config/emulationstation/.emulationstation/downloaded_media.old/* ~/retrodeck/.downloaded_media - rm -rf /var/config/emulationstation/.emulationstation/downloaded_media.old - # ES-DE themes folder - Original in ~/retrodeck - mv -f /var/config/emulationstation/.emulationstation/themes /var/config/emulationstation/.emulationstation/themes.old - mkdir ~/retrodeck/.themes - ln -s ~/retrodeck/.themes /var/config/emulationstation/.emulationstation/themes - mv -f /var/config/emulationstation/.emulationstation/themes.old/* ~/retrodeck/.themes - rm -rf /var/config/emulationstation/.emulationstation/themes.old - - # Initializing emulators configs - emuconfigs=/app/retrodeck/emu-configs/ - - # RetroArch - mkdir -p /var/config/retroarch/cores/ - rm -rf /var/config/retroarch/system - ln -s ~/retrodeck/bios /var/config/retroarch/system - cp /app/share/libretro/cores/* /var/config/retroarch/cores/ - cp $emuconfigs/retroarch.cfg /var/config/retroarch/ - rm -f ~/retrodeck/bios/bios # in some situations a double bios link is created - - # Yuzu - find ~/retrodeck/bios/switch -xtype l -exec rm {} \; # removing dead symlinks - # initializing the keys folder - mkdir -p ~/retrodeck/bios/switch/keys - rm -rf /var/data/yuzu/keys - ln -s ~/retrodeck/bios/switch/keys /var/data/yuzu/keys - # initializing the firmware folder - mkdir -p ~/retrodeck/bios/switch/registered - rm -rf /var/data/yuzu/nand/system/Contents/registered/ - ln -s ~/retrodeck/bios/switch/registered /var/data/yuzu/nand/system/Contents/registered/ - # configuring Yuzu - cp $emuconfigs/yuzu-qt-config.ini /var/config/yuzu/qt-config.ini - - # Dolphin - mkdir -p /var/config/dolphin-emu/ - cp $emuconfigs/Dolphin.ini /var/config/dolphin-emu/ - - # pcsx2 - mkdir -p /var/config/PCSX2/inis/ - cp $emuconfigs/PCSX2_ui.ini /var/config/PCSX2/inis/ - - # MelonDS - mkdir -p /var/config/melonDS/ - ln -s ~/retrodeck/bios /var/config/melonDS/bios - cp $emuconfigs/melonDS.ini /var/config/melonDS/ - - # CITRA - mkdir -p /var/config/citra-emu/ - cp $emuconfigs/citra-qt-config.ini /var/config/citra-emu/qt-config.ini - - # RPCS3 - mkdir -p /var/config/rpcs3/ - cp $emuconfigs/config.yml /var/config/rpcs3/ - - # PICO-8 - mkdir -p $roms_folder/pico-8 - - - # Locking RetroDECK - touch ~/retrodeck/.lock - - kdialog --title "RetroDECK" --msgbox "Initialization completed.\nplease put your roms in:\n\n$roms_folder\n\nand your bioses in\n\n~/retrodeck/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\nIt's suggested to add RetroDECK to your Steam Library for a quick access." -else - emulationstation --home /var/config/emulationstation + echo "Lockfile version is "$(cat "$lockfile")" but the actual version is $version" + post_update + start_retrodeck + exit 0 fi + +# LOCKFILE 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 + echo "Lockfile not found" + finit + exit 0 +fi + +# Normal Startup +start_retrodeck \ No newline at end of file From 329caca368a728a609160ae22028ae1b1c2090a7 Mon Sep 17 00:00:00 2001 From: Xargon Date: Thu, 19 May 2022 23:32:50 +0900 Subject: [PATCH 136/170] Moved es_configs in a proper folder --- es_find_rules.xml | 318 ---------- es_settings.xml | 121 ---- es_systems.xml | 1430 -------------------------------------------- tools-gamelist.xml | 73 --- 4 files changed, 1942 deletions(-) delete mode 100644 es_find_rules.xml delete mode 100644 es_settings.xml delete mode 100644 es_systems.xml delete mode 100644 tools-gamelist.xml diff --git a/es_find_rules.xml b/es_find_rules.xml deleted file mode 100644 index 35a091a4..00000000 --- a/es_find_rules.xml +++ /dev/null @@ -1,318 +0,0 @@ - - - - - - - - bash - sh - - - - - retroarch - org.libretro.RetroArch - RetroArch-Linux-x86_64.AppImage - - - /var/lib/flatpak/exports/bin/org.libretro.RetroArch - ~/.local/share/flatpak/exports/bin/org.libretro.RetroArch - ~/Applications/RetroArch-Linux-x86_64.AppImage - ~/.local/bin/RetroArch-Linux-x86_64.AppImage - ~/bin/RetroArch-Linux-x86_64.AppImage - - - - - - ~/snap/retroarch/current/.config/retroarch/cores - - ~/.var/app/org.libretro.RetroArch/config/retroarch/cores - - ~/.config/retroarch/cores - - /usr/lib/x86_64-linux-gnu/libretro - - /usr/lib64/libretro - - /usr/lib/libretro - - /usr/local/lib/libretro - - /usr/pkg/lib/libretro - - /app/share/libretro/cores - - - - - - citra-emu.citra-nightly - org.citra_emu.citra - citra-qt - - - /var/lib/flatpak/exports/bin/org.citra_emu.citra - ~/.local/share/flatpak/exports/bin/org.citra_emu.citra - - - - - - dolphin-emu - org.DolphinEmu.dolphin-emu - - - /var/lib/flatpak/exports/bin/org.DolphinEmu.dolphin-emu - ~/.local/share/flatpak/exports/bin/org.DolphinEmu.dolphin-emu - ~/Applications/Dolphin_Emulator.AppImage - ~/.local/bin/Dolphin_Emulator.AppImage - ~/bin/Dolphin_Emulator.AppImage - - - - - - dosbox-staging - io.github.dosbox-staging - - - /var/lib/flatpak/exports/bin/io.github.dosbox-staging - ~/.local/share/flatpak/exports/bin/io.github.dosbox-staging - - - - - - dosbox-x - com.dosbox_x.DOSBox-X - - - /var/lib/flatpak/exports/bin/com.dosbox_x.DOSBox-X - ~/.local/share/flatpak/exports/bin/com.dosbox_x.DOSBox-X - - - - - - duckstation-nogui - duckstation-qt - org.duckstation.DuckStation - - - /var/lib/flatpak/exports/bin/org.duckstation.DuckStation - ~/.local/share/flatpak/exports/bin/org.duckstation.DuckStation - ~/Applications/duckstation-nogui-x64.AppImage - ~/.local/bin/duckstation-nogui-x64.AppImage - ~/bin/duckstation-nogui-x64.AppImage - ~/Applications/duckstation-qt-x64.AppImage - ~/.local/bin/duckstation-qt-x64.AppImage - ~/bin/duckstation-qt-x64.AppImage - - - - - - flycast - org.flycast.Flycast - - - /var/lib/flatpak/exports/bin/org.flycast.Flycast - ~/.local/share/flatpak/exports/bin/org.flycast.Flycast - - - - - - fs-uae - fsuae.fs-uae - net.fsuae.FS-UAE - - - /var/lib/flatpak/exports/bin/net.fsuae.FS-UAE - ~/.local/share/flatpak/exports/bin/net.fsuae.FS-UAE - - - - - - mame - - - - - - melonds - melonDS - net.kuribo64.melonDS - - - /var/lib/flatpak/exports/bin/net.kuribo64.melonDS - ~/.local/share/flatpak/exports/bin/net.kuribo64.melonDS - - - - - - mgba - io.mgba.mGBA - - - /var/lib/flatpak/exports/bin/io.mgba.mGBA - ~/.local/share/flatpak/exports/bin/io.mgba.mGBA - ~/Applications/mGBA.AppImage - ~/.local/bin/mGBA.AppImage - ~/bin/mGBA.AppImage - - - - - - m64p - io.github.m64p.m64p - - - /var/lib/flatpak/exports/bin/io.github.m64p.m64p - ~/.local/share/flatpak/exports/bin/io.github.m64p.m64p - - - - - - PCSX2 - pcsx2 - net.pcsx2.PCSX2 - - - /var/lib/flatpak/exports/bin/net.pcsx2.PCSX2 - ~/.local/share/flatpak/exports/bin/net.pcsx2.PCSX2 - - - - - - /var/lib/flatpak/exports/bin/org.purei.Play - ~/.local/share/flatpak/exports/bin/org.purei.Play - ~/Applications/Play!.AppImage - ~/.local/bin/Play!.AppImage - ~/bin/Play!.AppImage - - - - - - ppsspp-emu.ppsspp-sdl - org.ppsspp.PPSSPP - - - /var/lib/flatpak/exports/bin/org.ppsspp.PPSSPP - ~/.local/share/flatpak/exports/bin/org.ppsspp.PPSSPP - - - - - - primehack - io.github.shiiion.primehack - - - /var/lib/flatpak/exports/bin/io.github.shiiion.primehack - ~/.local/share/flatpak/exports/bin/io.github.shiiion.primehack - - - - - - redream - - - ~/Applications/redream - ~/.local/bin/redream - ~/bin/redream - - - - - - rpcs3 - rpcs3-emu.rpcs3 - net.rpcs3.RPCS3 - rpcs3.AppImage - - - /var/lib/flatpak/exports/bin/net.rpcs3.RPCS3 - ~/.local/share/flatpak/exports/bin/net.rpcs3.RPCS3 - ~/Applications/rpcs3.AppImage - ~/.local/bin/rpcs3.AppImage - ~/bin/rpcs3.AppImage - - - - - - snes9x - - - /var/lib/flatpak/exports/bin/com.snes9x.Snes9x - ~/.local/share/flatpak/exports/bin/com.snes9x.Snes9x - - - - - - Ryujinx - org.ryujinx.Ryujinx - - - /var/lib/flatpak/exports/bin/org.ryujinx.Ryujinx - ~/.local/share/flatpak/exports/bin/org.ryujinx.Ryujinx - ~/Applications/publish/Ryujinx - ~/.local/bin/publish/Ryujinx - ~/bin/publish/Ryujinx - - - - - - visualboyadvance-m - - - - - - xemu - app.xemu.xemu - - - /var/lib/flatpak/exports/bin/app.xemu.xemu - ~/.local/share/flatpak/exports/bin/app.xemu.xemu - ~/Applications/Xemu.AppImage - ~/.local/bin/Xemu.AppImage - ~/bin/Xemu.AppImage - - - - - - yuzu - org.yuzu_emu.yuzu - yuzu.AppImage - - - /var/lib/flatpak/exports/bin/org.yuzu_emu.yuzu - ~/.local/share/flatpak/exports/bin/org.yuzu_emu.yuzu - ~/Applications/yuzu.AppImage - ~/.local/bin/yuzu.AppImage - ~/bin/yuzu.AppImage - - - - - pico8 - - - ~/retrodeck/bios/pico-8/pico8 - - - diff --git a/es_settings.xml b/es_settings.xml deleted file mode 100644 index 8573537d..00000000 --- a/es_settings.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/es_systems.xml b/es_systems.xml deleted file mode 100644 index 41f00e31..00000000 --- a/es_systems.xml +++ /dev/null @@ -1,1430 +0,0 @@ - - - - - 3do - 3DO - %ROMPATH%/3do - .iso .ISO .bin .BIN .chd .CHD .cue .CUE .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/opera_libretro.so %ROM% - 3do - 3do - - - 64dd - Nintendo 64DD - %ROMPATH%/64dd - .n64 .N64 .v64 .V64 .z64 .Z64 .bin .BIN .u1 .U1 .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 - 64dd - - - ags - Adventure Game Studio Game Engine - %ROMPATH%/ags - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - ags - ags - - - 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 - %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 - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae2021_libretro.so %ROM% - amiga - amiga1200 - - - 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 - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae2021_libretro.so %ROM% - amigacd32 - amigacd32 - - - amstradcpc - Amstrad CPC - %ROMPATH%/amstradcpc - .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% - amstradcpc - amstradcpc - - - android - Google Android - %ROMPATH%/android - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - android - android - - - apple2 - Apple II - %ROMPATH%/apple2 - .nib .NIB .do .DO .po .PO .dsk .DSK .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - apple2 - apple2 - - - apple2gs - Apple IIGS - %ROMPATH%/apple2gs - .nib .NIB .do .DO .po .PO .dsk .DSK .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - apple2gs - apple2gs - - - arcade - Arcade - %ROMPATH%/arcade - .cmd .CMD .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% - %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% - arcade - arcade - - - astrocde - Bally Astrocade - %ROMPATH%/astrocde - .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% - %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %ROMPATH%/astrocde astrocde -cart %BASENAME% - astrocde - astrocade - - - atari2600 - Atari 2600 - %ROMPATH%/atari2600 - .a26 .A26 .bin .BIN .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/stella_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/stella2014_libretro.so %ROM% - atari2600 - atari2600 - - - atari5200 - Atari 5200 - %ROMPATH%/atari5200 - .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 - - - atari7800 - Atari 7800 ProSystem - %ROMPATH%/atari7800 - .a78 .A78 .bin .BIN .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prosystem_libretro.so %ROM% - atari7800 - atari7800 - - - atari800 - Atari 800 - %ROMPATH%/atari800 - .xfd .XFD .atr .ATR .atx .ATX .cdm .CDM .cas .CAS .bin .BIN .a52 .A52 .xex .XEX .rom .ROM .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.so %ROM% - %EMULATOR_ATARI800% %ROM% - atari800 - atari800 - - - atarijaguar - Atari Jaguar - %ROMPATH%/atarijaguar - .j64 .J64 .jag .JAG .rom .ROM .abs .ABS .cof .COF .bin .BIN .prg .PRG .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/virtualjaguar_libretro.so %ROM% - atarijaguar, atarijaguarcd - atarijaguar - - - atarijaguarcd - Atari Jaguar CD - %ROMPATH%/atarijaguarcd - .j64 .J64 .jag .JAG .rom .ROM .abs .ABS .cof .COF .bin .BIN .prg .PRG .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/virtualjaguar_libretro.so %ROM% - atarijaguarcd - atarijaguarcd - - - atarilynx - Atari Lynx - %ROMPATH%/atarilynx - .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 - - - atarist - Atari ST - %ROMPATH%/atarist - .st .ST .msa .MSA .stx .STX .dim .DIM .ipf .IPF .m3u .M3U .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/hatari_libretro.so %ROM% - atarist - atarist - - - atarixe - Atari XE - %ROMPATH%/atarixe - .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%/atari800_libretro.so %ROM% - atarixe - atarixe - - - atomiswave - Atomiswave - %ROMPATH%/atomiswave - .chd .CHD .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM% - %EMULATOR_FLYCAST% %ROM% - atomiswave - atomiswave - - - bbcmicro - BBC Micro - %ROMPATH%/bbcmicro - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - bbcmicro - bbcmicro - - - c64 - Commodore 64 - %ROMPATH%/c64 - .bin .BIN .cmd .CMD .crt .CRT .d2m .D2M .d4m .D4M .d64 .D64 .d6z .D6Z .d71 .D71 .d7z .D7Z .d80 .D80 .d81 .D81 .d82 .D82 .d8z .D8Z .g41 .G41 .g4z .G4Z .g64 .G64 .g6z .G6Z .gz .GZ .lnx .LNX .m3u .M3U .nbz .NBZ .nib .NIB .p00 .P00 .prg .PRG .t64 .T64 .tap .TAP .vfl .VFL .vsf .VSF .x64 .X64 .x6z .X6Z .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x64sc_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x64_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_xscpu64_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x128_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/frodo_libretro.so %ROM% - c64 - c64 - - - cavestory - Cave Story (NXEngine) - %ROMPATH%/cavestory - .exe .EXE .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nxengine_libretro.so %ROM% - cavestory - cavestory - - - cdimono1 - Philips CD-i - %ROMPATH%/cdimono1 - .chd .CHD .cue .CUE .iso .ISO - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/same_cdi_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/cdi2015_libretro.so %ROM% - cdimono1 - cdimono1 - - - cdtv - Commodore CDTV - %ROMPATH%/cdtv - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - cdtv - cdtv - - - chailove - ChaiLove Game Engine - %ROMPATH%/chailove - .chai .CHAI .chailove .CHAILOVE .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/chailove_libretro.so %ROM% - love - chailove - - - channelf - Fairchild Channel F - %ROMPATH%/channelf - .bin .BIN .chf .CHF .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freechaf_libretro.so %ROM% - channelf - channelf - - - coco - Tandy Color Computer - %ROMPATH%/coco - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - coco - coco - - - colecovision - ColecoVision - %ROMPATH%/coleco - .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM% - colecovision - colecovision - - - daphne - Daphne Arcade LaserDisc Emulator - %ROMPATH%/daphne - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - daphne - daphne - - - doom - Doom - %ROMPATH%/doom - .wad .WAD .iwad .IWAD .pwad .PWAD - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prboom_libretro.so %ROM% - pc - doom - - - dos - DOS (PC) - %ROMPATH%/dos - .bat .BAT .com .COM .conf .CONF .cue .CUE .dosz .DOSZ .exe .EXE .iso .ISO .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_pure_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_svn_libretro.so %ROM% - %EMULATOR_DOSBOX-X% %ROM% - %EMULATOR_DOSBOX-STAGING% %ROM% - dos - dos - - - dragon32 - Dragon 32 - %ROMPATH%/dragon32 - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - dragon32 - dragon32 - - - dreamcast - Sega Dreamcast - %ROMPATH%/dreamcast - .chd .CHD .cdi .CDI .iso .ISO .elf .ELF .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM% - %EMULATOR_FLYCAST% %ROM% - %EMULATOR_REDREAM% %ROM% - dreamcast - dreamcast - - - famicom - Nintendo Family Computer - %ROMPATH%/famicom - .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_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quicknes_libretro.so %ROM% - famicom - famicom - - - fba - FinalBurn Alpha - %ROMPATH%/fba - .iso .ISO .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_neogeo_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps1_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps2_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps3_libretro.so %ROM% - arcade - fba - - - fbneo - FinalBurn Neo - %ROMPATH%/fbneo - .ccd .CCD .cue .CUE .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM% - arcade - fbneo - - - fds - Nintendo Famicom Disk System - %ROMPATH%/fds - .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_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM% - fds - fds - - - gameandwatch - Nintendo Game and Watch - %ROMPATH%/gameandwatch - .mgw .MGW .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gw_libretro.so %ROM% - gameandwatch - gameandwatch - - - gamegear - Sega Game Gear - %ROMPATH%/gamegear - .68k .68K .bin .BIN .bms .BMS .chd .CHD .col .COL .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx .MDX .rom .ROM .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%/gearsystem_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/smsplus_libretro.so %ROM% - gamegear - gamegear - - - gb - Nintendo Game Boy - %ROMPATH%/gb - .bs .BS .cgb .CGB .dmg .DMG .gb .GB .gbc .GBC .sgb .SGB .sfc .SFC .smc .SMC .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gambatte_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/sameboy_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearboy_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tgbdual_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mgba_libretro.so %ROM% - %EMULATOR_MGBA% -f %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vbam_libretro.so %ROM% - %EMULATOR_VBA-M% -f %ROM% - gb - gb - - - gba - Nintendo Game Boy Advance - %ROMPATH%/gba - .agb .AGB .bin .BIN .cgb .CGB .dmg .DMG .gb .GB .gba .GBA .gbc .GBC .sgb .SGB .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mgba_libretro.so %ROM% - %EMULATOR_MGBA% -f %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vbam_libretro.so %ROM% - %EMULATOR_VBA-M% -f %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vba_next_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gpsp_libretro.so %ROM% - gba - gba - - - gbc - Nintendo Game Boy Color - %ROMPATH%/gbc - .bs .BS .cgb .CGB .dmg .DMG .gb .GB .gbc .GBC .sgb .SGB .sfc .SFC .smc .SMC .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gambatte_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/sameboy_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearboy_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tgbdual_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mgba_libretro.so %ROM% - %EMULATOR_MGBA% -f %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vbam_libretro.so %ROM% - %EMULATOR_VBA-M% -f %ROM% - gbc - gbc - - - 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_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM% - %EMULATOR_DOLPHIN% -b -e %ROM% - %EMULATOR_PRIMEHACK% -b -e %ROM% - gc - gc - - - 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 - %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 - - - gx4000 - Amstrad GX4000 - %ROMPATH%/gx4000 - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - gx4000 - gx4000 - - - intellivision - Mattel Electronics Intellivision - %ROMPATH%/intellivision - .int .INT .bin .BIN .rom .ROM .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freeintv_libretro.so %ROM% - intellivision - intellivision - - - j2me - Java 2 Micro Edition (J2ME) - %ROMPATH%/j2me - .jar .JAR .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/squirreljme_libretro.so %ROM% - android - j2me - - - lutro - Lutro Game Engine - %ROMPATH%/lutro - .lua .LUA .lutro .LUTRO .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/lutro_libretro.so %ROM% - lutro - lutro - - - mame - Multiple Arcade Machine Emulator - %ROMPATH%/mame - .cmd .CMD .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% - %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% - arcade - mame - - - mame-advmame - AdvanceMAME - %ROMPATH%/mame-advmame - .chd .cue .CUE .CHD .cmd .CMD .fba .FBA .iso .ISO .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - arcade - mame-advmame - - - mame-mame4all - MAME4ALL - %ROMPATH%/mame-mame4all - .chd .cue .CUE .CHD .cmd .CMD .fba .FBA .iso .ISO .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - arcade - mame-mame4all - - - mastersystem - Sega Master System - %ROMPATH%/mastersystem - .68k .68K .bin .BIN .bms .BMS .chd .CHD .col .COL .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx .MDX .rom .ROM .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%/smsplus_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% - mastersystem - mastersystem - - - megacd - Sega Mega-CD - %ROMPATH%/megacd - .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% - segacd - megacd - - - megacdjp - Sega Mega-CD - %ROMPATH%/megacdjp - .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% - segacd - megacdjp - - - 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 - %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 - - - mess - Multi Emulator Super System - %ROMPATH%/mess - .chd .CHD .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mess2015_libretro.so %ROM% - mess - mess - - - moonlight - Moonlight Game Streaming - %ROMPATH%/moonlight - .moonlight .MOONLIGHT .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - moonlight - moonlight - - - moto - Thomson MO/TO Series - %ROMPATH%/moto - .fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.so %ROM% - moto - moto - - - msx - MSX - %ROMPATH%/msx - .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fmsx_libretro.so %ROM% - msx - msx - - - msx1 - MSX1 - %ROMPATH%/msx1 - .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fmsx_libretro.so %ROM% - msx - msx1 - - - msx2 - MSX2 - %ROMPATH%/msx2 - .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fmsx_libretro.so %ROM% - msx2 - msx2 - - - msxturbor - MSX Turbo R - %ROMPATH%/msxturbor - .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM% - msxturbor - msxturbor - - - multivision - Othello Multivision - %ROMPATH%/multivision - .bin .BIN .gg .GG .rom .ROM .sg .SG .sms .SMS .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM% - sg-1000 - multivision - - - n3ds - Nintendo 3DS - %ROMPATH%/n3ds - .3ds .3DS .3dsx .3DSX .app .APP .axf .AXF .cci .CCI .cxi .CXI .elf .ELF .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra2018_libretro.so %ROM% - %EMULATOR_CITRA% %ROM% - n3ds - n3ds - - - n64 - Nintendo 64 - %ROMPATH%/n64 - .n64 .N64 .v64 .V64 .z64 .Z64 .bin .BIN .u1 .U1 .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 - - - naomi - Sega NAOMI - %ROMPATH%/naomi - .chd .CHD .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM% - %EMULATOR_FLYCAST% %ROM% - naomi - naomi - - - naomigd - Sega NAOMI GD-ROM - %ROMPATH%/naomigd - .chd .CHD .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM% - %EMULATOR_FLYCAST% %ROM% - naomi - naomigd - - - nds - Nintendo DS - %ROMPATH%/nds - .bin .BIN .nds .NDS .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/desmume_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/desmume2015_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/melonds_libretro.so %ROM% - %EMULATOR_MELONDS% %ROM% - nds - nds - - - neogeo - SNK Neo Geo - %ROMPATH%/neogeo - .chd .CHD .cue .CUE .iso .ISO .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM% - neogeo - neogeo - - - neogeocd - SNK Neo Geo CD - %ROMPATH%/neogeocd - .chd .CHD .cue .CUE .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/neocd_libretro.so %ROM% - neogeocd - neogeocd - - - neogeocdjp - SNK Neo Geo CD - %ROMPATH%/neogeocdjp - .chd .CHD .cue .CUE .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/neocd_libretro.so %ROM% - neogeocd - neogeocdjp - - - nes - Nintendo Entertainment System - %ROMPATH%/nes - .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_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quicknes_libretro.so %ROM% - nes - nes - - - ngp - SNK Neo Geo Pocket - %ROMPATH%/ngp - .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 - - - ngpc - SNK Neo Geo Pocket Color - %ROMPATH%/ngpc - .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 - - - odyssey2 - Magnavox Odyssey2 - %ROMPATH%/odyssey2 - .bin .BIN .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.so %ROM% - odyssey2 - odyssey2 - - - openbor - OpenBOR Game Engine - %ROMPATH%/openbor - .AppImage - %STARTDIR%=%GAMEDIR% %EMULATOR_OS-SHELL% -c "%ROM%" - openbor - openbor - - - oric - Tangerine Computer Systems Oric - %ROMPATH%/oric - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - oric - oric - - - palm - Palm OS - %ROMPATH%/palm - .prc .PRC .pqa .PQA .img .IMG .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mu_libretro.so %ROM% - palm - palm - - - pc88 - NEC PC-8800 Series - %ROMPATH%/pc88 - .d88 .D88 .u88 .U88 .m3u .M3U .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quasi88_libretro.so %ROM% - pc88 - pc88 - - - pc98 - NEC PC-9800 Series - %ROMPATH%/pc98 - .2hd .2HD .88d .88D .98d .98D .d88 .D88 .d98 .D98 .cmd .CMD .dup .DUP .fdd .FDD .fdi .FDI .hdd .HDD .hdi .HDI .hdm .HDM .hdn .HDN .nhd .NHD .tfd .TFD .thd .THD . xdf .XDF .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/np2kai_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nekop2_libretro.so %ROM% - pc98 - pc98 - - - pcengine - NEC PC Engine - %ROMPATH%/pcengine - .bin .BIN .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 - - - pcenginecd - NEC PC Engine CD - %ROMPATH%/pcenginecd - .bin .BIN .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 - - - pcfx - 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% - pcfx - pcfx - - - pokemini - Nintendo Pokémon Mini - %ROMPATH%/pokemini - .min .MIN .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pokemini_libretro.so %ROM% - pokemini - pokemini - - - ports - Ports - %ROMPATH%/ports - .sh - %EMULATOR_OS-SHELL% %ROM% - pc - ports - - - ps2 - Sony PlayStation 2 - %ROMPATH%/ps2 - .bin .BIN .chd .CHD .cso .CSO .elf .ELF .iso .ISO .isz .ISZ - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM% - %EMULATOR_PCSX2% --nogui %ROM% - %EMULATOR_PLAY!% --disc %ROM% - ps2 - ps2 - - - ps3 - Sony PlayStation 3 - %ROMPATH%/ps3 - .ps3 .PS3 .ps3dir .PS3DIR - %EMULATOR_RPCS3% --no-gui %ROM% - ps3 - ps3 - - - ps4 - Sony PlayStation 4 - %ROMPATH%/ps4 - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - ps4 - ps4 - - - psp - Sony PlayStation Portable - %ROMPATH%/psp - .elf .ELF .iso .ISO .cso .CSO .prx .PRX .pbp .PBP .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/ppsspp_libretro.so %ROM% - %EMULATOR_PPSSPP% %ROM% - psp - psp - - - psvita - Sony PlayStation Vita - %ROMPATH%/psvita - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - psvita - psvita - - - psx - Sony PlayStation - %ROMPATH%/psx - .bin .BIN .cbn .CBN .ccd .CCD .chd .CHD .cue .CUE .ecm .ECM .exe .EXE .img .IMG .iso .ISO .m3u .M3U .mdf .MDF .mds .MDS .pbp .PBP .psexe .PSEXE .psf .PSF .toc .TOC .z .Z .znx .ZNX .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_psx_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_psx_hw_libretro.so %ROM% - %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 - - - samcoupe - SAM Coupé - %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 - - - satellaview - Nintendo Satellaview - %ROMPATH%/satellaview - .bml .BML .bs .BS .fig .FIG .sfc .SFC .smc .SMC .swc .SWC .st .ST .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% - satellaview - satellaview - - - saturn - Sega Saturn - %ROMPATH%/saturn - .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .iso .ISO .mds .MDS .toc .TOC .m3u .M3U .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_saturn_libretro.so %ROM% - %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 - - - saturnjp - Sega Saturn - %ROMPATH%/saturnjp - .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .iso .ISO .mds .MDS .toc .TOC .m3u .M3U .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_saturn_libretro.so %ROM% - %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 - - - scummvm - ScummVM Game Engine - %ROMPATH%/scummvm - .scummvm .SCUMMVM .svm .SVM - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/scummvm_libretro.so %ROM% - scummvm - scummvm - - - sega32x - Sega Mega Drive 32X - %ROMPATH%/sega32x - .bin .BIN .gen .GEN .smd .SMD .md .MD .32x .32X .cue .CUE .iso .ISO .sms .SMS .68k .68K .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% - sega32x - sega32x - - - sega32xjp - Sega Super 32X - %ROMPATH%/sega32xjp - .bin .BIN .gen .GEN .smd .SMD .md .MD .32x .32X .cue .CUE .iso .ISO .sms .SMS .68k .68K .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% - sega32x - sega32xjp - - - sega32xna - Sega Genesis 32X - %ROMPATH%/sega32xna - .bin .BIN .gen .GEN .smd .SMD .md .MD .32x .32X .cue .CUE .iso .ISO .sms .SMS .68k .68K .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% - sega32x - sega32xna - - - segacd - Sega CD - %ROMPATH%/segacd - .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% - segacd - segacd - - - sfc - Nintendo SFC (Super Famicom) - %ROMPATH%/sfc - .bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC .smc .SMC .st .ST .swc .SWC .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM% - %EMULATOR_SNES9X% %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supafaust_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% - snes - sfc - - - sg-1000 - Sega SG-1000 - %ROMPATH%/sg-1000 - .68k .68K .bin .BIN .bms .BMS .chd .CHD .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx .MDX .ri .RI .rom .ROM .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM% - %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%/bluemsx_libretro.so %ROM% - sg-1000 - sg-1000 - - - snes - Nintendo SNES (Super Nintendo) - %ROMPATH%/snes - .bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC .smc .SMC .st .ST .swc .SWC .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM% - %EMULATOR_SNES9X% %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supafaust_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% - snes - snes - - - snesna - Nintendo SNES (Super Nintendo) - %ROMPATH%/snesna - .bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC .smc .SMC .st .ST .swc .SWC .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM% - %EMULATOR_SNES9X% %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supafaust_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% - snes - snesna - - - solarus - Solarus Game Engine - %ROMPATH%/solarus - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - solarus - solarus - - - spectravideo - Spectravideo - %ROMPATH%/spectravideo - .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM% - spectravideo - spectravideo - - - stratagus - Stratagus Game Engine - %ROMPATH%/stratagus - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - stratagus - stratagus - - - sufami - Bandai SuFami Turbo - %ROMPATH%/sufami - .bml .BML .bs .BS .fig .FIG .sfc .SFC .smc .SMC .st .ST .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM% - sufami - sufami - - - supergrafx - NEC SuperGrafx - %ROMPATH%/supergrafx - .pce .PCE .sgx .SGX .cue .CUE .ccd .CCD .chd .CHD .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supergrafx_libretro.so %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM% - supergrafx - supergrafx - - - switch - Nintendo Switch - %ROMPATH%/switch - .nca .NCA .nro .NRO .nso .NSO .nsp .NSP .xci .XCI .7z .7Z .zip .ZIP - %EMULATOR_YUZU% -f -g %ROM% - %EMULATOR_RYUJINX% %ROM% - switch - switch - - - symbian - Symbian - %ROMPATH%/symbian - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - android - symbian - - - tanodragon - Tano Dragon - %ROMPATH%/tanodragon - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - dragon32 - tanodragon - - - tg16 - NEC TurboGrafx-16 - %ROMPATH%/tg16 - .bin .BIN .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 - - - tg-cd - NEC TurboGrafx-CD - %ROMPATH%/tg-cd - .bin .BIN .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 - - - ti99 - Texas Instruments TI-99 - %ROMPATH%/ti99 - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - ti99 - ti99 - - - tic80 - TIC-80 Game Engine - %ROMPATH%/tic80 - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - tic80 - tic80 - - - to8 - Thomson TO8 - %ROMPATH%/to8 - .fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.so %ROM% - moto - to8 - - - trs-80 - Tandy TRS-80 - %ROMPATH%/trs-80 - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - trs-80 - trs-80 - - - uzebox - Uzebox - %ROMPATH%/uzebox - .uze .UZE .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/uzem_libretro.so %ROM% - uzebox - uzebox - - - vectrex - Vectrex - %ROMPATH%/vectrex - .bin .BIN .vec .VEC .gam .GAM .vc .VC .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vecx_libretro.so %ROM% - vectrex - vectrex - - - vic20 - Commodore VIC-20 - %ROMPATH%/vic20 - .bin .BIN .cmd .CMD .crt .CRT .d2m .D2M .d4m .D4M .d64 .D64 .d6z .D6Z .d71 .D71 .d7z .D7Z .d80 .D80 .d81 .D81 .d82 .D82 .d8z .D8Z .g41 .G41 .g4z .G4Z .g64 .G64 .g6z .G6Z .gz .GZ .lnx .LNX .m3u .M3U .nbz .NBZ .nib .NIB .p00 .P00 .prg .PRG .t64 .T64 .tap .TAP .vfl .VFL .vsf .VSF .x64 .X64 .x6z .X6Z .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_xvic_libretro.so %ROM% - vic20 - vic20 - - - videopac - Philips Videopac G7000 - %ROMPATH%/videopac - .bin .BIN .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.so %ROM% - videopac - videopac - - - virtualboy - 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% - virtualboy - virtualboy - - - 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_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM% - %EMULATOR_DOLPHIN% -b -e %ROM% - %EMULATOR_PRIMEHACK% -b -e %ROM% - wii - wii - - - wiiu - Nintendo Wii U - %ROMPATH%/wiiu - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - wiiu - wiiu - - - wonderswan - Bandai WonderSwan - %ROMPATH%/wonderswan - .ws .WS .pc2 .PC2 .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_wswan_libretro.so %ROM% - wonderswan - wonderswan - - - wonderswancolor - 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% - wonderswancolor - wonderswancolor - - - x1 - Sharp X1 - %ROMPATH%/x1 - .dx1 .DX1 .2d .2D .2hd .2HD .tfd .TFD .d88 .D88 .88d .88D .hdm .HDM .xdf .XDF .dup .DUP .tap .TAP .cmd .CMD .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/x1_libretro.so %ROM% - x1 - x1 - - - x68000 - Sharp X68000 - %ROMPATH%/x68000 - .dim .DIM .img .IMG .d88 .D88 .88d .88D .hdm .HDM .dup .DUP .2hd .2HD .xdf .XDF .hdf .HDF .cmd .CMD .m3u .M3U .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/px68k_libretro.so %ROM% - x68000 - x68000 - - - xbox - Microsoft Xbox - %ROMPATH%/xbox - .iso .ISO - %EMULATOR_XEMU% -full-screen -dvd_path %ROM% - xbox - xbox - - - xbox360 - Microsoft Xbox 360 - %ROMPATH%/xbox360 - .iso .ISO .xex .XEX - PLACEHOLDER %ROM% - xbox360 - xbox360 - - - zmachine - Infocom Z-machine - %ROMPATH%/zmachine - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - zmachine - zmachine - - - zx81 - Sinclair ZX81 - %ROMPATH%/zx81 - .tzx .TZX .p .P .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/81_libretro.so %ROM% - zx81 - zx81 - - - zxspectrum - Sinclair ZX Spectrum - %ROMPATH%/zxspectrum - .tzx .TZX .tap .TAP .z80 .Z80 .rzx .RZX .scl .SCL .trd .TRD .sh .SH .sna .SNA .szx .SZX .udi .UDI .mgt .MGT .img .IMG .dsk .DSK .gz .GZ .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fuse_libretro.so %ROM% - zxspectrum - zxspectrum - - - tools - RetroDECK Tools - /var/config/retrodeck/tools - .sh .SH - bash %ROM% - tools - tools - - - pico-8 - Pico-8 - Lexaloffle - 2015 - console - %ROMPATH%/pico-8 - .p8 .png - %EMULATOR_PICO-8% -desktop ~/retrodeck/screenshots -windowed 0 -root_path %ROMPATH%/pico-8 -run %ROM% - pico-8 - pico-8 - - diff --git a/tools-gamelist.xml b/tools-gamelist.xml deleted file mode 100644 index 19a4c294..00000000 --- a/tools-gamelist.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - ./start-retroarch.sh - Start RetroArch - Start RetroArch to manually tweak your settings. - true - true - - - ./start-yuzu.sh - Start Yuzu - Start Yuzu to manually tweak your settings. - true - true - - - ./start-pcsx2.sh - Start PCSX2 (Standalone) - Start PCSX2 to manually tweak your settings. - true - true - - - ./start-ppsspp.sh - Start PPSSPP (Standalone) - Start PPSSPP to manually tweak your settings. - true - true - - - ./start-dolphin.sh - Start Dolphin (Standalone) - Start Dolphin to manually tweak your settings. - true - true - - - ./start-melonds.sh - Start MelonDS (Standalone) - Start MelonDS to manually tweak your settings. - true - true - - - ./start-citra.sh - Start CITRA (Standalone) - Start CITRA to manually tweak your settings. - true - true - - - ./start-rpcs3.sh - Start RPCS3 (Standalone) - Start RPCS3 to manually tweak your settings. - true - true - - - ./start-splore.sh - Start Splore - Start PICO-8's splore - true - true - - - ./move-roms.sh - Move roms folder - Move roms folder from internal to external and vice versa. - true - true - - From b6b56964f6ccc65967fc9a32a8aac6856ce02105 Mon Sep 17 00:00:00 2001 From: Xargon Date: Fri, 20 May 2022 00:46:24 +0900 Subject: [PATCH 137/170] SED: replaced separator --- 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 dec86763..00772f74 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -147,8 +147,8 @@ modules: branch: d89cedd25f1bbb9a38c1f66bca18b74d5332cad1 - type: shell commands: - - sed -i "s/QUIT EMULATIONSTATION/QUIT RETRODECK/g" es-app/src/guis/GuiMenu.cpp - - sed -i "s/"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)/"RetroDECK v$(cat ${FLATPAK_DEST}/retrodeck/version), ES-DE v" + Utils::String::toUpper(PROGRAM_VERSION_STRING)/g" es-app/src/guis/GuiMenu.cpp + - sed -i 's/QUIT EMULATIONSTATION/QUIT RETRODECK/g' es-app/src/guis/GuiMenu.cpp + - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK v$(cat ${FLATPAK_DEST}/retrodeck/version), ES-DE v" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#g' es-app/src/guis/GuiMenu.cpp # ES-DE - END From 7c17706a1350a87d2f824d4baef5ab9a004d0211 Mon Sep 17 00:00:00 2001 From: Xargon Date: Fri, 20 May 2022 11:43:09 +0900 Subject: [PATCH 138/170] WORKFLOW: edited tag generator --- .github/workflows/cooker.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 8e8812c9..f9962382 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -117,10 +117,14 @@ jobs: # run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" # id: extract_branch + - name: Generate tag + id: tag + run: "##[set-output name=tag;]echo $(flatpak run net.retrodeck.retrodeck -v)" + - name: Publish the flatpak in a new cooker release uses: ncipollo/release-action@v1 with: - tag: "$(flatpak run net.retrodeck.retrodeck -v)" + tag: "${{ steps.tag.outputs.tag }}" body: | # Release Notes (Cooker) This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}. From b15a24ecc40d7b3bf170a4a36e06337241c7f934 Mon Sep 17 00:00:00 2001 From: Xargon Date: Fri, 20 May 2022 14:41:46 +0900 Subject: [PATCH 139/170] WRAPPER: fixed dir_prep in order, was creating bad symlinks --- retrodeck.sh | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/retrodeck.sh b/retrodeck.sh index 80969825..2509ab87 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -34,17 +34,8 @@ dir_prep() { # creating the symlink echo "linking $real in $symlink" #DEBUG - mkdir -pv "$symlink" # creating the full path... - previous_dir=$PWD - cd "$symlink" - cd .. - echo "We are in $PWD" #DEBUG - ls -ln #DEBUG - rmdir -v "$symlink" - ln -sv "$real" . - echo "We are in $PWD" #DEBUG - ls -ln #DEBUG - cd $previous_dir + mkdir -pv "$(dirname "$symlink")" # creating the full path except the last folder + ln -sv "$real" "$symlink" # moving everything from the old folder to the new one, delete the old one if [ -d "$symlink.old" ]; From b13074c9ccdd343b45e8a8ab490e8640208d2e02 Mon Sep 17 00:00:00 2001 From: Xargon Date: Fri, 20 May 2022 15:07:15 +0900 Subject: [PATCH 140/170] ZENITY: tools migration from kdialog completed, added RetroDECK icon to the messages --- retrodeck.sh | 8 ++++---- tools/move-roms.sh | 4 ++-- tools/start-citra.sh | 2 +- tools/start-dolphin.sh | 2 +- tools/start-melonds.sh | 2 +- tools/start-pcsx2.sh | 2 +- tools/start-ppsspp.sh | 2 +- tools/start-retroarch.sh | 2 +- tools/start-rpcs3.sh | 2 +- tools/start-yuzu.sh | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/retrodeck.sh b/retrodeck.sh index 2509ab87..c0cf1c73 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -154,7 +154,7 @@ finit() { echo "Executing finit" # Internal or SD Card? - zenity --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?" + 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" @@ -171,7 +171,7 @@ finit() { mkdir -pv $roms_folder # TODO: after the next update of ES-DE this will not be needed - zenity --info --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="EmulationStation will now initialize the system.\nPlease DON'T EDIT THE ROMS LOCATION, just select:\n\nCREATE DIRECTORIES\nYES\nOK\nQUIT\n\nRetroDECK will manage the rest." + zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="EmulationStation will now initialize the system.\nPlease DON'T EDIT THE ROMS LOCATION, just select:\n\nCREATE DIRECTORIES\nYES\nOK\nQUIT\n\nRetroDECK will manage the rest." # Recreating the folder /var/config/retrodeck/tools/ @@ -180,7 +180,7 @@ finit() { # TODO: after the next update of ES-DE this will not be needed start_retrodeck - zenity --info --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="RetroDECK will now install the needed files.\nPlease wait up to one minute,\nanother message will notify when the process will be finished.\n\nPress OK to continue." + zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="RetroDECK will now install the needed files.\nPlease wait up to one minute,\nanother message will notify when the process will be finished.\n\nPress OK to continue." # Initializing ROMs folder - Original in retrodeck home (or SD Card) dir_prep $roms_folder "/var/config/emulationstation/ROMs" @@ -202,7 +202,7 @@ finit() { tools_init create_lock - zenity --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\nIt's suggested to add RetroDECK to your Steam Library for a quick access." + 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\nIt's suggested to add RetroDECK to your Steam Library for a quick access." # TODO: Replace the stuff above with BoilR code when ready } diff --git a/tools/move-roms.sh b/tools/move-roms.sh index c23e3315..a6bfafce 100644 --- a/tools/move-roms.sh +++ b/tools/move-roms.sh @@ -2,7 +2,7 @@ if [ -d ~/retrodeck/roms ] && [ -d /run/media/mmcblk0p1/retrodeck/roms ] then # found both internal and sd folders - kdialog --title "RetroDECK" --warning "I found a roms folder both in internal and SD Card, in order to make this tool useful you should remove one of the two or merge them." + 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." exit 0 fi @@ -18,7 +18,7 @@ then # found external folder and not the internal new_roms_path=~/retrodeck fi -kdialog --title "RetroDECK" --warningyesno "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_path/roms\n\nto\n\n$new_roms_path/roms?" if [ $? == 0 ] #yes then mkdir -p $new_roms_path diff --git a/tools/start-citra.sh b/tools/start-citra.sh index f7fda6b6..f551da09 100644 --- a/tools/start-citra.sh +++ b/tools/start-citra.sh @@ -1,6 +1,6 @@ #!/bin/bash -kdialog --title "RetroDECK" --warningyesno "Doing some changes in the emulator's configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?" +zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Doing some changes in the emulator's configuration may create serious issues,\nplease continue only if you know what you're doing.\n\nDo you want to continue?" if [ $? == 0 ] then citra-qt diff --git a/tools/start-dolphin.sh b/tools/start-dolphin.sh index e5943836..99d1a671 100644 --- a/tools/start-dolphin.sh +++ b/tools/start-dolphin.sh @@ -1,6 +1,6 @@ #!/bin/bash -kdialog --title "RetroDECK" --warningyesno "Doing some changes in the emulator's configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?" +zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Doing some changes in the emulator's configuration may create serious issues,\nplease continue only if you know what you're doing.\n\nDo you want to continue?" if [ $? == 0 ] then dolphin-emu diff --git a/tools/start-melonds.sh b/tools/start-melonds.sh index 7cdd9990..eec54c16 100644 --- a/tools/start-melonds.sh +++ b/tools/start-melonds.sh @@ -1,6 +1,6 @@ #!/bin/bash -kdialog --title "RetroDECK" --warningyesno "Doing some changes in the emulator's configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?" +zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Doing some changes in the emulator's configuration may create serious issues,\nplease continue only if you know what you're doing.\n\nDo you want to continue?" if [ $? == 0 ] then melonDS diff --git a/tools/start-pcsx2.sh b/tools/start-pcsx2.sh index 13fa82dc..4d2a7b69 100644 --- a/tools/start-pcsx2.sh +++ b/tools/start-pcsx2.sh @@ -1,6 +1,6 @@ #!/bin/bash -kdialog --title "RetroDECK" --warningyesno "Doing some changes in the emulator's configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?" +zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Doing some changes in the emulator's configuration may create serious issues,\nplease continue only if you know what you're doing.\n\nDo you want to continue?" if [ $? == 0 ] then pcsx2 diff --git a/tools/start-ppsspp.sh b/tools/start-ppsspp.sh index 6644c8ad..6343ba15 100644 --- a/tools/start-ppsspp.sh +++ b/tools/start-ppsspp.sh @@ -1,6 +1,6 @@ #!/bin/bash -kdialog --title "RetroDECK" --warningyesno "Doing some changes in the emulator's configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?" +zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Doing some changes in the emulator's configuration may create serious issues,\nplease continue only if you know what you're doing.\n\nDo you want to continue?" if [ $? == 0 ] then PPSSPPSDL diff --git a/tools/start-retroarch.sh b/tools/start-retroarch.sh index c485313f..5e3111e7 100644 --- a/tools/start-retroarch.sh +++ b/tools/start-retroarch.sh @@ -1,6 +1,6 @@ #!/bin/bash -kdialog --title "RetroDECK" --warningyesno "Doing some changes in the RetroArch configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?" +zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Doing some changes in the RetroArch configuration may create serious issues,\nplease continue only if you know what you're doing.\n\nDo you want to continue?" if [ $? == 0 ] then retroarch diff --git a/tools/start-rpcs3.sh b/tools/start-rpcs3.sh index ccfb38d5..d560b202 100644 --- a/tools/start-rpcs3.sh +++ b/tools/start-rpcs3.sh @@ -1,6 +1,6 @@ #!/bin/bash -kdialog --title "RetroDECK" --warningyesno "Doing some changes in the emulator's configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?" +zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Doing some changes in the emulator's configuration may create serious issues,\nplease continue only if you know what you're doing.\n\nDo you want to continue?" if [ $? == 0 ] then rpcs3 diff --git a/tools/start-yuzu.sh b/tools/start-yuzu.sh index fe4f4fba..e9150ff0 100644 --- a/tools/start-yuzu.sh +++ b/tools/start-yuzu.sh @@ -1,6 +1,6 @@ #!/bin/bash -kdialog --title "RetroDECK" --warningyesno "Doing some changes in the emulator's configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?" +zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Doing some changes in the emulator's configuration may create serious issues,\nplease continue only if you know what you're doing.\n\nDo you want to continue?" if [ $? == 0 ] then yuzu From 4269f9c116d1769ecad2ec2ed0de03154cbc367e Mon Sep 17 00:00:00 2001 From: Xargon Date: Fri, 20 May 2022 15:37:43 +0900 Subject: [PATCH 141/170] PICO-8: fixed roms creation logic, roms can be shown but not started from ES-DE --- retrodeck.sh | 13 ++++++++----- tools/start-splore.sh | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/retrodeck.sh b/retrodeck.sh index c0cf1c73..13282d77 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -111,7 +111,7 @@ standalones_init() { cp -fv $emuconfigs/config.yml /var/config/rpcs3/ # PICO-8 - mkdir -pv $roms_folder/pico-8 + # Moved PICO-8 stuff in the finit as only it knows here roms folders is } @@ -197,6 +197,9 @@ finit() { dir_prep "$rdhome/.downloaded_media" "/var/config/emulationstation/.emulationstation/downloaded_media" dir_prep "$rdhome/.themes" "/var/config/emulationstation/.emulationstation/themes" + # PICO-8 + dir_prep "$roms_folder/pico-8" "$rdhome/bios/pico-8/bbs/carts" #this is the folder where pico-8 is saving the carts + ra_init standalones_init tools_init @@ -234,10 +237,6 @@ https://retrodeck.net cat /var/config/retrodeck/version exit ;; - --reset*) - rm -f "$lockfile" - shift # past argument with no value - ;; --reset-ra*) ra_init shift # past argument with no value @@ -250,6 +249,10 @@ https://retrodeck.net tools_init shift # past argument with no value ;; + --reset*) + rm -f "$lockfile" + shift # past argument with no value + ;; -*|--*) echo "Unknown option $i" exit 1 diff --git a/tools/start-splore.sh b/tools/start-splore.sh index 74dd11de..a1dd4877 100644 --- a/tools/start-splore.sh +++ b/tools/start-splore.sh @@ -6,5 +6,5 @@ elif [ -d /run/media/mmcblk0p1/retrodeck/roms/pico-8 ]; then pico_folder=/run/media/mmcblk0p1/retrodeck/roms/pico-8 fi -echo $pico_folder >> ~/retrodeck/.retrodeck.log +echo $pico_folder > ~/retrodeck/.retrodeck.log ~/retrodeck/bios/pico-8/pico8 -desktop ~/retrodeck/screenshots -windowed 0 -home ~/retrodeck/bios/pico-8 -root_path $pico_folder -splore >> ~/retrodeck/.retrodeck.log From eddfd1d757ed1045f205e27e931d846b597d0926 Mon Sep 17 00:00:00 2001 From: Xargon Date: Sat, 21 May 2022 09:00:29 +0900 Subject: [PATCH 142/170] WORKFLOW: upload flatpak with global cache as failsafe --- .github/workflows/cooker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index f9962382..ca647a69 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -151,5 +151,5 @@ jobs: uses: actions/upload-artifact@v3 with: name: global-cache - path: retrodeck-cooker.tar.gz + path: retrodeck-cooker.tar.gz RetroDECK.flatpak continue-on-error: true \ No newline at end of file From d91e3153ea2eedb2a9c8ea7c1899190b6675ba6c Mon Sep 17 00:00:00 2001 From: Xargon Date: Sat, 21 May 2022 09:35:22 +0900 Subject: [PATCH 143/170] WORKFLOW: fixed version reader --- .github/workflows/cooker.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index ca647a69..d541580d 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -117,14 +117,14 @@ jobs: # run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" # id: extract_branch - - name: Generate tag - id: tag - run: "##[set-output name=tag;]echo $(flatpak run net.retrodeck.retrodeck -v)" + - name: Read version from version file + id: version + run: "##[set-output name=version;]cat $(find . -name version)" - name: Publish the flatpak in a new cooker release uses: ncipollo/release-action@v1 with: - tag: "${{ steps.tag.outputs.tag }}" + tag: "${{ steps.version.outputs.version }}" body: | # Release Notes (Cooker) This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}. From 27b0c4ef24941270eb1bab7c19dcce3e97b8e484 Mon Sep 17 00:00:00 2001 From: Xargon Date: Sat, 21 May 2022 13:27:13 +0900 Subject: [PATCH 144/170] WORKLFOW: attempt to fix global cache --- .github/workflows/cooker.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index d541580d..a4c99121 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -33,9 +33,12 @@ jobs: - uses: actions/checkout@v3 - name: Download global cache - uses: actions/download-artifact@v2 + uses: dawidd6/action-download-artifact@v2 with: + workflow: cooker.yml + workflow_conclusion: success name: global-cache + search_artifacts: true continue-on-error: true - name: Extracting cache From fb9ac5f45cb54b2515a79ec4e3bf54e85b741676 Mon Sep 17 00:00:00 2001 From: Xargon Date: Sat, 21 May 2022 13:53:20 +0900 Subject: [PATCH 145/170] WORKFLOW: added .flatpak-builder/downloads to cache to speed up the building --- .github/workflows/cooker.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index a4c99121..76fa1962 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -41,7 +41,8 @@ jobs: search_artifacts: true continue-on-error: true - - name: Extracting cache + # not needed maybe? + - name: Extracting global cache run: | tar --skip-old-files -xzvf retrodeck-cooker.tar.gz rm -f retrodeck-cooker.tar.gz @@ -67,7 +68,7 @@ jobs: touch retrodeck-cooker.tar.gz rm -rf .flatpak-builder/build/*-{2,3,4,5,6} find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker .flatpak-builder/downloads - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -147,7 +148,7 @@ jobs: touch retrodeck-cooker.tar.gz rm -rf .flatpak-builder/build/*-{2,3,4,5,6} find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker .flatpak-builder/downloads continue-on-error: true - name: Upload global cache From 117ea529a1d58d16f578534b75a438115a281bb0 Mon Sep 17 00:00:00 2001 From: Xargon Date: Sat, 21 May 2022 22:22:46 +0900 Subject: [PATCH 146/170] PICO-8: fixed logs folder --- tools/start-splore.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/start-splore.sh b/tools/start-splore.sh index a1dd4877..0803b113 100644 --- a/tools/start-splore.sh +++ b/tools/start-splore.sh @@ -6,5 +6,5 @@ elif [ -d /run/media/mmcblk0p1/retrodeck/roms/pico-8 ]; then pico_folder=/run/media/mmcblk0p1/retrodeck/roms/pico-8 fi -echo $pico_folder > ~/retrodeck/.retrodeck.log -~/retrodeck/bios/pico-8/pico8 -desktop ~/retrodeck/screenshots -windowed 0 -home ~/retrodeck/bios/pico-8 -root_path $pico_folder -splore >> ~/retrodeck/.retrodeck.log +echo $pico_folder > ~/retrodeck/.logs/retrodeck.log +~/retrodeck/bios/pico-8/pico8 -desktop ~/retrodeck/screenshots -windowed 0 -home ~/retrodeck/bios/pico-8 -root_path $pico_folder -splore >> ~/retrodeck/.logs/retrodeck.log From c42d9f7dc07c6701c20dae4a6d4f58196d91f136 Mon Sep 17 00:00:00 2001 From: Xargon Date: Sat, 21 May 2022 22:25:06 +0900 Subject: [PATCH 147/170] LOGS: added logs folder in ~/retrodeck/.logs --- retrodeck.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/retrodeck.sh b/retrodeck.sh index 13282d77..19edfcbe 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -135,6 +135,7 @@ post_update() { # Doing the dir prep as we don know from which version we came dir_prep "$rdhome/.downloaded_media" "/var/config/emulationstation/.emulationstation/downloaded_media" dir_prep "$rdhome/.themes" "/var/config/emulationstation/.emulationstation/themes" + mkdir -pv $rdhome/.logs #this was added later, maybe safe to remove in a few versions ra_init standalones_init tools_init @@ -189,6 +190,7 @@ finit() { mkdir -pv $rdhome/states mkdir -pv $rdhome/screenshots mkdir -pv $rdhome/bios/pico-8 + mkdir -pv $rdhome/.logs # XMLSTARLET HERE cp -f /app/retrodeck/es_settings.xml /var/config/emulationstation/.emulationstation/es_settings.xml From 29f7e3a7371f1e14d003ac198d6dc25898bfa62d Mon Sep 17 00:00:00 2001 From: Xargon Date: Sat, 21 May 2022 22:28:46 +0900 Subject: [PATCH 148/170] WORKFLOW: version reader - fix2 --- .github/workflows/cooker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 76fa1962..85b3def9 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -123,7 +123,7 @@ jobs: - name: Read version from version file id: version - run: "##[set-output name=version;]cat $(find . -name version)" + run: echo "##[set-output name=version;]cat $(find . -name version)" - name: Publish the flatpak in a new cooker release uses: ncipollo/release-action@v1 From 3aecbd86574aca1e7023cde99b9491c2bbed0051 Mon Sep 17 00:00:00 2001 From: Xargon Date: Sun, 22 May 2022 08:57:04 +0900 Subject: [PATCH 149/170] WORKFLOW: Publish, continue on error --- .github/workflows/cooker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 85b3def9..9c956bcd 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -142,6 +142,7 @@ jobs: draft: false token: ${{ secrets.TRIGGER_BUILD_TOKEN }} repo: RetroDECK-cooker + continue-on-error: true - name: Compressing global cache run: | From 8e25dd8d3a94ef64b006670acc513c352712930b Mon Sep 17 00:00:00 2001 From: Xargon Date: Sun, 22 May 2022 09:54:27 +0900 Subject: [PATCH 150/170] Testing release tag - fix5 --- .github/workflows/cooker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 9c956bcd..4aed287c 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -123,7 +123,7 @@ jobs: - name: Read version from version file id: version - run: echo "##[set-output name=version;]cat $(find . -name version)" + run: echo "##[set-output name=version;]$(cat $(find . -name version))" - name: Publish the flatpak in a new cooker release uses: ncipollo/release-action@v1 From 96bf3f08c63f3376503ecac82d374ae78a929e20 Mon Sep 17 00:00:00 2001 From: Xargon Date: Sun, 22 May 2022 17:03:30 +0900 Subject: [PATCH 151/170] WRAPPER: was not generating the yuzu registered folder --- retrodeck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retrodeck.sh b/retrodeck.sh index 19edfcbe..93452f90 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -84,7 +84,7 @@ standalones_init() { # initializing the keys folder dir_prep "$rdhome/bios/switch/keys" "/var/data/yuzu/keys" # initializing the firmware folder - dir_prep "$rdhome/bios/switch/registered" "/var/data/yuzu/nand/system/Contents/registered/" + dir_prep "$rdhome/bios/switch/registered" "/var/data/yuzu/nand/system/Contents/registered" # configuring Yuzu mkdir -pv /var/config/yuzu/ cp -fv $emuconfigs/yuzu-qt-config.ini /var/config/yuzu/qt-config.ini From a0634a0f813a7c5ee93c8f64a75ca40b6e561113 Mon Sep 17 00:00:00 2001 From: Xargon Date: Sun, 22 May 2022 22:40:58 +0900 Subject: [PATCH 152/170] ARTBOOK: updated to fix tools and pico-8 --- 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 00772f74..c1a17407 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -160,7 +160,7 @@ modules: sources: - type: git url: https://github.com/anthonycaccese/art-book-next-de.git - commit: c3563ab31c628774904ca51776c114c537ac0c33 + commit: 7fb9f567892a357651bbc6a2b6af3d1085a10ffb # External manifests start From bc219f95e79b21169916b9ee2007ab113f175687 Mon Sep 17 00:00:00 2001 From: Xargon Date: Sun, 22 May 2022 22:42:56 +0900 Subject: [PATCH 153/170] WORKLFOW: removed .flatpak-builder/downloads as was not useful to qucken the build --- .github/workflows/cooker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 4aed287c..92a342ad 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -68,7 +68,7 @@ jobs: touch retrodeck-cooker.tar.gz rm -rf .flatpak-builder/build/*-{2,3,4,5,6} find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker .flatpak-builder/downloads + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -149,7 +149,7 @@ jobs: touch retrodeck-cooker.tar.gz rm -rf .flatpak-builder/build/*-{2,3,4,5,6} find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker .flatpak-builder/downloads + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker continue-on-error: true - name: Upload global cache From ab392c603caa17a633e4a8086ddc75229e7307de Mon Sep 17 00:00:00 2001 From: Xargon Date: Mon, 23 May 2022 00:19:28 +0900 Subject: [PATCH 154/170] WORKFLOW: pushed back the Build part 1 to melonds to avod the timeout --- .github/workflows/cooker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 92a342ad..70b7c4c9 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -59,9 +59,9 @@ jobs: sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo 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 - - name: Bulding part 1 - Until rpcs3 + - name: Bulding part 1 - Until melonds run: | - sudo flatpak-builder --build-only --stop-at=rpcs3 --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + sudo flatpak-builder --build-only --stop-at=melonds --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Compressing cache run: | From 74b4156d577425f3d3005790670655bbd024f9d5 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Mon, 23 May 2022 09:33:28 +0900 Subject: [PATCH 155/170] WORKFLOW: restored old tag system, new one must be investigated --- .github/workflows/cooker.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 70b7c4c9..ee40f595 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -112,14 +112,14 @@ jobs: sudo flatpak-builder --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml sudo flatpak build-bundle $GITHUB_WORKSPACE/local RetroDECK.flatpak net.retrodeck.retrodeck - # - name: Get date for artifacts - # id: date - # run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M')" + - name: Get date for artifacts + id: date + run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M')" - # - name: Extract branch name - # shell: bash - # run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" - # id: extract_branch + - name: Extract branch name + shell: bash + run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" + id: extract_branch - name: Read version from version file id: version @@ -128,7 +128,8 @@ jobs: - name: Publish the flatpak in a new cooker release uses: ncipollo/release-action@v1 with: - tag: "${{ steps.version.outputs.version }}" + #tag: "${{ steps.version.outputs.version }}" + tag: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" body: | # Release Notes (Cooker) This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}. @@ -157,4 +158,4 @@ jobs: with: name: global-cache path: retrodeck-cooker.tar.gz RetroDECK.flatpak - continue-on-error: true \ No newline at end of file + continue-on-error: true From 8e143714eb4dce021553c2907dfabca20ae59d56 Mon Sep 17 00:00:00 2001 From: Xargon Date: Mon, 23 May 2022 09:39:11 +0900 Subject: [PATCH 156/170] WORKLFOW: retored old tagging system - fix2 --- .github/workflows/cooker.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index ee40f595..15829bdf 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -112,14 +112,14 @@ jobs: sudo flatpak-builder --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml sudo flatpak build-bundle $GITHUB_WORKSPACE/local RetroDECK.flatpak net.retrodeck.retrodeck - - name: Get date for artifacts - id: date - run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M')" + - name: Get date for artifacts + id: date + run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M')" - - name: Extract branch name - shell: bash - run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" - id: extract_branch + - name: Extract branch name + shell: bash + run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" + id: extract_branch - name: Read version from version file id: version From 59de318f1f058e5c29445fdfb0726881235cb89c Mon Sep 17 00:00:00 2001 From: Xargon Date: Mon, 23 May 2022 22:57:10 +0900 Subject: [PATCH 157/170] WORKFLOW: losing my time on this stuff again --- .github/workflows/cooker.yml | 61 +++++++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 11 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 15829bdf..daf93999 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -26,7 +26,7 @@ jobs: run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" id: extract_branch - - name: Generating build ID + - name: Generate build ID id: generating_buildid run: echo "##[set-output name=build-id;]$(echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}")" @@ -41,14 +41,22 @@ jobs: search_artifacts: true continue-on-error: true + - name: DEBUG + run: | + echo "Listing folder $PWD contents" + ls -ln + echo "Checking for verson file" + find ~ -iname version + cat $(find ~ -iname version) + # not needed maybe? - - name: Extracting global cache + - name: Extract global cache run: | tar --skip-old-files -xzvf retrodeck-cooker.tar.gz rm -f retrodeck-cooker.tar.gz continue-on-error: true - - name: Initializing enviornment + - name: Initialize enviornment run: | git pull git submodule init @@ -59,16 +67,16 @@ jobs: sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo 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 - - name: Bulding part 1 - Until melonds + - name: Buld part 1 - Until melonds run: | sudo flatpak-builder --build-only --stop-at=melonds --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - - name: Compressing cache + - name: Compress cache run: | touch retrodeck-cooker.tar.gz rm -rf .flatpak-builder/build/*-{2,3,4,5,6} find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker .flatpak-builder/build - name: Upload build specific cache uses: actions/upload-artifact@v3 @@ -76,6 +84,22 @@ jobs: name: "${{ steps.generating_buildid.outputs.build-id }}" path: retrodeck-cooker.tar.gz + # this is done to speed up the things now, it may be removed later + - name: Compress global cache + run: | + touch retrodeck-cooker.tar.gz + rm -rf .flatpak-builder/build/*-{2,3,4,5,6} + find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker .flatpak-builder/build + continue-on-error: true + + - name: Upload global cache + uses: actions/upload-artifact@v3 + with: + name: global-cache + path: retrodeck-cooker.tar.gz RetroDECK.flatpak + continue-on-error: true + outputs: buildID: "${{ steps.generating_buildid.outputs.build-id }}" @@ -91,12 +115,20 @@ jobs: with: name: ${{ needs.Job1_-_Building_P1.outputs.buildID }} - - name: Extracting cache + - name: Extract cache run: | tar --skip-old-files -xzvf retrodeck-cooker.tar.gz rm -f retrodeck-cooker.tar.gz - - name: Initializing enviornment + - name: DEBUG + run: | + echo "Listing folder $PWD contents" + ls -ln + echo "Checking for verson file" + find ~ -iname version + cat $(find ~ -iname version) + + - name: Initialize enviornment run: | git pull git submodule init @@ -107,7 +139,7 @@ jobs: sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo 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 - - name: Creating Bundle + - name: Create Bundle run: | sudo flatpak-builder --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml sudo flatpak build-bundle $GITHUB_WORKSPACE/local RetroDECK.flatpak net.retrodeck.retrodeck @@ -145,12 +177,12 @@ jobs: repo: RetroDECK-cooker continue-on-error: true - - name: Compressing global cache + - name: Compress global cache run: | touch retrodeck-cooker.tar.gz rm -rf .flatpak-builder/build/*-{2,3,4,5,6} find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker .flatpak-builder/build continue-on-error: true - name: Upload global cache @@ -159,3 +191,10 @@ jobs: name: global-cache path: retrodeck-cooker.tar.gz RetroDECK.flatpak continue-on-error: true + + - name: Upload RetroDECK.flatpak + uses: actions/upload-artifact@v3 + with: + name: retrodeck-flatpak + path: RetroDECK.flatpak + continue-on-error: true From 445e4d505ba786afed3277de2561009efa58bb47 Mon Sep 17 00:00:00 2001 From: Xargon Date: Mon, 23 May 2022 23:06:41 +0900 Subject: [PATCH 158/170] WORKFLOW: losing my time on this stuff again - fix1 --- .github/workflows/cooker.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index daf93999..ac104b4f 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -36,7 +36,6 @@ jobs: uses: dawidd6/action-download-artifact@v2 with: workflow: cooker.yml - workflow_conclusion: success name: global-cache search_artifacts: true continue-on-error: true @@ -44,7 +43,7 @@ jobs: - name: DEBUG run: | echo "Listing folder $PWD contents" - ls -ln + ls -lna echo "Checking for verson file" find ~ -iname version cat $(find ~ -iname version) @@ -123,7 +122,7 @@ jobs: - name: DEBUG run: | echo "Listing folder $PWD contents" - ls -ln + ls -lna echo "Checking for verson file" find ~ -iname version cat $(find ~ -iname version) From 26f9525c07bd82638eaa17fcbe2477ca82237c53 Mon Sep 17 00:00:00 2001 From: Xargon Date: Mon, 23 May 2022 23:11:39 +0900 Subject: [PATCH 159/170] WORKFLOW: losing my time on this stuff again - fix2 --- .github/workflows/cooker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index ac104b4f..f51ed311 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -37,6 +37,7 @@ jobs: with: workflow: cooker.yml name: global-cache + path: $GITHUB_WORKSPACE search_artifacts: true continue-on-error: true From 5032b1f1c138ec5d0490f4278c50664603a435b4 Mon Sep 17 00:00:00 2001 From: Xargon Date: Mon, 23 May 2022 23:35:37 +0900 Subject: [PATCH 160/170] WORKFLOW: losing my time on this stuff again - fix3 --- .github/workflows/cooker.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index f51ed311..9f2ac62e 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -37,7 +37,6 @@ jobs: with: workflow: cooker.yml name: global-cache - path: $GITHUB_WORKSPACE search_artifacts: true continue-on-error: true @@ -49,13 +48,6 @@ jobs: find ~ -iname version cat $(find ~ -iname version) - # not needed maybe? - - name: Extract global cache - run: | - tar --skip-old-files -xzvf retrodeck-cooker.tar.gz - rm -f retrodeck-cooker.tar.gz - continue-on-error: true - - name: Initialize enviornment run: | git pull From deb42188c26e320bd69e4e82c96e51429739bd87 Mon Sep 17 00:00:00 2001 From: Xargon Date: Tue, 24 May 2022 00:00:39 +0900 Subject: [PATCH 161/170] WORKFLOW: losing my time on this stuff again - try4 --- .github/workflows/cooker.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 9f2ac62e..c8776e2e 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -44,7 +44,7 @@ jobs: run: | echo "Listing folder $PWD contents" ls -lna - echo "Checking for verson file" + echo "Checking for version file" find ~ -iname version cat $(find ~ -iname version) @@ -61,7 +61,7 @@ jobs: - name: Buld part 1 - Until melonds run: | - sudo flatpak-builder --build-only --stop-at=melonds --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + sudo flatpak-builder --build-only --stop-at=melonds --user --force-clean --repo=${GITHUB_WORKSPACE}/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Compress cache run: | @@ -116,7 +116,7 @@ jobs: run: | echo "Listing folder $PWD contents" ls -lna - echo "Checking for verson file" + echo "Checking for version file" find ~ -iname version cat $(find ~ -iname version) @@ -133,7 +133,7 @@ jobs: - name: Create Bundle run: | - sudo flatpak-builder --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + sudo flatpak-builder --user --force-clean --repo=${GITHUB_WORKSPACE}/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml sudo flatpak build-bundle $GITHUB_WORKSPACE/local RetroDECK.flatpak net.retrodeck.retrodeck - name: Get date for artifacts From 9848bb8a1fcf9acdd714bb410bbc1e252f959dc6 Mon Sep 17 00:00:00 2001 From: Xargon Date: Tue, 24 May 2022 00:04:53 +0900 Subject: [PATCH 162/170] WORKFLOW: losing my time on this stuff again - try5 --- .github/workflows/cooker.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index c8776e2e..564d05c2 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -38,6 +38,13 @@ jobs: workflow: cooker.yml name: global-cache search_artifacts: true + skip_unpack: true + continue-on-error: true + + - name: Extract global cache + run: | + tar --skip-old-files -xzvf retrodeck-cooker.tar.gz + rm -f retrodeck-cooker.tar.gz continue-on-error: true - name: DEBUG From 3469db3f45c14c1a01dae64adb26baf35afcc77f Mon Sep 17 00:00:00 2001 From: Xargon Date: Wed, 25 May 2022 12:52:48 +0900 Subject: [PATCH 163/170] VERSIONING: added some debug code --- .github/workflows/cooker.yml | 7 +++++++ net.retrodeck.retrodeck.yml | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 564d05c2..be307366 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -156,6 +156,13 @@ jobs: id: version run: echo "##[set-output name=version;]$(cat $(find . -name version))" + - name: DEBUG - Print version name + shell: bash + run: | + echo "DEBUG: printing version from version file" + echo "${{ steps.version.outputs.version }}" + id: extract_branch + - name: Publish the flatpak in a new cooker release uses: ncipollo/release-action@v1 with: diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index c1a17407..5f60f2c7 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -76,6 +76,8 @@ modules: - VERSION="cooker" - if [ $VERSION == "cooker" ]; then VERSION=$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/')-$(date +'%Y%m%d_%H%M'); fi - $VERSION >> ${FLATPAK_DEST}/retrodeck/version + - echo "DEBUG - reading version " + - cat ${FLATPAK_DEST}/retrodeck/version - name: xmlstarlet config-opts: @@ -148,7 +150,7 @@ modules: - type: shell commands: - sed -i 's/QUIT EMULATIONSTATION/QUIT RETRODECK/g' es-app/src/guis/GuiMenu.cpp - - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK v$(cat ${FLATPAK_DEST}/retrodeck/version), ES-DE v" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#g' es-app/src/guis/GuiMenu.cpp + - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK v$((cat ${FLATPAK_DEST}/retrodeck/version)), ES-DE v" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#g' es-app/src/guis/GuiMenu.cpp # ES-DE - END From bcb9bb48270a9e424a2c8b45fc37f60af3cbf971 Mon Sep 17 00:00:00 2001 From: Xargon Date: Wed, 25 May 2022 14:33:49 +0900 Subject: [PATCH 164/170] VERSIONING: fixed in ES-DE --- 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 5f60f2c7..f92e9b1e 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -150,7 +150,7 @@ modules: - type: shell commands: - sed -i 's/QUIT EMULATIONSTATION/QUIT RETRODECK/g' es-app/src/guis/GuiMenu.cpp - - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK v$((cat ${FLATPAK_DEST}/retrodeck/version)), ES-DE v" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#g' es-app/src/guis/GuiMenu.cpp + - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK v'$((cat ${FLATPAK_DEST}/retrodeck/version))', ES-DE v" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#g' es-app/src/guis/GuiMenu.cpp # ES-DE - END From 91acd0f85f195540b3b599bbb482c935b90282f9 Mon Sep 17 00:00:00 2001 From: Xargon Date: Wed, 25 May 2022 14:57:02 +0900 Subject: [PATCH 165/170] VERSIONING: fixed in ES-DE -fix1 --- .github/workflows/cooker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index be307366..a51bb18d 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -161,7 +161,6 @@ jobs: run: | echo "DEBUG: printing version from version file" echo "${{ steps.version.outputs.version }}" - id: extract_branch - name: Publish the flatpak in a new cooker release uses: ncipollo/release-action@v1 From 15697c31a10f90b8f0fa048e067cfd92645858ce Mon Sep 17 00:00:00 2001 From: Xargon Date: Wed, 25 May 2022 16:21:55 +0900 Subject: [PATCH 166/170] VERSIONING: fixed in ES-DE -fix2 --- 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 f92e9b1e..ba162654 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -150,7 +150,7 @@ modules: - type: shell commands: - sed -i 's/QUIT EMULATIONSTATION/QUIT RETRODECK/g' es-app/src/guis/GuiMenu.cpp - - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK v'$((cat ${FLATPAK_DEST}/retrodeck/version))', ES-DE v" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#g' es-app/src/guis/GuiMenu.cpp + - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK v'$(cat ${FLATPAK_DEST}/retrodeck/version)', ES-DE v" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#g' es-app/src/guis/GuiMenu.cpp # ES-DE - END From 915cf9aba44743e69cb5716c21206e6faaae4111 Mon Sep 17 00:00:00 2001 From: Xargon Date: Wed, 25 May 2022 16:28:49 +0900 Subject: [PATCH 167/170] VERSIONING: fixed in ES-DE -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 ba162654..88334e53 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -74,7 +74,7 @@ modules: build-commands: - mkdir -p ${FLATPAK_DEST}/retrodeck/ - VERSION="cooker" - - if [ $VERSION == "cooker" ]; then VERSION=$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/')-$(date +'%Y%m%d_%H%M'); fi + - if [[] $VERSION == "cooker" ]]; then VERSION=$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/')-$(date +'%Y%m%d_%H%M'); fi - $VERSION >> ${FLATPAK_DEST}/retrodeck/version - echo "DEBUG - reading version " - cat ${FLATPAK_DEST}/retrodeck/version From 9d8a67c0b47c28c6a129a3a75c28a3bf6add6bdf Mon Sep 17 00:00:00 2001 From: Xargon Date: Wed, 25 May 2022 16:35:32 +0900 Subject: [PATCH 168/170] VERSIONING: fixed in ES-DE -fix4 --- 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 88334e53..4a686fcc 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -74,7 +74,7 @@ modules: build-commands: - mkdir -p ${FLATPAK_DEST}/retrodeck/ - VERSION="cooker" - - if [[] $VERSION == "cooker" ]]; then VERSION=$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/')-$(date +'%Y%m%d_%H%M'); fi + - if [[ $VERSION == "cooker" ]]; then VERSION=$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/')-$(date +'%Y%m%d_%H%M'); fi - $VERSION >> ${FLATPAK_DEST}/retrodeck/version - echo "DEBUG - reading version " - cat ${FLATPAK_DEST}/retrodeck/version From df7ffaa121c8ff0487bdc06673dbeb5d501153b4 Mon Sep 17 00:00:00 2001 From: Xargon Date: Wed, 25 May 2022 16:38:40 +0900 Subject: [PATCH 169/170] VERSIONING: fixed in ES-DE -fix5 --- 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 4a686fcc..30de6143 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -75,7 +75,7 @@ modules: - mkdir -p ${FLATPAK_DEST}/retrodeck/ - VERSION="cooker" - if [[ $VERSION == "cooker" ]]; then VERSION=$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/')-$(date +'%Y%m%d_%H%M'); fi - - $VERSION >> ${FLATPAK_DEST}/retrodeck/version + - echo $VERSION >> ${FLATPAK_DEST}/retrodeck/version - echo "DEBUG - reading version " - cat ${FLATPAK_DEST}/retrodeck/version From bf75b6ee59c3741d4b3a88c12242c996cf616d7a Mon Sep 17 00:00:00 2001 From: Xargon Date: Wed, 25 May 2022 22:27:51 +0900 Subject: [PATCH 170/170] VERSIONING: fixed in ES-DE -fix6 --- net.retrodeck.retrodeck.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 30de6143..68139131 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -72,12 +72,20 @@ modules: - name: version-initialization buildsystem: simple build-commands: - - mkdir -p ${FLATPAK_DEST}/retrodeck/ - - VERSION="cooker" - - if [[ $VERSION == "cooker" ]]; then VERSION=$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/')-$(date +'%Y%m%d_%H%M'); fi - - echo $VERSION >> ${FLATPAK_DEST}/retrodeck/version - - echo "DEBUG - reading version " - - cat ${FLATPAK_DEST}/retrodeck/version + - | + git checkout ${GITHUB_REF_NAME} + mkdir -p ${FLATPAK_DEST}/retrodeck/ + VERSION="cooker" + if [[ $VERSION == "cooker" ]]; + then + VERSION=$(git describe --tags | tr - .) + fi + echo $VERSION >> ${FLATPAK_DEST}/retrodeck/version + cat ${FLATPAK_DEST}/retrodeck/version + sources: + - type: git + url: https://github.com/XargonWan/RetroDECK.git + branch: cooker - name: xmlstarlet config-opts: