- CRITICAL:
-
- - DEEP TEST: prepare_emulator function is now called prepare_component, eidted even in the cli and split it into the Configurator, so we need to test if the reset emulator works as supposed, if the cli and the Configurator is consistent.
-
+
+ WARNING:
+ The post update script is initializing es-de 3.0, vita3k, mame-sa and ryujinx when coming from a version ealrier that 0.8.0b. Tp fully test this build you must come from a build 0.7.6b or previous otherwise you will surely encounter issues. Else reset RetroDECK but be aware that will not be a proper testing.
+
Changes:
+ - ES-DE: updated to 3.0
+ - Added new system: RYUJINX
- Added new system: SOLARUS
- Added new engine: GZDOOM
- - Added new emulator: Vita3K - Reset the emulator to grap the lates changes
+ - Added new emulator: Vita3K
- Added new emulator: MAME (Standalone)
- PPSSPP: added hotkeys
+ - MAME: added hotkeys
+ - SCUMMVM: added hotkeys
- DOLPHIN: improved wiimote pointer emulation for controllers
- - Added Steam Sync (with BoilR)
- Quit button after emulators reset should act as an actual full quit button
- Created a quit_retrodeck function to ease the quit in the scripts.
- Logs folder is now in retrodeck/logs (previously was .logs)
- - The post update script is initializing vita3k, mame and boilr when coming from a version ealrier that 0.8.0, this don't work in cokker and must be resetted manually (for boilr reset RetroDECK)
- RPCS3 is now running via shortcut (.desktop file) by default - WARN THE USERS TO MIGRATE
- Added controller config for PS4 and PS5
- Controller config overhaul
@@ -93,20 +95,18 @@
Fixes:
- Fixed DUCKSTATION memory card folder
- - Fixed RPCS3 saves folder (wrong symlink) - WRN THE USERS TO BACKUP
- - Fixed issues that prevents Steam Sync to work correctly
+ - Fixed RPCS3 saves folder (wrong symlink) - WARN THE USERS TO BACKUP
Issues:
+ - Vita3K firmware downloader is failing. Workaround: run the downloader twice
- GZDOOM: the controller for player 2+ is not correctly configured
- quit_retrodeck function seems to not working correctly
- - MAME (Standalone) paths should be fixed
Missing:
- GZDOOM: hotkeys
- SOLARUS: hotkeys
- - MAME (Standalone): hotkeys
- A proper reset script for the new emulators, now it's just a draft (only Vita3K is done)
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 031d7f28..ec4e4964 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -407,7 +407,7 @@ modules:
- '*.la'
# When updating this module remember to check those:
- # https://gitlab.com/es-de/emulationstation-de/-/blob/[VERSION]/resources/systems/unix/es_find_rules.xml
+ # https://gitlab.com/es-de/emulationstation-de/-/blob/[VERSION]/resources/systems/linux/es_find_rules.xml
# But we don't include them 1:1 as RetroDECK got some specific configs in some cases
- name: ES-DE
buildsystem: cmake-ninja
@@ -419,12 +419,8 @@ modules:
sources:
- type: git
url: https://github.com/XargonWan/RetroDECK-ES-DE
- branch: cebbeff3b5f834fd9adaeb1f5dc9e0da6b106599
+ branch: update/3.0
- type: shell
- commands:
- - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK
- v'$(cat ${FLATPAK_DEST}/retrodeck/version)', ES-DE v" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#g'
- es-app/src/guis/GuiMenu.cpp
# ES-DE - END
@@ -433,8 +429,8 @@ modules:
- name: art-book-next-es-de
buildsystem: simple
build-commands:
- - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-es-de/
- - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-es-de/
+ - mkdir -p ${FLATPAK_DEST}/share/es-de/themes/art-book-next-es-de/
+ - mv -f * ${FLATPAK_DEST}/share/es-de/themes/art-book-next-es-de/
sources:
- type: git
url: https://github.com/anthonycaccese/art-book-next-es-de.git
@@ -444,24 +440,6 @@ modules:
# External manifests start
- - name: boilr
- buildsystem: simple
- build-options:
- append-path: /usr/lib/sdk/rust-stable/bin
- env:
- # To pick up vendored deps
- CARGO_HOME: /run/build/boilr/cargo
- RUSTFLAGS: "-L /app/lib/"
- build-commands:
- - cargo --offline fetch --manifest-path Cargo.toml --verbose
- - cargo --offline build --release --verbose --features flatpak
- - install -Dm755 ./target/release/boilr -t /app/bin/
- sources:
- - type: git
- url: https://github.com/PhilipK/BoilR
- commit: b33d965f227fe971fd590cb022f608521b506ef3
- - rd-submodules/boilr/cargo-lock.json
-
# RetroArch - START
# https://github.com/flathub/org.libretro.RetroArch
@@ -1310,6 +1288,23 @@ modules:
# MAME - End
+ # Ryujinx Appimage - START
+ # https://ryujinx.org/download
+
+ - name: Ryujinx
+ buildsystem: simple
+ build-commands:
+ - |
+ tar -zxvf *.tar.gz
+ mv -v publish ${FLATPAK_DEST}/ryujinx
+ ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx ${FLATPAK_DEST}/bin/Ryujinx.sh
+ sources:
+ - type: file
+ url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.1192/ryujinx-1.1.1192-linux_x64.tar.gz
+ sha256: 41716233f5745a7df1e411af6bac9d828f0b6b6feb63b5ef87445b81b01dee54
+
+ # Ryujinx Appimage - END
+
# External manifests end
- name: retrodeck
@@ -1320,16 +1315,16 @@ modules:
- mkdir -p ${FLATPAK_DEST}/retrodeck
# Prep the ES-DE and RetroArch config files - I will have to SED/XMLSTARLET them soon
- - rm -rf /app/share/emulationstation/resources/systems/unix/es_find_rules.xml
- - cp es-configs/es_find_rules.xml /app/share/emulationstation/resources/systems/unix/
- - rm -rf /app/share/emulationstation/resources/systems/unix/es_systems.xml
- - cp es-configs/es_systems.xml /app/share/emulationstation/resources/systems/unix/
+ - rm -rf /app/share/es-de/resources/systems/linux/es_find_rules.xml
+ - cp es-configs/es_find_rules.xml /app/share/es-de/resources/systems/linux/
+ - rm -rf /app/share/es-de/resources/systems/linux/es_systems.xml
+ - cp es-configs/es_systems.xml /app/share/es-de/resources/systems/linux/
# These must be put in home folder, managed by retrodeck.sh
- cp es-configs/es_settings.xml ${FLATPAK_DEST}/retrodeck/es_settings.xml
- mv -f -t ${FLATPAK_DEST}/retrodeck es-configs/rd_prepacks
# Logo, res, move graphics directory away from default location so splash can be changed after build
- - mv -f -t ${FLATPAK_DEST}/retrodeck /app/share/emulationstation/resources/graphics
+ - mv -f -t ${FLATPAK_DEST}/retrodeck /app/share/es-de/resources/graphics
- cp -f res/splash.svg ${FLATPAK_DEST}/retrodeck/graphics/splash.svg
- cp -f res/splash.svg ${FLATPAK_DEST}/retrodeck/graphics/splash-orig.svg
- cp -rf res/extra_splashes/ ${FLATPAK_DEST}/retrodeck/graphics
@@ -1343,7 +1338,7 @@ modules:
# Tools
- mkdir -p /app/tools
- cp -r tools/** /app/tools
- - find /app/tools -name '*.py|*.sh' -exec chmod +x {} \;
+ - find /app/tools -type f \( -name "*.sh" -o -name "*.py" \) -exec chmod +x {} \;
# Function libraries
- mkdir -p /app/libexec
@@ -1376,7 +1371,11 @@ modules:
- cp emu-configs/gzdoom/gzdoom.sh ${FLATPAK_DEST}/bin/gzdoom.sh
- chmod +x ${FLATPAK_DEST}/bin/gzdoom.sh
+ # MAME wrapper
+ - cp emu-configs/mame/mame-rdwrapper.sh ${FLATPAK_DEST}/bin/mame-rdwrapper.sh
+ - chmod +x ${FLATPAK_DEST}/bin/mame-rdwrapper.sh
+
sources:
- type: git
url: https://github.com/XargonWan/RetroDECK.git
- branch: THISBRANCH
\ No newline at end of file
+ branch: THISBRANCH
diff --git a/old/removed-modules.yml b/old/removed-modules.yml
index 43d5cab3..04274441 100644
--- a/old/removed-modules.yml
+++ b/old/removed-modules.yml
@@ -112,24 +112,7 @@
# Duckstation-DontUpdate - END
- # Ryujinx Appimage - START
- # https://ryujinx.org/download
-
- # - name: Ryujinx
- # buildsystem: simple
- # build-commands:
- # - |
- # tar -zxvf ryujinx-1.1.685-linux_x64.tar.gz
- # mv -v publish ${FLATPAK_DEST}/ryujinx
- # ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx ${FLATPAK_DEST}/bin/Ryujinx
- # sources:
- # - type: file
- # url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.685/ryujinx-1.1.685-linux_x64.tar.gz
- # sha256: bc4d7076106d7aa59c3a3ea22b83c553e5fa1a897815831adcf18cc13d729e15
-
- # Ryujinx Appimage - END
-
- # Ryujinx - START
+ # Ryujinx - START
# https://github.com/flathub/org.ryujinx.Ryujinx
- name: Ryujinx
diff --git a/rd-submodules/es-de/GuiMenu.cpp.patch b/rd-submodules/es-de/GuiMenu.cpp.patch
deleted file mode 100644
index b0c035ea..00000000
--- a/rd-submodules/es-de/GuiMenu.cpp.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de/es-app/src/guis/GuiMenu.cpp
---- emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-08-23 13:12:15.617292576 +0200
-+++ emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-08-23 13:44:10.736412006 +0200
-@@ -67,2 +67,4 @@
-
-+ addEntry("RETRODECK CONFIGURATOR", mMenuColorPrimary, false, [this] { openRetroDeckConfigurator(); });
-+
- if (!Settings::getInstance()->getBool("ForceKiosk") &&
-@@ -70,3 +72,3 @@
- #if defined(__APPLE__)
-- addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); });
-+ addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); });
- #else
-@@ -75,3 +77,3 @@
- else
-- addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); });
-+ addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); });
- #endif
-@@ -1758,3 +1760,3 @@
- auto quitText = std::make_shared