git: 6129d1980306 - 2021Q4 - multimedia/aom: update to 3.1.3

The branch 2021Q4 has been updated by jbeich:

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

commit 6129d19803065731193300f463398cdac108b795
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-10-01 00:23:06 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-10-10 15:41:42 +0000

    multimedia/aom: update to 3.1.3
    
    Changes:        https://aomedia.googlesource.com/aom/+log/v3.1.2..v3.1.3
    Reported by:    portscout, /r/AV1
    
    (cherry picked from commit cd76dd6d0332d7f48352bfba631caf2425983b8c)
---
 multimedia/aom/Makefile                                | 2 +-
 multimedia/aom/distinfo                                | 6 +++---
 multimedia/aom/files/patch-aom__ports_arm__cpudetect.c | 6 +++---
 multimedia/aom/pkg-plist                               | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile
index dfa24344f29d..cd0f642aefd9 100644
--- a/multimedia/aom/Makefile
+++ b/multimedia/aom/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	aom
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.1.2
+DISTVERSION=	3.1.3
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/multimedia/aom/distinfo b/multimedia/aom/distinfo
index 771799a3285d..611768ca49ef 100644
--- a/multimedia/aom/distinfo
+++ b/multimedia/aom/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626819795
-SHA256 (jbeich-aom-v3.1.2_GH0.tar.gz) = aa1e6610b7abf37659ddc682feac4f50cfa01539a7bd9ed329d670b07e3c55d4
-SIZE (jbeich-aom-v3.1.2_GH0.tar.gz) = 4613689
+TIMESTAMP = 1633047786
+SHA256 (jbeich-aom-v3.1.3_GH0.tar.gz) = 02c4c6552cce81a7106f09c5ddf3912979d6ea6b6bdf6a7673f08809fbeb4c74
+SIZE (jbeich-aom-v3.1.3_GH0.tar.gz) = 4614421
diff --git a/multimedia/aom/files/patch-aom__ports_arm__cpudetect.c b/multimedia/aom/files/patch-aom__ports_arm__cpudetect.c
index 426f8a1fff08..c8bce475ce5e 100644
--- a/multimedia/aom/files/patch-aom__ports_arm__cpudetect.c
+++ b/multimedia/aom/files/patch-aom__ports_arm__cpudetect.c
@@ -1,14 +1,14 @@
 - Assume NEON is enabled on aarch64
 - Implement NEON runtime detection on FreeBSD
 
---- aom_ports/arm_cpudetect.c.orig	2021-07-20 22:23:15 UTC
+--- aom_ports/arm_cpudetect.c.orig	2021-10-01 00:23:06 UTC
 +++ aom_ports/arm_cpudetect.c
 @@ -38,7 +38,7 @@ static int arm_cpu_env_mask(void) {
    return env && *env ? (int)strtol(env, NULL, 0) : ~0;
  }
  
--#if !CONFIG_RUNTIME_CPU_DETECT
-+#if !CONFIG_RUNTIME_CPU_DETECT || defined(__ARM_NEON)
+-#if !CONFIG_RUNTIME_CPU_DETECT || defined(__APPLE__)
++#if !CONFIG_RUNTIME_CPU_DETECT || defined(__ARM_NEON) || defined(__APPLE__)
  
  int aom_arm_cpu_caps(void) {
    /* This function should actually be a no-op. There is no way to adjust any of
diff --git a/multimedia/aom/pkg-plist b/multimedia/aom/pkg-plist
index 7ca220e050ad..dd775ea4906d 100644
--- a/multimedia/aom/pkg-plist
+++ b/multimedia/aom/pkg-plist
@@ -12,5 +12,5 @@ include/aom/aomdx.h
 lib/libaom.a
 lib/libaom.so
 lib/libaom.so.3
-lib/libaom.so.3.1.2
+lib/libaom.so.3.1.3
 libdata/pkgconfig/aom.pc