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

[Matt Jolly]

commit:     60aa21be044325680e1001d43a7e04d8791968e0
Author:     Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  9 07:20:10 2024 +0000
Commit:     Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 07:22:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60aa21be

media-libs/mesa: properly gate rust_pkg_setup

Previously we called it if USE=vulkan, however it's actually
gated by USE=vulkan && USE=video_cards_nvk.

Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>

 media-libs/mesa/mesa-24.1.7-r1.ebuild | 2 +-
 media-libs/mesa/mesa-24.2.3-r1.ebuild | 2 +-
 media-libs/mesa/mesa-24.2.4-r1.ebuild | 2 +-
 media-libs/mesa/mesa-24.2.5-r1.ebuild | 2 +-
 media-libs/mesa/mesa-24.2.6-r1.ebuild | 2 +-
 media-libs/mesa/mesa-9999.ebuild      | 5 +----
 6 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/media-libs/mesa/mesa-24.1.7-r1.ebuild 
b/media-libs/mesa/mesa-24.1.7-r1.ebuild
index 5d4171f71288..ebfcea5d7aac 100644
--- a/media-libs/mesa/mesa-24.1.7-r1.ebuild
+++ b/media-libs/mesa/mesa-24.1.7-r1.ebuild
@@ -295,7 +295,7 @@ pkg_setup() {
        use llvm && llvm-r1_pkg_setup
        python-any-r1_pkg_setup
 
-       if use opencl || use vulkan; then
+       if use opencl || (use vulkan && use video_cards_nvk); then
                rust_pkg_setup
        fi
 }

diff --git a/media-libs/mesa/mesa-24.2.3-r1.ebuild 
b/media-libs/mesa/mesa-24.2.3-r1.ebuild
index d45bd4b23536..3dd7cb3ad57b 100644
--- a/media-libs/mesa/mesa-24.2.3-r1.ebuild
+++ b/media-libs/mesa/mesa-24.2.3-r1.ebuild
@@ -299,7 +299,7 @@ pkg_setup() {
        use llvm && llvm-r1_pkg_setup
        python-any-r1_pkg_setup
 
-       if use opencl || use vulkan; then
+       if use opencl || (use vulkan && use video_cards_nvk); then
                rust_pkg_setup
        fi
 }

diff --git a/media-libs/mesa/mesa-24.2.4-r1.ebuild 
b/media-libs/mesa/mesa-24.2.4-r1.ebuild
index d45bd4b23536..3dd7cb3ad57b 100644
--- a/media-libs/mesa/mesa-24.2.4-r1.ebuild
+++ b/media-libs/mesa/mesa-24.2.4-r1.ebuild
@@ -299,7 +299,7 @@ pkg_setup() {
        use llvm && llvm-r1_pkg_setup
        python-any-r1_pkg_setup
 
-       if use opencl || use vulkan; then
+       if use opencl || (use vulkan && use video_cards_nvk); then
                rust_pkg_setup
        fi
 }

diff --git a/media-libs/mesa/mesa-24.2.5-r1.ebuild 
b/media-libs/mesa/mesa-24.2.5-r1.ebuild
index d45bd4b23536..3dd7cb3ad57b 100644
--- a/media-libs/mesa/mesa-24.2.5-r1.ebuild
+++ b/media-libs/mesa/mesa-24.2.5-r1.ebuild
@@ -299,7 +299,7 @@ pkg_setup() {
        use llvm && llvm-r1_pkg_setup
        python-any-r1_pkg_setup
 
-       if use opencl || use vulkan; then
+       if use opencl || (use vulkan && use video_cards_nvk); then
                rust_pkg_setup
        fi
 }

diff --git a/media-libs/mesa/mesa-24.2.6-r1.ebuild 
b/media-libs/mesa/mesa-24.2.6-r1.ebuild
index d45bd4b23536..3dd7cb3ad57b 100644
--- a/media-libs/mesa/mesa-24.2.6-r1.ebuild
+++ b/media-libs/mesa/mesa-24.2.6-r1.ebuild
@@ -299,7 +299,7 @@ pkg_setup() {
        use llvm && llvm-r1_pkg_setup
        python-any-r1_pkg_setup
 
-       if use opencl || use vulkan; then
+       if use opencl || (use vulkan && use video_cards_nvk); then
                rust_pkg_setup
        fi
 }

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index f78c0c4a32e4..ceba860297d1 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -298,10 +298,7 @@ pkg_setup() {
        use llvm && llvm-r1_pkg_setup
        python-any-r1_pkg_setup
 
-       if use opencl || use vulkan; then
-               rust_pkg_setup
-       fi
-       if use opencl || use vulkan; then
+       if use opencl || (use vulkan && use video_cards_nvk); then
                rust_pkg_setup
        fi
 }