From eaf9685eaba57ad770663d9537bd4b4f2cdbe7e5 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 12 Oct 2023 09:39:31 +0200 Subject: [PATCH 01/52] Merged main --- net.retrodeck.retrodeck.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 64a079ed..72bf86e7 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -76,8 +76,8 @@ modules: # The version number is hardcoded in /app/retrodeck/version # # UPDATE STEPS FOR MAIN: - # [X] Update the VERSION variable on line containing "VERSION=THISBRANCH" - # [X] Update the appdata.xml with the version number and notes + # [ ] Update the VERSION variable on line containing "VERSION=THISBRANCH" + # [ ] Update the appdata.xml with the version number and notes # - name: version-initialization buildsystem: simple @@ -85,7 +85,9 @@ modules: - | # on main please update this with the version variable, eg: VERSION='0.7.0b' - VERSION=0.7.2b + # on cooker will be THISBRANCH + VERSION=THISBRANCH + git checkout ${GITHUB_REF_NAME} mkdir -p ${FLATPAK_DEST}/retrodeck/ From a911b9c6f5a8a88404114bb065edd228bfa206e2 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 12 Oct 2023 09:50:01 +0200 Subject: [PATCH 02/52] CITRA: updated for QT6 --- net.retrodeck.retrodeck.yml | 44 +++++++++------ rd-submodules/citra/citra-launcher.sh | 25 +++++++++ rd-submodules/citra/org.citra_emu.citra.svg | 1 + .../citra/unified-source-compat.patch | 56 ------------------- 4 files changed, 52 insertions(+), 74 deletions(-) create mode 100644 rd-submodules/citra/citra-launcher.sh create mode 100644 rd-submodules/citra/org.citra_emu.citra.svg delete mode 100644 rd-submodules/citra/unified-source-compat.patch diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 72bf86e7..961713bf 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1,11 +1,11 @@ app-id: net.retrodeck.retrodeck runtime: org.kde.Platform -runtime-version: 5.15-22.08 +runtime-version: "6.5" sdk: org.kde.Sdk sdk-extensions: - org.freedesktop.Sdk.Extension.llvm14 # Needed for rpcs3 base: io.qt.qtwebengine.BaseApp # Needed for Yuzu -base-version: 5.15-22.08 # Needed for Yuzu +base-version: "6.5" # Needed for Yuzu command: retrodeck.sh add-extensions: @@ -67,7 +67,7 @@ cleanup-commands: modules: - # dependency of: CEMU + # dependency of: CEMU, CITRA - rd-submodules/shared-modules/libusb/libusb.json # This module is used to define the RetroDECK version @@ -221,7 +221,7 @@ modules: url: https://github.com/mikefarah/yq/releases/download/v4.33.3/yq_linux_amd64 sha256: 4ee662847c588c3ef2fec8bfb304e8739e3dbaba87ccb9a608d691c88f5b64dc - # dependency of: CEMU (13.0.0) + # dependency of: CEMU, CITRA <-(13.0.0) - name: glslang buildsystem: cmake-ninja config-opts: @@ -610,37 +610,42 @@ modules: # Yuzu - END # CITRA - START - # DO NOT UPDATE! WENT ON QT6 # https://github.com/flathub/org.citra_emu.citra - - rd-submodules/shared-modules/SDL2/SDL2-with-libdecor.json + - rd-submodules/shared-modules/SDL2/SDL2-2.26.1-with-libdecor.json - name: citra buildsystem: cmake-ninja builddir: true config-opts: - '-DCMAKE_BUILD_TYPE=Release' - - '-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON' - - '-DENABLE_LTO=ON' - '-DENABLE_QT_TRANSLATION=ON' - '-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON' + - '-DUSE_DISCORD_PRESENCE=ON' - '-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF' - # - '-DENABLE_FFMPEG_VIDEO_DUMPER=ON' - # FFMPEG VIDEO DUMPER was disabled because of this: https://github.com/citra-emu/citra/issues/5949 - '-DUSE_SYSTEM_SDL2=ON' - - '-DCMAKE_POLICY_DEFAULT_CMP0069=NEW' - - '-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 + - install -Dm755 ../citra-launcher.sh /app/bin/citra-launcher + - >- + install -Dm644 ../org.citra_emu.citra.svg + /app/share/icons/hicolor/scalable/apps/citra.svg + - >- + install -Dm644 ../dist/icon.png + /app/share/icons/hicolor/512x512/apps/citra.png + - >- + mv /app/share/mime/packages/citra.xml + /app/share/mime/packages/org.citra_emu.citra.xml + - >- + sed 's/citra/org.citra_emu.citra/g' -i + /app/share/mime/packages/org.citra_emu.citra.xml sources: - type: archive url: >- - https://github.com/citra-emu/citra-nightly/releases/download/nightly-1898/citra-unified-source-20230504-70335a7.tar.xz - sha256: b320585bd8c4c075f63d3d9c74b830718e58fcf04d987a5dcead402a72abf753 + https://github.com/citra-emu/citra-nightly/releases/download/nightly-2009/citra-unified-source-20231012-40ba522.tar.xz + sha256: 927739892fff5d1b325b07182ab29a7355f58866debe60da1d6620680773ac97 x-checker-data: type: json url: https://api.github.com/repos/citra-emu/citra-nightly/releases/latest @@ -649,8 +654,11 @@ modules: .assets[] | .browser_download_url | match("https://.+citra-unified-source-.+.xz$") | .string is-main-source: true - - type: patch - path: rd-submodules/citra/unified-source-compat.patch + - type: file + path: rd-submodules/citra/org.citra_emu.citra.svg + - type: file + path: rd-submodules/citra/citra-launcher.sh + # CITRA - END diff --git a/rd-submodules/citra/citra-launcher.sh b/rd-submodules/citra/citra-launcher.sh new file mode 100644 index 00000000..33b95cfb --- /dev/null +++ b/rd-submodules/citra/citra-launcher.sh @@ -0,0 +1,25 @@ +#!/bin/bash -e + +report_error() { + read -r -d '|' MESSAGE <https://github.com/flathub/org.citra_emu.citra/issues. + +When submitting a bug report, please attach your system information and the Citra log file. +You seem to be using ${XDG_SESSION_DESKTOP} ${DESKTOP_SESSION} (${XDG_SESSION_TYPE}): +To obtain Citra log files, please see this guide. +To obtain your system information, please install inxi and run inxi -v3. | +EOF + zenity --warning --no-wrap --title "That's awkward ..." --text "$MESSAGE" +} + +unset VK_ICD_FILENAMES VK_DRIVER_FILES +# Discord RPC +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 + + +if ! prlimit --nofile=8192 citra-qt "$@"; then + report_error +fi \ No newline at end of file diff --git a/rd-submodules/citra/org.citra_emu.citra.svg b/rd-submodules/citra/org.citra_emu.citra.svg new file mode 100644 index 00000000..8fa09944 --- /dev/null +++ b/rd-submodules/citra/org.citra_emu.citra.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/rd-submodules/citra/unified-source-compat.patch b/rd-submodules/citra/unified-source-compat.patch deleted file mode 100644 index 6a1ca47c..00000000 --- a/rd-submodules/citra/unified-source-compat.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 710f3fcfb..e5f4f4687 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -94,7 +94,11 @@ function(check_submodules_present) - endif() - endforeach() - endfunction() --check_submodules_present() -+ -+if (EXISTS "${PROJECT_SOURCE_DIR}/.git/objects") -+ # only check submodules when source is obtained via Git -+ check_submodules_present() -+endif() - - configure_file(${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.qrc - ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc -diff --git a/CMakeModules/GenerateSCMRev.cmake b/CMakeModules/GenerateSCMRev.cmake -index a011c6cbf..87e9eef35 100644 ---- a/CMakeModules/GenerateSCMRev.cmake -+++ b/CMakeModules/GenerateSCMRev.cmake -@@ -6,15 +6,27 @@ endfunction() - - list(APPEND CMAKE_MODULE_PATH "${SRC_DIR}/externals/cmake-modules") - --# Find the package here with the known path so that the GetGit commands can find it as well --find_package(Git QUIET PATHS "${GIT_EXECUTABLE}") -- - # generate git/build information --include(GetGitRevisionDescription) --get_git_head_revision(GIT_REF_SPEC GIT_REV) --git_describe(GIT_DESC --always --long --dirty) --git_branch_name(GIT_BRANCH) - get_timestamp(BUILD_DATE) -+if (EXISTS "${SRC_DIR}/.git/objects") -+ # Find the package here with the known path so that the GetGit commands can find it as well -+ find_package(Git QUIET PATHS "${GIT_EXECUTABLE}") -+ # only use Git to check revision info when source is obtained via Git -+ include(GetGitRevisionDescription) -+ get_git_head_revision(GIT_REF_SPEC GIT_REV) -+ git_describe(GIT_DESC --always --long --dirty) -+ git_branch_name(GIT_BRANCH) -+elseif(EXISTS "${SRC_DIR}/GIT-COMMIT" AND EXISTS "${SRC_DIR}/GIT-TAG") -+ # unified source archive -+ file(READ "${SRC_DIR}/GIT-COMMIT" GIT_REV_RAW LIMIT 64) -+ string(STRIP "${GIT_REV_RAW}" GIT_REV) -+ string(SUBSTRING "${GIT_REV_RAW}" 0 9 GIT_DESC) -+ set(GIT_BRANCH "HEAD") -+else() -+ # self-packed archive? -+ set(GIT_DESC "UNKNOWN") -+ set(GIT_BRANCH "UNKNOWN") -+endif() - - # Generate cpp with Git revision from template - # Also if this is a CI build, add the build name (ie: Nightly, Canary) to the scm_rev file as well \ No newline at end of file From d6e6c599862daf1e7a85d37ff51cef01d4900303 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 12 Oct 2023 09:54:14 +0200 Subject: [PATCH 03/52] DOLPHIN: updated for QT6 --- net.retrodeck.retrodeck.yml | 39 +++------------------- rd-submodules/dolphin/nodirtyversion.patch | 10 +++--- 2 files changed, 10 insertions(+), 39 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 961713bf..6b2993c4 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -67,7 +67,7 @@ cleanup-commands: modules: - # dependency of: CEMU, CITRA + # dependency of: CEMU, CITRA, DOLPHIN - rd-submodules/shared-modules/libusb/libusb.json # This module is used to define the RetroDECK version @@ -688,37 +688,8 @@ modules: # https://github.com/flathub/org.DolphinEmu.dolphin-emu # WHEN UPADTING: remember to update rd-submodules/dolphin contents - # needed for the emulate bluetooth adapter feature to work - - name: bluez - config-opts: - - --enable-library - - --disable-manpages - - --disable-udev - - --disable-tools - - --disable-cups - - --disable-monitor - - --disable-client - - --disable-systemd - - --disable-a2dp - - --disable-avrcp - - --disable-network - - --disable-obex - - --disable-bap - - --disable-mcp - - --with-dbusconfdir=/app/etc - - --with-dbussessionbusdir=/app/usr/lib/system-services - sources: - - type: archive - url: https://www.kernel.org/pub/linux/bluetooth/bluez-5.66.tar.xz - sha256: 39fea64b590c9492984a0c27a89fc203e1cdc74866086efb8f4698677ab2b574 - x-checker-data: - type: anitya - project-id: 10029 - stable-only: true - url-template: https://www.kernel.org/pub/linux/bluetooth/bluez-$version.tar.xz - # enables motion controls on non-wii controllers (switch, ps4, etc) - # requires a udev rule enabling Motion Sensors access + # TODO: requires a udev rule enabling Motion Sensors access - name: libevdev buildsystem: meson config-opts: @@ -726,8 +697,8 @@ modules: - -Ddocumentation=disabled sources: - type: archive - url: https://www.freedesktop.org/software/libevdev/libevdev-1.13.0.tar.xz - sha256: 9edf2006cc86a5055279647c38ec923d11a821ee4dc2c3033e8d20e8ee237cd9 + url: https://www.freedesktop.org/software/libevdev/libevdev-1.13.1.tar.xz + sha256: 06a77bf2ac5c993305882bc1641017f5bec1592d6d1b64787bad492ab34f2f36 x-checker-data: type: anitya project-id: 20540 @@ -761,7 +732,7 @@ modules: # fatal: remote transport reported error # url: ssh://git@github.com/dolphin-emu/dolphin.git url: https://github.com/dolphin-emu/dolphin.git - commit: 46b99671d9158e0ca840c1d8ef249db0f321ced7 + commit: 032c77b462a220016f23c5079e71bb23e0ad2adf x-checker-data: type: json url: https://dolphin-emu.org/update/latest/beta diff --git a/rd-submodules/dolphin/nodirtyversion.patch b/rd-submodules/dolphin/nodirtyversion.patch index f20ae789..2dacc209 100644 --- a/rd-submodules/dolphin/nodirtyversion.patch +++ b/rd-submodules/dolphin/nodirtyversion.patch @@ -1,8 +1,8 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9af66009a1..2acd3bed9a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -149,7 +149,7 @@ if(GIT_FOUND) +diff --git a/CMake/ScmRevGen.cmake b/CMake/ScmRevGen.cmake +index aacf7491ce..503791cda8 100644 +--- a/CMake/ScmRevGen.cmake ++++ b/CMake/ScmRevGen.cmake +@@ -7,7 +7,7 @@ if(GIT_FOUND) OUTPUT_VARIABLE DOLPHIN_WC_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE) # defines DOLPHIN_WC_DESCRIBE From 47524a0cda5904bfe618a0c3457594280b36f94a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 12 Oct 2023 10:01:54 +0200 Subject: [PATCH 04/52] RPCS3: updated for QT6 --- net.retrodeck.retrodeck.yml | 62 +++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 34 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 6b2993c4..00b1278f 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -3,9 +3,9 @@ runtime: org.kde.Platform runtime-version: "6.5" sdk: org.kde.Sdk sdk-extensions: - - org.freedesktop.Sdk.Extension.llvm14 # Needed for rpcs3 -base: io.qt.qtwebengine.BaseApp # Needed for Yuzu -base-version: "6.5" # Needed for Yuzu + - org.freedesktop.Sdk.Extension.llvm14 # Needed for rpcs3 +# base: io.qt.qtwebengine.BaseApp # Needed for Yuzu - Disabled as we're using AppImage for Yuzu +# base-version: "6.5" # Needed for Yuzu - Disabled as we're using AppImage for Yuzu command: retrodeck.sh add-extensions: @@ -122,7 +122,7 @@ modules: # mesa repo got a double certificate issue and gnutils cannot handle that so GLU download fails, # this affects even the shared-modules's glu so I have to replace it temporarly # more info there: https://gitlab.com/gnutls/gnutls/-/issues/1335 - # dependency of: CEMU + # dependency of: RETROARCH, CEMU, RPCS3 - name: glu buildsystem: meson cleanup: @@ -240,6 +240,27 @@ modules: project-id: 205796 url-template: https://github.com/KhronosGroup/glslang/archive/$version.tar.gz + # enables motion controls on non-wii controllers (switch, ps4, etc) + # deèendency of: DOLPHIN, RPCS3 + # TODO: requires a udev rule enabling Motion Sensors access + - name: libevdev + buildsystem: meson + config-opts: + - -Dtests=disabled + - -Ddocumentation=disabled + sources: + - type: archive + url: https://www.freedesktop.org/software/libevdev/libevdev-1.13.1.tar.xz + sha256: 06a77bf2ac5c993305882bc1641017f5bec1592d6d1b64787bad492ab34f2f36 + x-checker-data: + type: anitya + project-id: 20540 + stable-only: true + url-template: https://www.freedesktop.org/software/libevdev/libevdev-$version.tar.xz + + # dependency of: CEMU, RPCS3 + - rd-submodules/shared-modules/glew/glew.json + # ES-DE - START # https://gitlab.com/es-de/emulationstation-de @@ -684,27 +705,9 @@ modules: # PCSX2 - END # Dolphin - START - # DO NOT UPDATE! WENT ON QT6 # https://github.com/flathub/org.DolphinEmu.dolphin-emu # WHEN UPADTING: remember to update rd-submodules/dolphin contents - # enables motion controls on non-wii controllers (switch, ps4, etc) - # TODO: requires a udev rule enabling Motion Sensors access - - name: libevdev - buildsystem: meson - config-opts: - - -Dtests=disabled - - -Ddocumentation=disabled - sources: - - type: archive - url: https://www.freedesktop.org/software/libevdev/libevdev-1.13.1.tar.xz - sha256: 06a77bf2ac5c993305882bc1641017f5bec1592d6d1b64787bad492ab34f2f36 - x-checker-data: - type: anitya - project-id: 20540 - stable-only: true - url-template: https://www.freedesktop.org/software/libevdev/libevdev-$version.tar.xz - # needed for screensaver inhibition - name: xdg-screensaver-shim buildsystem: meson @@ -876,15 +879,8 @@ modules: # MELONDS - END # RPCS3 - START - # DO NOT UPDATE! WENT ON QT6 # https://github.com/flathub/net.rpcs3.RPCS3 - # glu issue, check glu module for more info - #- rd-submodules/shared-modules/glu/glu-9.json - - # dependency of: CEMU - - rd-submodules/shared-modules/glew/glew.json - - name: rpcs3 buildsystem: cmake-ninja builddir: true @@ -905,14 +901,12 @@ modules: ldflags: -fuse-ld=lld config-opts: - -DCMAKE_BUILD_TYPE=RelWithDebInfo - #- -DBUILD_LLVM_SUBMODULE=ON this was replaced by the fllowing: - -DBUILD_LLVM=OFF - -DUSE_NATIVE_INSTRUCTIONS=OFF - -DUSE_PRECOMPILED_HEADERS=OFF - -DUSE_SDL=ON - -DUSE_SYSTEM_CURL=ON - # Disabled this to force RPCS3 to use our built FFMPEG - - -DUSE_SYSTEM_FFMPEG=OFF + - -DUSE_SYSTEM_FFMPEG=OFF # Disabled this to force RPCS3 to use our built FFMPEG - -DUSE_SYSTEM_LIBPNG=ON - -DUSE_SYSTEM_SDL=ON - -DUSE_SYSTEM_ZLIB=ON @@ -921,14 +915,14 @@ modules: - cp /usr/lib/sdk/llvm16/lib/libLLVM-16.so /app/lib/ - |- set -eux - 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)"; sources: - type: git url: https://github.com/RPCS3/rpcs3.git - commit: a828c214b5c0b87b81fcd13ff3c1e952c9a5d6dd + branch: master + commit: 75d239356a773b8211354049477d79006597505e # RPCS3 - END From cdbd4b4683113ba9acb60804f15f82cb537f9f7a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 12 Oct 2023 10:06:50 +0200 Subject: [PATCH 05/52] QT6: fixed libdecor path --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 00b1278f..3905da0a 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -633,7 +633,7 @@ modules: # CITRA - START # https://github.com/flathub/org.citra_emu.citra - - rd-submodules/shared-modules/SDL2/SDL2-2.26.1-with-libdecor.json + - rd-submodules/shared-modules/SDL2/SDL2-with-libdecor.json - name: citra buildsystem: cmake-ninja From 2cd7fc317e3ecfd505b532f1371113c0d80ae248 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 12 Oct 2023 10:12:45 +0200 Subject: [PATCH 06/52] QT6: updated RA cores --- 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 3905da0a..e9d6c941 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -513,7 +513,7 @@ modules: sources: - type: archive url: https://buildbot.libretro.com/stable/1.16.0/linux/x86_64/RetroArch_cores.7z - sha256: 156dede0c04cac1fee4bdb36128c19c396307f2369e5c1fc99fda29453bca184 + sha256: a149d34662516d791e8f90507d1107949cb158196d6bbf75105c649fb26504b6 - name: retroarch-sameduck-core buildsystem: simple From bf1b46cfe7abbbecfb65cc950375265a03f2fdb4 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 12 Oct 2023 11:46:44 +0200 Subject: [PATCH 07/52] CITRA: moved rapidjson out of CEMU as its a common dependency --- net.retrodeck.retrodeck.yml | 49 ++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index e9d6c941..cabe5219 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -241,7 +241,7 @@ modules: url-template: https://github.com/KhronosGroup/glslang/archive/$version.tar.gz # enables motion controls on non-wii controllers (switch, ps4, etc) - # deèendency of: DOLPHIN, RPCS3 + # dependency of: DOLPHIN, RPCS3 # TODO: requires a udev rule enabling Motion Sensors access - name: libevdev buildsystem: meson @@ -257,6 +257,29 @@ modules: project-id: 20540 stable-only: true url-template: https://www.freedesktop.org/software/libevdev/libevdev-$version.tar.xz + + # dependency of: CITRA, CEMU + - name: rapidjson + buildsystem: cmake-ninja + config-opts: + - -DRAPIDJSON_BUILD_DOC=OFF + - -DRAPIDJSON_BUILD_EXAMPLES=OFF + - -DRAPIDJSON_BUILD_TESTS=OFF + - -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF + cleanup: + - /include + - /lib/cmake + - /lib/pkgconfig + - /share/doc + sources: + - type: archive + url: https://github.com/Tencent/rapidjson/archive/refs/tags/v1.1.0.tar.gz + sha256: bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e + x-checker-data: + type: anitya + project-id: 7422 + stable-only: true + url-template: https://github.com/Tencent/rapidjson/archive/refs/tags/v$version.tar.gz # dependency of: CEMU, RPCS3 - rd-submodules/shared-modules/glew/glew.json @@ -680,8 +703,6 @@ modules: - type: file path: rd-submodules/citra/citra-launcher.sh - - # CITRA - END # PCSX2 - START @@ -1042,28 +1063,6 @@ modules: project-id: 10649 url-template: https://libzip.org/download/libzip-$version.tar.xz - - name: rapidjson - buildsystem: cmake-ninja - config-opts: - - -DRAPIDJSON_BUILD_DOC=OFF - - -DRAPIDJSON_BUILD_EXAMPLES=OFF - - -DRAPIDJSON_BUILD_TESTS=OFF - - -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF - cleanup: - - /include - - /lib/cmake - - /lib/pkgconfig - - /share/doc - sources: - - type: archive - url: https://github.com/Tencent/rapidjson/archive/refs/tags/v1.1.0.tar.gz - sha256: bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e - x-checker-data: - type: anitya - project-id: 7422 - stable-only: true - url-template: https://github.com/Tencent/rapidjson/archive/refs/tags/v$version.tar.gz - - name: glm buildsystem: cmake-ninja cleanup: ['*'] From e8c3dabc164f33c72751696be62c972d35b9be58 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 12 Oct 2023 13:51:17 +0200 Subject: [PATCH 08/52] MELONDS: use QT6 --- net.retrodeck.retrodeck.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index cabe5219..4e97022f 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -882,6 +882,7 @@ modules: - type: git url: https://gitlab.freedesktop.org/slirp/libslirp.git tag: v4.7.0 + - name: melonds buildsystem: cmake-ninja builddir: true @@ -890,6 +891,7 @@ modules: aarch64: config-opts: - -DENABLE_LTO_RELEASE=OFF + - -DUSE_QT6=ON sources: - type: git url: https://github.com/melonDS-emu/melonDS.git From 52fb7b43fb96d2f39b3640e481016113cffc5b43 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 12 Oct 2023 14:00:40 +0200 Subject: [PATCH 09/52] Comments [skip ci] --- 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 4e97022f..df295e0c 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -882,7 +882,7 @@ modules: - type: git url: https://gitlab.freedesktop.org/slirp/libslirp.git tag: v4.7.0 - + - name: melonds buildsystem: cmake-ninja builddir: true @@ -1007,7 +1007,6 @@ modules: # Duckstation-AppImage - END # Cemu - START - # LATEST BUILD BEFORE RUNTIME 23.08 # https://github.com/cemu-project/Cemu/releases # https://github.com/flathub/info.cemu.Cemu From b44c4a87f30b6f69ec1c554152587aac076b2fcd Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 12 Oct 2023 14:36:19 +0200 Subject: [PATCH 10/52] RPCS3: removed branch name --- net.retrodeck.retrodeck.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index df295e0c..16f536c5 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -944,7 +944,6 @@ modules: sources: - type: git url: https://github.com/RPCS3/rpcs3.git - branch: master commit: 75d239356a773b8211354049477d79006597505e # RPCS3 - END From d031eb23850789ef91c8010bb220d16a6109153e Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 12 Oct 2023 17:01:46 +0200 Subject: [PATCH 11/52] MELONDS: use QT6, fix --- net.retrodeck.retrodeck.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 16f536c5..51911ae4 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -886,12 +886,13 @@ modules: - name: melonds buildsystem: cmake-ninja builddir: true + config-opts: + - -DUSE_QT6=ON build-options: arch: aarch64: config-opts: - -DENABLE_LTO_RELEASE=OFF - - -DUSE_QT6=ON sources: - type: git url: https://github.com/melonDS-emu/melonDS.git From 2cf3f0e726f2a32ab64903f821d2d1209e689b1c Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 12 Oct 2023 18:54:34 +0200 Subject: [PATCH 12/52] PRIMEHACK: added proper patches --- net.retrodeck.retrodeck.yml | 4 +-- rd-submodules/primehack/detectflatpak.patch | 34 ++++++++++++++++++++ rd-submodules/primehack/nodirtyversion.patch | 13 ++++++++ 3 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 rd-submodules/primehack/detectflatpak.patch create mode 100644 rd-submodules/primehack/nodirtyversion.patch diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 51911ae4..2213991c 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -974,10 +974,10 @@ modules: # in non-writable paths, typically happens when a user # has leftover files from a previous non-flatpak install - type: patch - path: rd-submodules/dolphin/detectflatpak.patch + path: rd-submodules/primehack/detectflatpak.patch # version strings must match exactly for online multiplayer - type: patch - path: rd-submodules/dolphin/nodirtyversion.patch + path: rd-submodules/primehack/nodirtyversion.patch - type: script commands: - for i in {0..9}; do diff --git a/rd-submodules/primehack/detectflatpak.patch b/rd-submodules/primehack/detectflatpak.patch new file mode 100644 index 00000000..60dd1a2d --- /dev/null +++ b/rd-submodules/primehack/detectflatpak.patch @@ -0,0 +1,34 @@ +From f2d3b349d8487cf0ee50b36ba024ac513d36f826 Mon Sep 17 00:00:00 2001 +From: Carles Pastor +Date: Sat, 20 Aug 2022 13:35:32 +0200 +Subject: [PATCH] Detect we are running inside a flatpak sandbox + +--- + Source/Core/UICommon/UICommon.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Source/Core/UICommon/UICommon.cpp b/Source/Core/UICommon/UICommon.cpp +index 8d9dc2abb8..8a9d39a3d5 100644 +--- a/Source/Core/UICommon/UICommon.cpp ++++ b/Source/Core/UICommon/UICommon.cpp +@@ -348,7 +348,7 @@ void SetUserDirectory(std::string custom_path) + // -> Use GetExeDirectory()/User + // 2. $DOLPHIN_EMU_USERPATH is set + // -> Use $DOLPHIN_EMU_USERPATH +- // 3. ~/.dolphin-emu directory exists ++ // 3. ~/.dolphin-emu directory exists, and we're not in flatpak + // -> Use ~/.dolphin-emu + // 4. Default + // -> Use XDG basedir, see +@@ -381,7 +381,7 @@ void SetUserDirectory(std::string custom_path) + { + user_path = home_path + "." DOLPHIN_DATA_DIR DIR_SEP; + +- if (!File::Exists(user_path)) ++ if (File::Exists("/.flatpak-info") || !File::Exists(user_path)) + { + const char* data_home = getenv("XDG_DATA_HOME"); + std::string data_path = +-- +2.37.1 + diff --git a/rd-submodules/primehack/nodirtyversion.patch b/rd-submodules/primehack/nodirtyversion.patch new file mode 100644 index 00000000..20b6f3c1 --- /dev/null +++ b/rd-submodules/primehack/nodirtyversion.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9af66009a1..2acd3bed9a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -149,7 +149,7 @@ if(GIT_FOUND) + OUTPUT_VARIABLE DOLPHIN_WC_REVISION + OUTPUT_STRIP_TRAILING_WHITESPACE) + # defines DOLPHIN_WC_DESCRIBE +- execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long --dirty ++ execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long + OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE + OUTPUT_STRIP_TRAILING_WHITESPACE) + From 9039cb836f82c1f47c689ac8b7562f2063807286 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 13 Oct 2023 08:39:47 +0200 Subject: [PATCH 13/52] PRIMEHACK: testing a patch --- net.retrodeck.retrodeck.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 2213991c..0d8f9c25 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -960,14 +960,17 @@ modules: - -DENABLE_SDL=ON - -DENABLE_EVDEV=ON - -DDISTRIBUTOR=Flathub + - -DQT_DIR= cleanup: - /share/man post-install: - install -D primehack-wrapper /app/bin/primehack-wrapper sources: - type: git - url: https://github.com/TheDrifter363/primehack.git - commit: 6295c695307a67f11ee202b05cbdd7b5c1edae5c + url: https://github.com/XargonWan/primehack + commit: af7710ef7b04a632b4294eae5e0eff8fe9c4d1f8 + #url: https://github.com/TheDrifter363/primehack.git + #commit: 6295c695307a67f11ee202b05cbdd7b5c1edae5c # 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 From 9e2b59c4e48557f6caac6c8c9c907c95a4937bea Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 13 Oct 2023 11:16:21 +0200 Subject: [PATCH 14/52] QT6: failing on cleanup commands --- 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 0d8f9c25..3fdaa519 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -61,9 +61,9 @@ cleanup: # XMLSTARLET - /lib/debug - /share/runtime -cleanup-commands: +#cleanup-commands: # Yuzu - - /app/cleanup-BaseApp.sh + #- /app/cleanup-BaseApp.sh modules: From b1e73c0abb61dec96393c5a1793c1f77c134ce64 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 20 Oct 2023 14:12:26 +0200 Subject: [PATCH 15/52] ES-DE: updated to 2.2.0-beta --- 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 3fdaa519..dcb32989 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -376,7 +376,7 @@ modules: sources: - type: git url: https://gitlab.com/es-de/emulationstation-de - branch: 5545187d82fabf93256b7d176f39a0a98bcd6c54 + branch: d6f4c40a3867d1b72ff2e6cfbf5eb19c5625f426 - type: shell commands: - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK From 40985b020e5db2f62e0ed22f47ed7d35ec2c0bef Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 20 Oct 2023 14:40:26 +0200 Subject: [PATCH 16/52] ES-DE: updated es_systems.xml --- es-configs/es_systems.xml | 288 ++++++++++++++++++++++++++++++++------ 1 file changed, 249 insertions(+), 39 deletions(-) diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml index 736fafee..2eba04b1 100644 --- a/es-configs/es_systems.xml +++ b/es-configs/es_systems.xml @@ -5,18 +5,32 @@ 3do 3DO Interactive Multiplayer %ROMPATH%/3do - .bin .BIN .chd .CHD .cue .CUE .iso .ISO + .bin .BIN .chd .CHD .cue .CUE .iso .ISO .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/opera_libretro.so %ROM% 3do 3do + amstradcpc amstradcpc @@ -98,7 +113,8 @@ apple2gs Apple IIGS %ROMPATH%/apple2gs - .2mg .2MG + .2mg .2MG .7z .7z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "apple2gs -rompath %GAMEDIR%\;%ROMPATH%/apple2gs -flop3 \"%ROMRAW%\"" %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/apple2gs apple2gs -flop3 %ROM% apple2gs apple2gs @@ -131,10 +147,25 @@ Emerson Arcadia 2001 %ROMPATH%/arcadia .bin .BIN .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "arcadia -rompath %GAMEDIR%\;%ROMPATH%/arcadia -cart \"%ROMRAW%\"" %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/arcadia arcadia -cart %ROM% arcadia arcadia +--> + arduboy @@ -175,7 +206,7 @@ .a52 .A52 .atr .ATR .atx .ATX .bin .BIN .car .CAR .cas .CAS .cdm .CDM .rom .ROM .xex .XEX .xfd .XFD .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/a5200_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.so %ROM% - + atari5200 atari5200 @@ -185,6 +216,7 @@ %ROMPATH%/atari7800 .a78 .A78 .bin .BIN .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prosystem_libretro.so %ROM% + atari7800 atari7800 @@ -204,16 +236,19 @@ %ROMPATH%/atarijaguar .abs .ABS .bin .BIN .cdi .CDI .cof .COF .cue .CUE .j64 .J64 .jag .JAG .prg .PRG .rom .ROM .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/virtualjaguar_libretro.so %ROM% - - atarijaguar, atarijaguarcd + + + + atarijaguar 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% + .abs .ABS .bin .BIN .cdi .CDI .cof .COF .cue .CUE .j64 .J64 .jag .JAG .prg .PRG .rom .ROM .7z .7Z .zip .ZIP + + atarijaguarcd atarijaguarcd @@ -224,7 +259,7 @@ .lnx .LNX .o .O .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/handy_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_lynx_libretro.so %ROM% - + atarilynx atarilynx @@ -299,6 +334,7 @@ .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 @@ -354,6 +390,25 @@ colecovision colecovision + + consolearcade + Console Arcade Systems + %ROMPATH%/consolearcade + .arcadedef .desktop .iso .ISO .sh .xbe .XBE .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM% + + + %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% + + %INJECT%=%BASENAME%.esprefix %EMULATOR_XEMU% -dvd_path %ROM% + %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% + arcade + consolearcade + cps Capcom Play System @@ -430,6 +485,7 @@ VTech CreatiVision %ROMPATH%/crvision .bin .BIN .rom .ROM .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "crvision -rompath %GAMEDIR%\;%ROMPATH%/crvision -cart \"%ROMRAW%\"" %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/crvision crvision -cart %ROM% crvision crvision @@ -440,10 +496,12 @@ daphne Daphne Arcade LaserDisc Emulator %ROMPATH%/daphne - .daphne .singe + .daphne .singe .7z .7Z .zip .ZIP %EMULATOR_HYPSEUS-SINGE% %BASENAME% vldp -framefile %GAMEDIR%/%BASENAME%.txt %INJECT%=%BASENAME%.commands %EMULATOR_HYPSEUS-SINGE% singe vldp -framefile %GAMEDIR%/%BASENAME%.txt -script %GAMEDIR%/%BASENAME%.singe %INJECT%=%BASENAME%.commands - daphne + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% + %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/daphne %BASENAME% + daphne, arcade daphne --> @@ -506,6 +564,20 @@ easyrpg easyrpg + + famicom Nintendo Family Computer %ROMPATH%/famicom - .fds .FDS .nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP + .3dsen .3DSEN .fds .FDS .nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM% @@ -564,6 +638,7 @@ %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% @@ -584,13 +659,30 @@ flash --> + + gameandwatch @@ -623,6 +727,7 @@ Tiger Electronics Game.com %ROMPATH%/gamecom .tgc .TGC .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "gamecom -rompath %GAMEDIR%\;%ROMPATH%/gamecom -cartridge1 \"%ROMRAW%\"" %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/gamecom gamecom -cartridge1 %ROM% gamecom gamecom @@ -637,8 +742,9 @@ %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 @@ -654,6 +760,7 @@ %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% @@ -673,6 +780,8 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vba_next_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gpsp_libretro.so %ROM% + + gba gba @@ -688,6 +797,7 @@ %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% @@ -729,6 +839,7 @@ Hartung Game Master %ROMPATH%/gmaster .bin .BIN .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "gmaster -rompath %GAMEDIR%\;%ROMPATH%/gmaster -cart \"%ROMRAW%\"" %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/gmaster gmaster -cart %ROM% gmaster gmaster @@ -774,6 +885,18 @@ kodi --> + + laserdisc + LaserDisc Games + %ROMPATH%/laserdisc + .daphne .singe .7z .7Z .zip .ZIP + + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% + + daphne, arcade + laserdisc + lcdgames LCD Handheld Games @@ -827,24 +950,17 @@ arcade mame + mastersystem Sega Master System @@ -923,7 +1039,9 @@ %ROMPATH%/model2 .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% - + + + arcade model2 @@ -1073,11 +1191,21 @@ arcade naomi + + naomi2 + Sega NAOMI 2 + %ROMPATH%/naomi2 + .bin .BIN .dat .DAT .elf .ELF .lst .LST .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM% + + arcade + naomi2 + naomigd Sega NAOMI GD-ROM %ROMPATH%/naomigd - .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP + .bin .BIN .dat .DAT .elf .ELF .lst .LST .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM% arcade @@ -1093,6 +1221,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/melonds_libretro.so %ROM% %EMULATOR_MELONDS% %ROM% + nds nds @@ -1137,6 +1266,7 @@ %ROMPATH%/nes .fds .FDS .nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM% + %EMULATOR_MESEN% --fullscreen %ROM%--> %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM% @@ -1148,6 +1278,20 @@ nes nes + ngp SNK Neo Geo Pocket @@ -1216,8 +1360,9 @@ pc88 NEC PC-8800 Series %ROMPATH%/pc88 - .d88 .D88 .u88 .U88 .m3u .M3U .7z .7Z .zip .ZIP + .88d .88D .cmt .CMT .d88 .D88 .m3u .M3U .t88 .T88 .u88 .U88 %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quasi88_libretro.so %ROM% + pc88 pc88 @@ -1275,6 +1420,16 @@ pico8 pico8 + + plus4 + Commodore Plus/4 + %ROMPATH%/plus4 + .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_xplus4_libretro.so %ROM% + + plus4 + plus4 + pokemini Nintendo Pokémon Mini @@ -1298,11 +1453,12 @@ ps2 Sony PlayStation 2 %ROMPATH%/ps2 - %EMULATOR_PCSX2% -batch %ROM% - .bin .BIN .chd .CHD .ciso .CISO .cso .CSO .dump .DUMP .elf .ELF .gz .GZ .m3u .M3U .mdf .MDF .img .IMG .iso .ISO .isz .ISZ .ngr .NRG + .arcadedef .bin .BIN .chd .CHD .ciso .CISO .cso .CSO .dump .DUMP .elf .ELF .gz .GZ .m3u .M3U .mdf .MDF .img .IMG .iso .ISO .isz .ISZ .ngr .NRG + %EMULATOR_PCSX2% -batch %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM% - + + ps2 ps2 @@ -1412,6 +1568,8 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% + + satellaview satellaview @@ -1457,6 +1615,7 @@ Epoch Super Cassette Vision %ROMPATH%/scv .0 .bin .BIN .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "scv -rompath %GAMEDIR%\;%ROMPATH%/scv -cart \"%ROMRAW%\"" %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/scv scv -cart %ROM% scv scv @@ -1614,6 +1773,18 @@ stratagus stratagus + + stv + Sega Titan Video Game System + %ROMPATH%/stv + .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM% + + + + arcade + stv + sufami Bandai SuFami Turbo @@ -1650,6 +1821,18 @@ supervision supervision + switch Nintendo Switch @@ -1664,9 +1847,12 @@ symbian Symbian %ROMPATH%/symbian - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - android + .sis .SIS .sisx .SISX .symbian + %EMULATOR_EKA2L1% --fullscreen --device RH-29 --run "%BASENAME%" + %EMULATOR_EKA2L1% --fullscreen --device RM-84 --run "%BASENAME%" + %EMULATOR_EKA2L1% --fullscreen --device RM-507 --run "%BASENAME%" + %EMULATOR_EKA2L1% --fullscreen --device %INJECT%=%BASENAME%.device --run "%BASENAME%" + ngage symbian uzebox @@ -1799,7 +2006,7 @@ Visual Pinball %ROMPATH%/vpinball .vpt .VPT .vpx .VPX - PLACEHOLDER %ROM% + %EMULATOR_VISUAL-PINBALL% -Minimized -Play %ROM% vpinball vpinball @@ -1810,6 +2017,7 @@ VTech V.Smile %ROMPATH%/vsmile .bin .BIN .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "vsmile -rompath %GAMEDIR%\;%ROMPATH%/vsmile -cart \"%ROMRAW%\"" %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/vsmile vsmile -cart %ROM% vsmile vsmile @@ -1899,8 +2107,10 @@ xbox360 Microsoft Xbox 360 %ROMPATH%/xbox360 - . .iso .ISO .xex .XEX - PLACEHOLDER %ROM% + . .desktop .iso .ISO .sh .xex .XEX + %STARTDIR%=%EMUDIR% %PRECOMMAND_WINE% %EMULATOR_XENIA-WINDOWS% %ROM% + %STARTDIR%=%EMUDIR% %PRECOMMAND_PROTON% %EMULATOR_XENIA-WINDOWS% %ROM% + %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% xbox360 xbox360 From 6600b6ce1e0698222a9908258422eadf05d8889e Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 20 Oct 2023 14:45:04 +0200 Subject: [PATCH 17/52] ES-DE: updated es_find_rules.xml --- es-configs/es_find_rules.xml | 214 +++++++++++++++++++++++++++++++---- 1 file changed, 195 insertions(+), 19 deletions(-) diff --git a/es-configs/es_find_rules.xml b/es-configs/es_find_rules.xml index 8990e20b..85a0d940 100644 --- a/es-configs/es_find_rules.xml +++ b/es-configs/es_find_rules.xml @@ -12,7 +12,6 @@ retroarch org.libretro.RetroArch - RetroArch-Linux-x86_64.AppImage ~/Applications/RetroArch-Linux*.AppImage @@ -25,14 +24,17 @@ - - /app/share/libretro/cores - - ~/snap/retroarch/current/.config/retroarch/cores + + ~/.config/retroarch/cores + + ~/Applications/RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/cores + ~/.local/share/applications/RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/cores + ~/.local/bin/RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/cores + ~/bin/RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/cores ~/.var/app/org.libretro.RetroArch/config/retroarch/cores - - ~/.config/retroarch/cores + + ~/snap/retroarch/current/.config/retroarch/cores /usr/lib/x86_64-linux-gnu/libretro @@ -45,6 +47,27 @@ /usr/pkg/lib/libretro + + + + ~/Applications/3dSen/3dSen.exe + ~/.local/share/applications/3dSen/3dSen.exe + ~/.local/bin/3dSen/3dSen.exe + ~/bin/3dSen/3dSen.exe + + + + + + advmame + + + ~/Applications/advancemame/advmame + ~/.local/share/applications/advancemame/advmame + ~/.local/bin/advancemame/advmame + ~/bin/advancemame/advmame + + @@ -78,6 +101,15 @@ ~/.local/share/flatpak/exports/bin/net.cebix.basilisk + + + + ~/Applications/BigPEmu/BigPEmu.exe + ~/.local/share/applications/BigPEmu/BigPEmu.exe + ~/.local/bin/BigPEmu/BigPEmu.exe + ~/bin/BigPEmu/BigPEmu.exe + + @@ -93,6 +125,7 @@ bsnes + dev.bsnes.bsnes /var/lib/flatpak/exports/bin/dev.bsnes.bsnes @@ -102,7 +135,6 @@ - Cemu-wrapper cemu Cemu @@ -115,21 +147,24 @@ ~/.local/share/applications/Cemu/Cemu ~/.local/bin/Cemu/Cemu ~/bin/Cemu/Cemu + /var/lib/flatpak/exports/bin/info.cemu.Cemu + ~/.local/share/flatpak/exports/bin/info.cemu.Cemu - citra-qt - citra + citra citra-emu.citra-nightly org.citra_emu.citra - ~/Applications/citra*.AppImage - ~/.local/share/applications/citra*.AppImage - ~/.local/bin/citra*.AppImage - ~/bin/citra*.AppImage + ~/Applications/citra-qt*.AppImage + ~/.local/share/applications/citra-qt*.AppImage + ~/.local/bin/citra-qt*.AppImage + ~/bin/citra-qt*.AppImage + ~/.citra/canary/citra-qt.AppImage + ~/.citra/nightly/citra-qt.AppImage /var/lib/flatpak/exports/bin/org.citra_emu.citra ~/.local/share/flatpak/exports/bin/org.citra_emu.citra @@ -170,6 +205,7 @@ dolphin-emu + dolphin-emulator.dolphin-emu org.DolphinEmu.dolphin-emu @@ -211,6 +247,10 @@ org.duckstation.DuckStation + ~/Applications/DuckStation*.AppImage + ~/.local/share/applications/DuckStation*.AppImage + ~/.local/bin/DuckStation*.AppImage + ~/bin/DuckStation*.AppImage ~/Applications/duckstation-nogui*.AppImage ~/.local/share/applications/duckstation-nogui*.AppImage ~/.local/bin/duckstation-nogui*.AppImage @@ -235,6 +275,27 @@ ~/bin/easyrpg/easyrpg-player + + + + eka2l1_qt + + + ~/Applications/EKA2L1*.AppImage + ~/.local/share/applications/EKA2L1*.AppImage + ~/.local/bin/EKA2L1*.AppImage + ~/bin/EKA2L1*.AppImage + + + + + + ~/Applications/EKA2L1/eka2l1_qt.exe + ~/.local/share/applications/EKA2L1/eka2l1_qt.exe + ~/.local/bin/EKA2L1/eka2l1_qt.exe + ~/bin/EKA2L1/eka2l1_qt.exe + + @@ -289,6 +350,7 @@ gargoyle + io.github.garglk.Gargoyle ~/Applications/Gargoyle*.AppImage @@ -324,6 +386,7 @@ hatari + org.tuxfamily.hatari /var/lib/flatpak/exports/bin/org.tuxfamily.hatari @@ -366,6 +429,15 @@ ~/bin/linapple/linapple + + + + ~/Applications/m2emulator/EMULATOR.EXE + ~/.local/share/applications/m2emulator/EMULATOR.EXE + ~/.local/bin/m2emulator/EMULATOR.EXE + ~/bin/m2emulator/EMULATOR.EXE + + @@ -399,6 +471,18 @@ ~/.local/share/flatpak/exports/bin/net.kuribo64.melonDS + + + + mesen2 + + + ~/Applications/Mesen*.AppImage + ~/.local/share/applications/Mesen*.AppImage + ~/.local/bin/Mesen*.AppImage + ~/bin/Mesen*.AppImage + + @@ -430,6 +514,7 @@ nestopia + ca._0ldsk00l.Nestopia /var/lib/flatpak/exports/bin/ca._0ldsk00l.Nestopia @@ -440,6 +525,7 @@ openmsx + org.openmsx.openMSX /var/lib/flatpak/exports/bin/org.openmsx.openMSX @@ -462,11 +548,15 @@ pcsx2-qt + net.pcsx2.PCSX2 - ~/Applications/pcsx2*-Qt.AppImage - ~/.local/bin/pcsx2*-Qt.AppImage - ~/bin/pcsx2*-Qt.AppImage + ~/Applications/pcsx2*.AppImage + ~/.local/share/applications/pcsx2*.AppImage + ~/.local/bin/pcsx2*.AppImage + ~/bin/pcsx2*.AppImage + /var/lib/flatpak/exports/bin/net.pcsx2.PCSX2 + ~/.local/share/flatpak/exports/bin/net.pcsx2.PCSX2 @@ -495,6 +585,9 @@ + + org.purei.Play + ~/Applications/Play!*.AppImage ~/.local/share/applications/Play!*.AppImage @@ -508,9 +601,9 @@ ppsspp-emu.ppsspp-sdl - org.ppsspp.PPSSPP PPSSPPSDL PPSSPPQt + org.ppsspp.PPSSPP /var/lib/flatpak/exports/bin/org.ppsspp.PPSSPP @@ -534,6 +627,15 @@ ~/.local/share/flatpak/exports/bin/io.github.shiiion.primehack + + + + ~/Applications/Proton/wine*.AppImage + ~/.local/share/applications/Proton/wine*.AppImage + ~/.local/bin/Proton/wine*.AppImage + ~/bin/Proton/wine*.AppImage + + @@ -546,6 +648,18 @@ ~/bin/punes/punes + + + + quasi88 + + + ~/Applications/quasi88/quasi88 + ~/.local/share/applications/quasi88/quasi88 + ~/.local/bin/quasi88/quasi88 + ~/bin/quasi88/quasi88 + + @@ -690,13 +804,30 @@ ~/.local/share/flatpak/exports/bin/io.github.simple64.simple64 + + + + SkyEmu + + + ~/Applications/SkyEmu/SkyEmu + ~/.local/share/applications/SkyEmu/SkyEmu + ~/.local/bin/SkyEmu/SkyEmu + ~/bin/SkyEmu/SkyEmu + + snes9x snes9x-gtk + com.snes9x.Snes9x + ~/Applications/Snes9x*.AppImage + ~/.local/share/applications/Snes9x*.AppImage + ~/.local/bin/Snes9x*.AppImage + ~/bin/Snes9x*.AppImage /var/lib/flatpak/exports/bin/com.snes9x.Snes9x ~/.local/share/flatpak/exports/bin/com.snes9x.Snes9x @@ -780,8 +911,19 @@ ~/.local/share/flatpak/exports/bin/net.sf.VICE + + + + xplus4 + vice-jz.xplus4 + + + /var/lib/flatpak/exports/bin/net.sf.VICE|flatpak run --command=xplus4 net.sf.VICE + ~/.local/share/flatpak/exports/bin/net.sf.VICE|flatpak run --command=xplus4 net.sf.VICE + + - + xvic vice-jz.xvic @@ -791,6 +933,18 @@ ~/.local/share/flatpak/exports/bin/net.sf.VICE|flatpak run --command=xvic net.sf.VICE + + + + VPinballX_GL + + + ~/Applications/VPinballX/VPinballX_GL + ~/.local/share/applications/VPinballX/VPinballX_GL + ~/.local/bin/VPinballX/VPinballX_GL + ~/bin/VPinballX/VPinballX_GL + + @@ -819,6 +973,28 @@ ~/.local/share/flatpak/exports/bin/app.xemu.xemu + + + + ~/Applications/Wine/wine*.AppImage + ~/.local/share/applications/Wine/wine*.AppImage + ~/.local/bin/Wine/wine*.AppImage + ~/bin/Wine/wine*.AppImage + + + + + + ~/Applications/xenia/xenia.exe + ~/.local/share/applications/xenia/xenia.exe + ~/.local/bin/xenia/xenia.exe + ~/bin/xenia/xenia.exe + ~/Applications/xenia/xenia_canary.exe + ~/.local/share/applications/xenia/xenia_canary.exe + ~/.local/bin/xenia/xenia_canary.exe + ~/bin/xenia/xenia_canary.exe + + From e6193709e3803cae4be5db554b4112e9ca20c47b Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 20 Oct 2023 14:56:25 +0200 Subject: [PATCH 18/52] ES-DE: comments cleanup in es_find_rules.xml --- es-configs/es_systems.xml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml index 2eba04b1..0909a042 100644 --- a/es-configs/es_systems.xml +++ b/es-configs/es_systems.xml @@ -401,7 +401,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM% - + %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% %INJECT%=%BASENAME%.esprefix %EMULATOR_XEMU% -dvd_path %ROM% @@ -597,7 +597,7 @@ %ROMPATH%/famicom .3dsen .3DSEN .fds .FDS .nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM% - + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM% @@ -638,7 +638,7 @@ %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% @@ -744,7 +744,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/smsplus_libretro.so %ROM% - + gamegear gamegear @@ -760,7 +760,7 @@ %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% @@ -780,7 +780,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vba_next_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gpsp_libretro.so %ROM% - + gba gba @@ -797,7 +797,7 @@ %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% @@ -1266,9 +1266,9 @@ %ROMPATH%/nes .fds .FDS .nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM% - %EMULATOR_MESEN% --fullscreen %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% @@ -1284,10 +1284,10 @@ Nokia N-Gage %ROMPATH%/ngage .ngage .zip .ZIP - %EMULATOR_EKA2L1% --fullscreen --device RH-29 --mount %ROM% --run "%BASENAME%" - %EMULATOR_EKA2L1% --fullscreen --device RH-29 --run "%BASENAME%" - %STARTDIR%=%EMUDIR% %PRECOMMAND_WINE% %EMULATOR_EKA2L1-WINDOWS% --fullscreen --device RH-29 --mount %ROM% --run "%BASENAME%" - %STARTDIR%=%EMUDIR% %PRECOMMAND_WINE% %EMULATOR_EKA2L1-WINDOWS% --fullscreen --device RH-29 --run "%BASENAME%" + %EMULATOR_EKA2L1% ––fullscreen ––device RH-29 ––mount %ROM% ––run "%BASENAME%" + %EMULATOR_EKA2L1% ––fullscreen ––device RH-29 ––run "%BASENAME%" + %STARTDIR%=%EMUDIR% %PRECOMMAND_WINE% %EMULATOR_EKA2L1-WINDOWS% ––fullscreen ––device RH-29 ––mount %ROM% ––run "%BASENAME%" + %STARTDIR%=%EMUDIR% %PRECOMMAND_WINE% %EMULATOR_EKA2L1-WINDOWS% ––fullscreen ––device RH-29 ––run "%BASENAME%" ngage ngage @@ -1457,8 +1457,8 @@ %EMULATOR_PCSX2% -batch %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM% - - + + ps2 ps2 @@ -1568,8 +1568,8 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% - - + + satellaview satellaview From 9eb04160dbd7a43bc814ae660355c94cd283ad73 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Sat, 21 Oct 2023 20:02:21 +0200 Subject: [PATCH 19/52] TOOLS: added a patch helper for ES-DE --- rd-submodules/es-de/patch_helper.sh | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100755 rd-submodules/es-de/patch_helper.sh diff --git a/rd-submodules/es-de/patch_helper.sh b/rd-submodules/es-de/patch_helper.sh new file mode 100755 index 00000000..e774e724 --- /dev/null +++ b/rd-submodules/es-de/patch_helper.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +mkdir /tmp + +branch="2de8282f6a5feaf86424b1175154c5fc2585f70a" +git clone "https://gitlab.com/es-de/emulationstation-de.git" /tmp/emulationstation-de + +pushd . +cd /tmp/emulationstation-de +git checkout $branch +popd + +mkdir patches-tmp + +cp /tmp/emulationstation-de/es-app/src/guis/GuiMenu.cpp ./patches-tmp +cp /tmp/emulationstation-de/es-app/src/guis/GuiMenu.h ./patches-tmp +cp /tmp/emulationstation-de/es-app/src/views/ViewController.cpp ./patches-tmp +cp /tmp/emulationstation-de/es-core/src/Window.cpp ./patches-tmp + +read -p "Please edit the files in \"patches-tmp\" and press enter to continue." + +diff -au1r /tmp/emulationstation-de/es-app/src/guis/GuiMenu.cpp ./patches-tmp/GuiMenu.cpp > GuiMenu.cpp.patch +diff -au1r /tmp/emulationstation-de/es-app/src/guis/GuiMenu.h ./patches-tmp/GuiMenu.h > GuiMenu.h.patch +diff -au1r /tmp/emulationstation-de/es-app/src/views/ViewController.cpp ./patches-tmp/ViewController.cpp > ViewController.cpp.patch +diff -au1r /tmp/emulationstation-de/es-core/src/Window.cpp ./patches-tmp/Window.cpp > Window.cpp.patch + +#rm -rf patches-tmp \ No newline at end of file From 9f99076331ab00a8b898d3b2161a96ac96cfc964 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Sat, 21 Oct 2023 20:03:00 +0200 Subject: [PATCH 20/52] ES-DE: updated to 2.2.0-beta -hotfix --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index dcb32989..3f257097 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -376,7 +376,7 @@ modules: sources: - type: git url: https://gitlab.com/es-de/emulationstation-de - branch: d6f4c40a3867d1b72ff2e6cfbf5eb19c5625f426 + branch: 2de8282f6a5feaf86424b1175154c5fc2585f70a - type: shell commands: - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK From 1214a8cb1d83627a31ae7daf99315dc64213414e Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Sat, 21 Oct 2023 22:23:03 +0200 Subject: [PATCH 21/52] ES-DE: updated to 2.2.0-beta - fixing ViewController.cpp.patch --- rd-submodules/es-de/ViewController.cpp.patch | 77 ++++++++------------ 1 file changed, 30 insertions(+), 47 deletions(-) diff --git a/rd-submodules/es-de/ViewController.cpp.patch b/rd-submodules/es-de/ViewController.cpp.patch index 2f485a31..77c44b8a 100644 --- a/rd-submodules/es-de/ViewController.cpp.patch +++ b/rd-submodules/es-de/ViewController.cpp.patch @@ -1,22 +1,6 @@ -diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstation-de/es-app/src/views/ViewController.cpp ---- emulationstation-de/es-app/src/views/ViewController.cpp 2023-08-23 13:12:15.625292630 +0200 -+++ emulationstation-de/es-app/src/views/ViewController.cpp 2023-08-23 14:29:23.547223951 +0200 -@@ -164,9 +164,7 @@ - { -- mNoGamesErrorMessage = "NO GAME FILES WERE FOUND. EITHER PLACE YOUR GAMES IN " -- "THE CURRENTLY CONFIGURED ROM DIRECTORY OR CHANGE " -- "ITS PATH USING THE BUTTON BELOW. OPTIONALLY THE ROM " -- "DIRECTORY STRUCTURE CAN BE GENERATED WHICH WILL " -- "CREATE A TEXT FILE FOR EACH SYSTEM PROVIDING SOME " -- "INFORMATION SUCH AS THE SUPPORTED FILE EXTENSIONS.\n" -- "THIS IS THE CURRENTLY CONFIGURED ROM DIRECTORY:\n"; -+ mNoGamesErrorMessage = "RETRODECK COULD NOT FIND ANY ROM FILES. " -+ "PLEASE PLACE YOUR ROM FILES INTO THE APPROPRIATE " -+ "SYSTEM SUBFOLDER IN THE CONFIGURED ROM DIRECTORY " -+ "AND RUN RETRODECK AGAIN TO SCAN YOUR LIBRARY.\n" -+ "THE CURRENTLY CONFIGURED ROM DIRECTORY IS:\n"; - -@@ -179,90 +177,3 @@ +--- /tmp/emulationstation-de/es-app/src/views/ViewController.cpp 2023-10-21 19:46:36.202758979 +0200 ++++ ./patches-tmp/ViewController.cpp 2023-10-21 22:21:04.737925284 +0200 +@@ -195,96 +195,5 @@ mNoGamesMessageBox = new GuiMsgBox( - HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY", - [this] { @@ -29,22 +13,24 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat - if (Settings::getInstance()->getBool("VirtualKeyboard")) { - mWindow->pushGui(new GuiTextEditKeyboardPopup( - HelpStyle(), 0.0f, "ENTER ROM DIRECTORY PATH", currentROMDirectory, -- [this](const std::string& newROMDirectory) { -- Settings::getInstance()->setString("ROMDirectory", -- Utils::String::trim(newROMDirectory)); -- Settings::getInstance()->saveFile(); +- [this, currentROMDirectory](const std::string& newROMDirectory) { +- if (currentROMDirectory != newROMDirectory) { +- Settings::getInstance()->setString( +- "ROMDirectory", Utils::String::trim(newROMDirectory)); +- Settings::getInstance()->saveFile(); -#if defined(_WIN64) -- mRomDirectory = -- Utils::String::replace(FileData::getROMDirectory(), "/", "\\"); +- mRomDirectory = +- Utils::String::replace(FileData::getROMDirectory(), "/", "\\"); -#else -- mRomDirectory = FileData::getROMDirectory(); +- mRomDirectory = FileData::getROMDirectory(); -#endif -- mNoGamesMessageBox->changeText(mNoGamesErrorMessage + mRomDirectory); -- mWindow->pushGui(new GuiMsgBox(HelpStyle(), -- "ROM DIRECTORY SETTING SAVED, RESTART\n" -- "THE APPLICATION TO RESCAN THE SYSTEMS", -- "OK", nullptr, "", nullptr, "", nullptr, -- true, true)); +- mNoGamesMessageBox->changeText(mNoGamesErrorMessage + mRomDirectory); +- mWindow->pushGui(new GuiMsgBox(HelpStyle(), +- "ROM DIRECTORY SETTING SAVED, RESTART\n" +- "THE APPLICATION TO RESCAN THE SYSTEMS", +- "OK", nullptr, "", nullptr, "", nullptr, +- nullptr, true, true)); +- } - }, - false, "SAVE", "SAVE CHANGES?", "Currently configured path:", - currentROMDirectory, "LOAD CURRENTLY CONFIGURED PATH", @@ -68,7 +54,7 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat - "ROM DIRECTORY SETTING SAVED, RESTART\n" - "THE APPLICATION TO RESCAN THE SYSTEMS", - "OK", nullptr, "", nullptr, "", nullptr, -- true)); +- nullptr, true)); - }, - false, "SAVE", "SAVE CHANGES?", "Currently configured path:", - currentROMDirectory, "LOAD CURRENTLY CONFIGURED PATH", @@ -82,9 +68,8 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat - "THIS WILL CREATE DIRECTORIES FOR ALL THE\n" - "GAME SYSTEMS DEFINED IN es_systems.xml\n\n" - "THIS MAY CREATE A LOT OF FOLDERS SO IT'S\n" -- "ADVICED TO REMOVE THE ONES YOU DON'T NEED\n\n" -- "PROCEED?", -- "YES", +- "ADVICED TO REMOVE THE ONES YOU DON'T NEED", +- "PROCEED", - [this] { - if (!SystemData::createSystemDirectories()) { - mWindow->pushGui(new GuiMsgBox(HelpStyle(), @@ -92,7 +77,7 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat - "GENERATED, EXIT THE APPLICATION AND PLACE\n" - "YOUR GAMES IN THE NEWLY CREATED FOLDERS", - "OK", nullptr, "", nullptr, "", nullptr, -- true)); +- nullptr, true)); - } - else { - mWindow->pushGui(new GuiMsgBox(HelpStyle(), @@ -100,19 +85,17 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat - "PERMISSION PROBLEMS OR DISK FULL?\n\n" - "SEE THE LOG FILE FOR MORE DETAILS", - "OK", nullptr, "", nullptr, "", nullptr, -- true)); +- nullptr, true)); - } - }, -- "NO", nullptr, "", nullptr, true)); +- "CANCEL", nullptr, "", nullptr, nullptr, true)); - }, - "QUIT", + HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT", [] { -@@ -272,3 +183,3 @@ - }, -- true, false, -+ "", nullptr, "", nullptr, true, false, - (mRenderer->getIsVerticalOrientation() ? -@@ -1446 +1357,2 @@ - } -+ +- SDL_Event quit; +- quit.type = SDL_QUIT; +- SDL_PushEvent(&quit); +- }, ++ }, + nullptr, true, false, From a04857c4c7d80820b5b24d296a7513611759c16f Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 26 Oct 2023 09:46:22 +0200 Subject: [PATCH 22/52] Ignoring temporary patches dir --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d1256aed..3a2d30ac 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ backup .old tmp .godot +rd-submodules/es-de/patches-tmp \ No newline at end of file From be69660d25f8207a672f5fd9ba4cee356df6e2a4 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 26 Oct 2023 09:48:25 +0200 Subject: [PATCH 23/52] Fixed wiki paths [skip ci] --- wiki-rtd/{Citra:-Mods.md => Citra-Mods.md} | 0 ...exture-Packs.md => Citra-Texture-Packs.md} | 0 ...-notes.md => Development-General-notes.md} | 0 ...-Mods.md => Dolphin-and-Primehack-Mods.md} | 0 ...=> Dolphin-and-Primehack-Texture-Packs.md} | 0 ...-Packs.md => Duckstation-Texture-Packs.md} | 0 ...hemes.md => EmulationStation-DE-Themes.md} | 4 +- ...e.md => EmulationStation-DE-User-Guide.md} | 2 +- ...ware.md => Emulators-BIOS-and-Firmware.md} | 0 ... Emulators-Diffrent-controller-layouts.md} | 0 ... Emulators-Supported-folders-and-files.md} | 2 +- ...luded?.md => Emulators-What's-included.md} | 0 ....md => FAQs-Frequently-asked-questions.md} | 4 +- ...ing?.md => How-can-I-help-with-testing.md} | 0 ...g-started.md => How-to-Getting-started.md} | 18 ++--- ...r-games.md => How-to-Manage-your-games.md} | 2 +- ...Linux-Desktop-Software-recommendations.md} | 0 ...exture-Packs.md => PCXS2-Texture-Packs.md} | 0 ...xture-Packs.md => PPSSPP-Texture-Packs.md} | 0 ...ion-3:-RPCS3.md => Playstation-3-RPCS3.md} | 2 +- ...ks.md => RetroArch-Mesen-Texture-Packs.md} | 0 ...troArch-Mupen64Plus-Next-Texture-Packs.md} | 0 .../{RetroDECK:-CLI.md => RetroDECK-CLI.md} | 0 ...figurator.md => RetroDECK-Configurator.md} | 0 ...m.md => RetroDECK-Credits-and-The-Team.md} | 0 ....md => RetroDECK-Folders-and-filepaths.md} | 0 ...les.md => RetroDECK-Social-media-rules.md} | 0 ...md => RetroDECK-The-story-of-RetroDECK.md} | 0 ....md => Steam-Deck-Hotkeys-and-controls.md} | 0 ...=> Steam-Deck-Installation-and-updates.md} | 2 +- ...zations.md => Steam-Deck-Optimizations.md} | 2 +- ...=> Steam-Deck-Software-recommendations.md} | 2 +- wiki-rtd/{Switch:-Yuzu.md => Switch-Yuzu.md} | 0 ...otes.md => Version-history-Patch-Notes.md} | 2 +- wiki-rtd/{Yuzu:-Mods.md => Yuzu-Mods.md} | 0 wiki-rtd/_Sidebar.md | 70 +++++++++---------- wiki-rtd/index.md | 4 +- 37 files changed, 58 insertions(+), 58 deletions(-) rename wiki-rtd/{Citra:-Mods.md => Citra-Mods.md} (100%) rename wiki-rtd/{Citra:-Texture-Packs.md => Citra-Texture-Packs.md} (100%) rename wiki-rtd/{Development:-General-notes.md => Development-General-notes.md} (100%) rename wiki-rtd/{Dolphin-and-Primehack:-Mods.md => Dolphin-and-Primehack-Mods.md} (100%) rename wiki-rtd/{Dolphin-and-Primehack:-Texture-Packs.md => Dolphin-and-Primehack-Texture-Packs.md} (100%) rename wiki-rtd/{Duckstation:-Texture-Packs.md => Duckstation-Texture-Packs.md} (100%) rename wiki-rtd/{EmulationStation-DE:-Themes.md => EmulationStation-DE-Themes.md} (87%) rename wiki-rtd/{EmulationStation-DE:-User-Guide.md => EmulationStation-DE-User-Guide.md} (99%) rename wiki-rtd/{Emulators:-BIOS-and-Firmware.md => Emulators-BIOS-and-Firmware.md} (100%) rename wiki-rtd/{Emulators:-Diffrent-controller-layouts.md => Emulators-Diffrent-controller-layouts.md} (100%) rename wiki-rtd/{Emulators:-Supported-folders-and-files.md => Emulators-Supported-folders-and-files.md} (99%) rename wiki-rtd/{Emulators:-What's-included?.md => Emulators-What's-included.md} (100%) rename wiki-rtd/{FAQs:-Frequently-asked-questions.md => FAQs-Frequently-asked-questions.md} (99%) rename wiki-rtd/{How-can-I-help-with-testing?.md => How-can-I-help-with-testing.md} (100%) rename wiki-rtd/{How-to:-Getting-started.md => How-to-Getting-started.md} (80%) rename wiki-rtd/{How-to:-Manage-your-games.md => How-to-Manage-your-games.md} (98%) rename wiki-rtd/{Linux-Desktop:-Software-recommendations.md => Linux-Desktop-Software-recommendations.md} (100%) rename wiki-rtd/{PCXS2:-Texture-Packs.md => PCXS2-Texture-Packs.md} (100%) rename wiki-rtd/{PPSSPP:-Texture-Packs.md => PPSSPP-Texture-Packs.md} (100%) rename wiki-rtd/{Playstation-3:-RPCS3.md => Playstation-3-RPCS3.md} (98%) rename wiki-rtd/{RetroArch-Mesen:-Texture-Packs.md => RetroArch-Mesen-Texture-Packs.md} (100%) rename wiki-rtd/{RetroArch-Mupen64Plus-Next:-Texture-Packs.md => RetroArch-Mupen64Plus-Next-Texture-Packs.md} (100%) rename wiki-rtd/{RetroDECK:-CLI.md => RetroDECK-CLI.md} (100%) rename wiki-rtd/{RetroDECK:-Configurator.md => RetroDECK-Configurator.md} (100%) rename wiki-rtd/{RetroDECK:-Credits-and-The-Team.md => RetroDECK-Credits-and-The-Team.md} (100%) rename wiki-rtd/{RetroDECK:-Folders-and-filepaths.md => RetroDECK-Folders-and-filepaths.md} (100%) rename wiki-rtd/{RetroDECK:-Social-media-rules.md => RetroDECK-Social-media-rules.md} (100%) rename wiki-rtd/{RetroDECK:-The-story-of-RetroDECK.md => RetroDECK-The-story-of-RetroDECK.md} (100%) rename wiki-rtd/{Steam-Deck:-Hotkeys-and-controls.md => Steam-Deck-Hotkeys-and-controls.md} (100%) rename wiki-rtd/{Steam-Deck:-Installation-and-updates.md => Steam-Deck-Installation-and-updates.md} (98%) rename wiki-rtd/{Steam-Deck:-Optimizations.md => Steam-Deck-Optimizations.md} (98%) rename wiki-rtd/{Steam-Deck:-Software-recommendations.md => Steam-Deck-Software-recommendations.md} (95%) rename wiki-rtd/{Switch:-Yuzu.md => Switch-Yuzu.md} (100%) rename wiki-rtd/{Version-history:-Patch-Notes.md => Version-history-Patch-Notes.md} (99%) rename wiki-rtd/{Yuzu:-Mods.md => Yuzu-Mods.md} (100%) diff --git a/wiki-rtd/Citra:-Mods.md b/wiki-rtd/Citra-Mods.md similarity index 100% rename from wiki-rtd/Citra:-Mods.md rename to wiki-rtd/Citra-Mods.md diff --git a/wiki-rtd/Citra:-Texture-Packs.md b/wiki-rtd/Citra-Texture-Packs.md similarity index 100% rename from wiki-rtd/Citra:-Texture-Packs.md rename to wiki-rtd/Citra-Texture-Packs.md diff --git a/wiki-rtd/Development:-General-notes.md b/wiki-rtd/Development-General-notes.md similarity index 100% rename from wiki-rtd/Development:-General-notes.md rename to wiki-rtd/Development-General-notes.md diff --git a/wiki-rtd/Dolphin-and-Primehack:-Mods.md b/wiki-rtd/Dolphin-and-Primehack-Mods.md similarity index 100% rename from wiki-rtd/Dolphin-and-Primehack:-Mods.md rename to wiki-rtd/Dolphin-and-Primehack-Mods.md diff --git a/wiki-rtd/Dolphin-and-Primehack:-Texture-Packs.md b/wiki-rtd/Dolphin-and-Primehack-Texture-Packs.md similarity index 100% rename from wiki-rtd/Dolphin-and-Primehack:-Texture-Packs.md rename to wiki-rtd/Dolphin-and-Primehack-Texture-Packs.md diff --git a/wiki-rtd/Duckstation:-Texture-Packs.md b/wiki-rtd/Duckstation-Texture-Packs.md similarity index 100% rename from wiki-rtd/Duckstation:-Texture-Packs.md rename to wiki-rtd/Duckstation-Texture-Packs.md diff --git a/wiki-rtd/EmulationStation-DE:-Themes.md b/wiki-rtd/EmulationStation-DE-Themes.md similarity index 87% rename from wiki-rtd/EmulationStation-DE:-Themes.md rename to wiki-rtd/EmulationStation-DE-Themes.md index 7fee150a..2aee3876 100644 --- a/wiki-rtd/EmulationStation-DE:-Themes.md +++ b/wiki-rtd/EmulationStation-DE-Themes.md @@ -19,9 +19,9 @@ If you find a theme you would like to use that is not in the `Theme Downloader` ## FAQs: Frequently asked questions on Themes -["Why does the theme I am using not work?" or "Why does the layout look broken?" (black screen with blue text)](https://github.com/XargonWan/RetroDECK/wiki/FAQs:-Frequently-asked-questions#why-does-the-theme-i-am-using-not-work-or-why-does-the-layout-look-broken-black-screen-with-blue-text) +["Why does the theme I am using not work?" or "Why does the layout look broken?" (black screen with blue text)](https://github.com/XargonWan/RetroDECK/wiki/FAQs-Frequently-asked-questions#why-does-the-theme-i-am-using-not-work-or-why-does-the-layout-look-broken-black-screen-with-blue-text) -[Why does the theme layout look squished?](https://github.com/XargonWan/RetroDECK/wiki/FAQs:-Frequently-asked-questions#why-does-the-theme-layout-look-squished) +[Why does the theme layout look squished?](https://github.com/XargonWan/RetroDECK/wiki/FAQs-Frequently-asked-questions#why-does-the-theme-layout-look-squished) # RetroDECK: Included Theme diff --git a/wiki-rtd/EmulationStation-DE:-User-Guide.md b/wiki-rtd/EmulationStation-DE-User-Guide.md similarity index 99% rename from wiki-rtd/EmulationStation-DE:-User-Guide.md rename to wiki-rtd/EmulationStation-DE-User-Guide.md index 44a58f6d..1176aaf8 100644 --- a/wiki-rtd/EmulationStation-DE:-User-Guide.md +++ b/wiki-rtd/EmulationStation-DE-User-Guide.md @@ -27,7 +27,7 @@ These are mostly technical settings.
These are the buttons mappings automatically applied by ES-DE.
[General navigation](https://gitlab.com/es-de/emulationstation-de/-/blob/master/USERGUIDE.md#general-navigation) If you are using the Steam Deck look at RetroDECKs hotkeys: -[Steam Deck: Hotkeys ](https://github.com/XargonWan/RetroDECK/wiki/Steam-Deck:-Hotkeys) +[Steam Deck: Hotkeys ](https://github.com/XargonWan/RetroDECK/wiki/Steam-Deck-Hotkeys) ### Sound Settings Various sound settings.
diff --git a/wiki-rtd/Emulators:-BIOS-and-Firmware.md b/wiki-rtd/Emulators-BIOS-and-Firmware.md similarity index 100% rename from wiki-rtd/Emulators:-BIOS-and-Firmware.md rename to wiki-rtd/Emulators-BIOS-and-Firmware.md diff --git a/wiki-rtd/Emulators:-Diffrent-controller-layouts.md b/wiki-rtd/Emulators-Diffrent-controller-layouts.md similarity index 100% rename from wiki-rtd/Emulators:-Diffrent-controller-layouts.md rename to wiki-rtd/Emulators-Diffrent-controller-layouts.md diff --git a/wiki-rtd/Emulators:-Supported-folders-and-files.md b/wiki-rtd/Emulators-Supported-folders-and-files.md similarity index 99% rename from wiki-rtd/Emulators:-Supported-folders-and-files.md rename to wiki-rtd/Emulators-Supported-folders-and-files.md index 0ec89eee..60fd794f 100644 --- a/wiki-rtd/Emulators:-Supported-folders-and-files.md +++ b/wiki-rtd/Emulators-Supported-folders-and-files.md @@ -9,7 +9,7 @@ For the Steam Deck the `roms` folder location depends on where you choose to ins It's either on the internal storage: `~/retrodeck/roms` or the SDCard: `/retrodeck/roms`
-[What does ~ mean?](https://github.com/XargonWan/RetroDECK/wiki/FAQs:-Frequently-asked-questions#i-see--refereed-in-documentation-and-examples-what-does-it-mean) +[What does ~ mean?](https://github.com/XargonWan/RetroDECK/wiki/FAQs-Frequently-asked-questions#i-see--refereed-in-documentation-and-examples-what-does-it-mean) # 3DO - **Roms path:**
~/retrodeck/roms/3do diff --git a/wiki-rtd/Emulators:-What's-included?.md b/wiki-rtd/Emulators-What's-included.md similarity index 100% rename from wiki-rtd/Emulators:-What's-included?.md rename to wiki-rtd/Emulators-What's-included.md diff --git a/wiki-rtd/FAQs:-Frequently-asked-questions.md b/wiki-rtd/FAQs-Frequently-asked-questions.md similarity index 99% rename from wiki-rtd/FAQs:-Frequently-asked-questions.md rename to wiki-rtd/FAQs-Frequently-asked-questions.md index 845435c1..16028587 100644 --- a/wiki-rtd/FAQs:-Frequently-asked-questions.md +++ b/wiki-rtd/FAQs-Frequently-asked-questions.md @@ -311,7 +311,7 @@ Example of a launch script to launch to launch a Wii game called Baloon World:
Click here to see the answer If you previously installed from outside of Discover, you can find the instructions here to -[install from discover](https://github.com/XargonWan/RetroDECK/wiki/Steam-Deck:-Installation-and-updates) +[install from discover](https://github.com/XargonWan/RetroDECK/wiki/Steam-Deck-Installation-and-updates) or here @@ -349,7 +349,7 @@ The ES-DE interface allows you to change emulators for systems that has many dif Some emulators needs BIOS and/or firmware files, first you can check if you got the [needed ones](https://github.com/XargonWan/RetroDECK/wiki/BIOS-&-Firmware).
Then you can check if your got a bad dump by comparing your hash with the ones of the official lists on the internet, such as [no-intro](https://datomatic.no-intro.org/index.php?page=search&s=64) or even [RetroAchievements](https://retroachievements.org) if your game is supported.
-Moreover please mind that some emulator require very specific roms, please [read here](https://github.com/XargonWan/RetroDECK/wiki/How-to:-Manage-your-games#special-roms-formats). +Moreover please mind that some emulator require very specific roms, please [read here](https://github.com/XargonWan/RetroDECK/wiki/How-to-Manage-your-games#special-roms-formats). If it still not working you are welcome to ask for support on our [Discord Server](discord.gg/Dz3szYsP8g).
diff --git a/wiki-rtd/How-can-I-help-with-testing?.md b/wiki-rtd/How-can-I-help-with-testing.md similarity index 100% rename from wiki-rtd/How-can-I-help-with-testing?.md rename to wiki-rtd/How-can-I-help-with-testing.md diff --git a/wiki-rtd/How-to:-Getting-started.md b/wiki-rtd/How-to-Getting-started.md similarity index 80% rename from wiki-rtd/How-to:-Getting-started.md rename to wiki-rtd/How-to-Getting-started.md index 53d8a527..12eea100 100644 --- a/wiki-rtd/How-to:-Getting-started.md +++ b/wiki-rtd/How-to-Getting-started.md @@ -9,9 +9,9 @@ You need to meet the following prerequisites before you start following this gui * You need to have a device to install RetroDECK on (we currently only support the Steam Deck). * Read up on the FAQs pages:
-[Do you include any games, firmware or BIOS?](https://github.com/XargonWan/RetroDECK/wiki/FAQs:-Frequently-asked-questions#do-you-include-any-games-firmware-or-bios)
-[Where can I get them?](https://github.com/XargonWan/RetroDECK/wiki/FAQs:-Frequently-asked-questions#can-you-at-least-point-me-towards-where-i-can-get-them)
-[What does ~ mean?](https://github.com/XargonWan/RetroDECK/wiki/FAQs:-Frequently-asked-questions#i-see--refereed-in-documentation-and-examples-what-does-it-mean) +[Do you include any games, firmware or BIOS?](https://github.com/XargonWan/RetroDECK/wiki/FAQs-Frequently-asked-questions#do-you-include-any-games-firmware-or-bios)
+[Where can I get them?](https://github.com/XargonWan/RetroDECK/wiki/FAQs-Frequently-asked-questions#can-you-at-least-point-me-towards-where-i-can-get-them)
+[What does ~ mean?](https://github.com/XargonWan/RetroDECK/wiki/FAQs-Frequently-asked-questions#i-see--refereed-in-documentation-and-examples-what-does-it-mean) * Have related BIOS & Firmware ready * Have backup rom files of the games you want to play ready @@ -21,7 +21,7 @@ Only install RetroDECK from the official channels via flathub! ## Steam Deck - Installation
Read and follow the: -* [Installation guide for the Steam Deck](https://github.com/XargonWan/RetroDECK/wiki/Steam-Deck:-Installation-and-updates)
+* [Installation guide for the Steam Deck](https://github.com/XargonWan/RetroDECK/wiki/Steam-Deck-Installation-and-updates)
## Linux Desktop - Installation
@@ -67,7 +67,7 @@ The roms folder is: `/retrodeck/roms/`
## Let's get started on ROMs: -Read up on [Emulators: Folders & File extensions](https://github.com/XargonWan/RetroDECK/wiki/Emulators:-Folders-&-File-extensions) to see what folder each system has. +Read up on [Emulators: Folders & File extensions](https://github.com/XargonWan/RetroDECK/wiki/Emulators-Folders-&-File-extensions) to see what folder each system has. * Put the corresponding roms inside the corresponding system folder **Example:**
@@ -86,13 +86,13 @@ The NES column should now be shown with our `ExampleNESGame.nes` from `Step 3` Do the following: 1. Make an account on https://www.screenscraper.fr/ -2. Read up on scraping on the [ES-DE Guide](https://github.com/XargonWan/RetroDECK/wiki/EmulationStation-DE:-User-Guide#scraping-and-editing-roms-metadata-images-etc) +2. Read up on scraping on the [ES-DE Guide](https://github.com/XargonWan/RetroDECK/wiki/EmulationStation-DE-User-Guide#scraping-and-editing-roms-metadata-images-etc) 3. Login to your screenscraper account inside RetroDECK and start scraping. 4. Look at your nice pretty games. Also read: -* [I got some weird error message about quota after scraping in a foreign language from screenscraper.fr](https://github.com/XargonWan/RetroDECK/wiki/FAQs:-Frequently-asked-questions#i-got-some-weird-error-message-about-quota-after-scraping-in-a-foreign-language-from-screenscraperfr) -* [My system storage ran out after scraping!](https://github.com/XargonWan/RetroDECK/wiki/FAQs:-Frequently-asked-questions#my-system-storage-ran-out-after-scraping) +* [I got some weird error message about quota after scraping in a foreign language from screenscraper.fr](https://github.com/XargonWan/RetroDECK/wiki/FAQs-Frequently-asked-questions#i-got-some-weird-error-message-about-quota-after-scraping-in-a-foreign-language-from-screenscraperfr) +* [My system storage ran out after scraping!](https://github.com/XargonWan/RetroDECK/wiki/FAQs-Frequently-asked-questions#my-system-storage-ran-out-after-scraping) # Step 6: Themes RetroDECK comes with several themes built in for the ES-DE interface. @@ -101,4 +101,4 @@ RetroDECK comes with several themes built in for the ES-DE interface. * On the Steam Deck: you can switch between them by pressing the `☰` button to open the menu and then navigate to `UI Settings > Theme Set` to select the theme you want to use. ## How to add more themes? -[More information on themes and how to add more](https://github.com/XargonWan/RetroDECK/wiki/EmulationStation-DE:-Themes) +[More information on themes and how to add more](https://github.com/XargonWan/RetroDECK/wiki/EmulationStation-DE-Themes) diff --git a/wiki-rtd/How-to:-Manage-your-games.md b/wiki-rtd/How-to-Manage-your-games.md similarity index 98% rename from wiki-rtd/How-to:-Manage-your-games.md rename to wiki-rtd/How-to-Manage-your-games.md index cbf01c24..48158266 100644 --- a/wiki-rtd/How-to:-Manage-your-games.md +++ b/wiki-rtd/How-to-Manage-your-games.md @@ -1,5 +1,5 @@ # Supported extensions -In order to check which file extensions are supported check the page [Emulators: Folders & File extensions](https://github.com/XargonWan/RetroDECK/wiki/Emulators:-Folders-&-File-extensions) +In order to check which file extensions are supported check the page [Emulators: Folders & File extensions](https://github.com/XargonWan/RetroDECK/wiki/Emulators-Folders-&-File-extensions) ## Special ROMs formats Some emulators are working only with specific rips, here is what I gather. diff --git a/wiki-rtd/Linux-Desktop:-Software-recommendations.md b/wiki-rtd/Linux-Desktop-Software-recommendations.md similarity index 100% rename from wiki-rtd/Linux-Desktop:-Software-recommendations.md rename to wiki-rtd/Linux-Desktop-Software-recommendations.md diff --git a/wiki-rtd/PCXS2:-Texture-Packs.md b/wiki-rtd/PCXS2-Texture-Packs.md similarity index 100% rename from wiki-rtd/PCXS2:-Texture-Packs.md rename to wiki-rtd/PCXS2-Texture-Packs.md diff --git a/wiki-rtd/PPSSPP:-Texture-Packs.md b/wiki-rtd/PPSSPP-Texture-Packs.md similarity index 100% rename from wiki-rtd/PPSSPP:-Texture-Packs.md rename to wiki-rtd/PPSSPP-Texture-Packs.md diff --git a/wiki-rtd/Playstation-3:-RPCS3.md b/wiki-rtd/Playstation-3-RPCS3.md similarity index 98% rename from wiki-rtd/Playstation-3:-RPCS3.md rename to wiki-rtd/Playstation-3-RPCS3.md index 0e82ea03..4a622ea9 100644 --- a/wiki-rtd/Playstation-3:-RPCS3.md +++ b/wiki-rtd/Playstation-3-RPCS3.md @@ -84,4 +84,4 @@ _Example:_ You installed a file that contained the digital game Hockey World 2, it created a directory called `BCA123456` under `retrodeck/bios/rpcs3/dev_hdd0/game/` After that you moved `BCA123456` from `retrodeck/bios/rpcs3/dev_hdd0/game/` to `retrodeck/roms/ps3`. -The directory `BCA123456` is renamed to `Hockey World 2.ps3`. \ No newline at end of file +The directory `BCA123456` is renamed to `Hockey World 2.ps3`. diff --git a/wiki-rtd/RetroArch-Mesen:-Texture-Packs.md b/wiki-rtd/RetroArch-Mesen-Texture-Packs.md similarity index 100% rename from wiki-rtd/RetroArch-Mesen:-Texture-Packs.md rename to wiki-rtd/RetroArch-Mesen-Texture-Packs.md diff --git a/wiki-rtd/RetroArch-Mupen64Plus-Next:-Texture-Packs.md b/wiki-rtd/RetroArch-Mupen64Plus-Next-Texture-Packs.md similarity index 100% rename from wiki-rtd/RetroArch-Mupen64Plus-Next:-Texture-Packs.md rename to wiki-rtd/RetroArch-Mupen64Plus-Next-Texture-Packs.md diff --git a/wiki-rtd/RetroDECK:-CLI.md b/wiki-rtd/RetroDECK-CLI.md similarity index 100% rename from wiki-rtd/RetroDECK:-CLI.md rename to wiki-rtd/RetroDECK-CLI.md diff --git a/wiki-rtd/RetroDECK:-Configurator.md b/wiki-rtd/RetroDECK-Configurator.md similarity index 100% rename from wiki-rtd/RetroDECK:-Configurator.md rename to wiki-rtd/RetroDECK-Configurator.md diff --git a/wiki-rtd/RetroDECK:-Credits-and-The-Team.md b/wiki-rtd/RetroDECK-Credits-and-The-Team.md similarity index 100% rename from wiki-rtd/RetroDECK:-Credits-and-The-Team.md rename to wiki-rtd/RetroDECK-Credits-and-The-Team.md diff --git a/wiki-rtd/RetroDECK:-Folders-and-filepaths.md b/wiki-rtd/RetroDECK-Folders-and-filepaths.md similarity index 100% rename from wiki-rtd/RetroDECK:-Folders-and-filepaths.md rename to wiki-rtd/RetroDECK-Folders-and-filepaths.md diff --git a/wiki-rtd/RetroDECK:-Social-media-rules.md b/wiki-rtd/RetroDECK-Social-media-rules.md similarity index 100% rename from wiki-rtd/RetroDECK:-Social-media-rules.md rename to wiki-rtd/RetroDECK-Social-media-rules.md diff --git a/wiki-rtd/RetroDECK:-The-story-of-RetroDECK.md b/wiki-rtd/RetroDECK-The-story-of-RetroDECK.md similarity index 100% rename from wiki-rtd/RetroDECK:-The-story-of-RetroDECK.md rename to wiki-rtd/RetroDECK-The-story-of-RetroDECK.md diff --git a/wiki-rtd/Steam-Deck:-Hotkeys-and-controls.md b/wiki-rtd/Steam-Deck-Hotkeys-and-controls.md similarity index 100% rename from wiki-rtd/Steam-Deck:-Hotkeys-and-controls.md rename to wiki-rtd/Steam-Deck-Hotkeys-and-controls.md diff --git a/wiki-rtd/Steam-Deck:-Installation-and-updates.md b/wiki-rtd/Steam-Deck-Installation-and-updates.md similarity index 98% rename from wiki-rtd/Steam-Deck:-Installation-and-updates.md rename to wiki-rtd/Steam-Deck-Installation-and-updates.md index 4301fe29..99d9ed53 100644 --- a/wiki-rtd/Steam-Deck:-Installation-and-updates.md +++ b/wiki-rtd/Steam-Deck-Installation-and-updates.md @@ -44,7 +44,7 @@ - Go into `Controller Layouts` and press `Templates` - Add the layout for RetroDECK called `RetroDECK: Official Layout` with a version number. - You can now use RetroDECK and it's ready to populate with ROMS. -- If you are unsure on how to add ROMS and BIOS to RetroDECK follow the [Getting Started Guide ](https://github.com/XargonWan/RetroDECK/wiki/How-to:-Getting-started) from Step 2 and onward on how to add them. +- If you are unsure on how to add ROMS and BIOS to RetroDECK follow the [Getting Started Guide ](https://github.com/XargonWan/RetroDECK/wiki/How-to-Getting-started) from Step 2 and onward on how to add them. ### Step 4 (Optional): Extras diff --git a/wiki-rtd/Steam-Deck:-Optimizations.md b/wiki-rtd/Steam-Deck-Optimizations.md similarity index 98% rename from wiki-rtd/Steam-Deck:-Optimizations.md rename to wiki-rtd/Steam-Deck-Optimizations.md index 012da250..8b7cee2c 100644 --- a/wiki-rtd/Steam-Deck:-Optimizations.md +++ b/wiki-rtd/Steam-Deck-Optimizations.md @@ -13,7 +13,7 @@ This increases the VRAM to 4GB in the BIOS, this can give you improvements in ce * Save and Exit ## Setup a sudo password -[What is sudo?](https://github.com/XargonWan/RetroDECK/wiki/FAQs:-Frequently-asked-questions#what-is-sudo) +[What is sudo?](https://github.com/XargonWan/RetroDECK/wiki/FAQs-Frequently-asked-questions#what-is-sudo) This is a requirement for many optimizations and solutions, it also makes your Deck safer. It enables you to run commands/applications heighten sudo privileges. diff --git a/wiki-rtd/Steam-Deck:-Software-recommendations.md b/wiki-rtd/Steam-Deck-Software-recommendations.md similarity index 95% rename from wiki-rtd/Steam-Deck:-Software-recommendations.md rename to wiki-rtd/Steam-Deck-Software-recommendations.md index cb06b66b..bf037102 100644 --- a/wiki-rtd/Steam-Deck:-Software-recommendations.md +++ b/wiki-rtd/Steam-Deck-Software-recommendations.md @@ -6,7 +6,7 @@ There is a guide on how to install several of them under [Steam Deck: Optimizati # Steam Deck specific recommendations -For general Linux Desktop recommendations go to [Linux Desktop: Software recommendations](https://github.com/XargonWan/RetroDECK/wiki/Linux-Desktop:-Software-recommendations) as many of them also work on the Steam Deck. +For general Linux Desktop recommendations go to [Linux Desktop: Software recommendations](https://github.com/XargonWan/RetroDECK/wiki/Linux-Desktop-Software-recommendations) as many of them also work on the Steam Deck. ## CryoUtilities Scripts and utilities to improve performance and manage storage on the Steam Deck. diff --git a/wiki-rtd/Switch:-Yuzu.md b/wiki-rtd/Switch-Yuzu.md similarity index 100% rename from wiki-rtd/Switch:-Yuzu.md rename to wiki-rtd/Switch-Yuzu.md diff --git a/wiki-rtd/Version-history:-Patch-Notes.md b/wiki-rtd/Version-history-Patch-Notes.md similarity index 99% rename from wiki-rtd/Version-history:-Patch-Notes.md rename to wiki-rtd/Version-history-Patch-Notes.md index e067e206..6bcbf8fa 100644 --- a/wiki-rtd/Version-history:-Patch-Notes.md +++ b/wiki-rtd/Version-history-Patch-Notes.md @@ -375,7 +375,7 @@ These emulators are updated to the latest version available on 31/10/2022. ### General information -[I see ~ refereed in documentation and examples, what does it mean?](https://github.com/XargonWan/RetroDECK/wiki/FAQs:-Frequently-asked-questions#i-see--refereed-in-documentation-and-examples-what-does-it-mean) +[I see ~ refereed in documentation and examples, what does it mean?](https://github.com/XargonWan/RetroDECK/wiki/FAQs-Frequently-asked-questions#i-see--refereed-in-documentation-and-examples-what-does-it-mean) **Saves = game saves and save states**
The word "saves" is used to reference both save files and save state files in this wiki article. Both files are treated in the same manner, the only difference is that saves are located at. diff --git a/wiki-rtd/Yuzu:-Mods.md b/wiki-rtd/Yuzu-Mods.md similarity index 100% rename from wiki-rtd/Yuzu:-Mods.md rename to wiki-rtd/Yuzu-Mods.md diff --git a/wiki-rtd/_Sidebar.md b/wiki-rtd/_Sidebar.md index cc786846..92752fef 100644 --- a/wiki-rtd/_Sidebar.md +++ b/wiki-rtd/_Sidebar.md @@ -2,64 +2,64 @@ [Home[(/XargonWan/RetroDECK/wiki)] ## RetroDECK: Getting started -- [How to: Getting started[(How-to:-Getting-started.md)] -- [FAQs: Frequently asked questions[(FAQs:-Frequently-asked-questions.md)] -- [EmulationStation DE: User Guide[(EmulationStation-DE:-User-Guide.md)] +- [How to: Getting started[(How-to-Getting-started.md)] +- [FAQs: Frequently asked questions[(FAQs-Frequently-asked-questions.md)] +- [EmulationStation DE: User Guide[(EmulationStation-DE-User-Guide.md)] ## RetroDECK: General information -- [How to: Manage your games[(How-to:-Manage-your-games.md)] -- [Emulators: What's included?[(Emulators:-What's-included?.md)] -- [Emulators: BIOS and Firmware[(Emulators:-BIOS-and-Firmware.md)] -- [Emulators: Different controller layouts[(Emulators:-Diffrent-controller-layouts.md)] -- [Emulators: Supported folders and files[(Emulators:-Supported-folders-and-files.md)] -- [EmulationStation DE: Themes[é(EmulationStation-DE:-Themes.md)] +- [How to: Manage your games[(How-to-Manage-your-games.md)] +- [Emulators: What's included?[(Emulators-What's-included.md)] +- [Emulators: BIOS and Firmware[(Emulators-BIOS-and-Firmware.md)] +- [Emulators: Different controller layouts[(Emulators-Diffrent-controller-layouts.md)] +- [Emulators: Supported folders and files[(Emulators-Supported-folders-and-files.md)] +- [EmulationStation DE: Themes[é(EmulationStation-DE-Themes.md)] ## RetroDECK: Configuration -- [RetroDECK: Configurator[(RetroDECK:-Configurator.md)] -- [RetroDECK: CLI[(RetroDECK:-CLI.md)] -- [RetroDECK: Folders and filepaths[(RetroDECK:-Folders-and-filepaths.md)] +- [RetroDECK: Configurator[(RetroDECK-Configurator.md)] +- [RetroDECK: CLI[(RetroDECK-CLI.md)] +- [RetroDECK: Folders and filepaths[(RetroDECK-Folders-and-filepaths.md)] ## RetroDECK: Development -- [Development: General notes[(Development:-General-notes.md)] +- [Development: General notes[(Development-General-notes.md)] - [Known Issues[(Known-Issues.md)] -- [Version history: Patch Notes[(Version-history:-Patch-Notes.md)] -- [How can I help with testing?[(How-can-I-help-with-testing?.md)] +- [Version history: Patch Notes[(Version-history-Patch-Notes.md)] +- [How can I help with testing?[(How-can-I-help-with-testing.md)] ## Emulator Guides: -- [Playstation 3: RPCS3[(Playstation-3:-RPCS3.md)] -- [Switch: Yuzu[(Switch:-Yuzu.md)] +- [Playstation 3: RPCS3[(Playstation-3-RPCS3.md)] +- [Switch: Yuzu[(Switch-Yuzu.md)] ## Mod Guides: -- [Yuzu: Mods[(Yuzu:-Mods.md)] -- [Citra: Mods[(Citra:-Mods.md)] -- [Dolphin and Primehack: Mods[(Dolphin-and-Primehack:-Mods.md)] +- [Yuzu: Mods[(Yuzu-Mods.md)] +- [Citra: Mods[(Citra-Mods.md)] +- [Dolphin and Primehack: Mods[(Dolphin-and-Primehack-Mods.md)] ## Texture Packs Guides: -- [Citra: Texture Packs[(Citra:-Texture-Packs.md)] -- [Dolphin and Primehack: Texture Packs[(Dolphin-and-Primehack:-Texture-Packs.md)] -- [Duckstation: Texture Packs[(Duckstation:-Texture-Packs.md)] -- [RetroArch Mesen: Texture Packs[(RetroArch-Mesen:-Texture-Packs.md)] -- [RetroArch Mupen64Plus Next: Texture Packs[(RetroArch-Mupen64Plus-Next:-Texture-Packs.md)] -- [PPSSPP: Texture Packs[(PPSSPP:-Texture-Packs.md)] -- [PCXS2: Texture Packs[(PCXS2:-Texture-Packs.md)] +- [Citra: Texture Packs[(Citra-Texture-Packs.md)] +- [Dolphin and Primehack: Texture Packs[(Dolphin-and-Primehack-Texture-Packs.md)] +- [Duckstation: Texture Packs[(Duckstation-Texture-Packs.md)] +- [RetroArch Mesen: Texture Packs[(RetroArch-Mesen-Texture-Packs.md)] +- [RetroArch Mupen64Plus Next: Texture Packs[(RetroArch-Mupen64Plus-Next-Texture-Packs.md)] +- [PPSSPP: Texture Packs[(PPSSPP-Texture-Packs.md)] +- [PCXS2: Texture Packs[(PCXS2-Texture-Packs.md)] ## Steam Deck -- [Steam Deck: Installation and updates[(Steam-Deck:-Installation-and-updates.md)] -- [Steam Deck: Hotkeys and controls[(Steam-Deck:-Hotkeys-and-controls.md)] -- [Steam Deck: Optimizations[(Steam-Deck:-Optimizations.md)] -- [Steam Deck: Software recommendations[(Steam-Deck:-Software-recommendations.md)] +- [Steam Deck: Installation and updates[(Steam-Deck-Installation-and-updates.md)] +- [Steam Deck: Hotkeys and controls[(Steam-Deck-Hotkeys-and-controls.md)] +- [Steam Deck: Optimizations[(Steam-Deck-Optimizations.md)] +- [Steam Deck: Software recommendations[(Steam-Deck-Software-recommendations.md)] ## Linux Desktop -- [Linux Desktop: Software recommendations[(Linux-Desktop:-Software-recommendations.md)] +- [Linux Desktop: Software recommendations[(Linux-Desktop-Software-recommendations.md)] ## Other Devices - (More information later) ## Credits & Other -- [RetroDECK: Credits and The Team[(RetroDECK:-Credits-and-The-Team.md)] -- [RetroDECK: The story of RetroDECK[(RetroDECK:-The-story-of-RetroDECK.md)] -- [RetroDECK: Social media rules[(RetroDECK:-Social-media-rules.md)] +- [RetroDECK: Credits and The Team[(RetroDECK-Credits-and-The-Team.md)] +- [RetroDECK: The story of RetroDECK[(RetroDECK-The-story-of-RetroDECK.md)] +- [RetroDECK: Social media rules[(RetroDECK-Social-media-rules.md)] - [Licences[(Licences.md)] - [Archive[(Archive.md)] \ No newline at end of file diff --git a/wiki-rtd/index.md b/wiki-rtd/index.md index ce5bec03..03c5c421 100644 --- a/wiki-rtd/index.md +++ b/wiki-rtd/index.md @@ -40,7 +40,7 @@ RetroDECK does not have plans to support Windows, macOS, Android, or iOS.
For ## How do I start using RetroDECK? -Please read the [How to: Getting started](https://github.com/XargonWan/RetroDECK/wiki/How-to:-Getting-started) +Please read the [How to: Getting started](https://github.com/XargonWan/RetroDECK/wiki/How-to-Getting-started) ## RetroDECK is currently in in BETA and is not a full release. @@ -49,7 +49,7 @@ Please read the [How to: Getting started](https://github.com/XargonWan/RetroDECK - RetroDECK is missing some minor and major; emulators, features and configurations. The goal is to have them added over time.
Please check the [Known Issues](https://github.com/XargonWan/RetroDECK/wiki/Known-Issues) page and the [Issue tracker](https://github.com/XargonWan/RetroDECK/issues) for more information. -- RetroDECK during the BETA period only supports the Steam Deck, but for the full release we should have full Linux Desktop support read more at [FAQs: General questions](https://github.com/XargonWan/RetroDECK/wiki/FAQs:-Frequently-asked-questions#general-questions). +- RetroDECK during the BETA period only supports the Steam Deck, but for the full release we should have full Linux Desktop support read more at [FAQs: General questions](https://github.com/XargonWan/RetroDECK/wiki/FAQs-Frequently-asked-questions#general-questions). - The "b" in the versioning stands for BETA but RetroDECK is perfectly fine for daily use even during the beta phase, albeit some features are missing. To see what features are missing check the: [Known Issues page](https://github.com/XargonWan/RetroDECK/wiki/Known-Issues). ## The RetroDECK community: From b0a2f204314c8e78ae7282cb5a64543bef1f661e Mon Sep 17 00:00:00 2001 From: icenine451 Date: Thu, 26 Oct 2023 09:29:01 -0400 Subject: [PATCH 24/52] Update ESDE patch --- rd-submodules/es-de/ViewController.cpp.patch | 28 +++++++++++++------- rd-submodules/retroarch | 2 +- rd-submodules/shared-modules | 2 +- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/rd-submodules/es-de/ViewController.cpp.patch b/rd-submodules/es-de/ViewController.cpp.patch index 77c44b8a..a54202b3 100644 --- a/rd-submodules/es-de/ViewController.cpp.patch +++ b/rd-submodules/es-de/ViewController.cpp.patch @@ -1,6 +1,22 @@ ---- /tmp/emulationstation-de/es-app/src/views/ViewController.cpp 2023-10-21 19:46:36.202758979 +0200 -+++ ./patches-tmp/ViewController.cpp 2023-10-21 22:21:04.737925284 +0200 -@@ -195,96 +195,5 @@ +diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstation-de/es-app/src/views/ViewController.cpp +--- emulationstation-de/es-app/src/views/ViewController.cpp 2023-10-24 13:44:56.767947794 -0400 ++++ emulationstation-de/es-app/src/views/ViewController.cpp 2023-10-24 14:07:45.665387904 -0400 +@@ -180,9 +180,7 @@ + { +- mNoGamesErrorMessage = "NO GAME FILES WERE FOUND. EITHER PLACE YOUR GAMES IN " +- "THE CURRENTLY CONFIGURED ROM DIRECTORY OR CHANGE " +- "ITS PATH USING THE BUTTON BELOW. OPTIONALLY THE ROM " +- "DIRECTORY STRUCTURE CAN BE GENERATED WHICH WILL " +- "CREATE A TEXT FILE FOR EACH SYSTEM PROVIDING SOME " +- "INFORMATION SUCH AS THE SUPPORTED FILE EXTENSIONS.\n" +- "THIS IS THE CURRENTLY CONFIGURED ROM DIRECTORY:\n"; ++ mNoGamesErrorMessage = "RETRODECK COULD NOT FIND ANY ROM FILES. " ++ "PLEASE PLACE YOUR ROM FILES INTO THE APPROPRIATE " ++ "SYSTEM SUBFOLDER IN THE CONFIGURED ROM DIRECTORY " ++ "AND RUN RETRODECK AGAIN TO SCAN YOUR LIBRARY.\n" ++ "THE CURRENTLY CONFIGURED ROM DIRECTORY IS:\n"; + +@@ -195,91 +193,3 @@ mNoGamesMessageBox = new GuiMsgBox( - HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY", - [this] { @@ -93,9 +109,3 @@ - "QUIT", + HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT", [] { -- SDL_Event quit; -- quit.type = SDL_QUIT; -- SDL_PushEvent(&quit); -- }, -+ }, - nullptr, true, false, diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch index 9dc43930..0b1cfb79 160000 --- a/rd-submodules/retroarch +++ b/rd-submodules/retroarch @@ -1 +1 @@ -Subproject commit 9dc439300e92338d5b2bc3fc680eedd4fe1d3b0c +Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409 diff --git a/rd-submodules/shared-modules b/rd-submodules/shared-modules index 76809270..a2441b96 160000 --- a/rd-submodules/shared-modules +++ b/rd-submodules/shared-modules @@ -1 +1 @@ -Subproject commit 76809270588f87c6c14df96fef2dde9a7bac84f4 +Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42 From 27317f5e9c3dda17bec70b8125365d04fbf27c06 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Thu, 26 Oct 2023 09:36:49 -0400 Subject: [PATCH 25/52] Update ESDE patch --- rd-submodules/es-de/ViewController.cpp.patch | 28 +++++++++++++------- rd-submodules/retroarch | 2 +- rd-submodules/shared-modules | 2 +- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/rd-submodules/es-de/ViewController.cpp.patch b/rd-submodules/es-de/ViewController.cpp.patch index 77c44b8a..a54202b3 100644 --- a/rd-submodules/es-de/ViewController.cpp.patch +++ b/rd-submodules/es-de/ViewController.cpp.patch @@ -1,6 +1,22 @@ ---- /tmp/emulationstation-de/es-app/src/views/ViewController.cpp 2023-10-21 19:46:36.202758979 +0200 -+++ ./patches-tmp/ViewController.cpp 2023-10-21 22:21:04.737925284 +0200 -@@ -195,96 +195,5 @@ +diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstation-de/es-app/src/views/ViewController.cpp +--- emulationstation-de/es-app/src/views/ViewController.cpp 2023-10-24 13:44:56.767947794 -0400 ++++ emulationstation-de/es-app/src/views/ViewController.cpp 2023-10-24 14:07:45.665387904 -0400 +@@ -180,9 +180,7 @@ + { +- mNoGamesErrorMessage = "NO GAME FILES WERE FOUND. EITHER PLACE YOUR GAMES IN " +- "THE CURRENTLY CONFIGURED ROM DIRECTORY OR CHANGE " +- "ITS PATH USING THE BUTTON BELOW. OPTIONALLY THE ROM " +- "DIRECTORY STRUCTURE CAN BE GENERATED WHICH WILL " +- "CREATE A TEXT FILE FOR EACH SYSTEM PROVIDING SOME " +- "INFORMATION SUCH AS THE SUPPORTED FILE EXTENSIONS.\n" +- "THIS IS THE CURRENTLY CONFIGURED ROM DIRECTORY:\n"; ++ mNoGamesErrorMessage = "RETRODECK COULD NOT FIND ANY ROM FILES. " ++ "PLEASE PLACE YOUR ROM FILES INTO THE APPROPRIATE " ++ "SYSTEM SUBFOLDER IN THE CONFIGURED ROM DIRECTORY " ++ "AND RUN RETRODECK AGAIN TO SCAN YOUR LIBRARY.\n" ++ "THE CURRENTLY CONFIGURED ROM DIRECTORY IS:\n"; + +@@ -195,91 +193,3 @@ mNoGamesMessageBox = new GuiMsgBox( - HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY", - [this] { @@ -93,9 +109,3 @@ - "QUIT", + HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT", [] { -- SDL_Event quit; -- quit.type = SDL_QUIT; -- SDL_PushEvent(&quit); -- }, -+ }, - nullptr, true, false, diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch index 9dc43930..0b1cfb79 160000 --- a/rd-submodules/retroarch +++ b/rd-submodules/retroarch @@ -1 +1 @@ -Subproject commit 9dc439300e92338d5b2bc3fc680eedd4fe1d3b0c +Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409 diff --git a/rd-submodules/shared-modules b/rd-submodules/shared-modules index 76809270..a2441b96 160000 --- a/rd-submodules/shared-modules +++ b/rd-submodules/shared-modules @@ -1 +1 @@ -Subproject commit 76809270588f87c6c14df96fef2dde9a7bac84f4 +Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42 From 902a7fa4a1bd701effe92a79d9ce7967c10400ea Mon Sep 17 00:00:00 2001 From: icenine451 Date: Thu, 26 Oct 2023 11:57:19 -0400 Subject: [PATCH 26/52] Another ESDE patch attempt --- rd-submodules/es-de/ViewController.cpp.patch | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/rd-submodules/es-de/ViewController.cpp.patch b/rd-submodules/es-de/ViewController.cpp.patch index a54202b3..8c07888b 100644 --- a/rd-submodules/es-de/ViewController.cpp.patch +++ b/rd-submodules/es-de/ViewController.cpp.patch @@ -1,6 +1,6 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstation-de/es-app/src/views/ViewController.cpp ---- emulationstation-de/es-app/src/views/ViewController.cpp 2023-10-24 13:44:56.767947794 -0400 -+++ emulationstation-de/es-app/src/views/ViewController.cpp 2023-10-24 14:07:45.665387904 -0400 +--- emulationstation-de/es-app/src/views/ViewController.cpp 2023-10-26 11:47:39.831667627 -0400 ++++ emulationstation-de/es-app/src/views/ViewController.cpp 2023-10-26 11:52:14.945822651 -0400 @@ -180,9 +180,7 @@ { - mNoGamesErrorMessage = "NO GAME FILES WERE FOUND. EITHER PLACE YOUR GAMES IN " @@ -109,3 +109,8 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat - "QUIT", + HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT", [] { +@@ -289,3 +199,3 @@ + }, +- nullptr, true, false, ++ "", nullptr, "", nullptr, nullptr, true, true, + (mRenderer->getIsVerticalOrientation() ? From 65581f97a0cae105f3a3d2d7e0d2528a8416bc48 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 27 Oct 2023 09:18:08 +0200 Subject: [PATCH 27/52] tools: updated patches helper [skip ci] --- rd-submodules/es-de/patch_helper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rd-submodules/es-de/patch_helper.sh b/rd-submodules/es-de/patch_helper.sh index e774e724..abdc2189 100755 --- a/rd-submodules/es-de/patch_helper.sh +++ b/rd-submodules/es-de/patch_helper.sh @@ -24,4 +24,4 @@ diff -au1r /tmp/emulationstation-de/es-app/src/guis/GuiMenu.h ./patche diff -au1r /tmp/emulationstation-de/es-app/src/views/ViewController.cpp ./patches-tmp/ViewController.cpp > ViewController.cpp.patch diff -au1r /tmp/emulationstation-de/es-core/src/Window.cpp ./patches-tmp/Window.cpp > Window.cpp.patch -#rm -rf patches-tmp \ No newline at end of file +rm -rf patches-tmp \ No newline at end of file From c4f1ad507fed9c144468da05f30b9cb4dca9d9f9 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 27 Oct 2023 09:23:33 +0200 Subject: [PATCH 28/52] ES-DE: fixed emulator find rules --- es-configs/es_find_rules.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/es-configs/es_find_rules.xml b/es-configs/es_find_rules.xml index 85a0d940..29b708f5 100644 --- a/es-configs/es_find_rules.xml +++ b/es-configs/es_find_rules.xml @@ -24,6 +24,7 @@ + /app/share/libretro/cores ~/.config/retroarch/cores @@ -135,6 +136,7 @@ + Cemu-wrapper cemu Cemu @@ -154,6 +156,7 @@ + citra-qt citra citra-emu.citra-nightly org.citra_emu.citra From cf630034c76ea38bc7cbcfcce62db2bbe8e957dc Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 27 Oct 2023 09:33:35 +0200 Subject: [PATCH 29/52] Updated appdata [skip ci] --- net.retrodeck.retrodeck.appdata.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 058aa862..0c59deb7 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -65,6 +65,22 @@ GPL-3.0 CC0-1.0 + + https://github.com/XargonWan/RetroDECK/releases/tag/0.7.3b + +

Updates:

+
    +
  • ES-DE has been updated to 2.2.0
    • +
  • All emulators update
    • +
+

Known issues:

+
    +
  • PPSSPP now have Retroachievements, but it is right now not configurable in the configurator (as it works a bit different the other emulators), we hope to have a solution for it at a later date. You can still login / logout / enable hardcore mode normally from the PPSSPP interface.
    • +
  • Quitting the RetroArch GB core with the radial function makes the core swap the palette.
    • +
  • Borders sometimes are disappearing, a possible workaround is to reset RetroArch from the configurator.
    • +
+ + https://github.com/XargonWan/RetroDECK/releases/tag/0.7.2b From 71a8ba1e87cf74b34970504539996030bc8d3509 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 27 Oct 2023 14:06:34 +0200 Subject: [PATCH 30/52] ES-DE: updated to the latest beta branch --- 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 3f257097..1657d62a 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -376,7 +376,7 @@ modules: sources: - type: git url: https://gitlab.com/es-de/emulationstation-de - branch: 2de8282f6a5feaf86424b1175154c5fc2585f70a + branch: 2055b30836476f7cbdde9d94e43e451487537962 - type: shell commands: - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK From db8dcd356b6d5534a73aa1197ccc50a485a490c0 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 3 Nov 2023 16:31:56 +0100 Subject: [PATCH 31/52] Updated ES-DE to 2.2.0 (tentative) --- net.retrodeck.retrodeck.yml | 2 +- .../es-de/GuiThemeDownloader.cpp.patch | 10 ++++++++ rd-submodules/es-de/patch_helper.sh | 24 +++++++++++-------- 3 files changed, 25 insertions(+), 11 deletions(-) create mode 100644 rd-submodules/es-de/GuiThemeDownloader.cpp.patch diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 1657d62a..261a5535 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -376,7 +376,7 @@ modules: sources: - type: git url: https://gitlab.com/es-de/emulationstation-de - branch: 2055b30836476f7cbdde9d94e43e451487537962 + branch: dfaf8ef8cf9a2dd9350bf8bc0bbc94366c9fd168 - type: shell commands: - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK diff --git a/rd-submodules/es-de/GuiThemeDownloader.cpp.patch b/rd-submodules/es-de/GuiThemeDownloader.cpp.patch new file mode 100644 index 00000000..8dd35293 --- /dev/null +++ b/rd-submodules/es-de/GuiThemeDownloader.cpp.patch @@ -0,0 +1,10 @@ +diff -au1r emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp +--- emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp 2023-11-03 16:25:01.115126901 +0100 ++++ emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp 2023-11-03 16:26:18.882607724 +0100 +@@ -602,4 +602,4 @@ + getHelpStyle(), +- "IT SEEMS AS IF YOU'RE NOT RUNNING THE LATEST ES-DE RELEASE, PLEASE UPGRADE BEFORE " +- "PROCEEDING AS THESE THEMES MAY NOT BE COMPATIBLE WITH YOUR VERSION", ++ "ES-DE THEME ENGINE WAS UPDATED UPSTREAM. THESE THEMES MAY NOT BE COMPATIBLE WITH THE CURRENT RETRODECK VERSION." ++ "CHECK IF A NEW RETRODECK UPDATE IS AVAILABLE, ELSE PLEASE WAIT FOR IT OR PROCEED AT YOUR OWN RISK.", + "OK", [] { return; }, "", nullptr, "", nullptr, nullptr, true)); diff --git a/rd-submodules/es-de/patch_helper.sh b/rd-submodules/es-de/patch_helper.sh index abdc2189..27923b97 100755 --- a/rd-submodules/es-de/patch_helper.sh +++ b/rd-submodules/es-de/patch_helper.sh @@ -2,7 +2,7 @@ mkdir /tmp -branch="2de8282f6a5feaf86424b1175154c5fc2585f70a" +branch="00a226062fff37209d98e0ab048ac89af50ecacc" git clone "https://gitlab.com/es-de/emulationstation-de.git" /tmp/emulationstation-de pushd . @@ -12,16 +12,20 @@ popd mkdir patches-tmp -cp /tmp/emulationstation-de/es-app/src/guis/GuiMenu.cpp ./patches-tmp -cp /tmp/emulationstation-de/es-app/src/guis/GuiMenu.h ./patches-tmp -cp /tmp/emulationstation-de/es-app/src/views/ViewController.cpp ./patches-tmp -cp /tmp/emulationstation-de/es-core/src/Window.cpp ./patches-tmp +cp /tmp/emulationstation-de/es-app/src/guis/GuiMenu.cpp ./patches-tmp +cp /tmp/emulationstation-de/es-app/src/guis/GuiMenu.h ./patches-tmp +cp /tmp/emulationstation-de/es-app/src/views/ViewController.cpp ./patches-tmp +cp /tmp/emulationstation-de/es-core/src/Window.cpp ./patches-tmp +cp /tmp/emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp ./patches-tmp read -p "Please edit the files in \"patches-tmp\" and press enter to continue." -diff -au1r /tmp/emulationstation-de/es-app/src/guis/GuiMenu.cpp ./patches-tmp/GuiMenu.cpp > GuiMenu.cpp.patch -diff -au1r /tmp/emulationstation-de/es-app/src/guis/GuiMenu.h ./patches-tmp/GuiMenu.h > GuiMenu.h.patch -diff -au1r /tmp/emulationstation-de/es-app/src/views/ViewController.cpp ./patches-tmp/ViewController.cpp > ViewController.cpp.patch -diff -au1r /tmp/emulationstation-de/es-core/src/Window.cpp ./patches-tmp/Window.cpp > Window.cpp.patch +diff -au1r /tmp/emulationstation-de/es-app/src/guis/GuiMenu.cpp ./patches-tmp/GuiMenu.cpp > GuiMenu.cpp.patch +diff -au1r /tmp/emulationstation-de/es-app/src/guis/GuiMenu.h ./patches-tmp/GuiMenu.h > GuiMenu.h.patch +diff -au1r /tmp/emulationstation-de/es-app/src/views/ViewController.cpp ./patches-tmp/ViewController.cpp > ViewController.cpp.patch +diff -au1r /tmp/emulationstation-de/es-core/src/Window.cpp ./patches-tmp/Window.cpp > Window.cpp.patch +diff -au1r /tmp/emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp ./patches-tmp/GuiThemeDownloader.cpp > GuiThemeDownloader.cpp.patch -rm -rf patches-tmp \ No newline at end of file +rm -rf patches-tmp + +echo "Done, now please remeber to edit the headers of the patch files with the correct paths." \ No newline at end of file From 3d885dc98eae2ee5b4f62b89216edc1d1c907dee Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 4 Nov 2023 17:42:02 +0100 Subject: [PATCH 32/52] Updated ES-DE ViewController patch (tentative) --- rd-submodules/es-de/ViewController.cpp.patch | 39 +++++++++----------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/rd-submodules/es-de/ViewController.cpp.patch b/rd-submodules/es-de/ViewController.cpp.patch index 8c07888b..e018e517 100644 --- a/rd-submodules/es-de/ViewController.cpp.patch +++ b/rd-submodules/es-de/ViewController.cpp.patch @@ -1,22 +1,22 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstation-de/es-app/src/views/ViewController.cpp ---- emulationstation-de/es-app/src/views/ViewController.cpp 2023-10-26 11:47:39.831667627 -0400 -+++ emulationstation-de/es-app/src/views/ViewController.cpp 2023-10-26 11:52:14.945822651 -0400 -@@ -180,9 +180,7 @@ +--- emulationstation-de/es-app/src/views/ViewController.cpp 2023-11-04 17:32:01.356656877 +0100 ++++ emulationstation-de/es-app/src/views/ViewController.cpp 2023-11-04 17:38:58.132211437 +0100 +@@ -180,7 +180,9 @@ { -- mNoGamesErrorMessage = "NO GAME FILES WERE FOUND. EITHER PLACE YOUR GAMES IN " -- "THE CURRENTLY CONFIGURED ROM DIRECTORY OR CHANGE " -- "ITS PATH USING THE BUTTON BELOW. OPTIONALLY THE ROM " -- "DIRECTORY STRUCTURE CAN BE GENERATED WHICH WILL " -- "CREATE A TEXT FILE FOR EACH SYSTEM PROVIDING SOME " -- "INFORMATION SUCH AS THE SUPPORTED FILE EXTENSIONS.\n" -- "THIS IS THE CURRENTLY CONFIGURED ROM DIRECTORY:\n"; -+ mNoGamesErrorMessage = "RETRODECK COULD NOT FIND ANY ROM FILES. " -+ "PLEASE PLACE YOUR ROM FILES INTO THE APPROPRIATE " -+ "SYSTEM SUBFOLDER IN THE CONFIGURED ROM DIRECTORY " -+ "AND RUN RETRODECK AGAIN TO SCAN YOUR LIBRARY.\n" -+ "THE CURRENTLY CONFIGURED ROM DIRECTORY IS:\n"; +- mNoGamesErrorMessage = "RETRODECK COULD NOT FIND ANY ROM FILES. " +- "PLEASE PLACE YOUR ROM FILES INTO THE APPROPRIATE " +- "SYSTEM SUBFOLDER IN THE CONFIGURED ROM DIRECTORY " +- "AND RUN RETRODECK AGAIN TO SCAN YOUR LIBRARY.\n" +- "THE CURRENTLY CONFIGURED ROM DIRECTORY IS:\n"; ++ mNoGamesErrorMessage = "NO GAME FILES WERE FOUND. EITHER PLACE YOUR GAMES IN " ++ "THE CURRENTLY CONFIGURED ROM DIRECTORY OR CHANGE " ++ "ITS PATH USING THE BUTTON BELOW. OPTIONALLY THE ROM " ++ "DIRECTORY STRUCTURE CAN BE GENERATED WHICH WILL " ++ "CREATE A TEXT FILE FOR EACH SYSTEM PROVIDING SOME " ++ "INFORMATION SUCH AS THE SUPPORTED FILE EXTENSIONS.\n" ++ "THIS IS THE CURRENTLY CONFIGURED ROM DIRECTORY:\n"; -@@ -195,91 +193,3 @@ +@@ -193,91 +195,3 @@ mNoGamesMessageBox = new GuiMsgBox( - HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY", - [this] { @@ -104,13 +104,8 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat - nullptr, true)); - } - }, -- "CANCEL", nullptr, "", nullptr, nullptr, true)); +- "CANCEL", nullptr, "", nullptr, nullptr, false)); - }, - "QUIT", + HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT", [] { -@@ -289,3 +199,3 @@ - }, -- nullptr, true, false, -+ "", nullptr, "", nullptr, nullptr, true, true, - (mRenderer->getIsVerticalOrientation() ? From 68f7d59ff4f2f4b0ea6048308c932e2f87afc1c1 Mon Sep 17 00:00:00 2001 From: icenine451 <59938822+icenine451@users.noreply.github.com> Date: Sat, 4 Nov 2023 15:17:08 -0400 Subject: [PATCH 33/52] Another ES-DE patch attempt --- rd-submodules/es-de/ViewController.cpp.patch | 26 ++++++-------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/rd-submodules/es-de/ViewController.cpp.patch b/rd-submodules/es-de/ViewController.cpp.patch index 9227b19d..8d677c37 100644 --- a/rd-submodules/es-de/ViewController.cpp.patch +++ b/rd-submodules/es-de/ViewController.cpp.patch @@ -1,22 +1,7 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstation-de/es-app/src/views/ViewController.cpp ---- emulationstation-de/es-app/src/views/ViewController.cpp 2023-11-04 17:32:01.356656877 +0100 -+++ emulationstation-de/es-app/src/views/ViewController.cpp 2023-11-04 17:38:58.132211437 +0100 -@@ -180,7 +180,9 @@ - { -- mNoGamesErrorMessage = "RETRODECK COULD NOT FIND ANY ROM FILES. " -- "PLEASE PLACE YOUR ROM FILES INTO THE APPROPRIATE " -- "SYSTEM SUBFOLDER IN THE CONFIGURED ROM DIRECTORY " -- "AND RUN RETRODECK AGAIN TO SCAN YOUR LIBRARY.\n" -- "THE CURRENTLY CONFIGURED ROM DIRECTORY IS:\n"; -+ mNoGamesErrorMessage = "NO GAME FILES WERE FOUND. EITHER PLACE YOUR GAMES IN " -+ "THE CURRENTLY CONFIGURED ROM DIRECTORY OR CHANGE " -+ "ITS PATH USING THE BUTTON BELOW. OPTIONALLY THE ROM " -+ "DIRECTORY STRUCTURE CAN BE GENERATED WHICH WILL " -+ "CREATE A TEXT FILE FOR EACH SYSTEM PROVIDING SOME " -+ "INFORMATION SUCH AS THE SUPPORTED FILE EXTENSIONS.\n" -+ "THIS IS THE CURRENTLY CONFIGURED ROM DIRECTORY:\n"; - -@@ -193,91 +195,3 @@ +--- emulationstation-de/es-app/src/views/ViewController.cpp 2023-11-04 15:09:24.332178777 -0400 ++++ emulationstation-de/es-app/src/views/ViewController.cpp 2023-11-04 15:13:59.015780009 -0400 +@@ -195,91 +195,3 @@ mNoGamesMessageBox = new GuiMsgBox( - HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY", - [this] { @@ -109,3 +94,8 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat - "QUIT", + HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT", [] { +@@ -289,3 +201,3 @@ + }, +- nullptr, true, false, ++ "", nullptr, "", nullptr, nullptr, true, true, + (mRenderer->getIsVerticalOrientation() ? From 24772f7055c06714f7b04dbb4c0f608ab0565b1f Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 5 Nov 2023 10:28:16 +0100 Subject: [PATCH 34/52] Updated appdata --- net.retrodeck.retrodeck.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 0c59deb7..f8881095 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -65,7 +65,7 @@ GPL-3.0 CC0-1.0 - + https://github.com/XargonWan/RetroDECK/releases/tag/0.7.3b

Updates:

From bcb4ad01926e480c9c747cc41f7aa33872795d97 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 5 Nov 2023 10:28:28 +0100 Subject: [PATCH 35/52] PPSSPP: updated to v1.16.6 --- net.retrodeck.retrodeck.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 261a5535..3acaba44 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -589,10 +589,8 @@ modules: - -DUSE_SYSTEM_FFMPEG=OFF - -DUSE_SYSTEM_LIBZIP=ON - -DUSE_SYSTEM_ZSTD=ON - - -DUSE_WAYLAND_WSI=ON - -DUSING_QT_UI=OFF - - -DBUILD_TESTING=OFF - -DOpenGL_GL_PREFERENCE=GLVND build-options: @@ -608,8 +606,8 @@ modules: sources: - type: git url: &ppsspp-url https://github.com/hrydgard/ppsspp.git - tag: v1.16.3 - commit: a9b6421dfde68be9d065b51e9d519699ce2e9053 + tag: v1.16.6 + commit: ba0ce344937d17e177ec8656ab957f6b82facdda x-checker-data: type: json url: https://api.github.com/repos/hrydgard/ppsspp/releases/latest From 27ca86ab25ae508507d99bc236876e160aafceda Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 5 Nov 2023 10:30:38 +0100 Subject: [PATCH 36/52] YUZU: updated to mainline 1610 --- 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 3acaba44..72a06488 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -646,8 +646,8 @@ modules: - ln -s "${FLATPAK_DEST}/yuzu/usr/bin/yuzu" "${FLATPAK_DEST}/bin/yuzu" sources: - type: file - url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1567/yuzu-mainline-20230923-ace91dd0c.AppImage - sha256: 965bdfa63e713a0672fb5a037ecb527b4860600c6a2526f7c053bfe082b5a9d8 + url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1610/yuzu-mainline-20231104-a1ef67221.AppImage + sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 # Yuzu - END From 1f9e5160af8933cf657990df35297e42c58e065a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 5 Nov 2023 10:42:51 +0100 Subject: [PATCH 37/52] CITRA: updated to nightly-2024 --- net.retrodeck.retrodeck.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 72a06488..42c79de9 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -661,6 +661,9 @@ modules: builddir: true config-opts: - '-DCMAKE_BUILD_TYPE=Release' + - '-DCMAKE_C_COMPILER=clang' + - '-DCMAKE_CXX_COMPILER=clang++' + - '-DCMAKE_LINKER=lld' - '-DENABLE_QT_TRANSLATION=ON' - '-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON' - '-DUSE_DISCORD_PRESENCE=ON' @@ -686,8 +689,8 @@ modules: sources: - type: archive url: >- - https://github.com/citra-emu/citra-nightly/releases/download/nightly-2009/citra-unified-source-20231012-40ba522.tar.xz - sha256: 927739892fff5d1b325b07182ab29a7355f58866debe60da1d6620680773ac97 + https://github.com/citra-emu/citra-nightly/releases/download/nightly-2024/citra-unified-source-20231103-b10f3d9.tar.xz + sha256: 303cf9ab674fb7ee3a448c575de994e66bbca83cea26b8ef54d82b4af6e8264a x-checker-data: type: json url: https://api.github.com/repos/citra-emu/citra-nightly/releases/latest From 400190d099d2cfa96c8896026ad632bbb2ebd052 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 5 Nov 2023 10:46:20 +0100 Subject: [PATCH 38/52] PCSX2: updated to v1.7.5186 --- 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 42c79de9..bfb7bacc 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -721,8 +721,8 @@ modules: - ln -s "${FLATPAK_DEST}/pcsx2-qt/usr/bin/pcsx2-qt" "${FLATPAK_DEST}/bin/pcsx2-qt" sources: - type: file - url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.5059/pcsx2-v1.7.5059-linux-appimage-x64-Qt.AppImage - sha256: a51addc9bd15b77e842160acecb1f18486f8a024e5e73e8aea5de71de2b164c7 + url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.5186/pcsx2-v1.7.5186-linux-appimage-x64-Qt.AppImage + sha256: 9fd8108c11fd273a4a0c801a6ee2da802643966e61e0a53528f7dd023ece55dd # PCSX2 - END From 5183f0b82cf32a1d11a431b2f6c81325c49689a7 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 5 Nov 2023 10:53:39 +0100 Subject: [PATCH 39/52] LIBGLU: updated to 9.0.3 and switched back to mesa (tentative) --- net.retrodeck.retrodeck.yml | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index bfb7bacc..092f3d52 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -40,6 +40,8 @@ finish-args: # It allows an SDL application to specify its window class, which can be useful for window managers and desktop environments to identify and group similar windows - --env=SDL_VIDEO_X11_WMCLASS=net.retrodeck.retrodeck - --env=SDL_VIDEO_WAYLAND_WMCLASS=net.retrodeck.retrodeck + # XEMU - Fixes issues with openSUSE systems, QEMU_AUDIO_DRV is defined as "pa" causing xemu to not launch + - --unset-env=QEMU_AUDIO_DRV cleanup: # ES-DE @@ -120,10 +122,10 @@ modules: - ln -s "xml" "${FLATPAK_DEST}/bin/xmlstarlet" ||: # mesa repo got a double certificate issue and gnutils cannot handle that so GLU download fails, - # this affects even the shared-modules's glu so I have to replace it temporarly + # this affects even the shared-modules's libglu so I have to replace it temporarly # more info there: https://gitlab.com/gnutls/gnutls/-/issues/1335 - # dependency of: RETROARCH, CEMU, RPCS3 - - name: glu + # dependency of: RETROARCH, CEMU, RPCS3, XEMU + - name: libglu buildsystem: meson cleanup: - /include @@ -131,9 +133,17 @@ modules: - /lib/pkgconfig - /lib/*.a sources: + # - type: archive + # url: https://ftp.osuosl.org/pub/blfs/conglomeration/glu/glu-9.0.3.tar.xz + # sha256: 6e7280ff585c6a1d9dfcdf2fca489251634b3377bfc33c29e4002466a38d02d4 - type: archive - url: https://ftp.osuosl.org/pub/blfs/conglomeration/glu/glu-9.0.2.tar.xz - sha256: 6e7280ff585c6a1d9dfcdf2fca489251634b3377bfc33c29e4002466a38d02d4 + url: https://mesa.freedesktop.org/archive/glu/glu-9.0.3.tar.xz + sha256: bd43fe12f374b1192eb15fe20e45ff456b9bc26ab57f0eee919f96ca0f8a330f + x-checker-data: + type: anitya + project-id: 13518 + stable-only: true + url-template: https://mesa.freedesktop.org/archive/glu/glu-$version.tar.xz - name: libgudev buildsystem: meson @@ -284,6 +294,14 @@ modules: # dependency of: CEMU, RPCS3 - rd-submodules/shared-modules/glew/glew.json + # dependency of: XEMU, MelonDS + - name: libslirp + buildsystem: meson + sources: + - type: git + url: https://gitlab.freedesktop.org/slirp/libslirp.git + tag: v4.7.0 + # ES-DE - START # https://gitlab.com/es-de/emulationstation-de @@ -877,13 +895,6 @@ modules: # https://github.com/flathub/net.kuribo64.melonDS # ちっちゃい、かわいい！ - - name: libslirp - buildsystem: meson - sources: - - type: git - url: https://gitlab.freedesktop.org/slirp/libslirp.git - tag: v4.7.0 - - name: melonds buildsystem: cmake-ninja builddir: true From c091313c476469d8bd25ba7cba3f737e848d6d7e Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 5 Nov 2023 10:54:39 +0100 Subject: [PATCH 40/52] XEMU: updated to v0.7.116 --- 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 092f3d52..15fc8eee 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -870,8 +870,8 @@ modules: sources: - type: git url: https://github.com/xemu-project/xemu.git - tag: v0.7.98 - commit: 7bfb7c85378f64f93556c365ea0cc18cb2181dc8 + tag: v0.7.116 + commit: b3fc80b3a83fa99aeb541a0c665cfb596cedd71c x-checker-data: type: json url: https://api.github.com/repos/xemu-project/xemu/releases/latest From 0dcfb50358f321458c39fd1274ec416703feebe5 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 5 Nov 2023 10:58:00 +0100 Subject: [PATCH 41/52] PUGIXML: updated to v1.14 --- 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 15fc8eee..bf54bd82 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -337,7 +337,7 @@ modules: - sed -i 's|-o root -g root ||' ./Makefile.gnu - sed -i 's|/usr|/app|' ./Makefile.gnu - # dependency of: CEMU + # dependency of: CEMU, ES-DE - name: pugixml buildsystem: cmake-ninja config-opts: @@ -348,8 +348,8 @@ modules: - /lib/pkgconfig sources: - type: archive - url: https://github.com/zeux/pugixml/releases/download/v1.13/pugixml-1.13.tar.gz - sha256: 40c0b3914ec131485640fa57e55bf1136446026b41db91c1bef678186a12abbe + url: https://github.com/zeux/pugixml/releases/download/v1.14/pugixml-1.14.tar.gz + sha256: 2f10e276870c64b1db6809050a75e11a897a8d7456c4be5c6b2e35a11168a015 x-checker-data: type: anitya project-id: 3728 From 011fe210a38284dea45ae572b03332466ecd4059 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 5 Nov 2023 10:59:46 +0100 Subject: [PATCH 42/52] GLSLANG: updated to 13.1.1 (NOTE: can impact CITRA) --- net.retrodeck.retrodeck.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index bf54bd82..b25c1fdd 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -231,24 +231,34 @@ modules: url: https://github.com/mikefarah/yq/releases/download/v4.33.3/yq_linux_amd64 sha256: 4ee662847c588c3ef2fec8bfb304e8739e3dbaba87ccb9a608d691c88f5b64dc - # dependency of: CEMU, CITRA <-(13.0.0) + # dependency of: CEMU (13.1.1), CITRA (13.0.0) - name: glslang buildsystem: cmake-ninja config-opts: - -DCMAKE_BUILD_TYPE=Release - -DENABLE_CTEST=OFF + # TODO: Does Cemu benefit from SPIRV-Tools-opt + - -DENABLE_OPT=OFF cleanup: - /include - /lib/cmake sources: - type: archive - url: https://github.com/KhronosGroup/glslang/archive/13.0.0.tar.gz - sha256: bcda732434f829aa74414ea0e06d329ec8ac28637c38a0de45e17c8fd25a4715 + url: https://github.com/KhronosGroup/glslang/archive/13.1.1.tar.gz + sha256: 1c4d0a5a38c8aaf89a2d7e6093be734320599f5a6775b2726beeb05b0c054e66 x-checker-data: type: anitya stable-only: true project-id: 205796 url-template: https://github.com/KhronosGroup/glslang/archive/$version.tar.gz + # - type: git + # url: https://github.com/KhronosGroup/SPIRV-Tools.git + # tag: sdk-1.3.261.1 + # dest: External/spirv-tools + # - type: git + # url: https://github.com/KhronosGroup/SPIRV-Headers.git + # tag: sdk-1.3.261.1 + # dest: External/spirv-tools/external/spirv-headers # enables motion controls on non-wii controllers (switch, ps4, etc) # dependency of: DOLPHIN, RPCS3 From 647574631966849d286e1bc68547af6455e3174e Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 5 Nov 2023 11:01:21 +0100 Subject: [PATCH 43/52] CEMU: updated to v2.0-59 --- 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 b25c1fdd..8ab9d403 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1150,8 +1150,8 @@ modules: x-checker-data: type: git tag-pattern: ^v([\d.]+-\d+)$ - tag: v2.0-47 - commit: 85aa4f095b119e98620451a0c19c80f656d944a6 + tag: v2.0-59 + commit: f3c95f72e74d8a5f5873061fbb994643c63ec9c5 - type: shell commands: - sed "s/set(EXPERIMENTAL_VERSION.*/set(EXPERIMENTAL_VERSION \"$(git describe From 560a4e7c0516bbd1d88b9a75af8c0d35cac68440 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 5 Nov 2023 11:05:16 +0100 Subject: [PATCH 44/52] LIBGLU: reverted to osuosl mirror as mesa still have issues --- net.retrodeck.retrodeck.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 8ab9d403..c7bfa992 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -133,17 +133,17 @@ modules: - /lib/pkgconfig - /lib/*.a sources: - # - type: archive - # url: https://ftp.osuosl.org/pub/blfs/conglomeration/glu/glu-9.0.3.tar.xz - # sha256: 6e7280ff585c6a1d9dfcdf2fca489251634b3377bfc33c29e4002466a38d02d4 - type: archive - url: https://mesa.freedesktop.org/archive/glu/glu-9.0.3.tar.xz + url: https://ftp.osuosl.org/pub/blfs/conglomeration/glu/glu-9.0.3.tar.xz sha256: bd43fe12f374b1192eb15fe20e45ff456b9bc26ab57f0eee919f96ca0f8a330f - x-checker-data: - type: anitya - project-id: 13518 - stable-only: true - url-template: https://mesa.freedesktop.org/archive/glu/glu-$version.tar.xz + # - type: archive + # url: https://mesa.freedesktop.org/archive/glu/glu-9.0.3.tar.xz + # sha256: bd43fe12f374b1192eb15fe20e45ff456b9bc26ab57f0eee919f96ca0f8a330f + # x-checker-data: + # type: anitya + # project-id: 13518 + # stable-only: true + # url-template: https://mesa.freedesktop.org/archive/glu/glu-$version.tar.xz - name: libgudev buildsystem: meson From f7702d6c24d60798540340c73cdc2c6cc5958ec4 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 5 Nov 2023 11:12:06 +0100 Subject: [PATCH 45/52] YUZU: fixed sha --- 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 c7bfa992..fa532208 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -675,7 +675,7 @@ modules: sources: - type: file url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1610/yuzu-mainline-20231104-a1ef67221.AppImage - sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + sha256: 22ed30bd95e1549ac9f54e36544fa05c284378d594d11d788f84212dbb70dbff # Yuzu - END From 5d67dc44a1b191571ff31891eee9c09972015b1c Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Sun, 5 Nov 2023 15:27:24 +0100 Subject: [PATCH 46/52] GLSLANG: reverted to 13.0.0 (could impact CEMU) --- net.retrodeck.retrodeck.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index fa532208..c7d34620 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -244,8 +244,10 @@ modules: - /lib/cmake sources: - type: archive - url: https://github.com/KhronosGroup/glslang/archive/13.1.1.tar.gz - sha256: 1c4d0a5a38c8aaf89a2d7e6093be734320599f5a6775b2726beeb05b0c054e66 + #url: https://github.com/KhronosGroup/glslang/archive/13.1.1.tar.gz + #sha256: 1c4d0a5a38c8aaf89a2d7e6093be734320599f5a6775b2726beeb05b0c054e66 + url: https://github.com/KhronosGroup/glslang/archive/13.0.0.tar.gz + sha256: bcda732434f829aa74414ea0e06d329ec8ac28637c38a0de45e17c8fd25a4715 x-checker-data: type: anitya stable-only: true From f77141b85095d7f8b56c54bd61e3ac6e785413cd Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Sun, 5 Nov 2023 17:14:29 +0100 Subject: [PATCH 47/52] CITRA: updated to nightly-2025 --- net.retrodeck.retrodeck.yml | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index c7d34620..6fc48c9c 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -3,7 +3,7 @@ runtime: org.kde.Platform runtime-version: "6.5" sdk: org.kde.Sdk sdk-extensions: - - org.freedesktop.Sdk.Extension.llvm14 # Needed for rpcs3 + - org.freedesktop.Sdk.Extension.llvm17 # Needed for rpcs3 (llvm15) but llvm17 for CITRA # base: io.qt.qtwebengine.BaseApp # Needed for Yuzu - Disabled as we're using AppImage for Yuzu # base-version: "6.5" # Needed for Yuzu - Disabled as we're using AppImage for Yuzu command: retrodeck.sh @@ -244,10 +244,10 @@ modules: - /lib/cmake sources: - type: archive - #url: https://github.com/KhronosGroup/glslang/archive/13.1.1.tar.gz - #sha256: 1c4d0a5a38c8aaf89a2d7e6093be734320599f5a6775b2726beeb05b0c054e66 - url: https://github.com/KhronosGroup/glslang/archive/13.0.0.tar.gz - sha256: bcda732434f829aa74414ea0e06d329ec8ac28637c38a0de45e17c8fd25a4715 + url: https://github.com/KhronosGroup/glslang/archive/13.1.1.tar.gz + sha256: 1c4d0a5a38c8aaf89a2d7e6093be734320599f5a6775b2726beeb05b0c054e66 + # url: https://github.com/KhronosGroup/glslang/archive/13.0.0.tar.gz + # sha256: bcda732434f829aa74414ea0e06d329ec8ac28637c38a0de45e17c8fd25a4715 x-checker-data: type: anitya stable-only: true @@ -686,9 +686,21 @@ modules: - rd-submodules/shared-modules/SDL2/SDL2-with-libdecor.json + - rd-submodules/shared-modules/SDL2/SDL2-with-libdecor.json + - name: citra buildsystem: cmake-ninja builddir: true + build-options: + env: + CI: '1' + GITHUB_ACTIONS: '1' + GITHUB_REPOSITORY: citra-emu/citra-nightly + GITHUB_REF_NAME: nightly-2025 + append-path: /usr/lib/sdk/llvm17/bin + prepend-ld-library-path: /usr/lib/sdk/llvm17/lib + cflags: '-Wno-unused-command-line-argument' + cxxflags: '-Wno-unused-command-line-argument' config-opts: - '-DCMAKE_BUILD_TYPE=Release' - '-DCMAKE_C_COMPILER=clang' @@ -719,8 +731,8 @@ modules: sources: - type: archive url: >- - https://github.com/citra-emu/citra-nightly/releases/download/nightly-2024/citra-unified-source-20231103-b10f3d9.tar.xz - sha256: 303cf9ab674fb7ee3a448c575de994e66bbca83cea26b8ef54d82b4af6e8264a + https://github.com/citra-emu/citra-nightly/releases/download/nightly-2025/citra-unified-source-20231105-998b9a9.tar.xz + sha256: ebf52af66c6ef729688a29d093d9139baa76973b698c0630a295f38d126cf118 x-checker-data: type: json url: https://api.github.com/repos/citra-emu/citra-nightly/releases/latest From 0af8c8b70eb141df18f207e8da6e1c7cf604d80c Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Sun, 5 Nov 2023 17:16:24 +0100 Subject: [PATCH 48/52] CITRA: fixed llvm version --- 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 6fc48c9c..227c24c6 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -3,7 +3,7 @@ runtime: org.kde.Platform runtime-version: "6.5" sdk: org.kde.Sdk sdk-extensions: - - org.freedesktop.Sdk.Extension.llvm17 # Needed for rpcs3 (llvm15) but llvm17 for CITRA + - org.freedesktop.Sdk.Extension.llvm16 # Needed for rpcs3 (llvm15) but llvm16 for CITRA # base: io.qt.qtwebengine.BaseApp # Needed for Yuzu - Disabled as we're using AppImage for Yuzu # base-version: "6.5" # Needed for Yuzu - Disabled as we're using AppImage for Yuzu command: retrodeck.sh @@ -697,8 +697,8 @@ modules: GITHUB_ACTIONS: '1' GITHUB_REPOSITORY: citra-emu/citra-nightly GITHUB_REF_NAME: nightly-2025 - append-path: /usr/lib/sdk/llvm17/bin - prepend-ld-library-path: /usr/lib/sdk/llvm17/lib + append-path: /usr/lib/sdk/llvm16/bin + prepend-ld-library-path: /usr/lib/sdk/llvm16/lib cflags: '-Wno-unused-command-line-argument' cxxflags: '-Wno-unused-command-line-argument' config-opts: From 9ecd2ff5d2160d1464e3ce5bddd6ab2aed7a041b Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 6 Nov 2023 11:06:29 +0100 Subject: [PATCH 49/52] ES-DE: updated to 2.1.1-beta --- net.retrodeck.retrodeck.yml | 38 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 227c24c6..7fb19efb 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -302,6 +302,24 @@ modules: project-id: 7422 stable-only: true url-template: https://github.com/Tencent/rapidjson/archive/refs/tags/v$version.tar.gz + + # dependency of: CEMU, ES-DE + - name: pugixml + buildsystem: cmake-ninja + config-opts: + - -DBUILD_SHARED_LIBS=ON + cleanup: + - /include + - /lib/cmake + - /lib/pkgconfig + sources: + - type: archive + url: https://github.com/zeux/pugixml/releases/download/v1.14/pugixml-1.14.tar.gz + sha256: 2f10e276870c64b1db6809050a75e11a897a8d7456c4be5c6b2e35a11168a015 + x-checker-data: + type: anitya + project-id: 3728 + url-template: https://github.com/zeux/pugixml/releases/download/v$version/pugixml-$version.tar.gz # dependency of: CEMU, RPCS3 - rd-submodules/shared-modules/glew/glew.json @@ -349,24 +367,6 @@ modules: - sed -i 's|-o root -g root ||' ./Makefile.gnu - sed -i 's|/usr|/app|' ./Makefile.gnu - # dependency of: CEMU, ES-DE - - name: pugixml - buildsystem: cmake-ninja - config-opts: - - -DBUILD_SHARED_LIBS=ON - cleanup: - - /include - - /lib/cmake - - /lib/pkgconfig - sources: - - type: archive - url: https://github.com/zeux/pugixml/releases/download/v1.14/pugixml-1.14.tar.gz - sha256: 2f10e276870c64b1db6809050a75e11a897a8d7456c4be5c6b2e35a11168a015 - x-checker-data: - type: anitya - project-id: 3728 - url-template: https://github.com/zeux/pugixml/releases/download/v$version/pugixml-$version.tar.gz - - name: libgit2 buildsystem: cmake-ninja config-opts: @@ -406,7 +406,7 @@ modules: sources: - type: git url: https://gitlab.com/es-de/emulationstation-de - branch: dfaf8ef8cf9a2dd9350bf8bc0bbc94366c9fd168 + branch: c397f07984d7b4e3a762ef0000a1056dc48c5213 - type: shell commands: - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK From 2e1944aacf476a8664f905a06a7d96a8c92b66bb Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 13 Nov 2023 09:23:08 +0100 Subject: [PATCH 50/52] ES-DE: updated to 2.2.1 --- net.retrodeck.retrodeck.yml | 2 +- rd-submodules/retroarch | 2 +- rd-submodules/shared-modules | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 7fb19efb..a35128cc 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -406,7 +406,7 @@ modules: sources: - type: git url: https://gitlab.com/es-de/emulationstation-de - branch: c397f07984d7b4e3a762ef0000a1056dc48c5213 + branch: 77bf5ed8a03c5d065512cded36e4fb3bea90f4df - type: shell commands: - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch index 0b1cfb79..9dc43930 160000 --- a/rd-submodules/retroarch +++ b/rd-submodules/retroarch @@ -1 +1 @@ -Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409 +Subproject commit 9dc439300e92338d5b2bc3fc680eedd4fe1d3b0c diff --git a/rd-submodules/shared-modules b/rd-submodules/shared-modules index a2441b96..76809270 160000 --- a/rd-submodules/shared-modules +++ b/rd-submodules/shared-modules @@ -1 +1 @@ -Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42 +Subproject commit 76809270588f87c6c14df96fef2dde9a7bac84f4 From b71c19c83345960aba656c7967e61f7c6ea47827 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 13 Nov 2023 09:24:48 +0100 Subject: [PATCH 51/52] YUZU: updated to mainline 1618 --- 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 a35128cc..271b1c37 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -676,8 +676,8 @@ modules: - ln -s "${FLATPAK_DEST}/yuzu/usr/bin/yuzu" "${FLATPAK_DEST}/bin/yuzu" sources: - type: file - url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1610/yuzu-mainline-20231104-a1ef67221.AppImage - sha256: 22ed30bd95e1549ac9f54e36544fa05c284378d594d11d788f84212dbb70dbff + url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1618/yuzu-mainline-20231112-3cff94a38.AppImage + sha256: 4e92d6daeb1f288ca18950ed47b068fb971766ee386b012b9400b5caecad4246 # Yuzu - END From 080d619259ed2cf4bc1133389b19a168162dc2d8 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 13 Nov 2023 09:31:19 +0100 Subject: [PATCH 52/52] Updated appdata for 0.7.3b --- net.retrodeck.retrodeck.appdata.xml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index f8881095..f468b503 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -65,19 +65,17 @@ GPL-3.0 CC0-1.0 - + https://github.com/XargonWan/RetroDECK/releases/tag/0.7.3b

Updates:

    -
  • ES-DE has been updated to 2.2.0
    • -
  • All emulators update
    • +
  • All standalone emulators
    • +
  • EmulationStation Desktop Edition (ES-DE)

Known issues:

    -
  • PPSSPP now have Retroachievements, but it is right now not configurable in the configurator (as it works a bit different the other emulators), we hope to have a solution for it at a later date. You can still login / logout / enable hardcore mode normally from the PPSSPP interface.
    • -
  • Quitting the RetroArch GB core with the radial function makes the core swap the palette.
    • -
  • Borders sometimes are disappearing, a possible workaround is to reset RetroArch from the configurator.
    • +
  • Please check the know issues in the Wiki under General Infomration.