From bc02ff40719aae16746463c92b4074b28b83adc4 Mon Sep 17 00:00:00 2001 From: Pit64 Date: Fri, 13 Jun 2025 19:30:33 +0200 Subject: [PATCH] feat(emulators): bump amiga emulators --- .../0001-fix-ipf-library-path.patch | 22 +++++++ .../9998-fix-build-with-gcc14.patch | 45 -------------- ...softfloat-to-compile-with-gcc-14-1-0.patch | 61 ------------------- ...bretro-uae-0000-fix-ipf-library-path.patch | 22 ------- package/libretro-uae/libretro-uae.mk | 6 +- 5 files changed, 25 insertions(+), 131 deletions(-) create mode 100644 package/libretro-uae/0001-fix-ipf-library-path.patch delete mode 100644 package/libretro-uae/9998-fix-build-with-gcc14.patch delete mode 100644 package/libretro-uae/9999-Fix-type-usage-in-softfloat-to-compile-with-gcc-14-1-0.patch delete mode 100644 package/libretro-uae/libretro-uae-0000-fix-ipf-library-path.patch diff --git a/package/libretro-uae/0001-fix-ipf-library-path.patch b/package/libretro-uae/0001-fix-ipf-library-path.patch new file mode 100644 index 0000000000..88c33ed1cb --- /dev/null +++ b/package/libretro-uae/0001-fix-ipf-library-path.patch @@ -0,0 +1,22 @@ +diff --git a/sources/src/caps/caps.c b/sources/src/caps/caps.c +index f337891a..03e2227e 100644 +--- a/sources/src/caps/caps.c ++++ b/sources/src/caps/caps.c +@@ -37,7 +37,7 @@ char CAPSLIB_PATH[RETRO_PATH_MAX]; + #ifdef _WIN32 + #define CAPSLIB_NAME "capsimg.dll" + #else +-#define CAPSLIB_NAME "capsimg.so" ++#define CAPSLIB_NAME "libcapsimage.so" + #endif + + /* +@@ -74,7 +74,7 @@ static int load_capslib (void) + + #ifdef __LIBRETRO__ + #ifdef __ANDROID__ +- snprintf(CAPSLIB_PATH, RETRO_PATH_MAX, "%s%c%s", "/data/user/0/com.retroarch/cores", DIR_SEP_CHR, CAPSLIB_NAME); ++ snprintf(CAPSLIB_PATH, RETRO_PATH_MAX, "%s%c%s", "/usr/lib", DIR_SEP_CHR, CAPSLIB_NAME); + if (!path_is_valid(CAPSLIB_PATH)) + snprintf(CAPSLIB_PATH, RETRO_PATH_MAX, "%s%c%s", "/data/user/0/com.retroarch.aarch64/cores", DIR_SEP_CHR, CAPSLIB_NAME); + if (!path_is_valid(CAPSLIB_PATH)) diff --git a/package/libretro-uae/9998-fix-build-with-gcc14.patch b/package/libretro-uae/9998-fix-build-with-gcc14.patch deleted file mode 100644 index ffc33c8070..0000000000 --- a/package/libretro-uae/9998-fix-build-with-gcc14.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 4493a194dd42e593914c26952ee8cb4ba750f596 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Kelemen?= -Date: Wed, 22 May 2024 14:35:29 +0200 -Subject: [PATCH] fix build with gcc14 (#658) - ---- - retrodep/parser.c | 4 ++-- - retrodep/serial_host.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/retrodep/parser.c b/retrodep/parser.c -index 7ab5b637..9766e47a 100644 ---- a/retrodep/parser.c -+++ b/retrodep/parser.c -@@ -196,7 +196,7 @@ void uaeser_clearbuffers (void *vsd) {} - int uaeser_open (void *vsd, void *user, int unit) { return 0; } - void uaeser_close (void *vsd) {} - --static HANDLE hCom = INVALID_HANDLE_VALUE; -+static HANDLE hCom = (HANDLE)INVALID_HANDLE_VALUE; - static DCB dcb; - static DWORD fDtrControl = DTR_CONTROL_DISABLE, fRtsControl = RTS_CONTROL_DISABLE; - #if 0 -@@ -469,7 +469,7 @@ void closeser (void) - #if 0 - CloseHandle (hCom); - #endif -- hCom = INVALID_HANDLE_VALUE; -+ hCom = (HANDLE)INVALID_HANDLE_VALUE; - } - if (midi_ready) { - extern uae_u16 serper; -diff --git a/retrodep/serial_host.c b/retrodep/serial_host.c -index 03af6852..a807dfaa 100644 ---- a/retrodep/serial_host.c -+++ b/retrodep/serial_host.c -@@ -144,7 +144,7 @@ void shmem_serial_delete(void) - CloseHandle(sermap_handle); - #endif - sermap_data = NULL; -- sermap_handle = NULL; -+ sermap_handle = (HANDLE)NULL; - sermap1 = sermap2 = NULL; - } - diff --git a/package/libretro-uae/9999-Fix-type-usage-in-softfloat-to-compile-with-gcc-14-1-0.patch b/package/libretro-uae/9999-Fix-type-usage-in-softfloat-to-compile-with-gcc-14-1-0.patch deleted file mode 100644 index 4897e13c31..0000000000 --- a/package/libretro-uae/9999-Fix-type-usage-in-softfloat-to-compile-with-gcc-14-1-0.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 3432007d28ef173707e2b32bd931932e5b74085d Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Tue, 21 May 2024 03:39:51 +1000 -Subject: [PATCH] Fix type usage in softfloat to compile with gcc-14.1.0 (#657) - ---- - sources/src/softfloat/softfloat.c | 10 ++++++---- - sources/src/softfloat/softfloat.h | 4 ++-- - 2 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/sources/src/softfloat/softfloat.c b/sources/src/softfloat/softfloat.c -index b3c0117c..a27bdfef 100644 ---- a/sources/src/softfloat/softfloat.c -+++ b/sources/src/softfloat/softfloat.c -@@ -2883,12 +2883,13 @@ floatx80 floatx80_rem(floatx80 a, floatx80 b, float_status *status) - - } - #else // 09-01-2017: Modified version for Previous --floatx80 floatx80_rem(floatx80 a, floatx80 b, uint64_t *q, flag *s, float_status *status) -+floatx80 floatx80_rem(floatx80 a, floatx80 b, uae_u64 *q, flag *s, float_status *status) - { - flag aSign, bSign, zSign; - int32_t aExp, bExp, expDiff; - uint64_t aSig0, aSig1, bSig; -- uint64_t qTemp, term0, term1, alternateASig0, alternateASig1; -+ uae_u64 qTemp; -+ uint64_t term0, term1, alternateASig0, alternateASig1; - - aSig0 = extractFloatx80Frac(a); - aExp = extractFloatx80Exp(a); -@@ -2991,12 +2992,13 @@ floatx80 floatx80_rem(floatx80 a, floatx80 b, uint64_t *q, flag *s, float_status - | value `a' with respect to the corresponding value `b'. - *----------------------------------------------------------------------------*/ - --floatx80 floatx80_mod(floatx80 a, floatx80 b, uint64_t *q, flag *s, float_status *status) -+floatx80 floatx80_mod(floatx80 a, floatx80 b, uae_u64 *q, flag *s, float_status *status) - { - flag aSign, bSign, zSign; - int32_t aExp, bExp, expDiff; - uint64_t aSig0, aSig1, bSig; -- uint64_t qTemp, term0, term1; -+ uae_u64 qTemp; -+ uint64_t term0, term1; - - aSig0 = extractFloatx80Frac(a); - aExp = extractFloatx80Exp(a); -diff --git a/sources/src/softfloat/softfloat.h b/sources/src/softfloat/softfloat.h -index 1eda33d5..142adc71 100644 ---- a/sources/src/softfloat/softfloat.h -+++ b/sources/src/softfloat/softfloat.h -@@ -434,8 +434,8 @@ floatx80 floatx80_neg( floatx80 a, float_status *status ); - floatx80 floatx80_getexp( floatx80 a, float_status *status ); - floatx80 floatx80_getman( floatx80 a, float_status *status ); - floatx80 floatx80_scale(floatx80 a, floatx80 b, float_status *status ); --floatx80 floatx80_rem( floatx80 a, floatx80 b, uint64_t *q, flag *s, float_status *status ); --floatx80 floatx80_mod( floatx80 a, floatx80 b, uint64_t *q, flag *s, float_status *status ); -+floatx80 floatx80_rem( floatx80 a, floatx80 b, uae_u64 *q, flag *s, float_status *status ); -+floatx80 floatx80_mod( floatx80 a, floatx80 b, uae_u64 *q, flag *s, float_status *status ); - floatx80 floatx80_sglmul( floatx80 a, floatx80 b, float_status *status ); - floatx80 floatx80_sgldiv( floatx80 a, floatx80 b, float_status *status ); - floatx80 floatx80_cmp( floatx80 a, floatx80 b, float_status *status ); diff --git a/package/libretro-uae/libretro-uae-0000-fix-ipf-library-path.patch b/package/libretro-uae/libretro-uae-0000-fix-ipf-library-path.patch deleted file mode 100644 index 7533669b9f..0000000000 --- a/package/libretro-uae/libretro-uae-0000-fix-ipf-library-path.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/sources/src/caps/caps.c b/sources/src/caps/caps.c -index 41ffe5b..59a2bdb 100644 ---- a/sources/src/caps/caps.c -+++ b/sources/src/caps/caps.c -@@ -37,7 +37,7 @@ char CAPSLIB_PATH[RETRO_PATH_MAX]; - #ifdef _WIN32 - #define CAPSLIB_NAME "capsimg.dll" - #else --#define CAPSLIB_NAME "capsimg.so" -+#define CAPSLIB_NAME "libcapsimage.so" - #endif - - /* -@@ -73,7 +73,7 @@ static int load_capslib (void) - /* This could be done more elegantly ;-) */ - - #ifdef __LIBRETRO__ -- snprintf(CAPSLIB_PATH, RETRO_PATH_MAX, "%s%c%s", retro_system_directory, DIR_SEP_CHR, CAPSLIB_NAME); -+ snprintf(CAPSLIB_PATH, RETRO_PATH_MAX, "/usr/lib/%s", CAPSLIB_NAME); - if (!path_is_valid(CAPSLIB_PATH)) - snprintf(CAPSLIB_PATH, RETRO_PATH_MAX, "%s", CAPSLIB_NAME); - if (!path_is_valid(CAPSLIB_PATH)) diff --git a/package/libretro-uae/libretro-uae.mk b/package/libretro-uae/libretro-uae.mk index 5684d0a0ab..0341342933 100644 --- a/package/libretro-uae/libretro-uae.mk +++ b/package/libretro-uae/libretro-uae.mk @@ -4,9 +4,9 @@ # ################################################################################ -# Commit of 2023/10/14 -LIBRETRO_UAE_VERSION = e13578877d1764bde7d6fb5b404c0965fa209540 -LIBRETRO_UAE_SITE = $(call gitlab,recalbox,packages/libretro/libretro-uae,$(LIBRETRO_UAE_VERSION)) +# Commit of 2025/08/19 +LIBRETRO_UAE_VERSION = 9e2aa770a9b6b0a4e1f4fc05eb0db6c8e7aba8ee +LIBRETRO_UAE_SITE = $(call github,libretro,libretro-uae,$(LIBRETRO_UAE_VERSION)) LIBRETRO_UAE_LICENSE = GPL-2.0 LIBRETRO_UAE_LICENSE_FILES = COPYING -- GitLab