diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile index 0a242e7af896..fa0e50aed793 100644 --- a/multimedia/aom/Makefile +++ b/multimedia/aom/Makefile @@ -1,45 +1,44 @@ PORTNAME= aom DISTVERSIONPREFIX= v -DISTVERSION= 3.8.0 -PORTREVISION= 2 +DISTVERSION= 3.8.1 CATEGORIES= multimedia 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_GITHUB= yes USE_PERL5= build USE_LDCONFIG= yes GH_ACCOUNT= jbeich # mirror CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= ENABLE_DOCS ENABLE_TESTS 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 6ee7f481e071..87e00adea323 100644 --- a/multimedia/aom/distinfo +++ b/multimedia/aom/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1701386292 -SHA256 (jbeich-aom-v3.8.0_GH0.tar.gz) = d8e0cb0157410e97ffcf01f4fe24e6447303c46cc4103d6597ba30ef508afe05 -SIZE (jbeich-aom-v3.8.0_GH0.tar.gz) = 5458954 +TIMESTAMP = 1705523068 +SHA256 (jbeich-aom-v3.8.1_GH0.tar.gz) = 629d0fbd58654167d28f3efc2cdff0e708d68280aa5b30f81744e7e181a8d851 +SIZE (jbeich-aom-v3.8.1_GH0.tar.gz) = 5461300 diff --git a/multimedia/aom/files/patch-build_cmake_aom__configure.cmake b/multimedia/aom/files/patch-build_cmake_aom__configure.cmake index 2096d95fa6dd..4670783ec104 100644 --- a/multimedia/aom/files/patch-build_cmake_aom__configure.cmake +++ b/multimedia/aom/files/patch-build_cmake_aom__configure.cmake @@ -1,48 +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 2023-08-14 21:22:47 UTC +--- build/cmake/aom_configure.cmake.orig 2024-01-17 20:24:28 UTC +++ build/cmake/aom_configure.cmake -@@ -75,7 +75,7 @@ if(NOT AOM_TARGET_CPU) +@@ -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 " -@@ -183,33 +183,6 @@ if(AOM_TARGET_CPU STREQUAL "x86" OR AOM_TARGET_CPU STR +@@ -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 " "your cmake command line.") endif() - string(STRIP "${AOM_AS_FLAGS}" AOM_AS_FLAGS) -elseif(AOM_TARGET_CPU MATCHES "arm") - if(AOM_TARGET_SYSTEM STREQUAL "Darwin") -- set(CMAKE_ASM_COMPILER as) +- 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) endif() diff --git a/multimedia/aom/pkg-plist b/multimedia/aom/pkg-plist index 3042d3eabe09..2abf4a1b4d26 100644 --- a/multimedia/aom/pkg-plist +++ b/multimedia/aom/pkg-plist @@ -1,17 +1,17 @@ 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_external_partition.h include/aom/aom_frame_buffer.h include/aom/aom_image.h include/aom/aom_integer.h include/aom/aomcx.h include/aom/aomdx.h lib/libaom.a lib/libaom.so lib/libaom.so.3 -lib/libaom.so.3.8.0 +lib/libaom.so.3.8.1 libdata/pkgconfig/aom.pc