From a3d4feb4d7961ecc40e6ad2b302c5329f4148ebc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 9 Feb 2022 19:40:15 +0100
Subject: [PATCH 1/4] libaom: update to 3.2.0.

---
 common/shlibs           |  2 +-
 srcpkgs/libaom/template | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 39137dbe048f..eddbba7f1a39 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3460,7 +3460,7 @@ libticalcs2.so.12 libticalcs2-1.1.9_1
 libhtmlcxx.so.3 htmlcxx-0.86_1
 libcss_parser_pp.so.0 htmlcxx-0.86_1
 libcss_parser.so.0 htmlcxx-0.86_1
-libaom.so.2 libaom-2.0.0_1
+libaom.so.3 libaom-3.2.0_1
 libre.so.1 re-2.0.1_1
 libtpms.so.0 libtpms-0.9.0_1
 libswtpm_libtpms.so.0 libswtpm-0.6.1_1
diff --git a/srcpkgs/libaom/template b/srcpkgs/libaom/template
index 657301c7309a..e514aafe14f5 100644
--- a/srcpkgs/libaom/template
+++ b/srcpkgs/libaom/template
@@ -1,9 +1,10 @@
 # Template file for 'libaom'
 pkgname=libaom
-version=2.0.1
+version=3.2.0
 revision=1
 create_wrksrc=yes
 build_style=cmake
+make_cmd=make
 configure_args="-DENABLE_DOCS=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="yasm doxygen perl python"
 short_desc="AV1 Codec library implementation"
@@ -12,7 +13,9 @@ license="BSD-2-Clause"
 homepage="https://aomedia.org/"
 changelog="https://aomedia.googlesource.com/aom/+/master/CHANGELOG"
 distfiles="https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"
-checksum=@b89acd3304531a9f6c99eba13e1de66605893ff8d08abc8c6e0586481a90033a
+checksum=@358ac353cb20555aa8ad8faa4d14b98bf89dd05f76c45548d7219673c767d247
+
+CMAKE_GENERATOR="Unix Makefiles"
 
 # aom segfaults with default musl stack size
 LDFLAGS="-Wl,-z,stack-size=2097152"
@@ -35,11 +38,11 @@ pre_check() {
 
 do_check() {
 	cd build
-	make testdata ${makejobs}
+	${make_cmd} testdata ${makejobs}
 	../test/examples.sh --bin-path examples
 
 	if [ "$XBPS_CHECK_PKGS" = full ]; then
-		make runtests ${makejobs}
+		${make_cmd} runtests ${makejobs}
 	fi
 }
 

From 7acb064e9fb9f68ccb003ffea70eab7d0ccb0b58 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 9 Feb 2022 19:41:56 +0100
Subject: [PATCH 2/4] gst-plugins-bad1: rebuild against libaom-3.2.0.

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 451f73cb9f55..e0d7500c79e8 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.5
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson

From 637ba082401017dabba0c8a22cc2933ef86c302c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 9 Feb 2022 19:43:57 +0100
Subject: [PATCH 3/4] ffmpeg: rebuild against libaom-3.2.0.

---
 srcpkgs/ffmpeg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index c5929b4582f3..51bf6a9bc105 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.4.1
-revision=1
+revision=2
 short_desc="Decoding, encoding and streaming software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 8859efa06b3320a8e7e6e429102bab214b25a5e2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 9 Feb 2022 19:45:31 +0100
Subject: [PATCH 4/4] libheif: rebuild against libaom-3.2.0.

---
 srcpkgs/libheif/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 1972c5b8ad7c..48b4279b9f3a 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"