contrib/src/aom/aom-android-cpufeatures.patch

 diff --git a/aom_ports/aom_ports.cmake b/aom_ports/aom_ports.cmake
-index 6272fc0..2d795f8 100644
+index d57989654..11d4b5550 100644
 --- a/aom_ports/aom_ports.cmake
 +++ b/aom_ports/aom_ports.cmake
 @@ -30,7 +30,8 @@ list(APPEND AOM_PORTS_ASM_X86 "${AOM_ROOT}/aom_ports/emms.asm")
@@ -13,15 +13,15 @@ index 6272fc0..2d795f8 100644
  list(APPEND AOM_PORTS_SOURCES_PPC "${AOM_ROOT}/aom_ports/ppc.h"
              "${AOM_ROOT}/aom_ports/ppc_cpudetect.c")
 diff --git a/aom_ports/arm_cpudetect.c b/aom_ports/arm_cpudetect.c
-index 70efee9..86efb8e 100644
+index 5a75bb348..bd5e1cb93 100644
 --- a/aom_ports/arm_cpudetect.c
 +++ b/aom_ports/arm_cpudetect.c
-@@ -88,7 +88,7 @@ int arm_cpu_caps(void) {
+@@ -88,7 +88,7 @@ int aom_arm_cpu_caps(void) {
  }
  
  #elif defined(__ANDROID__) /* end _MSC_VER */
 -#include <cpu-features.h>
 +#include "cpu-features.h"
  
- int arm_cpu_caps(void) {
+ int aom_arm_cpu_caps(void) {
    int flags;

contrib/src/aom/aom-android-pthreads.patch

-diff --git a/build/cmake/pkg_config.cmake b/build/cmake/pkg_config.cmake
-index 64e2021..1cab2a3 100644
---- a/build/cmake/pkg_config.cmake
-+++ b/build/cmake/pkg_config.cmake
-@@ -47,12 +47,6 @@ file(APPEND "${pkgconfig_file}"
- file(APPEND "${pkgconfig_file}" "Version: ${package_version}\n")
- file(APPEND "${pkgconfig_file}" "Requires:\n")
- file(APPEND "${pkgconfig_file}" "Conflicts:\n")
+--- aom/build/cmake/pkg_config.cmake	2021-05-07 16:22:27.118065285 -0400
++++ aom/build/cmake/pkg_config.cmake.new	2021-05-07 16:23:24.937812883 -0400
+@@ -56,10 +56,6 @@
+   file(APPEND "${pkgconfig_file}" " libvmaf")
+ endif()
+ file(APPEND "${pkgconfig_file}" "\nConflicts:\n")
+-file(APPEND "${pkgconfig_file}" "Libs: -L\${libdir} -l${pkg_name}\n")
 -if(CONFIG_MULTITHREAD AND HAVE_PTHREAD_H)
--  file(APPEND "${pkgconfig_file}"
--              "Libs: -L\${prefix}/lib -l${pkg_name} -lm -lpthread\n")
 -  file(APPEND "${pkgconfig_file}" "Libs.private: -lm -lpthread\n")
 -else()
--  file(APPEND "${pkgconfig_file}" "Libs: -L\${prefix}/lib -l${pkg_name} -lm\n")
--  file(APPEND "${pkgconfig_file}" "Libs.private: -lm\n")
--endif()
 +file(APPEND "${pkgconfig_file}" "Libs: -L\${prefix}/lib -l${pkg_name} -lm\n")
-+file(APPEND "${pkgconfig_file}" "Libs.private: -lm\n")
- file(APPEND "${pkgconfig_file}" "Cflags: -I\${prefix}/include\n")
+   file(APPEND "${pkgconfig_file}" "Libs.private: -lm\n")
+-endif()
+ file(APPEND "${pkgconfig_file}" "Cflags: -I\${includedir}\n")

contrib/src/aom/aom-target-cpu.patch

---- aom/CMakeLists.txt.target-cpu	2019-01-08 12:23:33.570217317 -0500
-+++ aom/CMakeLists.txt	2019-01-08 12:23:26.118217140 -0500
-@@ -18,12 +18,6 @@ if(NOT EMSCRIPTEN)
-   endif()
- endif()
- 
--if(NOT AOM_TARGET_CPU)
--  set(AOM_TARGET_CPU generic)
--  message("Forcing generic build for normative branch; set AOM_TARGET_CPU to "
--          "the target CPU type to allow for an optimized build.")
--endif()
--
- option(ENABLE_CCACHE "Enable ccache support." OFF)
- option(ENABLE_DECODE_PERF_TESTS "Enables decoder performance tests" OFF)
- option(ENABLE_DISTCC "Enable distcc support." OFF)

contrib/src/aom/rules.mak

 # aom
-AOM_HASH := add4b15580e410c00c927ee366fa65545045a5d9
-AOM_VERSION := v1.0.0.errata.1
-AOM_GITURL := https://aomedia.googlesource.com/aom/+archive/$(AOM_HASH).tar.gz
+AOM_VERSION := v3.1.1
+AOM_GITURL := https://aomedia.googlesource.com/aom/+archive/$(AOM_VERSION).tar.gz
 
 PKGS += aom
 ifeq ($(call need_pkg,"aom"),)
@@ -9,17 +8,16 @@ PKGS_FOUND += aom
 endif
 
 $(TARBALLS)/aom-$(AOM_VERSION).tar.gz:
-	$(call download,$(AOM_GITURL))
+	$(call download_pkg,$(AOM_GITURL),aom)
 
 .sum-aom: aom-$(AOM_VERSION).tar.gz
 	$(warning $@ not implemented)
 	touch $@
 
 aom: aom-$(AOM_VERSION).tar.gz .sum-aom
-	rm -Rf $@-$(AOM_VERSION) $@
-	mkdir -p $@-$(AOM_VERSION)
-	tar xvzfo "$<" -C $@-$(AOM_VERSION)
-	$(APPLY) $(SRC)/aom/aom-target-cpu.patch
+	rm -Rf $(UNPACK_DIR) $@
+	mkdir -p $(UNPACK_DIR)
+	tar xvzfo "$<" -C $(UNPACK_DIR)
 ifdef HAVE_ANDROID
 	$(APPLY) $(SRC)/aom/aom-android-pthreads.patch
 	$(APPLY) $(SRC)/aom/aom-android-cpufeatures.patch
@@ -96,6 +94,8 @@ endif
 
 # libaom doesn't allow in-tree builds
 .aom: aom toolchain.cmake
+	rm -rf $(PREFIX)/include/aom
+	cd $< && rm -rf aom_build && mkdir -p aom_build
 	cd $< && mkdir -p aom_build
 	cd $</aom_build && LDFLAGS="$(AOM_LDFLAGS)" $(HOSTVARS) CFLAGS="$(AOM_CFLAGS)" CXXFLAGS="$(AOM_CXXFLAGS)" $(CMAKE) ../ $(AOM_CONF)
 	cd $< && $(CMAKEBUILD) aom_build