summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Andrews <candrews@gentoo.org>2018-11-12 09:21:48 -0500
committerCraig Andrews <candrews@gentoo.org>2018-11-13 07:57:51 -0500
commitf3a9a901f710d75e7e025db0d7acb423f9eb470c (patch)
tree899f0ed5fe7a02fd836ed54d9aacbff253362a85 /media-libs/libaom
parentmedia-libs/libaom: Correctly report version as 1.0.0 (diff)
downloadgentoo-f3a9a901f710d75e7e025db0d7acb423f9eb470c.tar.gz
gentoo-f3a9a901f710d75e7e025db0d7acb423f9eb470c.tar.bz2
gentoo-f3a9a901f710d75e7e025db0d7acb423f9eb470c.zip
media-libs/libaom: Fix configure on armv7l
Closes: https://bugs.gentoo.org/658068 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Craig Andrews <candrews@gentoo.org>
Diffstat (limited to 'media-libs/libaom')
-rw-r--r--media-libs/libaom/files/libaom-1.0.0-armv7l.patch13
-rw-r--r--media-libs/libaom/libaom-1.0.0-r1.ebuild1
2 files changed, 14 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/libaom-1.0.0-r1.ebuild b/media-libs/libaom/libaom-1.0.0-r1.ebuild
index f51e105a845f..1fc265f2b28b 100644
--- a/media-libs/libaom/libaom-1.0.0-r1.ebuild
+++ b/media-libs/libaom/libaom-1.0.0-r1.ebuild
@@ -46,6 +46,7 @@ PATCHES=(
"${FILESDIR}/libdirpc2.patch"
"${FILESDIR}/pthread_lib2.patch"
"${FILESDIR}/${P}-version.patch"
+ "${FILESDIR}/${P}-armv7l.patch"
)
src_prepare() {