diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-08-01 17:24:02 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-08-01 17:24:02 +0000 |
| commit | 72abe89bb582721c3291f6856bf31196d313cf76 (patch) | |
| tree | 179cb857f0a3190f1df05fec10c56342a411a23a /media-libs | |
| parent | fix description (diff) | |
| download | gentoo-2-72abe89bb582721c3291f6856bf31196d313cf76.tar.gz gentoo-2-72abe89bb582721c3291f6856bf31196d313cf76.tar.bz2 gentoo-2-72abe89bb582721c3291f6856bf31196d313cf76.zip | |
Go multilib and stack for for medialibs r8
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/x264/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/x264/x264-9999.ebuild | 18 |
2 files changed, 13 insertions, 10 deletions
diff --git a/media-libs/x264/ChangeLog b/media-libs/x264/ChangeLog index 79784a85281c..7cb5d364c6a2 100644 --- a/media-libs/x264/ChangeLog +++ b/media-libs/x264/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/x264 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.94 2013/08/01 16:59:00 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.95 2013/08/01 17:24:02 aballier Exp $ + + 01 Aug 2013; Alexis Ballier <aballier@gentoo.org> x264-9999.ebuild: + Go multilib and stack for for medialibs r8 01 Aug 2013; Alexis Ballier <aballier@gentoo.org> x264-9999.ebuild, +files/x264-cflags.patch: diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild index 9cd08f523ccc..8d738925d1fb 100644 --- a/media-libs/x264/x264-9999.ebuild +++ b/media-libs/x264/x264-9999.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.13 2013/08/01 16:59:00 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.14 2013/08/01 17:24:02 aballier Exp $ EAPI=5 -inherit flag-o-matic multilib toolchain-funcs eutils +inherit flag-o-matic multilib toolchain-funcs eutils multilib-minimal DESCRIPTION="A free library for encoding X264/AVC streams" HOMEPAGE="http://www.videolan.org/developers/x264.html" @@ -26,10 +26,10 @@ LICENSE="GPL-2" IUSE="10bit +interlaced pic static-libs sse +threads" ASM_DEP=">=dev-lang/yasm-1.2.0" -DEPEND="amd64? ( ${ASM_DEP} ) - amd64-fbsd? ( ${ASM_DEP} ) - x86? ( ${ASM_DEP} ) - x86-fbsd? ( ${ASM_DEP} )" +DEPEND="abi_x86_32? ( ${ASM_DEP} ) + abi_x86_64? ( ${ASM_DEP} )" +RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7 + !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" DOCS="AUTHORS doc/*.txt" @@ -39,18 +39,18 @@ src_prepare() { epatch "${FILESDIR}"/x264-cflags.patch } -src_configure() { +multilib_src_configure() { tc-export CC local asm_conf="" - if use x86 && use pic || [[ ${ABI} == "x32" ]]; then + if [[ ${ABI} == x86* ]] && use pic || [[ ${ABI} == "x32" ]]; then asm_conf=" --disable-asm" fi # Upstream uses this, see the cflags patch use sse && append-flags "-msse" "-mfpmath=sse" - ./configure \ + "${S}/configure" \ --prefix="${EPREFIX}"/usr \ --libdir="${EPREFIX}"/usr/$(get_libdir) \ --disable-cli \ |