Pullup ticket #6637 - requested by nia

multimedia/libaom: security fix

Revisions pulled up:
- multimedia/libaom/Makefile                                    1.22
- multimedia/libaom/distinfo                                    1.16
- multimedia/libaom/patches/patch-aom__ports_ppc__cpudetect.c   1.3
- multimedia/libaom/patches/patch-build_cmake_aom__configure.cmake 1.5
- multimedia/libaom/patches/patch-build_cmake_version.cmake     1.3

---
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Tue May 17 21:44:11 UTC 2022

   Modified Files:
   	pkgsrc/multimedia/libaom: Makefile distinfo
   	pkgsrc/multimedia/libaom/patches: patch-aom__ports_ppc__cpudetect.c
   	    patch-build_cmake_aom__configure.cmake
   	    patch-build_cmake_version.cmake

   Log Message:
   libaom: Update to 3.3.0

   2022-01-28 v3.3.0
     This release includes compression efficiency and perceptual quality
     improvements, speedup and memory optimizations, some new features, and
     several bug fixes.

     - New Features
       * AV1 RT: Introducing CDEF search level 5
       * Changed real time speed 4 to behave the same as real time speed 5
       * Add --deltaq-strength
       * rtc: Allow scene-change and overshoot detection for svc
       * rtc: Intra-only frame for svc
       * AV1 RT: Option 2 for codec control AV1E_SET_ENABLE_CDEF to disable
         CDEF on non-ref frames
       * New codec controls AV1E_SET_LOOPFILTER_CONTROL and
         AOME_GET_LOOPFILTER_LEVEL
       * Improvements to three pass encoding

     - Compression Efficiency Improvements
       * Overall compression gains: 0.6%

     - Perceptual Quality Improvements
       * Improves the perceptual quality of high QP encoding for delta-q mode 4
       * Auto select noise synthesis level for all intra

     - Speedup and Memory Optimizations
       * Added many SSE2 optimizations.
       * Good quality 2-pass encoder speedups:
         o Speed 2: 9%
         o Speed 3: 12.5%
         o Speed 4: 8%
         o Speed 5: 3%
         o Speed 6: 4%
       * Real time mode encoder speedups:
         o Speed 5: 2.6% BDRate gain, 4% speedup
         o Speed 6: 3.5% BDRate gain, 4% speedup
         o Speed 9: 1% BDRate gain, 3% speedup
         o Speed 10: 3% BDRate gain, neutral speedup
       * All intra encoding speedups (AVIF):
         o Single thread - speed 6: 8%
         o Single thread - speed 9: 15%
         o Multi thread(8) - speed 6: 14%
         o Multi thread(8) - speed 9: 34%

     - Bug Fixes
       * Issue 3163: Segmentation fault when using --enable-keyframe-filtering=2
       * Issue 2436: Integer overflow in av1_warp_affine_c()
       * Issue 3226: armv7 build failure due to gcc-11
       * Issue 3195: Bug report on libaom (AddressSanitizer: heap-buffer-overflow)
       * Issue 3191: Bug report on libaom (AddressSanitizer: SEGV on unknown
         address)
       * Issue 3176: Some SSE2/SADx4AvgTest.* tests fail on Windows
       * Issue 3175: Some SSE2/SADSkipTest.* tests fail on Windows

5 files changed, 25 insertions, 25 deletions

diff --git a/multimedia/libaom/Makefile b/multimedia/libaom/Makefile
index 2bda72f42da..6d0d0a5356d 100644
--- a/multimedia/libaom/Makefile
+++ b/multimedia/libaom/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2021/11/13 11:27:34 nia Exp $
+# $NetBSD: Makefile,v 1.21.4.1 2022/05/20 13:05:56 bsiegert Exp $
 
-DISTNAME=	libaom-3.2.0
+DISTNAME=	libaom-3.3.0
 CATEGORIES=	multimedia
 MASTER_SITES=	https://storage.googleapis.com/aom-releases/
 
@@ -11,7 +11,6 @@ LICENSE=	2-clause-bsd
 
 MAKE_JOBS_SAFE=	no
 
