[gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/

[Matt Turner]

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)