diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile index c2cba9c1ccc3..7061e582a45c 100644 --- a/multimedia/aom/Makefile +++ b/multimedia/aom/Makefile @@ -1,44 +1,44 @@ PORTNAME= aom -DISTVERSION= 3.13.3 +DISTVERSION= 3.14.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 + ${WRKSRC}/cmake/version.cmake .include diff --git a/multimedia/aom/distinfo b/multimedia/aom/distinfo index a121839e7f28..6aa520da149b 100644 --- a/multimedia/aom/distinfo +++ b/multimedia/aom/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1775076106 -SHA256 (libaom-3.13.3.tar.gz) = 446a4ae9741cb8f3eeb98c949d25f91b48cb2b8569cae975c4b737392e9024fc -SIZE (libaom-3.13.3.tar.gz) = 6256836 +TIMESTAMP = 1778714018 +SHA256 (libaom-3.14.0.tar.gz) = 55852c50eadc1a27229d4840ea14c84f20ede7d85d41cc5827434c63eea1436d +SIZE (libaom-3.14.0.tar.gz) = 6368667 diff --git a/multimedia/aom/files/patch-build_cmake_aom__configure.cmake b/multimedia/aom/files/patch-cmake_aom__configure.cmake similarity index 82% rename from multimedia/aom/files/patch-build_cmake_aom__configure.cmake rename to multimedia/aom/files/patch-cmake_aom__configure.cmake index 084689c6b170..ca8f6b071706 100644 --- a/multimedia/aom/files/patch-build_cmake_aom__configure.cmake +++ b/multimedia/aom/files/patch-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-08-27 18:17:57 UTC -+++ build/cmake/aom_configure.cmake -@@ -73,7 +73,7 @@ if(NOT AOM_TARGET_CPU) +--- cmake/aom_configure.cmake.orig 2026-05-13 23:13:38 UTC ++++ cmake/aom_configure.cmake +@@ -74,7 +74,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 " -@@ -182,35 +182,6 @@ if(AOM_TARGET_CPU STREQUAL "x86" OR AOM_TARGET_CPU STR + elseif(cpu_lowercase MATCHES "^riscv") + set(AOM_TARGET_CPU "riscv") +@@ -184,35 +184,6 @@ if(AOM_TARGET_CPU STREQUAL "x86" OR AOM_TARGET_CPU STR + "To build without optimizations, add -DAOM_TARGET_CPU=generic to " "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") - 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) diff --git a/multimedia/aom/files/patch-build_cmake_cpu.cmake b/multimedia/aom/files/patch-cmake_cpu.cmake similarity index 59% rename from multimedia/aom/files/patch-build_cmake_cpu.cmake rename to multimedia/aom/files/patch-cmake_cpu.cmake index 92353162f0a3..a760fa8ddc29 100644 --- a/multimedia/aom/files/patch-build_cmake_cpu.cmake +++ b/multimedia/aom/files/patch-cmake_cpu.cmake @@ -1,13 +1,13 @@ - Don't enable NEON on armv6 similar to build/cmake/rtcd.pl ---- build/cmake/cpu.cmake.orig 2023-11-30 23:18:12 UTC -+++ build/cmake/cpu.cmake -@@ -61,7 +61,7 @@ if("${AOM_TARGET_CPU}" STREQUAL "arm64") +--- cmake/cpu.cmake.orig 2026-05-13 23:13:38 UTC ++++ cmake/cpu.cmake +@@ -86,7 +86,7 @@ svfloat32_t func(svfloat32_t a) { endif() endforeach() -elseif("${AOM_TARGET_CPU}" MATCHES "^arm") +elseif("${AOM_TARGET_CPU}" MATCHES "^arm" AND NOT "${AOM_TARGET_CPU}" MATCHES "^armv6") set(AOM_ARCH_ARM 1) - set(RTCD_ARCH_ARM "yes") + if(ENABLE_NEON) diff --git a/multimedia/aom/files/patch-build_cmake_pkg__config.cmake b/multimedia/aom/files/patch-cmake_pkg__config.cmake similarity index 83% rename from multimedia/aom/files/patch-build_cmake_pkg__config.cmake rename to multimedia/aom/files/patch-cmake_pkg__config.cmake index 6fcc7a9a5e01..0ebcf5f166c1 100644 --- a/multimedia/aom/files/patch-build_cmake_pkg__config.cmake +++ b/multimedia/aom/files/patch-cmake_pkg__config.cmake @@ -1,13 +1,13 @@ - Limit internal dependencies to static library ---- build/cmake/pkg_config.cmake.orig 2022-06-17 17:46:18 UTC -+++ build/cmake/pkg_config.cmake +--- cmake/pkg_config.cmake.orig 2022-06-17 17:46:18 UTC ++++ cmake/pkg_config.cmake @@ -51,7 +51,7 @@ file(APPEND "${pkgconfig_file}" "Version: ${package_ve APPEND "${pkgconfig_file}" "Description: Alliance for Open Media AV1 codec library v${aom_version}.\n") file(APPEND "${pkgconfig_file}" "Version: ${package_version}\n") -file(APPEND "${pkgconfig_file}" "Requires:") +file(APPEND "${pkgconfig_file}" "Requires.private:") if(CONFIG_TUNE_VMAF) file(APPEND "${pkgconfig_file}" " libvmaf") endif() diff --git a/multimedia/aom/pkg-plist b/multimedia/aom/pkg-plist index 9a08e39953a4..314ac080e907 100644 --- a/multimedia/aom/pkg-plist +++ b/multimedia/aom/pkg-plist @@ -1,21 +1,23 @@ bin/aomdec bin/aomenc include/aom/aom.h include/aom/aom_codec.h include/aom/aom_decoder.h include/aom/aom_encoder.h +include/aom/aom_ext_ratectrl.h include/aom/aom_external_partition.h include/aom/aom_frame_buffer.h include/aom/aom_image.h include/aom/aom_integer.h +include/aom/aom_tpl.h include/aom/aomcx.h include/aom/aomdx.h lib/cmake/AOM/AOMConfig.cmake lib/cmake/AOM/AOMConfigVersion.cmake lib/cmake/AOM/AOMTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/AOM/AOMTargets.cmake lib/libaom.a lib/libaom.so lib/libaom.so.3 lib/libaom.so.%%VERSION%% libdata/pkgconfig/aom.pc