Xargon/RetroDECK
1
0
Fork 0
mirror of https://github.com/RetroDECK/RetroDECK.git synced 2024-11-29 09:05:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/cooker-0.7.3b' into cooker-0.7.3b-icenine451

Browse source
This commit is contained in:
icenine451 2023-11-04 15:04:22 -04:00
parent b0a2f20431 3d885dc98e
commit 676d49f2ab
6 changed files with 62 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
es-configs/es_find_rules.xml
View file

@ -24,6 +24,7 @@
</emulator> </emulator>
<core name="RETROARCH"> <core name="RETROARCH">
<rule type="corepath"> <rule type="corepath">
<entry>/app/share/libretro/cores</entry> <!-- RetroDECK -->
<!-- Non-portable AppImage and compiled from source --> <!-- Non-portable AppImage and compiled from source -->
<entry>~/.config/retroarch/cores</entry> <entry>~/.config/retroarch/cores</entry>
<!-- Portable AppImage --> <!-- Portable AppImage -->
@ -135,6 +136,7 @@
<emulator name="CEMU"> <emulator name="CEMU">
<!-- Nintendo Wii U emulator Cemu --> <!-- Nintendo Wii U emulator Cemu -->
<rule type="systempath"> <rule type="systempath">
<entry>Cemu-wrapper</entry> <!-- RetroDECK -->
<entry>cemu</entry> <entry>cemu</entry>
<entry>Cemu</entry> <entry>Cemu</entry>
</rule> </rule>
@ -154,6 +156,7 @@
<emulator name="CITRA"> <emulator name="CITRA">
<!-- Nintendo 3DS emulator Citra --> <!-- Nintendo 3DS emulator Citra -->
<rule type="systempath"> <rule type="systempath">
<entry>citra-qt</entry> <!-- RetroDECK -->
<entry>citra</entry> <entry>citra</entry>
<entry>citra-emu.citra-nightly</entry> <entry>citra-emu.citra-nightly</entry>
<entry>org.citra_emu.citra</entry> <entry>org.citra_emu.citra</entry>

16
net.retrodeck.retrodeck.appdata.xml
View file

@ -65,6 +65,22 @@
<project_license>GPL-3.0</project_license> <project_license>GPL-3.0</project_license>
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<releases> <releases>
<release version="0.7.3b" date="2023-10-22">
<url>https://github.com/XargonWan/RetroDECK/releases/tag/0.7.3b</url>
<description>
<p>Updates:</p>
<ul>
<li>ES-DE has been updated to 2.2.0</li>
<li>All emulators update</li>
</ul>
<p>Known issues:</p>
<ul>
<li>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.</li>
<li>Quitting the RetroArch GB core with the radial function makes the core swap the palette.</li>
<li>Borders sometimes are disappearing, a possible workaround is to reset RetroArch from the configurator.</li>
</ul>
</description>
</release>
<release version="0.7.2b" date="2023-09-27"> <release version="0.7.2b" date="2023-09-27">
<url>https://github.com/XargonWan/RetroDECK/releases/tag/0.7.2b</url> <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.7.2b</url>
<description> <description>

2
net.retrodeck.retrodeck.yml
View file

@ -376,7 +376,7 @@ modules:
sources: sources:
- type: git - type: git
url: https://gitlab.com/es-de/emulationstation-de url: https://gitlab.com/es-de/emulationstation-de
branch: 2de8282f6a5feaf86424b1175154c5fc2585f70a branch: dfaf8ef8cf9a2dd9350bf8bc0bbc94366c9fd168
- type: shell - type: shell
commands: commands:
- sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK

10
rd-submodules/es-de/GuiThemeDownloader.cpp.patch Normal file
View file

@ -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));

34
rd-submodules/es-de/ViewController.cpp.patch
View file

