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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A5A8B158089 for ; Thu, 9 Nov 2023 18:40:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DAF952BC023; Thu, 9 Nov 2023 18:40:16 +0000 (UTC) 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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 786DC2BC023 for ; Thu, 9 Nov 2023 18:40:16 +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 6E6F6335D27 for ; Thu, 9 Nov 2023 18:40:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C08401347 for ; Thu, 9 Nov 2023 18:40:13 +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: <1699555196.66c3be451de6b402da1d74e74985fc175abd3672.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: 66c3be451de6b402da1d74e74985fc175abd3672 X-VCS-Branch: master Date: Thu, 9 Nov 2023 18:40:13 +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: 38c2063d-cd81-4971-8990-c08c6b6509ea X-Archives-Hash: a9a7fad14a2da203e2721f6a289e79d5 commit: 66c3be451de6b402da1d74e74985fc175abd3672 Author: Matt Turner gentoo org> AuthorDate: Thu Nov 9 17:53:55 2023 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Nov 9 18:39:56 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66c3be45 media-libs/mesa: Depend on external dev-util/intel_clc intel_clc is an executable that is used to compile OpenCL C code to SPIR-V during the build of media-libs/mesa. It is needed to build code to support Vulkan ray tracing APIs on supported Intel GPUs. intel_clc is a part of Mesa, but since it must run on the build machine, I have split it into its own package that can be installed separately. This simplifies some of the dependencies and also allows for cross compilation. Signed-off-by: Matt Turner gentoo.org> media-libs/mesa/mesa-9999.ebuild | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index e74f085ef100..ef6c7bed1363 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -86,14 +86,6 @@ RDEPEND=" >=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) - vulkan? ( - video_cards_intel? ( - amd64? ( - dev-libs/libclc[spirv(-)] - >=dev-util/spirv-tools-1.3.231.0 - ) - ) - ) selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] ) wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] ) ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] @@ -133,14 +125,6 @@ PER_SLOT_DEPSTR=" !opencl? ( sys-devel/llvm:@SLOT@[${LLVM_USE_DEPS}] ) opencl? ( sys-devel/clang:@SLOT@[${LLVM_USE_DEPS}] ) opencl? ( dev-util/spirv-llvm-translator:@SLOT@ ) - vulkan? ( - video_cards_intel? ( - amd64? ( - dev-util/spirv-llvm-translator:@SLOT@ - sys-devel/clang:@SLOT@[${LLVM_USE_DEPS}] - ) - ) - ) ) " LLVM_DEPSTR=" @@ -182,6 +166,8 @@ BDEPEND=" video_cards_intel? ( amd64? ( $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]") + ~dev-util/intel_clc-${PV} + dev-libs/libclc[spirv(-)] ) ) ) @@ -202,8 +188,6 @@ x86? ( llvm_check_deps() { if use opencl; then has_version "sys-devel/clang:${LLVM_SLOT}[${LLVM_USE_DEPS}]" || return 1 - fi - if use opencl || { use vulkan && use video_cards_intel && use amd64; }; then has_version "dev-util/spirv-llvm-translator:${LLVM_SLOT}" || return 1 fi has_version "sys-devel/llvm:${LLVM_SLOT}[${LLVM_USE_DEPS}]" @@ -406,9 +390,8 @@ multilib_src_configure() { use vulkan-overlay && vulkan_layers+=",overlay" emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) - if use llvm && use vulkan && use video_cards_intel; then - PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig" - emesonargs+=(-Dintel-clc=enabled) + if use llvm && use vulkan && use video_cards_intel && use amd64; then + emesonargs+=(-Dintel-clc=system) else emesonargs+=(-Dintel-clc=disabled) fi