git: eb857c441866 - main - multimedia/aom: update to 3.4.0

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Sat, 18 Jun 2022 00:05:38 UTC
The branch main has been updated by jbeich:

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

commit eb857c44186603519028fd0595e077032335b21a
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-06-16 19:13:50 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-06-18 00:04:02 +0000

    multimedia/aom: update to 3.4.0
    
    Changes:        https://aomedia.googlesource.com/aom/+log/v3.3.0..v3.4.0
---
 multimedia/aom/Makefile                   | 6 +-----
 multimedia/aom/distinfo                   | 8 +++-----
 multimedia/aom/files/patch-CMakeLists.txt | 7 ++++---
 multimedia/aom/pkg-plist                  | 2 +-
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile
index 48a1f3bccb5c..a10fbc96cb14 100644
--- a/multimedia/aom/Makefile
+++ b/multimedia/aom/Makefile
@@ -1,12 +1,8 @@
 PORTNAME=	aom
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.3.0
-PORTREVISION=	1
+DISTVERSION=	3.4.0
 CATEGORIES=	multimedia
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	b389ce89bdb6.patch:-p1 # unbreak JXL
-
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	AV1 reference encoder/decoder
 
diff --git a/multimedia/aom/distinfo b/multimedia/aom/distinfo
index 5b86847f970c..59e1d3007e89 100644
--- a/multimedia/aom/distinfo
+++ b/multimedia/aom/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1644909642
-SHA256 (jbeich-aom-v3.3.0_GH0.tar.gz) = 298ced1f5aeed8f7c4e21138eeb646b19486e9c6e2d711640f4ae5822ad330c1
-SIZE (jbeich-aom-v3.3.0_GH0.tar.gz) = 4768166
-SHA256 (b389ce89bdb6.patch) = ce109a4b912c4400a46f09532bf3c059c3a661100cb85b8ae80d22ba64af8875
-SIZE (b389ce89bdb6.patch) = 2392
+TIMESTAMP = 1655487978
+SHA256 (jbeich-aom-v3.4.0_GH0.tar.gz) = 831ff8d1fe379beb2074722dd6bef253a2444965c2784a267ffab9183163e700
+SIZE (jbeich-aom-v3.4.0_GH0.tar.gz) = 5175309
diff --git a/multimedia/aom/files/patch-CMakeLists.txt b/multimedia/aom/files/patch-CMakeLists.txt
index 175de31849f0..91b299b29a9d 100644
--- a/multimedia/aom/files/patch-CMakeLists.txt
+++ b/multimedia/aom/files/patch-CMakeLists.txt
@@ -1,14 +1,15 @@
 - Drop unused static libhwy dependency when using shared libjxl
 
---- CMakeLists.txt.orig	2021-10-13 17:24:39 UTC
+--- CMakeLists.txt.orig	2022-06-16 19:13:50 UTC
 +++ CMakeLists.txt
-@@ -525,12 +525,6 @@ if(CONFIG_AV1_ENCODER)
+@@ -565,13 +565,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})
+-      target_include_directories(aom_dsp_encoder
+-                                 PRIVATE ${LIBLIBHWY_INCLUDE_DIRS})
 -      if(LIBHWY_CFLAGS)
 -        append_compiler_flag("${LIBHWY_CFLAGS}")
 -      endif()
diff --git a/multimedia/aom/pkg-plist b/multimedia/aom/pkg-plist
index 88f645191596..d7e864ac8031 100644
--- a/multimedia/aom/pkg-plist
+++ b/multimedia/aom/pkg-plist
@@ -13,5 +13,5 @@ include/aom/aomdx.h
 lib/libaom.a
 lib/libaom.so
 lib/libaom.so.3
-lib/libaom.so.3.3.0
+lib/libaom.so.3.4.0
 libdata/pkgconfig/aom.pc