gentoo resync : 18.11.2018

2 files changed, 23 insertions, 0 deletions

diff --git a/media-libs/libaom/files/libaom-1.0.0-armv7l.patch b/media-libs/libaom/files/libaom-1.0.0-armv7l.patch
new file mode 100644
index 000000000000..25fb9e0ff41c
--- /dev/null
+++ b/media-libs/libaom/files/libaom-1.0.0-armv7l.patch
@@ -0,0 +1,13 @@
+Only in libaom.orig/build/cmake: .aom_configure.cmake.swp
+diff -ru libaom.orig/build/cmake/aom_configure.cmake libaom/build/cmake/aom_configure.cmake
+--- libaom.orig/build/cmake/aom_configure.cmake	2018-06-13 21:22:56.295771914 +0200
++++ libaom/build/cmake/aom_configure.cmake	2018-06-13 21:23:10.489772591 +0200
+@@ -16,7 +16,7 @@
+ include(FindThreads)
+ 
+ set(AOM_SUPPORTED_CPU_TARGETS
+-    "arm64 armv7 armv7s generic mips32 mips64 ppc x86 x86_64")
++    "arm64 armv7 armv7l armv7s generic mips32 mips64 ppc x86 x86_64")
+ 
+ # Generate the user config settings. This must occur before include of
+ # aom_config_defaults.cmake (because it turns every config variable into a cache
diff --git a/media-libs/libaom/files/libaom-1.0.0-version.patch b/media-libs/libaom/files/libaom-1.0.0-version.patch
new file mode 100644
index 000000000000..6b2145d5ba9b
--- /dev/null
+++ b/media-libs/libaom/files/libaom-1.0.0-version.patch
@@ -0,0 +1,10 @@
+--- a/build/cmake/version.cmake	2018-09-21 01:20:32.299238765 +0200
++++ b/build/cmake/version.cmake	2018-09-21 01:21:01.473106534 +0200
+@@ -46,6 +46,7 @@
+ endif()
+ 
+ if(NOT "${aom_version}" STREQUAL "${last_aom_version}")
++  set(aom_version "v1.0.0")
+ 
+   # TODO(tomfinegan): Perl dependency is unnecessary. CMake can do everything
+   # that is done by version.pl on its own (if a bit more verbose...).