|
From: <sv...@op...> - 2025-11-07 21:38:33
|
Author: manx Date: Fri Nov 7 22:38:21 2025 New Revision: 24390 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=24390 Log: Merged revision(s) 24387 from trunk/OpenMPT: [Var] minimp3: Update to fork <https://github.com/manxorist/minimp3/releases/tag/openmpt-2025-11-07-v5> commit ec51f21ef59ecf6d87bdcb028fe8f76fe761e0fe (2025-11-07). This applies the following pull requests: <https://github.com/lieff/minimp3/pull/132>. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/include/minimp3/OpenMPT.txt branches/OpenMPT-1.30/include/minimp3/minimp3.h Modified: branches/OpenMPT-1.30/include/minimp3/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.30/include/minimp3/OpenMPT.txt Fri Nov 7 22:37:59 2025 (r24389) +++ branches/OpenMPT-1.30/include/minimp3/OpenMPT.txt Fri Nov 7 22:38:21 2025 (r24390) @@ -1,5 +1,5 @@ minimp3 library from https://github.com/lieff/minimp3 -Fork https://github.com/manxorist/minimp3/releases/tag/openmpt-2024-08-15-v4 +Fork https://github.com/manxorist/minimp3/releases/tag/openmpt-2025-11-07-v5 commit 2116754771b79347ad2f39127abace2a093c383e (2024-08-15) The following changes have been made: * minimp3.c has been added @@ -9,4 +9,5 @@ * https://github.com/lieff/minimp3/pull/97 * https://github.com/lieff/minimp3/pull/125 * https://github.com/lieff/minimp3/pull/127 + * https://github.com/lieff/minimp3/pull/132 * all modifications are marked by /* OpenMPT */ Modified: branches/OpenMPT-1.30/include/minimp3/minimp3.h ============================================================================== --- branches/OpenMPT-1.30/include/minimp3/minimp3.h Fri Nov 7 22:37:59 2025 (r24389) +++ branches/OpenMPT-1.30/include/minimp3/minimp3.h Fri Nov 7 22:38:21 2025 (r24390) @@ -86,7 +86,7 @@ #if !defined(MINIMP3_NO_SIMD) -#if !defined(MINIMP3_ONLY_SIMD) && (defined(_M_X64) || defined(__x86_64__) || defined(__aarch64__) || defined(_M_ARM64)) +#if !defined(MINIMP3_ONLY_SIMD) && (defined(_M_X64) || defined(__x86_64__) || defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)) /* x64 always have SSE2, arm64 always have neon, no need for generic code */ #define MINIMP3_ONLY_SIMD #endif /* SIMD checks... */ @@ -161,7 +161,7 @@ return g_have_simd - 1; #endif /* MINIMP3_ONLY_SIMD */ } -#elif defined(__ARM_NEON) || defined(__aarch64__) || defined(_M_ARM64) +#elif defined(__ARM_NEON) || defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC) #include <arm_neon.h> #define HAVE_SSE 0 #define HAVE_SIMD 1 @@ -191,7 +191,7 @@ #define HAVE_SIMD 0 #endif /* !defined(MINIMP3_NO_SIMD) */ -#if defined(__ARM_ARCH) && (__ARM_ARCH >= 6) && !defined(__aarch64__) && !defined(_M_ARM64) && !defined(__ARM_ARCH_6M__) +#if defined(__ARM_ARCH) && (__ARM_ARCH >= 6) && !defined(__aarch64__) && !defined(_M_ARM64) && !defined(_M_ARM64EC) && !defined(__ARM_ARCH_6M__) #define HAVE_ARMV6 1 static __inline__ __attribute__((always_inline)) int32_t minimp3_clip_int16_arm(int32_t a) { |