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 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 diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 3f257097..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: 2de8282f6a5feaf86424b1175154c5fc2585f70a + 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/ViewController.cpp.patch b/rd-submodules/es-de/ViewController.cpp.patch index a54202b3..9227b19d 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-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 @@ +--- 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"; - -@@ -195,91 +193,3 @@ +- 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 @@ mNoGamesMessageBox = new GuiMsgBox( - HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY", - [this] { @@ -104,7 +104,7 @@ 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", diff --git a/rd-submodules/es-de/patch_helper.sh b/rd-submodules/es-de/patch_helper.sh index e774e724..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