Cooker to main [skip ci]

azahar/component_launcher.sh

@@ -12,4 +12,4 @@ log i "RetroDECK is now launching $component_name"
 log d "Library path is: $LD_LIBRARY_PATH"
 log d "AppDir is: $component_path"
 
-exec "$component_path/bin/azahar" --fullscreen "$@"
+exec "$component_path/bin/azahar" --f "$@"

es-de/component_update.sh

@@ -78,3 +78,15 @@ if [[ $(check_version_is_older_than "$version_being_updated" "0.10.0b") == "true
   fi
 fi
 
+if [[ $(check_version_is_older_than "$version_being_updated" "0.10.10b") == "true" ]]; then
+  # With the RetroDECK 0.10.10b, that brings ES-DE 3.5.0 update, the splash screen progress bar color default value is added
+
+  if ! [[ $(get_setting_value "$es_de_config" "SplashScreenProgressBarColor" "es_settings") ]]; then
+      add_setting_line "$es_de_config" 'name="SplashScreenProgressBarColor" value="C858E6FF"' "es_settings"
+  fi
+  if ! [[ $(get_setting_value "$es_de_config" "SplashScreenProgressBarColor" "es_settings") == "C858E6FF" ]]; then
+      log i "0.10.10b Upgrade - Postmove: ES-DE - Default RetroDECK splash screen progress bar color is set, fixing it in ES-DE config"
+      set_setting_value "$es_de_config" "SplashScreenProgressBarColor" "C858E6FF" "es_settings"
+  fi
+fi
+

es-de/rd_assets/rd_config/es_settings.xml

@@ -166,6 +166,7 @@
 <string name="ScreensaverSlideshowCustomDir" value="" />
 <string name="ScreensaverSlideshowImageDir" value="/var/config/ES-DE/slideshow/custom_images" />
 <string name="ScreensaverType" value="video" />
+<string name="SplashScreenProgressBarColor" value="C858E6FF" />
 <string name="StartupSystem" value="" />
 <string name="StartupView" value="system" />
 <string name="SystemsSorting" value="manufacturer_hwtype_year" />

melonds/component_launcher.sh

@@ -4,9 +4,9 @@
 component_name="$(basename "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")"
 component_path="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd)"
 
-export LD_LIBRARY_PATH="$rd_shared_libs:$rd_shared_libs/org.gnome.Platform/49/:${DEFAULT_LD_LIBRARY_PATH}"
-export QT_PLUGIN_PATH="${QT_PLUGIN_PATH}"
-export QT_QPA_PLATFORM_PLUGIN_PATH="${QT_QPA_PLATFORM_PLUGIN_PATH}"
+export LD_LIBRARY_PATH="$component_path/lib:$rd_shared_libs/org.kde.Platform/6.10/:${DEFAULT_LD_LIBRARY_PATH}"
+export QT_PLUGIN_PATH="$rd_shared_libs/org.kde.Platform/6.10/plugins/:${QT_PLUGIN_PATH}"
+export QT_QPA_PLATFORM_PLUGIN_PATH="$rd_shared_libs/org.kde.Platform/6.10/plugins/platforms/:${QT_QPA_PLATFORM_PLUGIN_PATH}"
 
 log i "RetroDECK is now launching $component_name"
 log d "Library path is: $LD_LIBRARY_PATH"

melonds/component_prepare.sh

@@ -11,14 +11,23 @@ if [[ "$action" == "reset" ]]; then # Run reset-only commands
 
   create_dir -d "$XDG_CONFIG_HOME/melonDS/"
   cp -fv "$component_config/melonDS.toml" "$melonds_config"
+
+  create_dir "$saves_path/nds/melonds"
+  create_dir "$states_path/nds/melonds"
+  dir_prep "$bios_path" "$XDG_CONFIG_HOME/melonDS/bios"
+
   set_setting_value "$melonds_config" "BIOS9Path" "\"$bios_path/bios9.bin\"" "melonds" "DS"
   set_setting_value "$melonds_config" "BIOS7Path" "\"$bios_path/bios7.bin\"" "melonds" "DS"
   set_setting_value "$melonds_config" "FirmwarePath" "\"$bios_path/firmware.bin\"" "melonds" "DS"
+
+  set_setting_value "$melonds_config" "NANDPath" "\"$bios_path/dsi_nand.bin\"" "melonds" "DSi"
+  set_setting_value "$melonds_config" "BIOS7Path" "\"$bios_path/dsi_bios7.bin\"" "melonds" "DSi"
+  set_setting_value "$melonds_config" "BIOS9Path" "\"$bios_path/dsi_bios9.bin\"" "melonds" "DSi"
+  set_setting_value "$melonds_config" "FirmwarePath" "\"$bios_path/dsi_firmware.bin\"" "melonds" "DSi"
+
   set_setting_value "$melonds_config" "SaveFilePath" "\"$saves_path/nds/melonds\"" "melonds" "Instance0"
   set_setting_value "$melonds_config" "SavestatePath" "\"$states_path/nds/melonds\"" "melonds" "Instance0"
-  create_dir "$saves_path/nds/melonds"
-  create_dir "$states_path/nds/melonds"
-  dir_prep "$bios_path" "$XDG_CONFIG_HOME/melonDS/bios"
+
 fi
 
 if [[ "$action" == "postmove" ]]; then # Run only post-move commands
@@ -27,9 +36,16 @@ if [[ "$action" == "postmove" ]]; then # Run only post-move commands
   log i "----------------------"
 
   dir_prep "$bios_path" "$XDG_CONFIG_HOME/melonDS/bios"
+
   set_setting_value "$melonds_config" "BIOS9Path" "\"$bios_path/bios9.bin\"" "melonds" "DS"
   set_setting_value "$melonds_config" "BIOS7Path" "\"$bios_path/bios7.bin\"" "melonds" "DS"
   set_setting_value "$melonds_config" "FirmwarePath" "\"$bios_path/firmware.bin\"" "melonds" "DS"
+
+  set_setting_value "$melonds_config" "NANDPath" "\"$bios_path/dsi_nand.bin\"" "melonds" "DSi"
+  set_setting_value "$melonds_config" "BIOS7Path" "\"$bios_path/dsi_bios7.bin\"" "melonds" "DSi"
+  set_setting_value "$melonds_config" "BIOS9Path" "\"$bios_path/dsi_bios9.bin\"" "melonds" "DSi"
+  set_setting_value "$melonds_config" "FirmwarePath" "\"$bios_path/dsi_firmware.bin\"" "melonds" "DSi"
+
   set_setting_value "$melonds_config" "SaveFilePath" "\"$saves_path/nds/melonds\"" "melonds" "Instance0"
   set_setting_value "$melonds_config" "SavestatePath" "\"$states_path/nds/melonds\"" "melonds" "Instance0"
 fi

melonds/component_recipe.json

@@ -12,6 +12,16 @@
           "source": "bin",
           "dest": "bin"
         },
+        {
+          "type": "dir",
+          "source": "lib",
+          "dest": "lib"
+        },
+        {
+          "type": "dir",
+          "source": "share/licenses/net.kuribo64.melonDS/",
+          "dest": "docs"
+        },
         {
           "type": "create",
           "dest": "component_version",
@@ -55,19 +65,51 @@
       ],
       "libs": [
         {
-          "library": "libevdev.so.2",
-          "runtime_name": "org.gnome.Platform",
-          "runtime_version": "49",
+          "library": "libQt6Multimedia.so.6",
+          "runtime_name": "org.kde.Platform",
+          "runtime_version": "6.10",
           "dest": "shared-libs"
         },
         {
-          "library": "libenet.so.7",
-          "source": "lib",
+          "library": "libQt6Network.so.6",
+          "runtime_name": "org.kde.Platform",
+          "runtime_version": "6.10",
           "dest": "shared-libs"
         },
         {
-          "library": "libfaad.so.2",
-          "source": "lib",
+          "library": "libQt6Gui.so.6",
+          "runtime_name": "org.kde.Platform",
+          "runtime_version": "6.10",
+          "dest": "shared-libs"
+        },
+        {
+          "library": "libQt6DBus.so.6",
+          "runtime_name": "org.kde.Platform",
+          "runtime_version": "6.10",
+          "dest": "shared-libs"
+        },
+        {
+          "library": "libQt6Core.so.6",
+          "runtime_name": "org.kde.Platform",
+          "runtime_version": "6.10",
+          "dest": "shared-libs"
+        },
+        {
+          "library": "libQt6Widgets.so.6",
+          "runtime_name": "org.kde.Platform",
+          "runtime_version": "6.10",
+          "dest": "shared-libs"
+        },
+        {
+          "library": "libQt6WaylandClient.so.6",
+          "runtime_name": "org.kde.Platform",
+          "runtime_version": "6.10",
+          "dest": "shared-libs"
+        },
+        {
+          "library": "libQt6XcbQpa.so.6",
+          "runtime_name": "org.kde.Platform",
+          "runtime_version": "6.10",
           "dest": "shared-libs"
         }
       ]

melonds/component_update.sh

@@ -4,6 +4,15 @@
 # These actions happen conditionally based on the version being upgraded
 #########################################################################
 
+if [[ $(check_version_is_older_than "$version_being_updated" "0.10.10b") == "true" ]]; then
+
+  log i "0.10.10b Upgrade - MelonDS: Reset"
+
+  prepare_component "reset" "melonds"
+
+fi
+
+
 if [[ $(check_version_is_older_than "$version_being_updated" "0.10.1b") == "true" ]]; then
 
   log i "0.10.1b Upgrade - Fix Bios Path: MelonDS"