From 27317f5e9c3dda17bec70b8125365d04fbf27c06 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Thu, 26 Oct 2023 09:36:49 -0400 Subject: [PATCH 1/8] 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 2/8] 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 3/8] 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 4/8] 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 5/8] 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 6/8] 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 7/8] 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 8/8] 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() ?