gentoo resync : 18.11.2018

4 files changed, 115 insertions, 0 deletions

diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 9323a625ddf2..debf502f54ff 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -1,6 +1,9 @@
+AUX libaom-1.0.0-armv7l.patch 677 BLAKE2B 600f7ea90c611e0a7b7a54e70c208061f6aefb0d2f4d096b19f5d77288fd0c8760cb5a1b044c5c9bbefe2d3c9ecfe6049a7d14a55586bae44c770fc3c953511b SHA512 0ab5a011d458238f4cae1e5d618e928ba3ba780c494c4e56ff2dc28b782de62265fade7a0a08b001a1c5ff6128d7d625516f61f7f1ce0452116ca873fd1544ec
+AUX libaom-1.0.0-version.patch 403 BLAKE2B 8ab115aecb2251750f964bafea7e74ea8e4ede648bffa42724e0b71a47bd1ffe841c36059a8e634cc581488a645dc4cc42d8884516067ec79a3f71adae1e8b06 SHA512 ca715566cb821de9b32cdc77b1a1f2b11627e7ced3c134f75fa9a1d1dc59494c4097bb6d9efa0adfa5c841f73666fe10cd86f2ca9db01e07ab97e1966d8dd159
 AUX libdirpc2.patch 2481 BLAKE2B 6236c31784ebd76884e716857e665824f9b325a97c2cb8e01a38c97b0398141202d7cab0a8d9b69b037ad8ba0b7d5e293bda3e2c491906ac6dd9555f7d4631ec SHA512 ec47d5b026c4b687649a2ce46500376103ae3fef21cba2cb564771c3738dba4e61e51858875516f884ab4604b0c160e6ee07b98e6740643e18f596c624df1ccb
 AUX pthread_lib2.patch 535 BLAKE2B 17eabab9e5d7b9d22b4f25ec8006e7e48bc3683b88f560bcb092234a1448ff47ae20d6ba04efb1af5742d7fc253acf9c944322acc8e8ed1acfad0b08df358eda SHA512 be19983342bae014409dd22c2e94ce11a5003a8ded3547a287ff71f53ef63ce1a1cfd6cdfbbfbf36deece2d3c1d9fb3e8e679598698a045229f79ba704976001
 DIST libaom-1.0.0.tar.gz 2775454 BLAKE2B 09b891d365804f0c086785a00760af3191b40fc66fc752294e915b54454171fb47d3d1b037fb6d276727772ceec3177d78c14f90a2b01e28250d2de735bf02ec SHA512 131512ef286cb138047bb56dea54196f9a8d2b0d9f3d7689299f185338e5c03ee658b0cfe017a099f1a6be351a3a7157204dea70d2645a1d0a9249fd582c3fa4
+EBUILD libaom-1.0.0-r1.ebuild 2440 BLAKE2B 34720b3fe6d174a9e069dd8708725ba834711885818c2585179afe229effa58551cb45ca4ef8f984424210284d1bdf919c3c02532e7ec09d30bea55333c9d6c1 SHA512 13f1de9f2a2ab03947286efc76d71dac163637a0b0c94cccc628eec113f7bff1c882713d15c22893cfa130d7708636d29b779a60d2d8b9133457fb0dcc1eda0f
 EBUILD libaom-1.0.0.ebuild 2374 BLAKE2B 8728a4a8d71dac7a07f4c91bec20802aa8595c0b4171ea01effe66bff9e83cc66aa37e81b837bc014242af63c3bc0bcada084b4c61eb7ecad5d8861fa466e721 SHA512 d7f35a202de62518fbaec96a3cabd4549e0acc9e306cd8f9715ac279f59067c624e3e58ae92f515d8ff2b22611c72583d1747fb56c57ed129b50b450bae815f8
 EBUILD libaom-9999.ebuild 2369 BLAKE2B f3fab7bda7c1aaaeab7dfb6cc3da7ddec3e1176e48a48a912b0e11a8206ce3ee3200993b94fb00759f3b75e701659157f15b7fdca2208d7d1d07a59f75969409 SHA512 7f7d1450f4f7c1bd605c86f0d0900b50d1773a7f19b2da3efb6f1077f46acc1912c7c5635010ba57661cacf5cef436040f3257d817812ce538b3f5785d03a965
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
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...).
diff --git a/media-libs/libaom/libaom-1.0.0-r1.ebuild b/media-libs/libaom/libaom-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..1fc265f2b28b
--- /dev/null
+++ b/media-libs/libaom/libaom-1.0.0-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
+else
+	if [[ ${PV} == *pre* ]]; then
+		SRC_URI="mirror://gentoo/${P}.tar.xz"
+		S="${WORKDIR}/${PN}"
+	else
+		# SRC_URI="https://aomedia.googlesource.com/aom/+archive/v${PV}.tar.gz -> ${P}.tar.gz"
+		SRC_URI="mirror://gentoo/${P}.tar.gz"
+		S="${WORKDIR}"
+	fi
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86"
+fi
+
+DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
+HOMEPAGE="https://aomedia.org"
+
+LICENSE="BSD-2"
+SLOT="0/0"
+IUSE="doc examples"
+IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_avx cpu_flags_x86_avx2"
+IUSE="${IUSE} cpu_flags_arm_neon"
+
+RDEPEND=""
+DEPEND="abi_x86_32? ( dev-lang/yasm )
+	abi_x86_64? ( dev-lang/yasm )
+	abi_x86_x32? ( dev-lang/yasm )
+	x86-fbsd? ( dev-lang/yasm )
+	amd64-fbsd? ( dev-lang/yasm )
+	doc? ( app-doc/doxygen )
+"
+
+REQUIRED_USE="
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+"
+
+PATCHES=(
+	"${FILESDIR}/libdirpc2.patch"
+	"${FILESDIR}/pthread_lib2.patch"
+	"${FILESDIR}/${P}-version.patch"
+	"${FILESDIR}/${P}-armv7l.patch"
+)
+
+src_prepare() {
+	sed -e 's/lib"/lib${LIB_SUFFIX}"/' -i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
+		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
+		-DENABLE_NASM=OFF
+		-DENABLE_TOOLS=ON
+		-DENABLE_WERROR=OFF
+
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON OFF)
+		-DENABLE_NEON_ASM=$(usex cpu_flags_arm_neon ON OFF)
+		# ENABLE_DSPR2 / ENABLE_MSA for mips
+		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
+		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
+		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
+		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)
+		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+
+		-DBUILD_SHARED_LIBS=ON
+	)
+	cmake-utils_src_configure
+	rm aom.pc # ensure it is rebuilt with proper libdir
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+	if multilib_is_native_abi && use doc ; then
+		docinto html
+		dodoc docs/html/*
+	fi
+}