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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 66B4F13933E for ; Tue, 6 Jul 2021 23:30:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8737CE0A44; Tue, 6 Jul 2021 23:30:23 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6C7C7E0A44 for ; Tue, 6 Jul 2021 23:30:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5B02B335DD1 for ; Tue, 6 Jul 2021 23:30:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DB23C78A for ; Tue, 6 Jul 2021 23:30:20 +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: <1625614213.c1423568da90a84b85d32e7cbb0456ca00118caa.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-21.1.4.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: c1423568da90a84b85d32e7cbb0456ca00118caa X-VCS-Branch: master Date: Tue, 6 Jul 2021 23:30:20 +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: 3cf4b4ef-fc0e-49e4-81d6-02e9272657af X-Archives-Hash: cf0506f8194d52c0fabde682694f9cac commit: c1423568da90a84b85d32e7cbb0456ca00118caa Author: Sebastian Parborg gmail com> AuthorDate: Sun Jul 4 10:46:53 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Jul 6 23:30:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1423568 media-libs/mesa: Fix vulkan overlay mesa flags These flags were changed to be in a list variable instead of individual meson flags. Mesa commit: https://gitlab.freedesktop.org/mesa/mesa/-/commit/54fe5b0482df0f066384b274796d4081c2a1968c Closes: https://github.com/gentoo/gentoo/pull/21518 Signed-off-by: Sebastian Parborg gmail.com> Signed-off-by: Matt Turner gentoo.org> media-libs/mesa/mesa-21.1.4.ebuild | 7 +++++-- media-libs/mesa/mesa-9999.ebuild | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/media-libs/mesa/mesa-21.1.4.ebuild b/media-libs/mesa/mesa-21.1.4.ebuild index 892e0707669..635fc07d42b 100644 --- a/media-libs/mesa/mesa-21.1.4.ebuild +++ b/media-libs/mesa/mesa-21.1.4.ebuild @@ -501,6 +501,11 @@ multilib_src_configure() { echo "${drivers//$'\n'/,}" } + local vulkan_layers + use vulkan && vulkan_layers+="device-select" + use vulkan-overlay && vulkan_layers+=",overlay" + emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) + emesonargs+=( $(meson_use test build-tests) -Dglx=$(usex X dri disabled) @@ -517,8 +522,6 @@ multilib_src_configure() { -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") - $(meson_use vulkan vulkan-device-select-layer) - $(meson_use vulkan-overlay vulkan-overlay-layer) --buildtype $(usex debug debug plain) -Db_ndebug=$(usex debug false true) ) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index caf150f61b6..b3ab8d6070d 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -498,6 +498,11 @@ multilib_src_configure() { echo "${drivers//$'\n'/,}" } + local vulkan_layers + use vulkan && vulkan_layers+="device-select" + use vulkan-overlay && vulkan_layers+=",overlay" + emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) + emesonargs+=( $(meson_use test build-tests) -Dglx=$(usex X dri disabled) @@ -514,8 +519,6 @@ multilib_src_configure() { -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") - $(meson_use vulkan vulkan-device-select-layer) - $(meson_use vulkan-overlay vulkan-overlay-layer) --buildtype $(usex debug debug plain) -Db_ndebug=$(usex debug false true) )