From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 30FA81584AD for ; Thu, 24 Apr 2025 03:37:04 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id F2AB43430AA for ; Thu, 24 Apr 2025 03:37:03 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 1E3461104B1; Thu, 24 Apr 2025 03:36:59 +0000 (UTC) Received: from smtp.gentoo.org (dev.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)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 182731104B1 for ; Thu, 24 Apr 2025 03:36:59 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BADC5342FF8 for ; Thu, 24 Apr 2025 03:36:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ED8B42511 for ; Thu, 24 Apr 2025 03:36:56 +0000 (UTC) From: "Matt Turner" 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 Turner" Message-ID: <1745465338.7a05c4c37d6c5939fc9f04f11debbd5f058a8804.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mesa/mesa-9999.ebuild X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 7a05c4c37d6c5939fc9f04f11debbd5f058a8804 X-VCS-Branch: master Date: Thu, 24 Apr 2025 03:36:56 +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: b2865092-5748-4f96-a793-5c99140dd451 X-Archives-Hash: 41d3ee90309c741879def1fbe9eca9f4 commit: 7a05c4c37d6c5939fc9f04f11debbd5f058a8804 Author: Matt Turner gentoo org> AuthorDate: Thu Apr 24 03:24:17 2025 +0000 Commit: Matt Turner gentoo 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 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[*]}")