summaryrefslogtreecommitdiff
path: root/audio/mac/files
diff options
context:
space:
mode:
Diffstat (limited to 'audio/mac/files')
-rw-r--r--audio/mac/files/patch-CMakeLists.txt23
-rw-r--r--audio/mac/files/patch-Source_Console_Console.cpp6
-rw-r--r--audio/mac/files/patch-Source_Shared_CPUFeatures.cpp26
3 files changed, 51 insertions, 4 deletions
diff --git a/audio/mac/files/patch-CMakeLists.txt b/audio/mac/files/patch-CMakeLists.txt
index 405846035bfc..b26b2cdbbbee 100644
--- a/audio/mac/files/patch-CMakeLists.txt
+++ b/audio/mac/files/patch-CMakeLists.txt
@@ -1,7 +1,9 @@
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
+Version 11.41 renamed IO.h to IAPEIO.h, but they didn't update CMakeLists.txt
+
+--- CMakeLists.txt.orig 2025-09-01 19:26:38 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)
@@ -12,6 +14,25 @@ to resolve symbols.
#
# Determine interface version
#
+@@ -74,7 +76,7 @@ set(MAC_PUBLIC_HEADERS
+ Shared/All.h
+ Shared/APETag.h
+ Shared/CharacterHelper.h
+- Shared/IO.h
++ Shared/IAPEIO.h
+ Shared/MACDll.h
+ Shared/MACLib.h
+ Shared/NoWindows.h
+@@ -91,8 +93,8 @@ set(MAC_SHARED_HEADERS
+ Source/Shared/CPUFeatures.h
+ Source/Shared/CRC.h
+ Source/Shared/GlobalFunctions.h
++ Source/Shared/IAPEIO.h
+ Source/Shared/ID3Genres.h
+- Source/Shared/IO.h
+ Source/Shared/MACDll.h
+ Source/Shared/MemoryIO.h
+ Source/Shared/MFCGlobals.h
@@ -229,6 +231,7 @@ if(BUILD_SHARED)
if(BUILD_SHARED)
add_library(MAC SHARED $<TARGET_OBJECTS:shared> $<TARGET_OBJECTS:objects>)
diff --git a/audio/mac/files/patch-Source_Console_Console.cpp b/audio/mac/files/patch-Source_Console_Console.cpp
index 72ce55e11dc4..0033ecb30d5a 100644
--- a/audio/mac/files/patch-Source_Console_Console.cpp
+++ b/audio/mac/files/patch-Source_Console_Console.cpp
@@ -1,8 +1,8 @@
Unixify built-in help.
---- Source/Console/Console.cpp.orig 2025-05-07 22:12:54 UTC
+--- Source/Console/Console.cpp.orig 2025-08-15 06:11:17 UTC
+++ Source/Console/Console.cpp
-@@ -136,7 +136,7 @@ static void DisplayProperUsage(FILE * pFile)
+@@ -135,7 +135,7 @@ static void DisplayProperUsage(FILE * pFile)
**************************************************************************************************/
static void DisplayProperUsage(FILE * pFile)
{
@@ -11,7 +11,7 @@ Unixify built-in help.
fwprintf(pFile, L"Modes:\n");
fwprintf(pFile, L" Compress (fast): '-c1000'\n");
-@@ -156,18 +156,18 @@ static void DisplayProperUsage(FILE * pFile)
+@@ -155,18 +155,18 @@ static void DisplayProperUsage(FILE * pFile)
fwprintf(pFile, L" Set the number of threads when compressing or decompressing: -threads=#'\n\n");
fwprintf(pFile, L"Examples:\n");
diff --git a/audio/mac/files/patch-Source_Shared_CPUFeatures.cpp b/audio/mac/files/patch-Source_Shared_CPUFeatures.cpp
new file mode 100644
index 000000000000..3713b9bb9152
--- /dev/null
+++ b/audio/mac/files/patch-Source_Shared_CPUFeatures.cpp
@@ -0,0 +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