[gentoo-commits] repo/gentoo:master commit in: media-libs/x264/

[Alexis Ballier]

commit:     957db0b234d928bb48a8890f78b2bd6332ebc8f8
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 14:23:09 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 14:23:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=957db0b2

media-libs/x264: Add altivec useflag and disable ppc asm if not enabled, since 
ppc asm is what that means.

Bug #616004.
Patch by Marcus Comstedt

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-libs/x264/x264-0.0.20160712.ebuild | 4 ++--
 media-libs/x264/x264-9999.ebuild         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-libs/x264/x264-0.0.20160712.ebuild 
b/media-libs/x264/x264-0.0.20160712.ebuild
index 85989275285..ee2a5490d74 100644
--- a/media-libs/x264/x264-0.0.20160712.ebuild
+++ b/media-libs/x264/x264-0.0.20160712.ebuild
@@ -22,7 +22,7 @@ SONAME="148"
 SLOT="0/${SONAME}"
 
 LICENSE="GPL-2"
-IUSE="10bit +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
+IUSE="10bit altivec +interlaced opencl pic static-libs cpu_flags_x86_sse 
+threads"
 
 ASM_DEP=">=dev-lang/yasm-1.2.0"
 DEPEND="abi_x86_32? ( ${ASM_DEP} )
@@ -38,7 +38,7 @@ multilib_src_configure() {
        tc-export CC
        local asm_conf=""
 
-       if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || 
[[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]]; then
+       if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || 
[[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]] || [[ ${ABI} == ppc* ]] && { 
use !altivec ; }; then
                asm_conf=" --disable-asm"
        fi
 

diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild
index ad54c5cdf91..8cfe28afdd7 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-9999.ebuild
@@ -22,7 +22,7 @@ SONAME="148"
 SLOT="0/${SONAME}"
 
 LICENSE="GPL-2"
-IUSE="10bit +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
+IUSE="10bit altivec +interlaced opencl pic static-libs cpu_flags_x86_sse 
+threads"
 
 ASM_DEP=">=dev-lang/yasm-1.2.0"
 DEPEND="abi_x86_32? ( ${ASM_DEP} )
@@ -38,7 +38,7 @@ multilib_src_configure() {
        tc-export CC
        local asm_conf=""
 
-       if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || 
[[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]]; then
+       if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || 
[[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]] || [[ ${ABI} == ppc* ]] && { 
use !altivec ; }; then
                asm_conf=" --disable-asm"
        fi