updated to current and added arm/neon config

2 files changed, 135 insertions, 2 deletions

diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index f9fddd6..42cf63b 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -1,4 +1,4 @@
-AUX libvpx-1.3.0-sparc-configure.patch 475 SHA256 0854c8886cd3b2e74fc284db5f17984ebbc4afbfd96a64f90aa9d5390c1c688e SHA512 39b3e5563db9410ec2cf39bc72276b0ccb8ac0ffff479b3896bc4243981d7d59a96523baac067823126b2dde88211a87b7f615ff7a021b774449cb00b01d5c64 WHIRLPOOL f074ce8a4790caf67091f03edcfcb657fb2cd830331926bffe6355811362f39abb6148302c99c45e96c50a507dcd3bef66ac5a8b04d3153ab72a7c0149ad5b72
 DIST libvpx-1.4.0.tar.bz2 1807989 SHA256 f582d9b2d60a592a4a3d8c32965ca2d2167e9ade38c6c30bac8801ff66a118e4 SHA512 70234220e0ed64db000689ec8bea02dadef938a4f4dea96e5781d361c15245456212c1b6aec2b698d32ed423e73917d2303009e49224a2237669cab416dd6984 WHIRLPOOL 309055669aea96f8ed051ae33d2b86c4aac2096be43ac7140812d2b42e0b1b6e609d86206a01268137f18769f967cbd074beb75fe5b059ced71a1caefb8dcb05
+DIST libvpx-1.5.0.tar.bz2 1906571 SHA256 306d67908625675f8e188d37a81fbfafdf5068b09d9aa52702b6fbe601c76797 SHA512 5a952aa53e539a130d316723d424fa02a8f42a450950d74a16d8abc5df569ba5559b3b09a32140b638d7a0cd54be1c7b0f8306ad286825bc1281f513bb665fc5 WHIRLPOOL 9b7130aeb45c3c29ae92a2dd9d63c4d0eb02976d8a0061cc550e144b18101ec5b709a73a191ad61c80be7a4c5686a968a86b068eba6736de61d717c2eb11d550
 DIST libvpx-testdata-1.4.0.tar.bz2 113132379 SHA256 8458297dfe6ecc168a6bb3b41260aeef5c35296b99ced888767f70af40a50046 SHA512 5a0402ce1943fcd1a0e954a42728a409a512c9382883c227adea399f4ca4ff8b7d72d0247dce842c3e929dce86ca2bdad935fc82d3ee58ea72291c8fcdeca393 WHIRLPOOL b4b451be2074a1af1e36c757ac14dc41c764a32eeb4b4fed2bbb38030e51a18d0c37afd71db3118dc4af4546e212946fabc6e1cf453ebee88e66a43045c938be
