From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1461691-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id B7B68158021
for <garchives@archives.gentoo.org>; Tue, 29 Nov 2022 16:53:40 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D5D9AE07C5;
Tue, 29 Nov 2022 16:53:38 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id B773CE07C5
for <gentoo-commits@lists.gentoo.org>; Tue, 29 Nov 2022 16:53:38 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id B4A553412B3
for <gentoo-commits@lists.gentoo.org>; Tue, 29 Nov 2022 16:53:37 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 03D6973C
for <gentoo-commits@lists.gentoo.org>; Tue, 29 Nov 2022 16:53:36 +0000 (UTC)
From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" <mattst88@gentoo.org>
Message-ID: <1669740756.d4cf1f51a0421a5e56c0d010bb86a5b057d67c11.mattst88@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/pixman/
X-VCS-Repository: repo/gentoo
X-VCS-Files: x11-libs/pixman/pixman-0.42.2.ebuild x11-libs/pixman/pixman-9999.ebuild
X-VCS-Directories: x11-libs/pixman/
X-VCS-Committer: mattst88
X-VCS-Committer-Name: Matt Turner
X-VCS-Revision: d4cf1f51a0421a5e56c0d010bb86a5b057d67c11
X-VCS-Branch: master
Date: Tue, 29 Nov 2022 16:53:36 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: cd8a290e-22ff-40f7-b379-6bd5c5d4fd1a
X-Archives-Hash: f6ce7e1ac93e02093be7fc89403c6727
commit: d4cf1f51a0421a5e56c0d010bb86a5b057d67c11
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 16:44:20 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 16:52:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4cf1f51
x11-libs/pixman: Fix enabling neon on arm/arm64
Closes: https://bugs.gentoo.org/881169
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-libs/pixman/pixman-0.42.2.ebuild | 9 +++++++--
x11-libs/pixman/pixman-9999.ebuild | 9 +++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/x11-libs/pixman/pixman-0.42.2.ebuild b/x11-libs/pixman/pixman-0.42.2.ebuild
index 802e65eac019..4c274d484e3b 100644
--- a/x11-libs/pixman/pixman-0.42.2.ebuild
+++ b/x11-libs/pixman/pixman-0.42.2.ebuild
@@ -46,8 +46,6 @@ multilib_src_configure() {
$(meson_feature cpu_flags_x86_sse2 sse2)
$(meson_feature cpu_flags_x86_ssse3 ssse3)
$(meson_feature cpu_flags_ppc_altivec vmx)
- $(meson_feature cpu_flags_arm_neon neon)
- $(meson_feature cpu_flags_arm_neon a64-neon)
$(meson_feature loongson2f loongson-mmi)
$(meson_feature test openmp) # only used in unit tests
$(meson_feature test tests)
@@ -55,6 +53,13 @@ multilib_src_configure() {
-Dgtk=disabled
-Dlibpng=disabled
)
+
+ if [[ ${ABI} == arm64 ]]; then
+ emesonargs+=($(meson_feature cpu_flags_arm_neon a64-neon))
+ elif [[ ${ABI} == arm ]]; then
+ emesonargs+=($(meson_feature cpu_flags_arm_neon neon))
+ fi
+
meson_src_configure
}
diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index 0fbef29030a3..1cd3dd3a43a8 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -46,8 +46,6 @@ multilib_src_configure() {
$(meson_feature cpu_flags_x86_sse2 sse2)
$(meson_feature cpu_flags_x86_ssse3 ssse3)
$(meson_feature cpu_flags_ppc_altivec vmx)
- $(meson_feature cpu_flags_arm_neon neon)
- $(meson_feature cpu_flags_arm_neon a64-neon)
$(meson_feature loongson2f loongson-mmi)
$(meson_feature test openmp) # only used in unit tests
$(meson_feature test tests)
@@ -55,6 +53,13 @@ multilib_src_configure() {
-Dgtk=disabled
-Dlibpng=disabled
)
+
+ if [[ ${ABI} == arm64 ]]; then
+ emesonargs+=($(meson_feature cpu_flags_arm_neon a64-neon))
+ elif [[ ${ABI} == arm ]]; then
+ emesonargs+=($(meson_feature cpu_flags_arm_neon neon))
+ fi
+
meson_src_configure
}