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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7701515800A for ; Mon, 28 Aug 2023 15:11:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70E5E2BC013; Mon, 28 Aug 2023 15:11:15 +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 52F122BC013 for ; Mon, 28 Aug 2023 15:11:15 +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 E33DA340D3B for ; Mon, 28 Aug 2023 15:11:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 136BC1076 for ; Mon, 28 Aug 2023 15:11:12 +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: <1693235468.00223287044785f94cdc91927c4fc14bf9ae880a.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-23.1.6.ebuild 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: 00223287044785f94cdc91927c4fc14bf9ae880a X-VCS-Branch: master Date: Mon, 28 Aug 2023 15:11:12 +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: 77fb23f7-012e-436c-a8c9-37e820f20b08 X-Archives-Hash: 37e3715ad125b686cd70178ba9ec477e commit: 00223287044785f94cdc91927c4fc14bf9ae880a Author: Matt Turner gentoo org> AuthorDate: Mon Aug 28 15:09:39 2023 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Aug 28 15:11:08 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00223287 media-libs/mesa: Fix build without LLVM Closes: https://bugs.gentoo.org/910435 Signed-off-by: Matt Turner gentoo.org> media-libs/mesa/mesa-23.1.6.ebuild | 6 ++++-- media-libs/mesa/mesa-9999.ebuild | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/media-libs/mesa/mesa-23.1.6.ebuild b/media-libs/mesa/mesa-23.1.6.ebuild index 66cdcc4c1f78..13f6a8b67de1 100644 --- a/media-libs/mesa/mesa-23.1.6.ebuild +++ b/media-libs/mesa/mesa-23.1.6.ebuild @@ -396,9 +396,11 @@ multilib_src_configure() { use vulkan-overlay && vulkan_layers+=",overlay" emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) - if use vulkan && use video_cards_intel; then + if use llvm && use vulkan && use video_cards_intel; then PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" - emesonargs+=($(meson_feature llvm intel-clc)) + emesonargs+=(-Dintel-clc=enabled) + else + emesonargs+=(-Dintel-clc=disabled) fi emesonargs+=( diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index a595f6d878f8..2079e1c158a7 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -391,9 +391,11 @@ multilib_src_configure() { use vulkan-overlay && vulkan_layers+=",overlay" emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) - if use vulkan && use video_cards_intel; then + if use llvm && use vulkan && use video_cards_intel; then PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" - emesonargs+=($(meson_feature llvm intel-clc)) + emesonargs+=(-Dintel-clc=enabled) + else + emesonargs+=(-Dintel-clc=disabled) fi emesonargs+=(