Date: Wed, 15 Oct 2025 09:21:47 GMT From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 11b21784e3cc - main - audio/mac: Update to 11.62 Message-ID: <202510150921.59F9LlFv094193@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=11b21784e3cc078f3503d936a9966bd1b70c4288 commit 11b21784e3cc078f3503d936a9966bd1b70c4288 Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2025-10-15 09:09:06 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2025-10-15 09:20:51 +0000 audio/mac: Update to 11.62 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. [1] Patch the correct "All.h" and apply DOS2UNIX to all patched files. https://www.monkeysaudio.com/versionhistory.html Reported by: <monochrome@twcny.rr.com> via private mail [1] MFH: 2025Q4 --- audio/mac/Makefile | 7 ++-- audio/mac/distinfo | 6 +-- audio/mac/files/patch-Shared_All.h | 15 ------- audio/mac/files/patch-Source_Shared_All.h | 27 +++++++++++++ .../mac/files/patch-Source_Shared_CPUFeatures.cpp | 46 +++++++++++----------- 5 files changed, 57 insertions(+), 44 deletions(-) diff --git a/audio/mac/Makefile b/audio/mac/Makefile index 2a99619bd084..c01f8463ae6d 100644 --- a/audio/mac/Makefile +++ b/audio/mac/Makefile @@ -1,5 +1,5 @@ PORTNAME= mac -PORTVERSION= 11.54 +PORTVERSION= 11.62 CATEGORIES= audio MASTER_SITES= https://www.monkeysaudio.com/files/ DISTNAME= ${PORTNAME:tu}_${PORTVERSION:S|.||}_SDK @@ -13,8 +13,9 @@ LICENSE_FILE= ${WRKSRC}/License.txt USES= cmake dos2unix zip -DOS2UNIX_FILES= Shared/*.h \ - Source/Console/Console.cpp +DOS2UNIX_FILES= Source/Console/*.cpp \ + Source/Shared/*.cpp \ + Source/Shared/*.h NO_WRKSUBDIR= yes diff --git a/audio/mac/distinfo b/audio/mac/distinfo index c420dbd014e0..bb534eecf5d4 100644 --- a/audio/mac/distinfo +++ b/audio/mac/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1759128267 -SHA256 (MAC_1154_SDK.zip) = 6f825a606e474a03729eb50d8b6967c74dbd1863c172e0732d836bebd9813dfc -SIZE (MAC_1154_SDK.zip) = 1704471 +TIMESTAMP = 1760517847 +SHA256 (MAC_1162_SDK.zip) = 9945408555424f1f81d69d8bba46f191331219c144b7576158f1e4d9cff67024 +SIZE (MAC_1162_SDK.zip) = 1705126 diff --git a/audio/mac/files/patch-Shared_All.h b/audio/mac/files/patch-Shared_All.h deleted file mode 100644 index 03e25dc1defc..000000000000 --- a/audio/mac/files/patch-Shared_All.h +++ /dev/null @@ -1,15 +0,0 @@ -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 -+++ 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 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; + #endifhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510150921.59F9LlFv094193>