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 708B9158083 for ; Wed, 4 Sep 2024 19:46:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 543F3E2A6A; Wed, 4 Sep 2024 19:46:12 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3895AE2A6A for ; Wed, 4 Sep 2024 19:46:12 +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 4D21334134D for ; Wed, 4 Sep 2024 19:46:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BCCD61DC5 for ; Wed, 4 Sep 2024 19:46:09 +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: <1725479165.f4e60367ba1fab9ab1f3323fc47a277506b409af.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: f4e60367ba1fab9ab1f3323fc47a277506b409af X-VCS-Branch: master Date: Wed, 4 Sep 2024 19:46:09 +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: 92aeda7c-2076-485d-a8f8-34db89e92d3a X-Archives-Hash: 4cc53198d7964d2d97e582896e30cd58 commit: f4e60367ba1fab9ab1f3323fc47a277506b409af Author: Kostadin Shishmanov tutanota com> AuthorDate: Wed Sep 4 19:02:14 2024 +0000 Commit: Matt Turner gentoo org> CommitDate: Wed Sep 4 19:46:05 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4e60367 media-libs/mesa: merge USE=vulkan and USE=vulkan-overlay This commit removes USE=vulkan-overlay and enables the overlay by just toggling USE=vulkan, the former USE flag isn't needed, since the overlay has no additional dependencies. Closes: https://github.com/gentoo/gentoo/pull/38440 Signed-off-by: Kostadin Shishmanov tutanota.com> Signed-off-by: Matt Turner gentoo.org> media-libs/mesa/mesa-9999.ebuild | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 2a22372153e4..172d1f066e10 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -60,7 +60,7 @@ IUSE="${IUSE_VIDEO_CARDS} cpu_flags_x86_sse2 d3d9 debug +llvm lm-sensors opencl +opengl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan - vulkan-overlay wayland +X xa +zstd" + wayland +X xa +zstd" RESTRICT="!test? ( test )" REQUIRED_USE=" d3d9? ( @@ -77,7 +77,6 @@ REQUIRED_USE=" ) ) llvm? ( ${LLVM_REQUIRED_USE} ) - vulkan-overlay? ( vulkan ) video_cards_lavapipe? ( llvm vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) @@ -413,6 +412,8 @@ multilib_src_configure() { ) fi fi + + emesonargs+=(-Dvulkan-layers=device-select,overlay) fi driver_list() { @@ -420,11 +421,6 @@ 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#,}) - if use opengl && use X; then emesonargs+=(-Dglx=dri) else