From 8128651b3776bd684efb4456c83cccec393ba4a4 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Mon, 17 Jul 2023 10:07:28 -0400 Subject: [PATCH] Another attempt at ES-DE 2.1.1 --- net.retrodeck.retrodeck.yml | 28 +-- .../es-de/es-de-2.1-retrodeck-mods.patch | 168 ------------------ .../es-de/es-de-retrodeck-mods.patch | 69 +++---- 3 files changed, 51 insertions(+), 214 deletions(-) delete mode 100644 rd-submodules/es-de/es-de-2.1-retrodeck-mods.patch diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 10c28533..9d00ba11 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -291,19 +291,19 @@ modules: tag: v1.6.3 # Needed from ES-DE 2.1.0+ - # - name: libpoppler-glib - # buildsystem: cmake-ninja - # config-opts: - # - -DENABLE_BOOST=OFF - # sources: - # - type: archive - # url: https://gitlab.freedesktop.org/poppler/poppler/-/archive/poppler-22.11.0/poppler-poppler-22.11.0.tar.bz2 - # sha256: b8f618d5c62030034d5c8da4d3f6a740260b7620b9a31021679ce1914d327f81 - # cleanup: - # - /lib/pkgconfig - # - /include - # - '*.a' - # - '*.la' + - name: libpoppler-glib + buildsystem: cmake-ninja + config-opts: + - -DENABLE_BOOST=OFF + sources: + - type: archive + url: https://gitlab.freedesktop.org/poppler/poppler/-/archive/poppler-22.11.0/poppler-poppler-22.11.0.tar.bz2 + sha256: b8f618d5c62030034d5c8da4d3f6a740260b7620b9a31021679ce1914d327f81 + cleanup: + - /lib/pkgconfig + - /include + - '*.a' + - '*.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 @@ -318,7 +318,7 @@ modules: sources: - type: git url: https://gitlab.com/es-de/emulationstation-de - branch: 7a1e420c9df3b801a65e9bcdc0ac92e2d708836e + branch: c78e215d13b02132762b9fbf45ec7b861d50601b - type: shell commands: - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK diff --git a/rd-submodules/es-de/es-de-2.1-retrodeck-mods.patch b/rd-submodules/es-de/es-de-2.1-retrodeck-mods.patch deleted file mode 100644 index 2a2d01e8..00000000 --- a/rd-submodules/es-de/es-de-2.1-retrodeck-mods.patch +++ /dev/null @@ -1,168 +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-07-14 08:44:25.788696841 -0400 -+++ emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-07-14 08:48:23.574196859 -0400 -@@ -10,2 +10,3 @@ - #include "guis/GuiMenu.h" -+#include "utils/PlatformUtil.h" - -@@ -67,2 +68,4 @@ - -+ addEntry("RETRODECK CONFIGURATOR", mMenuColorPrimary, false, [this] { openRetroDeckConfigurator(); }); -+ - if (!Settings::getInstance()->getBool("ForceKiosk") && -@@ -70,3 +73,3 @@ - #if defined(__APPLE__) -- addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); }); -+ addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); }); - #else -@@ -75,3 +78,3 @@ - else -- addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); }); -+ addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); }); - #endif -@@ -1729,2 +1732,15 @@ - -+void GuiMenu::openRetroDeckConfigurator() -+{ -+ // Launch the configurator.sh script -+ std::string command; -+ std::string startDirectory; -+ bool runInBackground; -+ command = "bash /app/tools/configurator.sh"; -+ startDirectory = "/app/tools"; -+ runInBackground = false; -+ int result = Utils::Platform::launchGameUnix(command, startDirectory, runInBackground); -+ // You can add any checks for the script's outcome here. -+} -+ - void GuiMenu::openQuitMenu() -@@ -1758,3 +1774,3 @@ - auto quitText = std::make_shared( -- "QUIT EMULATIONSTATION", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary); -+ "QUIT RETRODECK", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary); - quitText->setSelectable(true); -diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.h emulationstation-de/es-app/src/guis/GuiMenu.h ---- emulationstation-de/es-app/src/guis/GuiMenu.h 2023-07-14 08:44:25.788696841 -0400 -+++ emulationstation-de/es-app/src/guis/GuiMenu.h 2023-07-14 08:49:05.851991859 -0400 -@@ -46,2 +46,3 @@ - void openOtherOptions(); -+ void openRetroDeckConfigurator(); - void openQuitMenu(); -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-07-14 08:44:25.788696841 -0400 -+++ emulationstation-de/es-app/src/views/ViewController.cpp 2023-07-14 08:51:37.107581872 -0400 -@@ -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 @@ - mNoGamesMessageBox = new GuiMsgBox( -- HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY", -- [this] { -- std::string currentROMDirectory; --#if defined(_WIN64) -- currentROMDirectory = Utils::String::replace(FileData::getROMDirectory(), "/", "\\"); --#else -- currentROMDirectory = FileData::getROMDirectory(); --#endif -- 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(); --#if defined(_WIN64) -- mRomDirectory = -- Utils::String::replace(FileData::getROMDirectory(), "/", "\\"); --#else -- 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)); -- }, -- false, "SAVE", "SAVE CHANGES?", "Currently configured path:", -- currentROMDirectory, "LOAD CURRENTLY CONFIGURED PATH", -- "CLEAR (LEAVE BLANK TO RESET TO DEFAULT PATH)")); -- } -- else { -- mWindow->pushGui(new GuiTextEditPopup( -- HelpStyle(), "ENTER ROM DIRECTORY PATH", currentROMDirectory, -- [this](const std::string& newROMDirectory) { -- Settings::getInstance()->setString("ROMDirectory", -- Utils::String::trim(newROMDirectory)); -- Settings::getInstance()->saveFile(); --#if defined(_WIN64) -- mRomDirectory = -- Utils::String::replace(FileData::getROMDirectory(), "/", "\\"); --#else -- 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)); -- }, -- false, "SAVE", "SAVE CHANGES?", "Currently configured path:", -- currentROMDirectory, "LOAD CURRENTLY CONFIGURED PATH", -- "CLEAR (LEAVE BLANK TO RESET TO DEFAULT PATH)")); -- } -- }, -- "CREATE DIRECTORIES", -- [this] { -- mWindow->pushGui(new GuiMsgBox( -- HelpStyle(), -- "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", -- [this] { -- if (!SystemData::createSystemDirectories()) { -- mWindow->pushGui(new GuiMsgBox(HelpStyle(), -- "THE SYSTEM DIRECTORIES WERE SUCCESSFULLY\n" -- "GENERATED, EXIT THE APPLICATION AND PLACE\n" -- "YOUR GAMES IN THE NEWLY CREATED FOLDERS", -- "OK", nullptr, "", nullptr, "", nullptr, -- true)); -- } -- else { -- mWindow->pushGui(new GuiMsgBox(HelpStyle(), -- "ERROR CREATING THE SYSTEM DIRECTORIES,\n" -- "PERMISSION PROBLEMS OR DISK FULL?\n\n" -- "SEE THE LOG FILE FOR MORE DETAILS", -- "OK", nullptr, "", nullptr, "", nullptr, -- true)); -- } -- }, -- "NO", nullptr, "", nullptr, true)); -- }, -- "QUIT", -+ HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT", - [] { -diff -au1r emulationstation-de/es-core/src/Window.cpp emulationstation-de/es-core/src/Window.cpp ---- emulationstation-de/es-core/src/Window.cpp 2023-07-14 08:44:25.805371841 -0400 -+++ emulationstation-de/es-core/src/Window.cpp 2023-07-14 08:52:32.335181878 -0400 -@@ -165,3 +165,3 @@ - progressBarRect.barPosY = mSplashTextPositions.y + (progressBarRect.barHeight * 2.0f); -- progressBarRect.color = 0x777777FF; -+ progressBarRect.color = 0xC858E6FF; - mProgressBarRectangles.emplace_back(progressBarRect); diff --git a/rd-submodules/es-de/es-de-retrodeck-mods.patch b/rd-submodules/es-de/es-de-retrodeck-mods.patch index 8b3f5db4..fd17ccf9 100644 --- a/rd-submodules/es-de/es-de-retrodeck-mods.patch +++ b/rd-submodules/es-de/es-de-retrodeck-mods.patch @@ -1,27 +1,27 @@ 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-04-12 09:08:12.394935336 -0400 -+++ emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-04-12 16:25:04.618753274 -0400 +--- emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-07-14 08:44:25.788696841 -0400 ++++ emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-07-14 08:48:23.574196859 -0400 @@ -10,2 +10,3 @@ #include "guis/GuiMenu.h" +#include "utils/PlatformUtil.h" - -@@ -66,2 +67,4 @@ - -+ addEntry("RETRODECK CONFIGURATOR", 0x777777FF, false, [this] { openRetroDeckConfigurator(); }); + +@@ -67,2 +68,4 @@ + ++ addEntry("RETRODECK CONFIGURATOR", mMenuColorPrimary, false, [this] { openRetroDeckConfigurator(); }); + if (!Settings::getInstance()->getBool("ForceKiosk") && -@@ -69,3 +72,3 @@ +@@ -70,3 +73,3 @@ #if defined(__APPLE__) -- addEntry("QUIT EMULATIONSTATION", 0x777777FF, false, [this] { openQuitMenu(); }); -+ addEntry("QUIT RETRODECK", 0x777777FF, false, [this] { openQuitMenu(); }); +- addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); }); ++ addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); }); #else -@@ -74,3 +77,3 @@ +@@ -75,3 +78,3 @@ else -- addEntry("QUIT EMULATIONSTATION", 0x777777FF, false, [this] { openQuitMenu(); }); -+ addEntry("QUIT RETRODECK", 0x777777FF, false, [this] { openQuitMenu(); }); +- addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); }); ++ addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); }); #endif -@@ -1704,2 +1707,15 @@ - +@@ -1729,2 +1732,15 @@ + +void GuiMenu::openRetroDeckConfigurator() +{ + // Launch the configurator.sh script @@ -36,22 +36,22 @@ diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de/e +} + void GuiMenu::openQuitMenu() -@@ -1732,3 +1748,3 @@ - }); -- auto quitText = std::make_shared("QUIT EMULATIONSTATION", -+ auto quitText = std::make_shared("QUIT RETRODECK", - Font::get(FONT_SIZE_MEDIUM), 0x777777FF); +@@ -1758,3 +1774,3 @@ + auto quitText = std::make_shared( +- "QUIT EMULATIONSTATION", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary); ++ "QUIT RETRODECK", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary); + quitText->setSelectable(true); diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.h emulationstation-de/es-app/src/guis/GuiMenu.h ---- emulationstation-de/es-app/src/guis/GuiMenu.h 2023-04-12 09:08:12.394935336 -0400 -+++ emulationstation-de/es-app/src/guis/GuiMenu.h 2023-04-12 09:33:25.023871033 -0400 +--- emulationstation-de/es-app/src/guis/GuiMenu.h 2023-07-14 08:44:25.788696841 -0400 ++++ emulationstation-de/es-app/src/guis/GuiMenu.h 2023-07-14 08:49:05.851991859 -0400 @@ -46,2 +46,3 @@ void openOtherOptions(); + void openRetroDeckConfigurator(); void openQuitMenu(); 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-06-26 09:37:59.297437013 -0400 -+++ emulationstation-de/es-app/src/views/ViewController.cpp 2023-06-26 09:38:18.410322017 -0400 -@@ -85,9 +85,7 @@ +--- emulationstation-de/es-app/src/views/ViewController.cpp 2023-07-14 08:44:25.788696841 -0400 ++++ emulationstation-de/es-app/src/views/ViewController.cpp 2023-07-17 09:58:26.862373622 -0400 +@@ -164,9 +164,7 @@ { - mNoGamesErrorMessage = "NO GAME FILES WERE FOUND. EITHER PLACE YOUR GAMES IN " - "THE CURRENTLY CONFIGURED ROM DIRECTORY OR CHANGE " @@ -65,8 +65,8 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat + "SYSTEM SUBFOLDER IN THE CONFIGURED ROM DIRECTORY " + "AND RUN RETRODECK AGAIN TO SCAN YOUR LIBRARY.\n" + "THE CURRENTLY CONFIGURED ROM DIRECTORY IS:\n"; - -@@ -100,90 +98,3 @@ + +@@ -179,90 +177,3 @@ mNoGamesMessageBox = new GuiMsgBox( - HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY", - [this] { @@ -158,11 +158,16 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat - "QUIT", + HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT", [] { +@@ -272,3 +183,3 @@ + }, +- true, false, ++ "", nullptr, "", nullptr, true, false, + (mRenderer->getIsVerticalOrientation() ? diff -au1r emulationstation-de/es-core/src/Window.cpp emulationstation-de/es-core/src/Window.cpp ---- emulationstation-de/es-core/src/Window.cpp 2023-04-12 09:08:12.398268670 -0400 -+++ emulationstation-de/es-core/src/Window.cpp 2023-04-14 11:03:48.261309278 -0400 -@@ -179,3 +179,3 @@ - progressBarRect.barPosY += borderThickness; -- progressBarRect.color = 0x79010FFF; +--- emulationstation-de/es-core/src/Window.cpp 2023-07-14 08:44:25.805371841 -0400 ++++ emulationstation-de/es-core/src/Window.cpp 2023-07-14 08:52:32.335181878 -0400 +@@ -165,3 +165,3 @@ + progressBarRect.barPosY = mSplashTextPositions.y + (progressBarRect.barHeight * 2.0f); +- progressBarRect.color = 0x777777FF; + progressBarRect.color = 0xC858E6FF; - mProgressBarRectangles.emplace_back(progressBarRect); \ No newline at end of file + mProgressBarRectangles.emplace_back(progressBarRect);