diff options
Diffstat (limited to 'audio/mac')
| -rw-r--r-- | audio/mac/Makefile | 6 | ||||
| -rw-r--r-- | audio/mac/distinfo | 6 | ||||
| -rw-r--r-- | audio/mac/files/patch-CMakeLists.txt | 2 | ||||
| -rw-r--r-- | audio/mac/files/patch-Shared_All.h | 14 | ||||
| -rw-r--r-- | audio/mac/files/patch-Source_Console_Console.cpp | 13 | ||||
| -rw-r--r-- | audio/mac/files/patch-Source_Shared_All.h | 27 | ||||
| -rw-r--r-- | audio/mac/files/patch-Source_Shared_CPUFeatures.cpp | 46 | ||||
| -rw-r--r-- | audio/mac/pkg-plist | 2 |
8 files changed, 72 insertions, 44 deletions
diff --git a/audio/mac/Makefile b/audio/mac/Makefile index 2d9729dc35ba..f2d7fc7096d3 100644 --- a/audio/mac/Makefile +++ b/audio/mac/Makefile @@ -1,5 +1,5 @@ PORTNAME= mac -PORTVERSION= 11.37 +PORTVERSION= 11.71 CATEGORIES= audio MASTER_SITES= https://www.monkeysaudio.com/files/ DISTNAME= ${PORTNAME:tu}_${PORTVERSION:S|.||}_SDK @@ -14,7 +14,9 @@ LICENSE_FILE= ${WRKSRC}/License.txt USES= cmake dos2unix zip DOS2UNIX_FILES= Shared/*.h \ - Source/Console/Console.cpp + Source/Console/*.cpp \ + Source/Shared/*.cpp \ + Source/Shared/*.h NO_WRKSUBDIR= yes diff --git a/audio/mac/distinfo b/audio/mac/distinfo index 80410af68f23..26e9ca735c08 100644 --- a/audio/mac/distinfo +++ b/audio/mac/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755237529 -SHA256 (MAC_1137_SDK.zip) = d578e193ca882474dba256d5d1f44d463a9f5cfa6a2191b741babbb1e8b026a2 -SIZE (MAC_1137_SDK.zip) = 1710217 +TIMESTAMP = 1761845266 +SHA256 (MAC_1171_SDK.zip) = 51665d0d3fa6ad3969b2a2208ef7568b0f82c1c2f99710321d50d1fdb31ae6b6 +SIZE (MAC_1171_SDK.zip) = 1728874 diff --git a/audio/mac/files/patch-CMakeLists.txt b/audio/mac/files/patch-CMakeLists.txt index 405846035bfc..66e6a2e3e99d 100644 --- a/audio/mac/files/patch-CMakeLists.txt +++ b/audio/mac/files/patch-CMakeLists.txt @@ -1,7 +1,7 @@ Version 11.00 added multi-threading support, but we need to link to -lpthread to resolve symbols. ---- CMakeLists.txt.orig 2025-04-25 04:13:46 UTC +--- CMakeLists.txt.orig 2025-09-05 10:46:54 UTC +++ CMakeLists.txt @@ -6,6 +6,8 @@ option(BUILD_UTIL "Build the mac command line tool" ON option(BUILD_SHARED "Build libMAC as a shared library" ON) diff --git a/audio/mac/files/patch-Shared_All.h b/audio/mac/files/patch-Shared_All.h index 03e25dc1defc..10b574e7d180 100644 --- a/audio/mac/files/patch-Shared_All.h +++ b/audio/mac/files/patch-Shared_All.h @@ -1,6 +1,9 @@ We need to define PLATFORM_LINUX as the default if consumers don't do so. ---- Shared/All.h.orig 2025-02-07 08:39:49 UTC +Fix runtime for little endian archs. At least on amd64, _BIG_ENDIAN is defined +somewhere in the toolchain, causing the byte order to be reversed. + +--- Shared/All.h.orig 2025-10-15 08:20:58 UTC +++ Shared/All.h @@ -10,8 +10,8 @@ PLATFORM_ANDROID PLATFORM_ANDROID @@ -13,3 +16,12 @@ We need to define PLATFORM_LINUX as the default if consumers don't do so. #endif #ifdef PLATFORM_ANDROID +@@ -311,7 +311,7 @@ Byte order + #define APE_LITTLE_ENDIAN 1234 + #define APE_BIG_ENDIAN 4321 + +-#if defined(_BIG_ENDIAN) || defined(__BIG_ENDIAN__) || (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)) ++#if defined(__BIG_ENDIAN__) || (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)) + #define APE_BYTE_ORDER APE_BIG_ENDIAN + #else + #define APE_BYTE_ORDER APE_LITTLE_ENDIAN diff --git a/audio/mac/files/patch-Source_Console_Console.cpp b/audio/mac/files/patch-Source_Console_Console.cpp index eb2f53fcb881..0033ecb30d5a 100644 --- a/audio/mac/files/patch-Source_Console_Console.cpp +++ b/audio/mac/files/patch-Source_Console_Console.cpp @@ -2,19 +2,6 @@ Unixify built-in help. --- Source/Console/Console.cpp.orig 2025-08-15 06:11:17 UTC +++ Source/Console/Console.cpp -@@ -61,10 +61,10 @@ class CArguments (public) - #ifdef _UNICODE - rspString.Assign(m_argv[nArgument], true, false); - #else -- rspString.Assign(CAPECharacterHelper::GetUTF16FromANSI(m_argv[nArgument]), true); -+ rspString.Assign(CAPECharacterHelper::GetUTFNFromANSI(m_argv[nArgument]), true); - #endif - #else -- rspString.Assign(CAPECharacterHelper::GetUTF16FromUTF8((str_utf8 *) m_argv[nArgument]), true); -+ rspString.Assign(CAPECharacterHelper::GetUTFNFromUTF8((str_utf8 *) m_argv[nArgument]), true); - #endif - } - else @@ -135,7 +135,7 @@ static void DisplayProperUsage(FILE * pFile) **************************************************************************************************/ static void DisplayProperUsage(FILE * pFile) diff --git a/audio/mac/files/patch-Source_Shared_All.h b/audio/mac/files/patch-Source_Shared_All.h new file mode 100644 index 000000000000..d7748cd159f8 --- /dev/null +++ b/audio/mac/files/patch-Source_Shared_All.h @@ -0,0 +1,27 @@ +We need to define PLATFORM_LINUX as the default if consumers don't do so. + +Fix runtime for little endian archs. At least on amd64, _BIG_ENDIAN is defined +somewhere in the toolchain, causing the byte order to be reversed. + +--- Source/Shared/All.h.orig 2025-10-15 08:20:58 UTC ++++ Source/Shared/All.h +@@ -10,8 +10,8 @@ PLATFORM_ANDROID + PLATFORM_ANDROID + **************************************************************************************************/ + #if !defined(PLATFORM_WINDOWS) && !defined(PLATFORM_APPLE) && !defined(PLATFORM_LINUX) && !defined(PLATFORM_ANDROID) +- #pragma message("No platform set for MACLib, defaulting to Windows") +- #define PLATFORM_WINDOWS ++ #pragma message("No platform set for MACLib, defaulting to Linux") ++ #define PLATFORM_LINUX + #endif + + #ifdef PLATFORM_ANDROID +@@ -311,7 +311,7 @@ Byte order + #define APE_LITTLE_ENDIAN 1234 + #define APE_BIG_ENDIAN 4321 + +-#if defined(_BIG_ENDIAN) || defined(__BIG_ENDIAN__) || (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)) ++#if defined(__BIG_ENDIAN__) || (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)) + #define APE_BYTE_ORDER APE_BIG_ENDIAN + #else + #define APE_BYTE_ORDER APE_LITTLE_ENDIAN diff --git a/audio/mac/files/patch-Source_Shared_CPUFeatures.cpp b/audio/mac/files/patch-Source_Shared_CPUFeatures.cpp index 3713b9bb9152..4c89888d95e9 100644 --- a/audio/mac/files/patch-Source_Shared_CPUFeatures.cpp +++ b/audio/mac/files/patch-Source_Shared_CPUFeatures.cpp @@ -1,26 +1,26 @@ --- Source/Shared/CPUFeatures.cpp.orig 2025-08-04 20:52:19 UTC +++ Source/Shared/CPUFeatures.cpp @@ -4,7 +4,7 @@ - #if defined(PLATFORM_LINUX)
- #include <sys/auxv.h>
-
-- #if defined(__arm__)
-+ #if defined(__arm__) && defined(__linux__)
- #include <asm/hwcap.h>
-
- #ifndef HWCAP_NEON
-@@ -187,7 +187,14 @@ bool GetNeonSupported()
- #if defined(__ARM_NEON) || defined(__ARM_NEON__) || defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
- return true;
- #elif defined(__arm__) && defined(PLATFORM_LINUX)
-+#ifdef __linux__
- return getauxval(AT_HWCAP) & HWCAP_NEON;
-+#elif defined(__FreeBSD__)
-+ long hwcap = 0;
-+
-+ elf_aux_info(AT_HWCAP, &hwcap, sizeof hwcap);
-+ return (hwcap & HWCAP_NEON);
-+#endif
- #else
- return false;
- #endif
+ #if defined(PLATFORM_LINUX) + #include <sys/auxv.h> + +- #if defined(__arm__) ++ #if defined(__arm__) && defined(__linux__) + #include <asm/hwcap.h> + + #ifndef HWCAP_NEON +@@ -187,7 +187,14 @@ bool GetNeonSupported() + #if defined(__ARM_NEON) || defined(__ARM_NEON__) || defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC) + return true; + #elif defined(__arm__) && defined(PLATFORM_LINUX) ++#ifdef __linux__ + return getauxval(AT_HWCAP) & HWCAP_NEON; ++#elif defined(__FreeBSD__) ++ long hwcap = 0; ++ ++ elf_aux_info(AT_HWCAP, &hwcap, sizeof hwcap); ++ return (hwcap & HWCAP_NEON); ++#endif + #else + return false; + #endif diff --git a/audio/mac/pkg-plist b/audio/mac/pkg-plist index 10d5917bd1e6..f6d49421e696 100644 --- a/audio/mac/pkg-plist +++ b/audio/mac/pkg-plist @@ -2,7 +2,7 @@ bin/mac include/MAC/APETag.h include/MAC/All.h include/MAC/CharacterHelper.h -include/MAC/IO.h +include/MAC/IAPEIO.h include/MAC/MACDll.h include/MAC/MACLib.h include/MAC/NoWindows.h |
