commit: 92b8e9a2f9d0f3df5fd691d9cb208df91d0ccba1
parent: 50604e490502ba0c2d2fe00b5ac5afafd9b24e29
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Sun, 3 Jun 2018 01:51:24 +0200
media-libs/x264: USE asm flag, instead of in-ebuild ABI masking
Diffstat:
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/media-libs/x264/x264-0.0.20170701.ebuild b/media-libs/x264/x264-0.0.20170701.ebuild
@@ -22,7 +22,7 @@ SONAME="152"
SLOT="0/${SONAME}"
LICENSE="GPL-2"
-IUSE="10bit altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
+IUSE="10bit altivec asm +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
ASM_DEP=">=dev-lang/nasm-2.13"
DEPEND="abi_x86_32? ( ${ASM_DEP} )
@@ -34,11 +34,6 @@ DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt )
multilib_src_configure() {
tc-export CC
- local asm_conf=""
-
- if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || [[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]] || [[ ${ABI} == ppc* ]] && { use !altivec ; }; then
- asm_conf=" --disable-asm"
- fi
"${S}/configure" \
--prefix="${EPREFIX}"/usr \
@@ -57,5 +52,5 @@ multilib_src_configure() {
$(usex opencl "" "--disable-opencl") \
$(usex static-libs "--enable-static" "") \
$(usex threads "" "--disable-thread") \
- ${asm_conf} || die
+ $(use_enable asm)
}