From fd488e8b55c063c892d858b1900b48dd9e0559c4 Mon Sep 17 00:00:00 2001
From: Pit64 <yrigaud@icloud.com>
Date: Sat, 14 Jun 2025 21:58:45 +0200
Subject: [PATCH] feat(emulators): bump nds emulators

---
 configs/recalbox-rpi4_64_defconfig            |  1 +
 configs/recalbox-rpi5_64_defconfig            |  1 +
 package/libretro-desmume/libretro-desmume.mk  |  4 +--
 package/libretro-melonds/libretro-melonds.mk  |  4 +--
 .../generators/libretro/libretroCores.py      | 27 ++++++++++++++++++-
 .../generators/libretro/libretroRetroarch.py  |  1 +
 6 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/configs/recalbox-rpi4_64_defconfig b/configs/recalbox-rpi4_64_defconfig
index 40ddd8f255..a181406f64 100644
--- a/configs/recalbox-rpi4_64_defconfig
+++ b/configs/recalbox-rpi4_64_defconfig
@@ -279,6 +279,7 @@ BR2_PACKAGE_LIBRETRO_MAME2003_PLUS=y
 BR2_PACKAGE_LIBRETRO_MAME2003=y
 BR2_PACKAGE_LIBRETRO_MAME2010=y
 BR2_PACKAGE_LIBRETRO_MAME2015=y
+BR2_PACKAGE_LIBRETRO_MELONDS=y
 BR2_PACKAGE_LIBRETRO_MESEN=y
 BR2_PACKAGE_LIBRETRO_MESEN_S=y
 BR2_PACKAGE_LIBRETRO_METEOR=y
diff --git a/configs/recalbox-rpi5_64_defconfig b/configs/recalbox-rpi5_64_defconfig
index c6fe2646be..0d8c2da05f 100644
--- a/configs/recalbox-rpi5_64_defconfig
+++ b/configs/recalbox-rpi5_64_defconfig
@@ -280,6 +280,7 @@ BR2_PACKAGE_LIBRETRO_MAME2003_PLUS=y
 BR2_PACKAGE_LIBRETRO_MAME2003=y
 BR2_PACKAGE_LIBRETRO_MAME2010=y
 BR2_PACKAGE_LIBRETRO_MAME2015=y
+BR2_PACKAGE_LIBRETRO_MELONDS=y
 BR2_PACKAGE_LIBRETRO_MESEN=y
 BR2_PACKAGE_LIBRETRO_MESEN_S=y
 BR2_PACKAGE_LIBRETRO_METEOR=y
diff --git a/package/libretro-desmume/libretro-desmume.mk b/package/libretro-desmume/libretro-desmume.mk
index 6015c39eee..46869e1e69 100644
--- a/package/libretro-desmume/libretro-desmume.mk
+++ b/package/libretro-desmume/libretro-desmume.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-# Commit of 2023/10/06
-LIBRETRO_DESMUME_VERSION = 4ee1bb1d6a6c9695baea49d0c2dff34c10187502
+# Commit of 2024/10/21
+LIBRETRO_DESMUME_VERSION = 7f05a8d447b00acd9e0798aee97b4f72eb505ef9
 LIBRETRO_DESMUME_SITE = $(call github,libretro,desmume,$(LIBRETRO_DESMUME_VERSION))
 LIBRETRO_DESMUME_DEPENDENCIES = libpcap
 LIBRETRO_DESMUME_LICENSE = GPL-2.0+
diff --git a/package/libretro-melonds/libretro-melonds.mk b/package/libretro-melonds/libretro-melonds.mk
index 4f947ad0d8..d8b070fbfa 100644
--- a/package/libretro-melonds/libretro-melonds.mk
+++ b/package/libretro-melonds/libretro-melonds.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-# Commit of 2023/04/13
-LIBRETRO_MELONDS_VERSION = c6488c88cb4c7583dbcd61609e0eef441572fae8
+# Commit of 2024/10/21
+LIBRETRO_MELONDS_VERSION = 7a3c11ff970cd36ca806961fae6db94b30dd5401
 LIBRETRO_MELONDS_SITE = $(call github,libretro,melonds,$(LIBRETRO_MELONDS_VERSION))
 LIBRETRO_MELONDS_LICENSE = GPLv3
 
diff --git a/projects/configgen/configgen/generators/libretro/libretroCores.py b/projects/configgen/configgen/generators/libretro/libretroCores.py
index ff2657a2e9..abaaa834cd 100644
--- a/projects/configgen/configgen/generators/libretro/libretroCores.py
+++ b/projects/configgen/configgen/generators/libretro/libretroCores.py
@@ -264,6 +264,31 @@ class LibretroCores:
         coreSettings.setString("parallel-n64-alt-map", '"disabled"')
         coreSettings.setString("mupen64plus-alt-map", '"False"')
 
+    def configureNDS(self, coreSettings: keyValueSettings) -> None:
+        # Auto-apply game languages
+        DS_LANGUAGES = \
+        {
+            "jp": "Japanese",
+            "en": "English",
+            "fr": "French",
+            "de": "German",
+            "it": "Italian",
+            "es": "Spanish"
+        }
+
+        import configgen.recalboxFiles as recalboxFiles
+        conf = keyValueSettings(recalboxFiles.recalboxConf).loadFile(True)
+        kl = conf.getString("system.kblayout", conf.getString("system.language", "en")[0:2]).lower()
+        language = DS_LANGUAGES[kl] if kl in DS_LANGUAGES else '"English"'
+        settingName: str = ""
+
+        if self.system.Core == "melonds":
+            settingName = "melonds"
+        elif self.system.Core == "desmume":
+            settingName = "desmume_firmware"
+
+        coreSettings.setString(settingName + "_language", f'"{language}"')
+
     @staticmethod
     def configureSpectravideo(coreSettings: keyValueSettings):
         coreSettings.setString("bluemsx_msxtype", '"SVI - Spectravideo SVI-328 MK2"')
@@ -324,7 +349,6 @@ class LibretroCores:
             coreSettings.setString("fbneo-diagnostic-input", '"L3"')
 
     def configureScummvm(self, coreSettings: keyValueSettings):
-        from configgen.settings.iniSettings import IniSettings
         import configgen.recalboxFiles as recalboxFiles
         import configparser
         import os.path
@@ -438,6 +462,7 @@ class LibretroCores:
             "atari800"     : LibretroCores.configureAtari800,
             "amstradcpc"   : LibretroCores.configureAmstradCPC,
             "gx4000"       : LibretroCores.configureAmstradGX4000,
+            "nds"          : self.configureNDS,
             "spectravideo" : LibretroCores.configureSpectravideo,
             "64dd"         : LibretroCores.configure64DD,
             "msx1"         : LibretroCores.configureMsx1,
diff --git a/projects/configgen/configgen/generators/libretro/libretroRetroarch.py b/projects/configgen/configgen/generators/libretro/libretroRetroarch.py
index 98c380e33d..2f879b1108 100755
--- a/projects/configgen/configgen/generators/libretro/libretroRetroarch.py
+++ b/projects/configgen/configgen/generators/libretro/libretroRetroarch.py
@@ -54,6 +54,7 @@ class LibretroRetroarch:
         'mame',
         'n64',
         'naomi',
+        'nds',
         'neogeocd',
         'ngpc',
         'pcfx',
-- 
GitLab