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 05D1E158649 for ; Fri, 12 May 2023 17:19:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0F131E07E6; Fri, 12 May 2023 17:19:00 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 pigeon.gentoo.org (Postfix) with ESMTPS id EA584E07E6 for ; Fri, 12 May 2023 17:18: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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3B6E033BF53 for ; Fri, 12 May 2023 17:18:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6FCC1A6E for ; Fri, 12 May 2023 17:18: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: <1683911923.5d184b31cc80996fed4b938fc2b3e68e27b1e29c.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: 5d184b31cc80996fed4b938fc2b3e68e27b1e29c X-VCS-Branch: master Date: Fri, 12 May 2023 17:18: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: 25b05b22-5a4b-4f0e-92b6-71008dc8790e X-Archives-Hash: fbbab013b01e9ede865c1affddc943a2 commit: 5d184b31cc80996fed4b938fc2b3e68e27b1e29c Author: Matt Turner gentoo org> AuthorDate: Thu May 11 18:26:48 2023 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri May 12 17:18:43 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d184b31 media-libs/mesa: Enable Intel Vulkan ray-tracing support Requires USE=llvm. Note that Vulkan ray-tracing support is only available on amd64, per upstream. Signed-off-by: Matt Turner gentoo.org> media-libs/mesa/mesa-9999.ebuild | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 80d191b25459..1cafc813c908 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -76,6 +76,7 @@ RDEPEND=" >=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) + vulkan? ( video_cards_intel? ( >=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}] @@ -114,6 +115,7 @@ 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? ( dev-util/spirv-llvm-translator:@SLOT@ ) ) ) " LLVM_DEPSTR=" @@ -167,6 +169,8 @@ 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; }; then has_version "dev-util/spirv-llvm-translator:${LLVM_SLOT}" || return 1 fi has_version "sys-devel/llvm:${LLVM_SLOT}[${LLVM_USE_DEPS}]" @@ -364,6 +368,11 @@ multilib_src_configure() { use vulkan-overlay && vulkan_layers+=",overlay" emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) + if use vulkan && use video_cards_intel; then + PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" + emesonargs+=($(meson_feature llvm intel-clc)) + fi + emesonargs+=( $(meson_use test build-tests) -Dglx=$(usex X dri disabled)