diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile index 9b5d6508a170..799f356ab651 100644 --- a/multimedia/aom/Makefile +++ b/multimedia/aom/Makefile @@ -1,44 +1,44 @@ PORTNAME= aom -DISTVERSION= 3.9.1 +DISTVERSION= 3.10.0 CATEGORIES= multimedia MASTER_SITES= https://storage.googleapis.com/${PORTNAME}-releases/ DISTNAME= lib${PORTNAME}-${DISTVERSION} MAINTAINER= jbeich@FreeBSD.org COMMENT= AV1 reference encoder/decoder WWW= https://aomedia.org/ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${BUILD_DEPENDS_${ARCH}} BUILD_DEPENDS_amd64= nasm:devel/nasm BUILD_DEPENDS_i386= nasm:devel/nasm USES= cmake compiler:c++11-lib perl5 USE_PERL5= build USE_LDCONFIG= yes CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= ENABLE_DOCS ENABLE_TESTS PLIST_SUB= VERSION=${PORTVERSION} OPTIONS_DEFINE= JXL VMAF OPTIONS_DEFAULT=JXL VMAF OPTIONS_EXCLUDE=JXL # https://bugs.chromium.org/p/aomedia/issues/detail?id=3457 JXL_DESC= Encoding tuning for Butteraugli JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl JXL_USES= pkgconfig JXL_CMAKE_ON= -DCONFIG_TUNE_BUTTERAUGLI:STRING=1 VMAF_DESC= Encoding tuning for VMAF VMAF_LIB_DEPENDS= libvmaf.so:multimedia/vmaf VMAF_USES= pkgconfig VMAF_CMAKE_ON= -DCONFIG_TUNE_VMAF:STRING=1 post-patch: # Extract (snapshot) version from the port instead of CHANGELOG @${REINPLACE_CMD} 's,$${AOM_ROOT}/CHANGELOG,${DISTVERSIONFULL:S/^v//},' \ ${WRKSRC}/build/cmake/version.cmake .include diff --git a/multimedia/aom/distinfo b/multimedia/aom/distinfo index a553424c0d01..2a85e3406231 100644 --- a/multimedia/aom/distinfo +++ b/multimedia/aom/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1717625991 -SHA256 (libaom-3.9.1.tar.gz) = dba99fc1c28aaade28dda59821166b2fa91c06162d1bc99fde0ddaad7cecc50e -SIZE (libaom-3.9.1.tar.gz) = 5524048 +TIMESTAMP = 1724782677 +SHA256 (libaom-3.10.0.tar.gz) = 55ccb6816fb4b7d508d96a95b6e9cc3d2c0ae047f9f947dbba03720b56d89631 +SIZE (libaom-3.10.0.tar.gz) = 5445319 diff --git a/multimedia/aom/files/patch-CMakeLists.txt b/multimedia/aom/files/patch-CMakeLists.txt index 91b299b29a9d..f70950e398d8 100644 --- a/multimedia/aom/files/patch-CMakeLists.txt +++ b/multimedia/aom/files/patch-CMakeLists.txt @@ -1,18 +1,18 @@ - Drop unused static libhwy dependency when using shared libjxl ---- CMakeLists.txt.orig 2022-06-16 19:13:50 UTC +--- CMakeLists.txt.orig 2024-08-27 18:17:57 UTC +++ CMakeLists.txt -@@ -565,13 +565,6 @@ if(CONFIG_AV1_ENCODER) +@@ -588,13 +588,6 @@ if(CONFIG_AV1_ENCODER) if(LIBJXL_CFLAGS) append_compiler_flag("${LIBJXL_CFLAGS}") endif() - pkg_check_modules(LIBHWY REQUIRED libhwy) -- target_link_libraries(aom PRIVATE ${LIBHWY_LDFLAGS} ${LIBHWY_LIBRARIES}) +- target_link_libraries(aom PRIVATE ${LIBHWY_LDFLAGS}) - target_include_directories(aom_dsp_encoder - PRIVATE ${LIBLIBHWY_INCLUDE_DIRS}) - if(LIBHWY_CFLAGS) - append_compiler_flag("${LIBHWY_CFLAGS}") - endif() endif() set_target_properties(aom PROPERTIES LINKER_LANGUAGE CXX) diff --git a/multimedia/aom/files/patch-build_cmake_aom__configure.cmake b/multimedia/aom/files/patch-build_cmake_aom__configure.cmake index 4670783ec104..084689c6b170 100644 --- a/multimedia/aom/files/patch-build_cmake_aom__configure.cmake +++ b/multimedia/aom/files/patch-build_cmake_aom__configure.cmake @@ -1,50 +1,50 @@ - FreeBSD and NetBSD powerpc* targets don't abbreviate to ppc* - ARM uses compiler intrinsics, so don't require GNU as ---- build/cmake/aom_configure.cmake.orig 2024-01-17 20:24:28 UTC +--- build/cmake/aom_configure.cmake.orig 2024-08-27 18:17:57 UTC +++ build/cmake/aom_configure.cmake @@ -73,7 +73,7 @@ if(NOT AOM_TARGET_CPU) set(AOM_TARGET_CPU "${cpu_lowercase}") elseif(cpu_lowercase MATCHES "aarch64") set(AOM_TARGET_CPU "arm64") - elseif(cpu_lowercase MATCHES "^ppc") + elseif(cpu_lowercase MATCHES "^ppc|^powerpc") set(AOM_TARGET_CPU "ppc") else() message(WARNING "The architecture ${CMAKE_SYSTEM_PROCESSOR} is not " -@@ -181,35 +181,6 @@ if(AOM_TARGET_CPU STREQUAL "x86" OR AOM_TARGET_CPU STR - "To build without optimizations, add -DAOM_TARGET_CPU=generic to " +@@ -182,35 +182,6 @@ if(AOM_TARGET_CPU STREQUAL "x86" OR AOM_TARGET_CPU STR "your cmake command line.") endif() -- string(STRIP "${AOM_AS_FLAGS}" AOM_AS_FLAGS) + string(STRIP "${AOM_AS_FLAGS}" AOM_AS_FLAGS) -elseif(AOM_TARGET_CPU MATCHES "arm") - if(AOM_TARGET_SYSTEM STREQUAL "Darwin") - if(NOT CMAKE_ASM_COMPILER) - set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER}) - endif() - set(AOM_AS_FLAGS -arch ${AOM_TARGET_CPU} -isysroot ${CMAKE_OSX_SYSROOT}) - elseif(AOM_TARGET_SYSTEM STREQUAL "Windows") - if(NOT CMAKE_ASM_COMPILER) -- set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER} -c -mimplicit-it=always) +- set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER} "-c -mimplicit-it=always") - endif() - else() - if(NOT CMAKE_ASM_COMPILER) - set(CMAKE_ASM_COMPILER as) - endif() - endif() - include(CheckLanguage) - check_language(ASM) - if(NOT CMAKE_ASM_COMPILER) - message( - FATAL_ERROR - "Unable to find assembler and optimizations are enabled." - "Searched for ${CMAKE_ASM_COMPILER}. Install it, add it to your path," - "or set the assembler directly by adding " - "-DCMAKE_ASM_COMPILER= to your CMake command line." - "To build without optimizations, add -DAOM_TARGET_CPU=generic to your " - "cmake command line.") - endif() - enable_language(ASM) - string(STRIP "${AOM_AS_FLAGS}" AOM_AS_FLAGS) +- string(STRIP "${AOM_AS_FLAGS}" AOM_AS_FLAGS) endif() + if(CONFIG_ANALYZER)