Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/pixman/
Date: Tue, 29 Nov 2022 16:53:40
Message-Id: 1669740756.d4cf1f51a0421a5e56c0d010bb86a5b057d67c11.mattst88@gentoo
1 commit: d4cf1f51a0421a5e56c0d010bb86a5b057d67c11
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 29 16:44:20 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 29 16:52:36 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4cf1f51
7
8 x11-libs/pixman: Fix enabling neon on arm/arm64
9
10 Closes: https://bugs.gentoo.org/881169
11 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
12
13 x11-libs/pixman/pixman-0.42.2.ebuild | 9 +++++++--
14 x11-libs/pixman/pixman-9999.ebuild | 9 +++++++--
15 2 files changed, 14 insertions(+), 4 deletions(-)
16
17 diff --git a/x11-libs/pixman/pixman-0.42.2.ebuild b/x11-libs/pixman/pixman-0.42.2.ebuild
18 index 802e65eac019..4c274d484e3b 100644
19 --- a/x11-libs/pixman/pixman-0.42.2.ebuild
20 +++ b/x11-libs/pixman/pixman-0.42.2.ebuild
21 @@ -46,8 +46,6 @@ multilib_src_configure() {
22 $(meson_feature cpu_flags_x86_sse2 sse2)
23 $(meson_feature cpu_flags_x86_ssse3 ssse3)
24 $(meson_feature cpu_flags_ppc_altivec vmx)
25 - $(meson_feature cpu_flags_arm_neon neon)
26 - $(meson_feature cpu_flags_arm_neon a64-neon)
27 $(meson_feature loongson2f loongson-mmi)
28 $(meson_feature test openmp) # only used in unit tests
29 $(meson_feature test tests)
30 @@ -55,6 +53,13 @@ multilib_src_configure() {
31 -Dgtk=disabled
32 -Dlibpng=disabled
33 )
34 +
35 + if [[ ${ABI} == arm64 ]]; then
36 + emesonargs+=($(meson_feature cpu_flags_arm_neon a64-neon))
37 + elif [[ ${ABI} == arm ]]; then
38 + emesonargs+=($(meson_feature cpu_flags_arm_neon neon))
39 + fi
40 +
41 meson_src_configure
42 }
43
44
45 diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
46 index 0fbef29030a3..1cd3dd3a43a8 100644
47 --- a/x11-libs/pixman/pixman-9999.ebuild
48 +++ b/x11-libs/pixman/pixman-9999.ebuild
49 @@ -46,8 +46,6 @@ multilib_src_configure() {
50 $(meson_feature cpu_flags_x86_sse2 sse2)
51 $(meson_feature cpu_flags_x86_ssse3 ssse3)
52 $(meson_feature cpu_flags_ppc_altivec vmx)
53 - $(meson_feature cpu_flags_arm_neon neon)
54 - $(meson_feature cpu_flags_arm_neon a64-neon)
55 $(meson_feature loongson2f loongson-mmi)
56 $(meson_feature test openmp) # only used in unit tests
57 $(meson_feature test tests)
58 @@ -55,6 +53,13 @@ multilib_src_configure() {
59 -Dgtk=disabled
60 -Dlibpng=disabled
61 )
62 +
63 + if [[ ${ABI} == arm64 ]]; then
64 + emesonargs+=($(meson_feature cpu_flags_arm_neon a64-neon))
65 + elif [[ ${ABI} == arm ]]; then
66 + emesonargs+=($(meson_feature cpu_flags_arm_neon neon))
67 + fi
68 +
69 meson_src_configure
70 }