[gentoo-commits] repo/gentoo:master commit in: profiles/arch/base/, dev-util/mesa_clc/

[gentoo-commits] repo/gentoo:master commit in: profiles/arch/base/, dev-util/mesa_clc/

[Matt Turner]

commit:     2b438e011045dc702c5867397dab03cb11661cad
Author:     Janne Grunau <j <AT> jannau <DOT> net>
AuthorDate: Wed Apr 30 20:13:33 2025 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri May  2 01:43:22 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b438e01

dev-util/mesa_clc: Build asahi tools / precomp-compiler

The asahi gallium/vulkan drivers depend on the host tool `asahi_clc`. Add
it to dev-util/mesa_clc to match the video_cards_panfrost build (and
support cross-compilation).

Signed-off-by: Janne Grunau <j <AT> jannau.net>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/mesa_clc/mesa_clc-9999.ebuild | 4 +++-
 profiles/arch/base/package.use.mask    | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dev-util/mesa_clc/mesa_clc-9999.ebuild b/dev-util/mesa_clc/mesa_clc-9999.ebuild
index 9b3128f4a731..3c5d58138c6c 100644
--- a/dev-util/mesa_clc/mesa_clc-9999.ebuild
+++ b/dev-util/mesa_clc/mesa_clc-9999.ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="MIT"
 SLOT="0"
 
-VIDEO_CARDS="panfrost"
+VIDEO_CARDS="asahi panfrost"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
 done
@@ -68,6 +68,7 @@ pkg_setup() {
 }
 
 src_configure() {
+	tools_enable video_cards_asahi asahi
 	tools_enable video_cards_panfrost panfrost
 
 	tools_list() {
@@ -108,6 +109,7 @@ src_configure() {
 src_install() {
 	dobin "${BUILD_DIR}"/src/compiler/clc/mesa_clc
 	dobin "${BUILD_DIR}"/src/compiler/spirv/vtn_bindgen2
+	use video_cards_asahi && dobin "${BUILD_DIR}"/src/asahi/clc/asahi_clc
 	use video_cards_panfrost && dobin "${BUILD_DIR}"/src/panfrost/clc/panfrost_compile
 }
 

diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index a8fafd0cfe23..ddacbeecd89c 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -279,9 +279,9 @@ dev-util/diffoscope haskell
 # gui-libs/egl-wayland with nvidia-drivers is only usable on some arches.
 x11-wm/mutter video_cards_nvidia
 
-# dev-util/mesa_clc with video_cards_panfrost is required to cross-compile
-# dev-libs/mesa with video_cards_panfrost
-dev-util/mesa_clc -video_cards_panfrost
+# dev-util/mesa_clc with video_cards_{asahi,panfrost} is required to
+# cross-compile dev-libs/mesa with video_cards_{asahi,panfrost}
+dev-util/mesa_clc -video_cards_asahi -video_cards_panfrost
 
 # Michael Orlitzky <mjo@gentoo.org> (2021-03-27)
 # The clozurecl and clozurecl64 flags are now arch-specific in maxima,