git: 825c0055b720 - 2022Q1 - multimedia/aom: expose Butteraugli tuning

The branch 2022Q1 has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=825c0055b72033b0f04e5d0239584cba82525b61

commit 825c0055b72033b0f04e5d0239584cba82525b61
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-01-08 18:28:10 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-01-09 13:20:34 +0000

    multimedia/aom: expose Butteraugli tuning
    
    (cherry picked from commit bd359cba9a6e7091aba73afd713bf82abdb3666e)
---
 multimedia/aom/Makefile                   |  7 ++++++-
 multimedia/aom/files/patch-CMakeLists.txt | 17 +++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile
index cb15e55d73b7..d2e9b55f6dcf 100644
--- a/multimedia/aom/Makefile
+++ b/multimedia/aom/Makefile
@@ -22,9 +22,14 @@ GH_ACCOUNT=	jbeich # mirror
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	ENABLE_DOCS ENABLE_TESTS
 
-OPTIONS_DEFINE=	VMAF
+OPTIONS_DEFINE=	JXL VMAF
 OPTIONS_DEFAULT=VMAF
 
+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
diff --git a/multimedia/aom/files/patch-CMakeLists.txt b/multimedia/aom/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..175de31849f0
--- /dev/null
+++ b/multimedia/aom/files/patch-CMakeLists.txt
@@ -0,0 +1,17 @@
+- Drop unused static libhwy dependency when using shared libjxl
+
+--- CMakeLists.txt.orig	2021-10-13 17:24:39 UTC
++++ CMakeLists.txt
+@@ -525,12 +525,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_include_directories(aom PRIVATE ${LIBLIBHWY_INCLUDE_DIRS})
+-      if(LIBHWY_CFLAGS)
+-        append_compiler_flag("${LIBHWY_CFLAGS}")
+-      endif()
+     endif()
+ 
+     set_target_properties(aom PROPERTIES LINKER_LANGUAGE CXX)