diff --git a/package/libretro-cdi2015/libretro-cdi2015-001-recalbox-path.patch b/package/libretro-cdi2015/0001-recalbox-path.patch
similarity index 100%
rename from package/libretro-cdi2015/libretro-cdi2015-001-recalbox-path.patch
rename to package/libretro-cdi2015/0001-recalbox-path.patch
diff --git a/package/libretro-cdi2015/libretro-cdi2015.mk b/package/libretro-cdi2015/libretro-cdi2015.mk
index daf45c44f0d44bc3dfb96d48e9b4ff1dae3e7324..3ed5d8c25129538757b8d8c4d2b78845a78fb89c 100644
--- a/package/libretro-cdi2015/libretro-cdi2015.mk
+++ b/package/libretro-cdi2015/libretro-cdi2015.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-# Commit of 22/06/14
-LIBRETRO_CDI2015_VERSION = 2599c8aeaf84f62fe16ea00daa460a19298c121c
+# Commit of 2023/11/01
+LIBRETRO_CDI2015_VERSION = 316cd06349f2b34b4719f04f7c0d07569a74c764
 LIBRETRO_CDI2015_SITE = $(call github,libretro,mame2015-libretro,$(LIBRETRO_CDI2015_VERSION))
 LIBRETRO_CDI2015_LICENSE = MAME
 LIBRETRO_CDI2015_NON_COMMERCIAL = y
@@ -34,7 +34,8 @@ define LIBRETRO_CDI2015_BUILD_CMDS
 		$(SED) "s|^LDFLAGS =|LDFLAGS = $(LIBRETRO_CDI2015_LDFLAGS) -lm|g" $(@D)/Makefile
 		$(SED) "s|-O2|-O3|g" $(@D)/Makefile
 		$(MAKE) REALCC="$(TARGET_CC)" CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_CC)" AR="$(TARGET_CC)-ar" \
-				-C $(@D)/ -f Makefile platform="$(RETROARCH_LIBRETRO_PLATFORM)" $(LIBRETRO_CDI2015_OPTS)
+				-C $(@D)/ -f Makefile platform="$(RETROARCH_LIBRETRO_PLATFORM)" $(LIBRETRO_CDI2015_OPTS) \
+				GIT_VERSION="$(shell echo $(LIBRETRO_CDI2015_VERSION) | cut -c 1-8)"
 endef
 
 define LIBRETRO_CDI2015_INSTALL_TARGET_CMDS
diff --git a/package/libretro-o2em/libretro-o2em.mk b/package/libretro-o2em/libretro-o2em.mk
index f4dfafa0f6338703616783eb9737c8f801de100e..33badf0805c0ac172eb4101714cdeb14268d15e4 100644
--- a/package/libretro-o2em/libretro-o2em.mk
+++ b/package/libretro-o2em/libretro-o2em.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-# Commit of 2023/10/19
-LIBRETRO_O2EM_VERSION = 44fe5f306033242f7d74144105e19a7d4939477e
+# Commit of 2024/10/21
+LIBRETRO_O2EM_VERSION = 3ba4231c1dc8dcdf487428712856b790d2e4b8f3
 LIBRETRO_O2EM_SITE = $(call github,libretro,libretro-o2em,$(LIBRETRO_O2EM_VERSION))
 LIBRETRO_O2EM_LICENSE = ARTISTIC
 LIBRETRO_O2EM_LICENSE_FILES = COPYING
@@ -15,7 +15,8 @@ define LIBRETRO_O2EM_BUILD_CMDS
 	CFLAGS="$(TARGET_CFLAGS) $(COMPILER_COMMONS_CFLAGS_SO)" \
 		CXXFLAGS="$(TARGET_CXXFLAGS) $(COMPILER_COMMONS_CXXFLAGS_SO)" \
 		LDFLAGS="$(TARGET_LDFLAGS) $(COMPILER_COMMONS_LDFLAGS_SO)" \
-		$(MAKE) CXX="$(TARGET_CXX)" CC="$(TARGET_CC)" -C $(@D)/ -f Makefile platform="$(RETROARCH_LIBRETRO_PLATFORM)"
+		$(MAKE) CXX="$(TARGET_CXX)" CC="$(TARGET_CC)" -C $(@D)/ -f Makefile platform="$(RETROARCH_LIBRETRO_PLATFORM)" \
+		GIT_VERSION="$(shell echo $(LIBRETRO_O2EM_VERSION) | cut -c 1-8)"
 endef
 
 define LIBRETRO_O2EM_INSTALL_TARGET_CMDS