[vlc-commits] contrib: aom: update to AOM v2.0.0

[Tristan Matthews]

vlc | branch: master | Tristan Matthews <tmatth at videolan.org> | Mon Jul  6 15:41:13 2020 -0400| [ab8f0e57720b454f9ccdb86887d391956870f68b] | committer: Tristan Matthews

contrib: aom: update to AOM v2.0.0

This is the first "official" release, see:
https://aomedia.googlesource.com/aom/+/HEAD/CHANGELOG

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ab8f0e57720b454f9ccdb86887d391956870f68b
---

 contrib/src/aom/aom-android-cpufeatures.patch |  8 ++++----
 contrib/src/aom/aom-android-pthreads.patch    | 10 ++++------
 contrib/src/aom/aom-target-cpu.patch          | 15 ---------------
 contrib/src/aom/rules.mak                     |  6 ++----
 4 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/contrib/src/aom/aom-android-cpufeatures.patch b/contrib/src/aom/aom-android-cpufeatures.patch
index 82339c2e23..9fef19804a 100644
--- a/contrib/src/aom/aom-android-cpufeatures.patch
+++ b/contrib/src/aom/aom-android-cpufeatures.patch
@@ -1,5 +1,5 @@
 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;
diff --git a/contrib/src/aom/aom-android-pthreads.patch b/contrib/src/aom/aom-android-pthreads.patch
index 8b414772e6..94ed665c86 100644
--- a/contrib/src/aom/aom-android-pthreads.patch
+++ b/contrib/src/aom/aom-android-pthreads.patch
@@ -1,19 +1,17 @@
 diff --git a/build/cmake/pkg_config.cmake b/build/cmake/pkg_config.cmake
-index 64e2021..1cab2a3 100644
+index c3914d79e..1eb36f7ec 100644
 --- a/build/cmake/pkg_config.cmake
 +++ b/build/cmake/pkg_config.cmake
-@@ -47,12 +47,6 @@ file(APPEND "${pkgconfig_file}"
+@@ -53,10 +53,6 @@ file(
  file(APPEND "${pkgconfig_file}" "Version: ${package_version}\n")
  file(APPEND "${pkgconfig_file}" "Requires:\n")
  file(APPEND "${pkgconfig_file}" "Conflicts:\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}" "Cflags: -I\${includedir}\n")
diff --git a/contrib/src/aom/aom-target-cpu.patch b/contrib/src/aom/aom-target-cpu.patch
deleted file mode 100644
index 93d4e170f2..0000000000
--- a/contrib/src/aom/aom-target-cpu.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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)
diff --git a/contrib/src/aom/rules.mak b/contrib/src/aom/rules.mak
index 965b0f408d..63007ef435 100644
--- a/contrib/src/aom/rules.mak
+++ b/contrib/src/aom/rules.mak
@@ -1,7 +1,6 @@
 # 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 := v2.0.0
+AOM_GITURL := https://aomedia.googlesource.com/aom/+archive/$(AOM_VERSION).tar.gz
 
 PKGS += aom
 ifeq ($(call need_pkg,"aom"),)
@@ -19,7 +18,6 @@ aom: aom-$(AOM_VERSION).tar.gz .sum-aom
 	rm -Rf $(UNPACK_DIR) $@
 	mkdir -p $(UNPACK_DIR)
 	tar xvzfo "$<" -C $(UNPACK_DIR)
-	$(APPLY) $(SRC)/aom/aom-target-cpu.patch
 ifdef HAVE_ANDROID
 	$(APPLY) $(SRC)/aom/aom-android-pthreads.patch
 	$(APPLY) $(SRC)/aom/aom-android-cpufeatures.patch