[vlc-commits] contrib: aom: do not force generic target

[Tristan Matthews]

vlc/vlc-3.0 | branch: master | Tristan Matthews <tmatth at videolan.org> | Tue Jan  8 12:28:54 2019 -0500| [f1e046481b42615bd5f982178c4613c41f42cfce] | committer: Tristan Matthews

contrib: aom: do not force generic target

This is the default for the av1-normative branch.

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

 contrib/src/aom/aom-target-cpu.patch | 15 +++++++++++++++
 contrib/src/aom/rules.mak            |  1 +
 2 files changed, 16 insertions(+)

diff --git a/contrib/src/aom/aom-target-cpu.patch b/contrib/src/aom/aom-target-cpu.patch
new file mode 100644
index 0000000000..93d4e170f2
--- /dev/null
+++ b/contrib/src/aom/aom-target-cpu.patch
@@ -0,0 +1,15 @@
+--- 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 3c6f10c5d4..48a3313091 100644
--- a/contrib/src/aom/rules.mak
+++ b/contrib/src/aom/rules.mak
@@ -19,6 +19,7 @@ aom: aom-$(AOM_VERSION).tar.gz .sum-aom
 	rm -Rf $@-$(AOM_VERSION) $@
 	mkdir -p $@-$(AOM_VERSION)
 	tar xvzf "$<" -C $@-$(AOM_VERSION)
+	$(APPLY) $(SRC)/aom/aom-target-cpu.patch
 ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/aom/aom-pthreads-win32.patch
 endif