-WRKSRC=		${WRKDIR}
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	perl
diff --git a/multimedia/libaom/distinfo b/multimedia/libaom/distinfo
index aa18e54d37b..836fb3c51b7 100644
--- a/multimedia/libaom/distinfo
+++ b/multimedia/libaom/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2021/12/28 17:35:52 gutteridge Exp $
+$NetBSD: distinfo,v 1.15.4.1 2022/05/20 13:05:56 bsiegert Exp $
 
-BLAKE2s (libaom-3.2.0.tar.gz) = 0324096a1c955c6db4fa194397280810c36398b51b05833633d621268a88a68c
-SHA512 (libaom-3.2.0.tar.gz) = 649bebde85c1a42b0c1c3d2d3b7110b999e3ee1c8e76595259e4e75a8b0f3918e23ff7c7e2c313da4d579882f55bf29765bb882570280adc81f3bc1e82f1ee19
-Size (libaom-3.2.0.tar.gz) = 4717955 bytes
-SHA1 (patch-aom__ports_ppc__cpudetect.c) = 57bf7974b0be44939a7e9ab59d93a4cf49844411
-SHA1 (patch-build_cmake_aom__configure.cmake) = 87a8b65cee873f7deff18cd74c140cd7e8c95924
+BLAKE2s (libaom-3.3.0.tar.gz) = 860dad497824c53b87ccae3f047195e94e52649cccf49a9906af3c8290e6cd78
+SHA512 (libaom-3.3.0.tar.gz) = 9bd118bf46d777da4e85f348fed95510ce583d16d005d062d33e2899f16f24bdb8b120792a7c77ccb64b4e1ff5b3d934342fb1b356bb426693ef69220f138c5f
+Size (libaom-3.3.0.tar.gz) = 4768475 bytes
+SHA1 (patch-aom__ports_ppc__cpudetect.c) = 5b34032e3530a3ba65755e7faefb2f1f97855d98
+SHA1 (patch-build_cmake_aom__configure.cmake) = d9357e5e52564c4bf5facc9ed20696e0522ae22f
 SHA1 (patch-build_cmake_exports.cmake) = be181c5718a5fac75f31bd8e74f214fc8b610ad9
-SHA1 (patch-build_cmake_version.cmake) = 1e6b4a1373c0d54cafdc8ad5c153881e41758bd6
+SHA1 (patch-build_cmake_version.cmake) = ec0255b02649b49da92d4fa13450850841aa4a33
diff --git a/multimedia/libaom/patches/patch-aom__ports_ppc__cpudetect.c b/multimedia/libaom/patches/patch-aom__ports_ppc__cpudetect.c
index 2556ffa619d..caae24e86d8 100644
--- a/multimedia/libaom/patches/patch-aom__ports_ppc__cpudetect.c
+++ b/multimedia/libaom/patches/patch-aom__ports_ppc__cpudetect.c
@@ -1,15 +1,15 @@
-$NetBSD: patch-aom__ports_ppc__cpudetect.c,v 1.2 2021/12/28 17:35:52 gutteridge Exp $
+$NetBSD: patch-aom__ports_ppc__cpudetect.c,v 1.2.4.1 2022/05/20 13:05:56 bsiegert Exp $
 
 Make this at least build on NetBSD.
 So far no dynamic CPU feature detection on NetBSD.
 
---- aom_ports/ppc_cpudetect.c.orig	2021-10-14 18:05:43.000000000 +0000
+--- aom_ports/ppc_cpudetect.c.orig	2022-02-15 07:20:42.000000000 +0000
 +++ aom_ports/ppc_cpudetect.c
 @@ -12,14 +12,16 @@
  #include <fcntl.h>
  #include <unistd.h>
  #include <stdint.h>
-+#if !defined(__NetBSD__)
++#ifdef __linux
  #include <asm/cputable.h>
  #include <linux/auxvec.h>
 +#endif
@@ -19,7 +19,7 @@ So far no dynamic CPU feature detection on NetBSD.
  #include "aom_ports/ppc.h"
  
 -#if CONFIG_RUNTIME_CPU_DETECT
