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

[Matt Turner]

commit:     7a05c4c37d6c5939fc9f04f11debbd5f058a8804
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 24 03:24:17 2025 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 24 03:28:58 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a05c4c3

media-libs/mesa: Factor out CLC dependencies

We'll need this in the next commits.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-libs/mesa/mesa-9999.ebuild | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index f2a790c23878..168c3a5c292f 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -157,6 +157,11 @@ DEPEND="${RDEPEND}
                x11-base/xorg-proto
        )
 "
+
+CLC_DEPSTRING="
+       ~dev-util/mesa_clc-${PV}
+       llvm-core/libclc[spirv(-)]
+"
 BDEPEND="
        ${PYTHON_DEPS}
        opencl? (
@@ -173,10 +178,7 @@ BDEPEND="
                dev-python/packaging[\${PYTHON_USEDEP}]
                dev-python/pyyaml[\${PYTHON_USEDEP}]
        ")
-       video_cards_intel? (
-               ~dev-util/mesa_clc-${PV}
-               llvm-core/libclc[spirv(-)]
-       )
+       video_cards_intel? ( ${CLC_DEPSTRING} )
        vulkan? (
                dev-util/glslang
                video_cards_nvk? (
@@ -433,6 +435,10 @@ multilib_src_configure() {
                emesonargs+=($(meson_feature video_cards_intel intel-rt))
        fi
 
+       if use video_cards_intel; then
+               emesonargs+=(-Dmesa-clc=system)
+       fi
+
        use debug && EMESON_BUILDTYPE=debug
 
        emesonargs+=(
@@ -450,7 +456,6 @@ multilib_src_configure() {
                $(meson_feature unwind libunwind)
                $(meson_feature zstd)
                $(meson_use cpu_flags_x86_sse2 sse2)
-               -Dmesa-clc=$(usex video_cards_intel system auto)
                -Dvalgrind=$(usex valgrind auto disabled)
                -Dvideo-codecs=$(usex proprietary-codecs "all" "all_free")
                -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")