From 50834d7b1a2e089009136e912721906221186fbd Mon Sep 17 00:00:00 2001 From: Pit64 Date: Fri, 13 Jun 2025 20:12:34 +0200 Subject: [PATCH] feat(emulators): bump engines emulators --- .../frotz-recalbox/0000-sdl2-c-options.patch | 25 ------------------- .../frotz-recalbox/0001-sdl2-c-options.patch | 25 +++++++++++++++++++ ...ch => 0002-configure-saves-and-quit.patch} | 16 ++++++------ package/frotz-recalbox/frotz-recalbox.mk | 4 +-- package/liblcf/Config.in | 1 + package/liblcf/liblcf.mk | 8 +++--- package/libretro-easyrpg/libretro-easyrpg.mk | 4 +-- .../libretro-mojozork/libretro-mojozork.mk | 4 +-- package/libretro-uzem/libretro-uzem.mk | 7 +++--- 9 files changed, 49 insertions(+), 45 deletions(-) delete mode 100644 package/frotz-recalbox/0000-sdl2-c-options.patch create mode 100644 package/frotz-recalbox/0001-sdl2-c-options.patch rename package/frotz-recalbox/{0001-configure-saves-and-quit.patch => 0002-configure-saves-and-quit.patch} (75%) diff --git a/package/frotz-recalbox/0000-sdl2-c-options.patch b/package/frotz-recalbox/0000-sdl2-c-options.patch deleted file mode 100644 index 2214f22315..0000000000 --- a/package/frotz-recalbox/0000-sdl2-c-options.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/src/sdl/Makefileorg 2022-15-04 20:51:00.449076651 +0200 -+++ b/src/sdl/Makefile 2022-15-04 20:03:18.338953993 +0200 -@@ -34,7 +34,7 @@ - clean: - -rm -f $(TARGET) $(OBJECTS) $(DEPS) - --%.o: override CFLAGS += $(shell $(PKG_CONFIG) $(SDL_PKGS) --cflags) $(SDL_CFLAGS) -+%.o: override CFLAGS += -I$(CROSS_DIR)/usr/include/SDL2 -I$(CROSS_DIR)/usr/include/libpng16 -I$(CROSS_DIR)/usr/include/freetype2 $(SDL_CFLAGS) - - %.o: %.c - $(CC) $(CFLAGS) -fPIC -fpic -o $@ -c $< - ---- a/src/sdl/sf_resource.c 2022-10-16 19:46:09.000000000 +0200 -+++ b/src/sdl/sf_resource.c 2022-10-16 19:48:02.000000000 +0200 -@@ -442,8 +442,8 @@ - m_gfxScale_w = 1.0; - m_gfxScale_h = 1.0; - sf_initcolours(); -- m_defaultFore = (sf_GetProfileInt("Display", "Foreground", m_colours[7])); -- m_defaultBack = (sf_GetProfileInt("Display", "Background", m_colours[10])); -+ m_defaultFore = m_colours[sf_GetProfileInt("Display", "Foreground", 7) % 11]; -+ m_defaultBack = m_colours[sf_GetProfileInt("Display", "Background", 10) % 11]; - m_morePrompts = - sf_GetProfileInt("Display", "Show More Prompts", 1) ? true : false; - m_gamma = sf_GetProfileDouble("Display", "Gamma", DEFAULT_GAMMA); \ No newline at end of file diff --git a/package/frotz-recalbox/0001-sdl2-c-options.patch b/package/frotz-recalbox/0001-sdl2-c-options.patch new file mode 100644 index 0000000000..f43fa96b4a --- /dev/null +++ b/package/frotz-recalbox/0001-sdl2-c-options.patch @@ -0,0 +1,25 @@ +--- a/src/sdl/Makefile ++++ b/src/sdl/Makefile +@@ -18,7 +18,7 @@ TARGET = frotz_sdl.a + ARFLAGS = rc + + ifneq ($(NO_PKGCONF), yes) +-SDL_CFLAGS += $(shell $(PKG_CONFIG) $(SDL_PKGS) --cflags) ++SDL_CFLAGS += -I$(CROSS_DIR)/usr/include/SDL2 -I$(CROSS_DIR)/usr/include/libpng16 -I$(CROSS_DIR)/usr/include/freetype2 + SDL_SOUND_CFLAGS += $(shell $(PKG_CONFIG) $(SDL_SOUND_PKGS) --cflags) + else + SDL_CFLAGS += $(SDL_CFLAGS_DEF) + +--- a/src/sdl/sf_resource.c ++++ b/src/sdl/sf_resource.c +@@ -440,8 +440,8 @@ void sf_readsettings(void) + m_gfxScale_w = 1.0; + m_gfxScale_h = 1.0; + sf_initcolours(); +- m_defaultFore = (sf_GetProfileInt("Display", "Foreground", m_colours[7])); +- m_defaultBack = (sf_GetProfileInt("Display", "Background", m_colours[10])); ++ m_defaultFore = m_colours[sf_GetProfileInt("Display", "Foreground", 7) % 11]; ++ m_defaultBack = m_colours[sf_GetProfileInt("Display", "Background", 10) % 11]; + m_morePrompts = + sf_GetProfileInt("Display", "Show More Prompts", 1) ? true : false; + m_gamma = sf_GetProfileDouble("Display", "Gamma", DEFAULT_GAMMA); \ No newline at end of file diff --git a/package/frotz-recalbox/0001-configure-saves-and-quit.patch b/package/frotz-recalbox/0002-configure-saves-and-quit.patch similarity index 75% rename from package/frotz-recalbox/0001-configure-saves-and-quit.patch rename to package/frotz-recalbox/0002-configure-saves-and-quit.patch index 9a7ca238d2..ce1ba7be06 100644 --- a/package/frotz-recalbox/0001-configure-saves-and-quit.patch +++ b/package/frotz-recalbox/0002-configure-saves-and-quit.patch @@ -1,6 +1,6 @@ ---- a/src/sdl/sf_util.c 2022-10-17 10:30:15.000000000 +0200 -+++ b/src/sdl/sf_util.c 2022-10-17 10:32:50.000000000 +0200 -@@ -647,6 +647,7 @@ +--- a/src/sdl/sf_util.c ++++ b/src/sdl/sf_util.c +@@ -648,6 +648,7 @@ static int dialog_read_file_name(char *file_name, const char *default_name, * * Return value is NULL is there was a problem */ @@ -8,8 +8,8 @@ char *os_read_file_name(const char *default_name, int flag) { int st; -@@ -661,6 +661,12 @@ - initname = getnumbername(initname, ext); +@@ -663,6 +664,12 @@ char *os_read_file_name(const char *default_name, int flag) + initname = getnumbername(initname, flag_ext); } + char recalbox_name[FILENAME_MAX + 1]; @@ -22,9 +22,9 @@ * and our filename is already provided with the -L flag, * just go ahead silently. ---- a/src/sdl/sf_video.c 2022-10-18 19:32:02.000000000 +0200 -+++ b/src/sdl/sf_video.c 2022-10-18 19:34:34.000000000 +0200 -@@ -732,7 +732,7 @@ +--- a/src/sdl/sf_video.c ++++ b/src/sdl/sf_video.c +@@ -734,7 +734,7 @@ static zword goodzkey(SDL_Event * e, int allowed) switch (e->type) { case SDL_QUIT: diff --git a/package/frotz-recalbox/frotz-recalbox.mk b/package/frotz-recalbox/frotz-recalbox.mk index 9a79308f21..b34b1a05b6 100644 --- a/package/frotz-recalbox/frotz-recalbox.mk +++ b/package/frotz-recalbox/frotz-recalbox.mk @@ -4,8 +4,8 @@ # ################################################################################ -# Commit of 2023/09/24 -FROTZ_RECALBOX_VERSION = 2f17d64f23f3d6e68cd676d35c9d1789e17bc9fc +# Commit of 2025/12/07 +FROTZ_RECALBOX_VERSION = dc6b7a7413a753e4b1583094a94a17590d393152 FROTZ_RECALBOX_SITE = $(call gitlab,DavidGriffith,frotz,$(FROTZ_RECALBOX_VERSION)) FROTZ_RECALBOX_DEPENDENCIES = host-pkgconf libpng jpeg sdl2 freetype zlib libao sdl2_mixer FROTZ_RECALBOX_LICENSE = GPL-2.0+ diff --git a/package/liblcf/Config.in b/package/liblcf/Config.in index c95e7cee6e..9e2cc37089 100644 --- a/package/liblcf/Config.in +++ b/package/liblcf/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBLCF bool "liblcf" select BR2_PACKAGE_EXPAT select BR2_PACKAGE_ICU + select BR2_PACKAGE_INIH help Library to handle RPG Maker 2000 and 2003 game data. diff --git a/package/liblcf/liblcf.mk b/package/liblcf/liblcf.mk index b53ca71278..c70c0e4758 100644 --- a/package/liblcf/liblcf.mk +++ b/package/liblcf/liblcf.mk @@ -4,10 +4,10 @@ # ################################################################################ -# Commit of 2023/09/20 -LIBLCF_VERSION = 87504151691830ab924daa89203c8b5d722b62c4 +# Commit of 2025/04/07 +LIBLCF_VERSION = 0.8.1 LIBLCF_SITE = https://github.com/EasyRPG/liblcf.git -LIBLCF_DEPENDENCIES = expat icu +LIBLCF_DEPENDENCIES = expat icu inih LIBLCF_SITE_METHOD = git LIBLCF_LICENSE = MIT LIBLCF_INSTALL_STAGING = YES @@ -26,4 +26,6 @@ LIBLCF_CONF_OPTS += -DCMAKE_C_FLAGS="$(COMPILER_COMMONS_CFLAGS_SO)" LIBLCF_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(COMPILER_COMMONS_CXXFLAGS_SO)" LIBLCF_CONF_OPTS += -DCMAKE_LINKER_EXE_FLAGS="$(COMPILER_COMMONS_LDFLAGS_SO)" +LIBLCF_SUPPORTS_IN_SOURCE_BUILD = NO + $(eval $(cmake-package)) diff --git a/package/libretro-easyrpg/libretro-easyrpg.mk b/package/libretro-easyrpg/libretro-easyrpg.mk index 969f26e298..985cd913ab 100644 --- a/package/libretro-easyrpg/libretro-easyrpg.mk +++ b/package/libretro-easyrpg/libretro-easyrpg.mk @@ -4,8 +4,8 @@ # ################################################################################ -# Commit of 2023/09/29 -LIBRETRO_EASYRPG_VERSION = ad6e8232bf51b804537fd603fc77a6c2770d4254 +# Commit of 2025/12/17 +LIBRETRO_EASYRPG_VERSION = 396dff57561f3c5e705b8106f5a97279c5b00f86 LIBRETRO_EASYRPG_SITE = https://github.com/EasyRPG/Player.git LIBRETRO_EASYRPG_DEPENDENCIES = pixman libpng zlib fmt freetype mpg123 wildmidi libvorbis libogg opusfile libsndfile libxmp-lite liblcf speexdsp LIBRETRO_EASYRPG_SITE_METHOD=git diff --git a/package/libretro-mojozork/libretro-mojozork.mk b/package/libretro-mojozork/libretro-mojozork.mk index 071e75bf4c..6c3c4c00f8 100644 --- a/package/libretro-mojozork/libretro-mojozork.mk +++ b/package/libretro-mojozork/libretro-mojozork.mk @@ -4,8 +4,8 @@ # ################################################################################ -# Commit of 2023/08/14 -LIBRETRO_MOJOZORK_VERSION = 89832e31d9d05c4e81908286b99db21924f3ba1a +# Commit of 2025/11/29 +LIBRETRO_MOJOZORK_VERSION = 517ccff5ad6a811f948fadc0489b45c32f177c42 LIBRETRO_MOJOZORK_SITE = $(call github,icculus,mojozork,$(LIBRETRO_MOJOZORK_VERSION)) LIBRETRO_MOJOZORK_LICENSE = zlib LIBRETRO_MOJOZORK_LICENSE_FILE = LICENSE.txt diff --git a/package/libretro-uzem/libretro-uzem.mk b/package/libretro-uzem/libretro-uzem.mk index 30e9215869..d3db6b9f6d 100644 --- a/package/libretro-uzem/libretro-uzem.mk +++ b/package/libretro-uzem/libretro-uzem.mk @@ -4,8 +4,8 @@ # ################################################################################ -# Commit of 2022/04/14 -LIBRETRO_UZEM_VERSION = 08e39e19167727c89fb995e3fa70dde252e6aab0 +# Commit of 2024/10/24 +LIBRETRO_UZEM_VERSION = cd6004ea143435cfdb6b12e7c6779dab499f7829 LIBRETRO_UZEM_SITE = $(call github,libretro,libretro-uzem,$(LIBRETRO_UZEM_VERSION)) LIBRETRO_UZEM_LICENSE = GPL-3.0 @@ -13,7 +13,8 @@ define LIBRETRO_UZEM_BUILD_CMDS CFLAGS="$(TARGET_CFLAGS) $(COMPILER_COMMONS_CFLAGS_SO)" \ CPPFLAGS="$(TARGET_CXXFLAGS) $(COMPILER_COMMONS_CXXFLAGS_SO) -fmerge-all-constants -lstdc++ -lm" \ LDFLAGS="$(TARGET_LDFLAGS) $(COMPILER_COMMONS_LDFLAGS_SO)" \ - $(MAKE) CXX="$(TARGET_CXX)" CC="$(TARGET_CC)" -C $(@D) -f Makefile + $(MAKE) CXX="$(TARGET_CXX)" CC="$(TARGET_CC)" -C $(@D) -f Makefile \ + GIT_VERSION="$(shell echo $(LIBRETRO_UZEM_VERSION) | cut -c 1-8)" endef define LIBRETRO_UZEM_INSTALL_TARGET_CMDS -- GitLab