-+#if (CONFIG_RUNTIME_CPU_DETECT && !defined(__NetBSD__))
++#if (CONFIG_RUNTIME_CPU_DETECT && defined(__linux))
  static int cpu_env_flags(int *flags) {
    char *env;
    env = getenv("AOM_SIMD_CAPS");
diff --git a/multimedia/libaom/patches/patch-build_cmake_aom__configure.cmake b/multimedia/libaom/patches/patch-build_cmake_aom__configure.cmake
index 45c90e9f598..21cedf63a48 100644
--- a/multimedia/libaom/patches/patch-build_cmake_aom__configure.cmake
+++ b/multimedia/libaom/patches/patch-build_cmake_aom__configure.cmake
@@ -1,16 +1,15 @@
-$NetBSD: patch-build_cmake_aom__configure.cmake,v 1.4 2021/10/09 14:47:24 nia Exp $
+$NetBSD: patch-build_cmake_aom__configure.cmake,v 1.4.4.1 2022/05/20 13:05:56 bsiegert Exp $
 
 - Don't disable fortify just because it's a release build.
 - Set CPU correctly on SunOS.
 - Add support for NetBSD/*arm*
 
---- build/cmake/aom_configure.cmake.orig	2021-10-09 07:54:04.000000000 +0000
+--- build/cmake/aom_configure.cmake.orig	2022-02-15 07:20:42.000000000 +0000
 +++ build/cmake/aom_configure.cmake
-@@ -66,12 +66,16 @@ if(NOT AOM_TARGET_CPU)
-                     "      CMAKE_GENERATOR=${CMAKE_GENERATOR}\n")
+@@ -67,11 +67,16 @@ if(NOT AOM_TARGET_CPU)
      endif()
    elseif(cpu_lowercase STREQUAL "i386" OR cpu_lowercase STREQUAL "x86")
--    set(AOM_TARGET_CPU "x86")
+     set(AOM_TARGET_CPU "x86")
 -  elseif(cpu_lowercase MATCHES "^arm" OR cpu_lowercase MATCHES "^mips")
 +    if(${CMAKE_SIZEOF_VOID_P} EQUAL 4)
 +      set(AOM_TARGET_CPU "x86")
@@ -26,7 +25,7 @@ $NetBSD: patch-build_cmake_aom__configure.cmake,v 1.4 2021/10/09 14:47:24 nia Ex
      set(AOM_TARGET_CPU "ppc")
    else()
      message(WARNING "The architecture ${CMAKE_SYSTEM_PROCESSOR} is not "
-@@ -321,9 +325,6 @@ else()
+@@ -322,9 +327,6 @@ else()
      add_compiler_flag_if_supported("-Werror")
    endif()
  
diff --git a/multimedia/libaom/patches/patch-build_cmake_version.cmake b/multimedia/libaom/patches/patch-build_cmake_version.cmake
index f9fea2f3a41..87c38adbed4 100644
--- a/multimedia/libaom/patches/patch-build_cmake_version.cmake
+++ b/multimedia/libaom/patches/patch-build_cmake_version.cmake
@@ -1,19 +1,21 @@
-$NetBSD: patch-build_cmake_version.cmake,v 1.2 2021/10/09 14:47:24 nia Exp $
+$NetBSD: patch-build_cmake_version.cmake,v 1.2.4.1 2022/05/20 13:05:56 bsiegert Exp $
 
 Write the correct version number in the aom.pc file.
 
---- build/cmake/version.cmake.orig	2021-10-09 07:54:04.000000000 +0000
+--- build/cmake/version.cmake.orig	2022-02-15 07:20:42.000000000 +0000
 +++ build/cmake/version.cmake
-@@ -23,28 +23,8 @@ include("${AOM_ROOT}/build/cmake/util.cm
+@@ -23,30 +23,7 @@ include("${AOM_ROOT}/build/cmake/util.cm
  
  # Generate the version string for this run.
  unset(aom_version)
 -if(EXISTS "${GIT_EXECUTABLE}")
--  execute_process(COMMAND ${GIT_EXECUTABLE} --git-dir=${AOM_ROOT}/.git describe
+-  execute_process(COMMAND ${GIT_EXECUTABLE}
+-                          --git-dir=${AOM_ROOT}/.git describe
+-                          --match=v[0-9]*
 -                  OUTPUT_VARIABLE aom_version
 -                  ERROR_QUIET
 -                  RESULT_VARIABLE version_check_result)
- 
+-
 -  if(${version_check_result} EQUAL 0)
 -    string(STRIP "${aom_version}" aom_version)
 -