3.0.0-1

3 files changed, 17 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 29a79cf4cce9..506b4d8d0d93 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-aom
 	pkgdesc = Alliance for Open Media video codec (mingw-w64)
-	pkgver = 2.0.2
+	pkgver = 3.0.0
 	pkgrel = 1
 	url = https://aomedia.org/
 	arch = any
@@ -15,10 +15,10 @@ pkgbase = mingw-w64-aom
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = git+https://aomedia.googlesource.com/aom#commit=cb1d48da8da2061e72018761788a18b8fa8013bb
+	source = git+https://aomedia.googlesource.com/aom#commit=d853caa2ab62d161e5edf344ffee7b597449dc0d
 	source = cmake.patch
-	sha256sums = SKIP
-	sha256sums = 0e32c089670732e8193050fd63b0677458cc86ed58ac42d5b73ea07f945632e0
+	b2sums = SKIP
+	b2sums = fe0f18fa9e1dd9aa920ac5f097961833a37bc8777c591378deb82ce94a83271afbbb386b9a2f1cb578b56405035abb81515143f88f55b7f6c95a4141ea9c1a9b
 
 pkgname = mingw-w64-aom
 
diff --git a/PKGBUILD b/PKGBUILD
index f482486d3fb0..010b1f68df5d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Chocobo1 <chocobo1 AT archlinux DOT net>
 
 pkgname=mingw-w64-aom
-pkgver=2.0.2
+pkgver=3.0.0
 pkgrel=1
 pkgdesc="Alliance for Open Media video codec (mingw-w64)"
 url="https://aomedia.org/"
@@ -12,16 +12,16 @@ license=(BSD custom:PATENTS)
 depends=(mingw-w64-crt)
 options=(!strip !buildflags staticlibs)
 makedepends=(mingw-w64-gcc mingw-w64-cmake git ninja yasm)
-_commit=cb1d48da8da2061e72018761788a18b8fa8013bb  # tags/v2.0.2^0
+_commit=d853caa2ab62d161e5edf344ffee7b597449dc0d  # tags/v3.0.0^0
 source=("git+https://aomedia.googlesource.com/aom#commit=$_commit"
         "cmake.patch")
-sha256sums=('SKIP'
-            '0e32c089670732e8193050fd63b0677458cc86ed58ac42d5b73ea07f945632e0')
+b2sums=('SKIP'
+        '627c000cc5b152e78714898156ebebb2524749bd1d701bbbdca0b431301426c2f821403299a6fd4420be80133d4e7178dea8b2f4aae2ab34e9e81e584ebda345')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 pkgver() {
   cd aom
-  git describe --tags | sed 's/^v//;s/-/+/g'
+  git describe --tags | sed 's/^v//;s/-errata/.errata/;s/-/+/g'
 }
 
 prepare() {
diff --git a/cmake.patch b/cmake.patch
index 378d8fb2a6f1..3adbaa0a9de0 100644
--- a/cmake.patch
+++ b/cmake.patch
@@ -1,11 +1,12 @@
 diff -ruN aom/build/cmake/aom_configure.cmake patched/build/cmake/aom_configure.cmake
---- aom/build/cmake/aom_configure.cmake	2020-05-25 10:32:02.443333045 +0200
-+++ patched/build/cmake/aom_configure.cmake	2020-05-25 10:37:34.206666378 +0200
-@@ -67,6 +67,7 @@
+--- aom/build/cmake/aom_configure.cmake	        2021-04-23 19:56:11.023333334 +0200
++++ patched/build/cmake/aom_configure.cmake	2021-04-23 19:59:04.576666669 +0200
+@@ -65,7 +65,7 @@
+                     "      CMAKE_SYSTEM_PROCESSOR=${CMAKE_SYSTEM_PROCESSOR}\n"
                      "      CMAKE_GENERATOR=${CMAKE_GENERATOR}\n")
      endif()
-   elseif("${cpu_lowercase}" STREQUAL "i386"
-+         OR "${cpu_lowercase}" STREQUAL "i686"
-          OR "${cpu_lowercase}" STREQUAL "x86")
+-  elseif(cpu_lowercase STREQUAL "i386" OR cpu_lowercase STREQUAL "x86")
++  elseif(cpu_lowercase STREQUAL "i386" OR cpu_lowercase STREQUAL "i686" OR cpu_lowercase STREQUAL "x86")
      set(AOM_TARGET_CPU "x86")
-   elseif("${cpu_lowercase}" MATCHES "^arm"
+   elseif(cpu_lowercase MATCHES "^arm" OR cpu_lowercase MATCHES "^mips")
+     set(AOM_TARGET_CPU "${cpu_lowercase}")