summaryrefslogtreecommitdiff
path: root/media-libs/x264/x264-9999.ebuild
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs/x264/x264-9999.ebuild')
-rw-r--r--media-libs/x264/x264-9999.ebuild9
1 files changed, 8 insertions, 1 deletions
diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild
index 83de5d6c78bb..98ce78b4c8e5 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-9999.ebuild
@@ -17,7 +17,7 @@ else
S="${WORKDIR}/${MY_P}"
fi
-SLOT="0/159" # SONAME
+SLOT="0/161" # SONAME
LICENSE="GPL-2"
IUSE="cpu_flags_ppc_altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
@@ -32,6 +32,13 @@ DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt )
multilib_src_configure() {
tc-export CC
+
+ if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then
+ export AS="nasm"
+ else
+ export AS="${CC}"
+ fi
+
local asm_conf=""
if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || [[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]] || [[ ${ABI} == ppc* ]] && { use !cpu_flags_ppc_altivec ; }; then