-EBUILD libvpx-1.4.0.ebuild 4093 SHA256 89463838406232967158fb0ccde61ed1075dfe9a012d71a792baf7fc434559c0 SHA512 f3b5f61c60a8901d218b96657480fbecf693372f25f9f563c254e845081c1823c2de0fd16274d90ee6b6e1b92f2c8881f6a5c0754667d8cb2b0d07f892c06abd WHIRLPOOL 813a1e5391a5d40568b611cac96c9600630de8c3067403bf3d8ae15b0439db805b25f5f4b3833e920c8804f9d9783e9400f7008aa4e18e02efb46b8dd53f5575
+DIST libvpx-testdata-1.5.0.tar.bz2 117022525 SHA256 e707d6e1499250e24fb4b355f4e3e1cec848881c42016a5f1fc3068b7cc01257 SHA512 58abcea159d1f709c2b9b52e8ae381481ed0ee1f43972f5e52d628754844ed23f5f77180a9c3f950a19fd8e2eaec406288d9ec65a42c9d6d080a6948827698bb WHIRLPOOL 357ed7f300536f5767a264e6a379f9b19259b23dde925584f66a911c1e44605deff4f93aa4eb012cd7ffc20d6eb471cb227422d4c28f0776bef2979370a4e784
diff --git a/media-libs/libvpx/libvpx-1.5.0.ebuild b/media-libs/libvpx/libvpx-1.5.0.ebuild
new file mode 100644
index 0000000..d0ef942
--- /dev/null
+++ b/media-libs/libvpx/libvpx-1.5.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
+
+LIBVPX_TESTDATA_VER=1.5.0
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://chromium.googlesource.com/webm/${PN}.git"
+elif [[ ${PV} == *pre* ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+else
+	SRC_URI="http://storage.googleapis.com/downloads.webmproject.org/releases/webm/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+# generated by: make LIBVPX_TEST_DATA_PATH=libvpx-testdata testdata + tar'ing
+# it.
+SRC_URI="${SRC_URI}
+	test? ( mirror://gentoo/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.bz2 )"
+
+DESCRIPTION="WebM VP8 Codec SDK"
+HOMEPAGE="http://www.webmproject.org"
+
+LICENSE="BSD"
+SLOT="0/3"
+IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx neon postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 static-libs svc test +threads"
+
+RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+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
+		dev-lang/php
+	)
+"
+
+REQUIRED_USE="
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}/libvpx-1.3.0-sparc-configure.patch" # 501010
+}
+
+multilib_src_configure() {
+	unset CODECS #357487
+
+	local myconf
+	if [[ ${ARCH} == arm* ]] ; then
+		cputune=$(get-flag mtune)
+		[ -n ${cputune} ] && myconf+=" --cpu=${cputune}"
+		if use neon ; then
+			myconf+=" --enable-thumb --target=armv7-linux-gcc"
+		fi
+	fi
+
+	# let the build system decide which AS to use (it honours $AS but
+	# then feeds it with yasm flags without checking...) #345161
+	tc-export AS
+	case "${CHOST}" in
+		i?86*) export AS=yasm;;
+		x86_64*) export AS=yasm;;
+	esac
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=384585
+	# https://bugs.gentoo.org/show_bug.cgi?id=465988
+	# copied from php-pear-r1.eclass
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/
+	addpredict /var/lib/net-snmp/mib_indexes
+	addpredict /session_mm_cli0.sem
+
+	# Build with correct toolchain.
+	tc-export CC CXX AR NM
+	# Link with gcc by default, the build system should override this if needed.
+	export LD="${CC}"
+
+	local myconf
+	if [ "${ABI}" = "${DEFAULT_ABI}" ] ; then
+		myconf+=" $(use_enable doc install-docs) $(use_enable doc docs)"
+	else
+		# not needed for multilib and will be overwritten anyway.
+		myconf+=" --disable-examples --disable-install-docs --disable-docs"
+	fi
+
+	# #498364: sse doesn't work without sse2 enabled,
+	"${S}/configure" \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--enable-pic \
+		--enable-vp8 \
+		--enable-vp9 \
+		--enable-shared \
+		--extra-cflags="${CFLAGS}" \
+		$(use_enable cpu_flags_x86_avx avx) \
+		$(use_enable cpu_flags_x86_avx2 avx2) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable postproc) \
+		$(use cpu_flags_x86_sse2 && use_enable cpu_flags_x86_sse sse || echo --disable-sse) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable cpu_flags_x86_sse3 sse3) \
+		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
+		$(use_enable cpu_flags_x86_ssse3 ssse3) \
+		$(use_enable svc experimental) $(use_enable svc spatial-svc) \
+		$(use_enable static-libs static) \
+		$(use_enable test unit-tests) \
+		$(use_enable threads multithread) \
+		${myconf} \
+		|| die
+}
+
+multilib_src_compile() {
+	# build verbose by default and do not build examples that will not be installed
+	emake verbose=yes GEN_EXAMPLES=
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" \
+		emake verbose=yes GEN_EXAMPLES=  LIBVPX_TEST_DATA_PATH="${WORKDIR}/${PN}-testdata" test
+}
+
+multilib_src_install() {
+	emake verbose=yes GEN_EXAMPLES= DESTDIR="${D}" install
+	[ "${ABI}" = "${DEFAULT_ABI}" ] && use doc && dohtml docs/html/*
+}