From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 755F2158042 for ; Sat, 9 Nov 2024 07:24:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87E06E087D; Sat, 9 Nov 2024 07:24:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 704CCE087D for ; Sat, 9 Nov 2024 07:24:21 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A44A533BED4 for ; Sat, 9 Nov 2024 07:24:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3F5761AED for ; Sat, 9 Nov 2024 07:24:19 +0000 (UTC) From: "Matt Jolly" 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 Jolly" Message-ID: <1731136967.60aa21be044325680e1001d43a7e04d8791968e0.kangie@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.7-r1.ebuild media-libs/mesa/mesa-24.2.3-r1.ebuild media-libs/mesa/mesa-24.2.4-r1.ebuild media-libs/mesa/mesa-24.2.5-r1.ebuild media-libs/mesa/mesa-24.2.6-r1.ebuild media-libs/mesa/mesa-9999.ebuild X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 60aa21be044325680e1001d43a7e04d8791968e0 X-VCS-Branch: master Date: Sat, 9 Nov 2024 07:24:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f4a0c3a1-bcec-47af-9903-c48688e1fe98 X-Archives-Hash: 47a792a6772b396968cd9c06432614cd commit: 60aa21be044325680e1001d43a7e04d8791968e0 Author: Matt Jolly gentoo org> AuthorDate: Sat Nov 9 07:20:10 2024 +0000 Commit: Matt Jolly gentoo 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 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 }