diff --git a/audio/mac/Makefile b/audio/mac/Makefile index 50138efd93c6..90dceadc3f27 100644 --- a/audio/mac/Makefile +++ b/audio/mac/Makefile @@ -1,21 +1,21 @@ PORTNAME= mac -PORTVERSION= 11.38 +PORTVERSION= 11.41 CATEGORIES= audio MASTER_SITES= https://www.monkeysaudio.com/files/ DISTNAME= ${PORTNAME:tu}_${PORTVERSION:S|.||}_SDK MAINTAINER= multimedia@FreeBSD.org COMMENT= Monkey's Audio lossless codec WWW= https://www.monkeysaudio.com/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/License.txt USES= cmake dos2unix zip DOS2UNIX_FILES= Shared/*.h \ Source/Console/Console.cpp NO_WRKSUBDIR= yes .include diff --git a/audio/mac/distinfo b/audio/mac/distinfo index f579cb43ad28..cd2331c26aab 100644 --- a/audio/mac/distinfo +++ b/audio/mac/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1756358910 -SHA256 (MAC_1138_SDK.zip) = 50fb286ef83fe739427610b7658d5d3422d0b5b636e1aa52ae14277c635ffcad -SIZE (MAC_1138_SDK.zip) = 1710212 +TIMESTAMP = 1756944953 +SHA256 (MAC_1141_SDK.zip) = e31329e426802ee5072ebfcc4ea746005dafd54a0ab2793056f50764378fd94f +SIZE (MAC_1141_SDK.zip) = 1708143 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,31 +1,52 @@ 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) option(BUILD_UTIL "Build the mac command line tool" ON) +find_package(Threads) + # # 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 $ $) 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_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/pkg-plist b/audio/mac/pkg-plist index 10d5917bd1e6..f6d49421e696 100644 --- a/audio/mac/pkg-plist +++ b/audio/mac/pkg-plist @@ -1,14 +1,14 @@ 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 include/MAC/SmartPtr.h include/MAC/Version.h include/MAC/Warnings.h include/MAC/WindowsEnvironment.h lib/libMAC.so lib/libMAC.so.14