diff options
Diffstat (limited to 'audio/mac')
| -rw-r--r-- | audio/mac/Makefile | 2 | ||||
| -rw-r--r-- | audio/mac/distinfo | 6 | ||||
| -rw-r--r-- | audio/mac/files/patch-CMakeLists.txt | 31 | ||||
| -rw-r--r-- | audio/mac/files/patch-Source_Console_Console.cpp | 14 | ||||
| -rw-r--r-- | audio/mac/pkg-plist | 2 |
5 files changed, 45 insertions, 10 deletions
diff --git a/audio/mac/Makefile b/audio/mac/Makefile index 3c18d2e130f1..cdfdd3bd9c2b 100644 --- a/audio/mac/Makefile +++ b/audio/mac/Makefile @@ -1,5 +1,5 @@ PORTNAME= mac -PORTVERSION= 10.96 +PORTVERSION= 11.10 CATEGORIES= audio MASTER_SITES= https://www.monkeysaudio.com/files/ DISTNAME= ${PORTNAME:tu}_${PORTVERSION:S|.||}_SDK diff --git a/audio/mac/distinfo b/audio/mac/distinfo index 1b1f10e024cb..1f0737423b76 100644 --- a/audio/mac/distinfo +++ b/audio/mac/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1739444601 -SHA256 (MAC_1096_SDK.zip) = 73b25a517079bb015e2066b65854a7de0d8468f050b9b96025b7a3cb038f4dba -SIZE (MAC_1096_SDK.zip) = 1675244 +TIMESTAMP = 1746655971 +SHA256 (MAC_1110_SDK.zip) = fe6f481e15eb03e0d4e0f8144a4fd1aff4398c77c419ff36aec99e807b38a54c +SIZE (MAC_1110_SDK.zip) = 1695304 diff --git a/audio/mac/files/patch-CMakeLists.txt b/audio/mac/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..405846035bfc --- /dev/null +++ b/audio/mac/files/patch-CMakeLists.txt @@ -0,0 +1,31 @@ +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 +@@ -6,6 +6,8 @@ option(BUILD_UTIL "Build the mac command line tool" ON + option(BUILD_SHARED "Build libMAC as a shared library" ON) + option(BUILD_UTIL "Build the mac command line tool" ON) + ++find_package(Threads) ++ + # + # Determine interface version + # +@@ -229,6 +231,7 @@ if(BUILD_SHARED) + if(BUILD_SHARED) + add_library(MAC SHARED $<TARGET_OBJECTS:shared> $<TARGET_OBJECTS:objects>) + set_target_properties(MAC PROPERTIES VERSION ${MAC_SOVERSION} SOVERSION ${MAC_SOVERSION}) ++ target_link_libraries(MAC Threads::Threads) + + if(WIN32) + if(${ARCHITECTURE} STREQUAL x86) +@@ -315,7 +318,7 @@ if(BUILD_UTIL) + Source/Console/Console.cpp) + + add_executable(macutil ${MAC_UTIL_HEADER_FILES} ${MAC_UTIL_SOURCE_FILES} $<TARGET_OBJECTS:shared>) +- target_link_libraries(macutil MAC) ++ target_link_libraries(macutil MAC Threads::Threads) + + target_include_directories(macutil PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/Source/MACLib diff --git a/audio/mac/files/patch-Source_Console_Console.cpp b/audio/mac/files/patch-Source_Console_Console.cpp index 21d541b6a5b8..72ce55e11dc4 100644 --- a/audio/mac/files/patch-Source_Console_Console.cpp +++ b/audio/mac/files/patch-Source_Console_Console.cpp @@ -1,36 +1,40 @@ Unixify built-in help. ---- Source/Console/Console.cpp.orig 2025-02-12 09:59:48 UTC +--- Source/Console/Console.cpp.orig 2025-05-07 22:12:54 UTC +++ Source/Console/Console.cpp -@@ -68,7 +68,7 @@ static void DisplayProperUsage(FILE * pFile) +@@ -136,7 +136,7 @@ static void DisplayProperUsage(FILE * pFile) **************************************************************************************************/ static void DisplayProperUsage(FILE * pFile) { - fwprintf(pFile, L"Proper Usage: [EXE] [Input File] [Output File] [Mode]\n\n"); + fwprintf(pFile, L"Proper Usage: [mac] [Input File] [Output File] [Mode]\n\n"); - fwprintf(pFile, L"Modes: \n"); + fwprintf(pFile, L"Modes:\n"); fwprintf(pFile, L" Compress (fast): '-c1000'\n"); -@@ -85,16 +85,16 @@ static void DisplayProperUsage(FILE * pFile) - fwprintf(pFile, L" Convert to ID3v1 (needed by some players, etc.): '-L'\n\n"); +@@ -156,18 +156,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"); - fwprintf(pFile, L" Compress: mac.exe \"Metallica - One.wav\" \"Metallica - One.ape\" -c2000\n"); +- fwprintf(pFile, L" Compress: mac.exe \"Metallica - One.wav\" \"Metallica - One.ape\" -c2000 -threads=16 -t \"Artist=Metallica|Album=Black|Name=One\"\n"); - fwprintf(pFile, L" Compress: mac.exe \"Metallica - One.wav\" \"Metallica - One.ape\" -c2000 -t \"Artist=Metallica|Album=Black|Name=One\"\n"); - fwprintf(pFile, L" Compress: mac.exe \"Metallica - One.wav\" auto -c2000\n"); - fwprintf(pFile, L" Transcode from pipe: ffmpeg.exe -i \"Metallica - One.flac\" -f wav - | mac.exe - \"Metallica - One.ape\" -c2000\n"); - fwprintf(pFile, L" Decompress: mac.exe \"Metallica - One.ape\" \"Metallica - One.wav\" -d\n"); - fwprintf(pFile, L" Decompress: mac.exe \"Metallica - One.ape\" auto -d\n"); +- fwprintf(pFile, L" Decompress: mac.exe \"Metallica - One.ape\" \"Metallica - One.wav\" -d -threads=16\n"); - fwprintf(pFile, L" Verify: mac.exe \"Metallica - One.ape\" -v\n"); - fwprintf(pFile, L" Full Verify: mac.exe \"Metallica - One.ape\" -V\n"); - fwprintf(pFile, L" Tag: mac.exe \"Metallica - One.ape\" -t \"Artist=Metallica|Album=Black|Name=One|Comment=\\\"This is in quotes\\\"\"\n"); - fwprintf(pFile, L" Remove tag: mac.exe \"Metallica - One.ape\" -r\n"); + fwprintf(pFile, L" Compress: mac \"Metallica - One.wav\" \"Metallica - One.ape\" -c2000\n"); ++ fwprintf(pFile, L" Compress: mac \"Metallica - One.wav\" \"Metallica - One.ape\" -c2000 -threads=16 -t \"Artist=Metallica|Album=Black|Name=One\"\n"); + fwprintf(pFile, L" Compress: mac \"Metallica - One.wav\" \"Metallica - One.ape\" -c2000 -t \"Artist=Metallica|Album=Black|Name=One\"\n"); + fwprintf(pFile, L" Compress: mac \"Metallica - One.wav\" auto -c2000\n"); + fwprintf(pFile, L" Transcode from pipe: ffmpeg -i \"Metallica - One.flac\" -f wav - | mac - \"Metallica - One.ape\" -c2000\n"); + fwprintf(pFile, L" Decompress: mac \"Metallica - One.ape\" \"Metallica - One.wav\" -d\n"); + fwprintf(pFile, L" Decompress: mac \"Metallica - One.ape\" auto -d\n"); ++ fwprintf(pFile, L" Decompress: mac \"Metallica - One.ape\" \"Metallica - One.wav\" -d -threads=16\n"); + fwprintf(pFile, L" Verify: mac \"Metallica - One.ape\" -v\n"); + fwprintf(pFile, L" Full Verify: mac \"Metallica - One.ape\" -V\n"); + fwprintf(pFile, L" Tag: mac \"Metallica - One.ape\" -t \"Artist=Metallica|Album=Black|Name=One|Comment=\\\"This is in quotes\\\"\"\n"); diff --git a/audio/mac/pkg-plist b/audio/mac/pkg-plist index c31834c74702..3107453423b6 100644 --- a/audio/mac/pkg-plist +++ b/audio/mac/pkg-plist @@ -11,4 +11,4 @@ include/MAC/Version.h include/MAC/Warnings.h include/MAC/WindowsEnvironment.h lib/libMAC.so -lib/libMAC.so.12 +lib/libMAC.so.13 |