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 6611015808B for ; Tue, 13 Feb 2024 22:35:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 81A1EE2A1C; Tue, 13 Feb 2024 22:35:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 69E60E2A1C for ; Tue, 13 Feb 2024 22:35:06 +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 8B676343009 for ; Tue, 13 Feb 2024 22:35:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 15DF8148C for ; Tue, 13 Feb 2024 22:35:03 +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: <1707863698.f21a150abe95c332adf035356dede1c54cce5da2.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: f21a150abe95c332adf035356dede1c54cce5da2 X-VCS-Branch: master Date: Tue, 13 Feb 2024 22:35:03 +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: e5697711-b070-41a3-9316-d67121c1dc6c X-Archives-Hash: 2eeaa5b8db317a98b5236eb99c66d193 commit: f21a150abe95c332adf035356dede1c54cce5da2 Author: Matt Turner gentoo org> AuthorDate: Tue Feb 13 22:03:20 2024 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Feb 13 22:34:58 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f21a150a media-libs/mesa: Depend on intel_clc for VIDEO_CARDS=intel New requirement added by upstream commit a512c2a8b57 ("meson: enforce build of intel-clc with anv/iris"). And now that `-Dintel_clc=system` is required for more than just ray-tracing support, set the new `-Dintel-rt=` option as well. Signed-off-by: Matt Turner gentoo.org> media-libs/mesa/mesa-9999.ebuild | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 0f1b37ec26f6..e8c5b7c006f3 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -139,16 +139,12 @@ BDEPEND=" app-alternatives/lex virtual/pkgconfig $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") - vulkan? ( - dev-util/glslang - llvm? ( - video_cards_intel? ( - amd64? ( - $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]") - ~dev-util/intel_clc-${PV} - dev-libs/libclc[spirv(-)] - ) - ) + video_cards_intel? ( + ~dev-util/intel_clc-${PV} + dev-libs/libclc[spirv(-)] + vulkan? ( + dev-util/glslang + $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]") ) ) wayland? ( dev-util/wayland-scanner ) @@ -359,12 +355,6 @@ multilib_src_configure() { use vulkan-overlay && vulkan_layers+=",overlay" emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) - if use llvm && use vulkan && use video_cards_intel && use amd64; then - emesonargs+=(-Dintel-clc=system) - else - emesonargs+=(-Dintel-clc=disabled) - fi - if use opengl || use gles1 || use gles2; then emesonargs+=( -Degl=enabled @@ -398,8 +388,10 @@ multilib_src_configure() { $(meson_use osmesa) $(meson_use selinux) $(meson_feature unwind libunwind) + $(meson_feature video_cards_intel intel-rt) $(meson_feature zstd) $(meson_use cpu_flags_x86_sse2 sse2) + -Dintel-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[*]}")