From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1637385-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 9105F1581D3
for <garchives@archives.gentoo.org>; Fri, 31 May 2024 16:27:26 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D121BE29FE;
Fri, 31 May 2024 16:27:25 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(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 AA71DE29FE
for <gentoo-commits@lists.gentoo.org>; Fri, 31 May 2024 16:27:25 +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 98D2633BF39
for <gentoo-commits@lists.gentoo.org>; Fri, 31 May 2024 16:27:24 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 05388148D
for <gentoo-commits@lists.gentoo.org>; Fri, 31 May 2024 16:27:23 +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: <1717172838.e5fba1addf36ad42a3437416d62b02a64db1a775.mattst88@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/mesa/mesa-24.1.0-r1.ebuild media-libs/mesa/mesa-9999.ebuild
X-VCS-Directories: media-libs/mesa/
X-VCS-Committer: mattst88
X-VCS-Committer-Name: Matt Turner
X-VCS-Revision: e5fba1addf36ad42a3437416d62b02a64db1a775
X-VCS-Branch: master
Date: Fri, 31 May 2024 16:27:23 +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: f5cb49ea-1299-4393-85a7-edbe2b9223fb
X-Archives-Hash: a0610ffccfafccda422679ca499466db
commit: e5fba1addf36ad42a3437416d62b02a64db1a775
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May 31 16:26:07 2024 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri May 31 16:27:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5fba1ad
media-libs/mesa: Disable intel-rt on x86
In commit 911669b55c71 ("media-libs/mesa: Limit intel-rt to native ABI")
I failed to consider regular old 32-bit x86 platforms.
Closes: https://bugs.gentoo.org/932875
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-libs/mesa/mesa-24.1.0-r1.ebuild | 5 ++++-
media-libs/mesa/mesa-9999.ebuild | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/media-libs/mesa/mesa-24.1.0-r1.ebuild b/media-libs/mesa/mesa-24.1.0-r1.ebuild
index b5b9519bb96e..dee69ac8033e 100644
--- a/media-libs/mesa/mesa-24.1.0-r1.ebuild
+++ b/media-libs/mesa/mesa-24.1.0-r1.ebuild
@@ -415,6 +415,10 @@ multilib_src_configure() {
emesonargs+=(-Dglx=disabled)
fi
+ if [[ "${ABI}" == amd64 ]]; then
+ emesonargs+=($(meson_feature video_cards_intel intel-rt))
+ fi
+
use debug && EMESON_BUILDTYPE=debug
emesonargs+=(
@@ -433,7 +437,6 @@ multilib_src_configure() {
$(meson_use osmesa)
$(meson_use selinux)
$(meson_feature unwind libunwind)
- $(meson_native_use_feature video_cards_intel intel-rt)
$(meson_feature zstd)
$(meson_use cpu_flags_x86_sse2 sse2)
-Dintel-clc=$(usex video_cards_intel system auto)
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index b5b9519bb96e..dee69ac8033e 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -415,6 +415,10 @@ multilib_src_configure() {
emesonargs+=(-Dglx=disabled)
fi
+ if [[ "${ABI}" == amd64 ]]; then
+ emesonargs+=($(meson_feature video_cards_intel intel-rt))
+ fi
+
use debug && EMESON_BUILDTYPE=debug
emesonargs+=(
@@ -433,7 +437,6 @@ multilib_src_configure() {
$(meson_use osmesa)
$(meson_use selinux)
$(meson_feature unwind libunwind)
- $(meson_native_use_feature video_cards_intel intel-rt)
$(meson_feature zstd)
$(meson_use cpu_flags_x86_sse2 sse2)
-Dintel-clc=$(usex video_cards_intel system auto)