diff --git a/audio/mac/Makefile b/audio/mac/Makefile index 29ff7315df60..353e7667cb47 100644 --- a/audio/mac/Makefile +++ b/audio/mac/Makefile @@ -1,23 +1,23 @@ PORTNAME= mac -PORTVERSION= 13.01 +PORTVERSION= 13.16 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/*.cpp \ Source/Shared/*.cpp \ Source/Shared/*.h NO_WRKSUBDIR= yes .include diff --git a/audio/mac/distinfo b/audio/mac/distinfo index 1e022c9b80f5..3d666a3e73b9 100644 --- a/audio/mac/distinfo +++ b/audio/mac/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1780390429 -SHA256 (MAC_1301_SDK.zip) = 92e735181c3dcd6ddb7c98078f7225e2cceb9fea4ec961f6a1cd3c530afe1195 -SIZE (MAC_1301_SDK.zip) = 14834853 +TIMESTAMP = 1782890741 +SHA256 (MAC_1316_SDK.zip) = 5b99491a7da1bd5144371f8b371058ddb1876a5667cf8640ec9fff6c9c0a21f3 +SIZE (MAC_1316_SDK.zip) = 1786995 diff --git a/audio/mac/files/patch-CMakeLists.txt b/audio/mac/files/patch-CMakeLists.txt index d24447b65af8..3d664c0a5114 100644 --- a/audio/mac/files/patch-CMakeLists.txt +++ b/audio/mac/files/patch-CMakeLists.txt @@ -1,31 +1,31 @@ Version 11.00 added multi-threading support, but we need to link to -lpthread to resolve symbols. ---- CMakeLists.txt.orig 2026-03-29 18:11:44 UTC +--- CMakeLists.txt.orig 2026-06-28 11:27:58 UTC +++ CMakeLists.txt @@ -18,6 +18,8 @@ endif() add_compile_options(-Wpedantic) endif() +find_package(Threads) + # # Determine interface version # -@@ -241,6 +243,7 @@ if(BUILD_SHARED) +@@ -244,6 +246,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) -@@ -327,7 +330,7 @@ if(BUILD_UTIL) +@@ -330,7 +333,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/files/patch-Shared_All.h b/audio/mac/files/patch-Shared_All.h index 853f5deb0841..e476d54a6592 100644 --- a/audio/mac/files/patch-Shared_All.h +++ b/audio/mac/files/patch-Shared_All.h @@ -1,25 +1,25 @@ 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. ---- Shared/All.h.orig 2026-05-23 07:19:19 UTC +--- Shared/All.h.orig 2026-07-01 07:25:49 UTC +++ Shared/All.h @@ -19,7 +19,7 @@ PLATFORM_ANDROID #if !defined(PLATFORM_WINDOWS) && !defined(PLATFORM_APPLE) && !defined(PLATFORM_LINUX) && !defined(PLATFORM_ANDROID) #if defined(__ANDROID__) #define PLATFORM_ANDROID - #elif defined(__linux__) + #elif defined(__linux__) || defined(__FreeBSD__) #define PLATFORM_LINUX #elif defined(__APPLE__) #define PLATFORM_APPLE -@@ -338,7 +338,7 @@ Byte order +@@ -364,7 +364,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_All.h b/audio/mac/files/patch-Source_Shared_All.h index 5f00fb5ae66d..7f841b33768e 100644 --- a/audio/mac/files/patch-Source_Shared_All.h +++ b/audio/mac/files/patch-Source_Shared_All.h @@ -1,25 +1,25 @@ 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 2026-05-23 07:19:19 UTC +--- Source/Shared/All.h.orig 2026-07-01 07:25:49 UTC +++ Source/Shared/All.h @@ -19,7 +19,7 @@ PLATFORM_ANDROID #if !defined(PLATFORM_WINDOWS) && !defined(PLATFORM_APPLE) && !defined(PLATFORM_LINUX) && !defined(PLATFORM_ANDROID) #if defined(__ANDROID__) #define PLATFORM_ANDROID - #elif defined(__linux__) + #elif defined(__linux__) || defined(__FreeBSD__) #define PLATFORM_LINUX #elif defined(__APPLE__) #define PLATFORM_APPLE -@@ -338,7 +338,7 @@ Byte order +@@ -364,7 +364,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/pkg-plist b/audio/mac/pkg-plist index 27d102eecd01..1bf84720b66a 100644 --- a/audio/mac/pkg-plist +++ b/audio/mac/pkg-plist @@ -1,14 +1,14 @@ bin/mac include/MAC/All.h include/MAC/CharacterHelper.h include/MAC/IAPEIO.h include/MAC/IAPETag.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.15 +lib/libMAC.so.16