@ -1,22 +1,22 @@
diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstation-de/es-app/src/views/ViewController.cpp 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-11-04 17:32:01.356656877 +0100
+++ 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-11-04 17:38:58.132211437 +0100
@@ -180,9 +180,7 @@ @@ -180,7 +180,9 @@
{ {
- mNoGamesErrorMessage = "NO GAME FILES WERE FOUND. EITHER PLACE YOUR GAMES IN " - mNoGamesErrorMessage = "RETRODECK COULD NOT FIND ANY ROM FILES. "
- "THE CURRENTLY CONFIGURED ROM DIRECTORY OR CHANGE " - "PLEASE PLACE YOUR ROM FILES INTO THE APPROPRIATE "
- "ITS PATH USING THE BUTTON BELOW. OPTIONALLY THE ROM " - "SYSTEM SUBFOLDER IN THE CONFIGURED ROM DIRECTORY "
- "DIRECTORY STRUCTURE CAN BE GENERATED WHICH WILL " - "AND RUN RETRODECK AGAIN TO SCAN YOUR LIBRARY.\n"
- "CREATE A TEXT FILE FOR EACH SYSTEM PROVIDING SOME " - "THE CURRENTLY CONFIGURED ROM DIRECTORY IS:\n";
- "INFORMATION SUCH AS THE SUPPORTED FILE EXTENSIONS.\n" + mNoGamesErrorMessage = "NO GAME FILES WERE FOUND. EITHER PLACE YOUR GAMES IN "
- "THIS IS THE CURRENTLY CONFIGURED ROM DIRECTORY:\n"; + "THE CURRENTLY CONFIGURED ROM DIRECTORY OR CHANGE "
+ mNoGamesErrorMessage = "RETRODECK COULD NOT FIND ANY ROM FILES. " + "ITS PATH USING THE BUTTON BELOW. OPTIONALLY THE ROM "
+ "PLEASE PLACE YOUR ROM FILES INTO THE APPROPRIATE " + "DIRECTORY STRUCTURE CAN BE GENERATED WHICH WILL "
+ "SYSTEM SUBFOLDER IN THE CONFIGURED ROM DIRECTORY " + "CREATE A TEXT FILE FOR EACH SYSTEM PROVIDING SOME "
+ "AND RUN RETRODECK AGAIN TO SCAN YOUR LIBRARY.\n" + "INFORMATION SUCH AS THE SUPPORTED FILE EXTENSIONS.\n"
+ "THE CURRENTLY CONFIGURED ROM DIRECTORY IS:\n"; + "THIS IS THE CURRENTLY CONFIGURED ROM DIRECTORY:\n";
@@ -195,91 +193,3 @@ @@ -193,91 +195,3 @@
mNoGamesMessageBox = new GuiMsgBox( mNoGamesMessageBox = new GuiMsgBox(
- HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY", - HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY",
- [this] { - [this] {
@ -104,7 +104,7 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat
- nullptr, true)); - nullptr, true));
- } - }
- }, - },
- "CANCEL", nullptr, "", nullptr, nullptr, true)); - "CANCEL", nullptr, "", nullptr, nullptr, false));
- }, - },
- "QUIT", - "QUIT",
+ HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT", + HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT",

8
rd-submodules/es-de/patch_helper.sh
View file

@ -2,7 +2,7 @@
mkdir /tmp mkdir /tmp
branch="2de8282f6a5feaf86424b1175154c5fc2585f70a" branch="00a226062fff37209d98e0ab048ac89af50ecacc"
git clone "https://gitlab.com/es-de/emulationstation-de.git" /tmp/emulationstation-de git clone "https://gitlab.com/es-de/emulationstation-de.git" /tmp/emulationstation-de
pushd . pushd .
@ -16,6 +16,7 @@ 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/guis/GuiMenu.h ./patches-tmp
cp /tmp/emulationstation-de/es-app/src/views/ViewController.cpp ./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-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." read -p "Please edit the files in \"patches-tmp\" and press enter to continue."
@ -23,5 +24,8 @@ diff -au1r /tmp/emulationstation-de/es-app/src/guis/GuiMenu.cpp ./patche
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/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-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-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 rm -rf patches-tmp
echo "Done, now please remeber to edit the headers of the patch files with the correct paths."