x11-libs/pixman: Switch USE=neon -> CPU_FLAGS_ARM=neon

Signed-off-by: Matt Turner <mattst88@gentoo.org>

diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index db7e10319702489e57ad45d0a0860e5cff5be230..9dd68701321a8436c065217e4ba5c93f7f9343d5 100644 (file)
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -333,9 +333,8 @@ media-sound/pulseaudio neon
 media-libs/vo-aacenc cpu_flags_arm_neon
 
 # Alexis Ballier <aballier@gentoo.org> (2017-06-16)
-# neon on pixman seems armv7 only, at least according to configure checks: it
-# aborts when neon is enabled.
-x11-libs/pixman neon
+# pixman's neon code is armv7 only.
+x11-libs/pixman cpu_flags_arm_neon neon
 
 # James Le Cuirot <chewi@gentoo.org> (2017-05-22)
 # Only available on some architectures.

diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index 17ea41af3389bfce81961a27c16c84ab56de0e6a..d47bd5ea26c826c6183a37d4cfdd15f8190abd7c 100644 (file)
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
+IUSE="altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
 
 src_unpack() {
        default
@@ -40,7 +40,7 @@ multilib_src_configure() {
                $(meson_feature cpu_flags_x86_sse2 sse2)
                $(meson_feature cpu_flags_x86_ssse3 ssse3)
                $(meson_feature altivec vmx)
-               $(meson_feature neon neon)
+               $(meson_feature cpu_flags_arm_neon neon)
                $(meson_feature loongson2f loongson-mmi)
                -Dgtk=disabled
                -Dlibpng=disabled