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 18826158041 for ; Wed, 6 Mar 2024 21:51:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D19C0E2A08; Wed, 6 Mar 2024 21:51:33 +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 B3B5CE2A08 for ; Wed, 6 Mar 2024 21:51:33 +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 A5934343052 for ; Wed, 6 Mar 2024 21:51:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3581C14EE for ; Wed, 6 Mar 2024 21:51:31 +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: <1709761878.e2085d0c2993116abb98e87a8ec06d59839dbc36.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/vulkan-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/vulkan-tools/vulkan-tools-9999.ebuild X-VCS-Directories: dev-util/vulkan-tools/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: e2085d0c2993116abb98e87a8ec06d59839dbc36 X-VCS-Branch: master Date: Wed, 6 Mar 2024 21:51:31 +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: 8d143a44-33e9-429d-92ae-2badaa8d77a5 X-Archives-Hash: ddc5edd55bb4d4281f5abb8ba2836ff3 commit: e2085d0c2993116abb98e87a8ec06d59839dbc36 Author: Matt Turner gentoo org> AuthorDate: Wed Mar 6 21:34:50 2024 +0000 Commit: Matt Turner gentoo org> CommitDate: Wed Mar 6 21:51:18 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2085d0c dev-util/vulkan-tools: Allow building USE=cube without X/wayland Closes: https://bugs.gentoo.org/920515 Signed-off-by: Matt Turner gentoo.org> dev-util/vulkan-tools/vulkan-tools-9999.ebuild | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild index ef16acd05d20..19a70d8f2a16 100644 --- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild @@ -22,9 +22,7 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools" LICENSE="Apache-2.0" SLOT="0" -IUSE="cube wayland +X" - -REQUIRED_USE="cube? ( || ( X wayland ) )" +IUSE="cube wayland X" BDEPEND="${PYTHON_DEPS} cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] ) @@ -72,9 +70,15 @@ multilib_src_configure() { -DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr" ) - use cube && mycmakeargs+=( - -DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND) - ) + if use cube; then + if use X; then + mycmakeargs+=(-DCUBE_WSI_SELECTION=XCB) + elif use wayland; then + mycmakeargs+=(-DCUBE_WSI_SELECTION=WAYLAND) + else + mycmakeargs+=(-DCUBE_WSI_SELECTION=DISPLAY) + fi + fi cmake_src_configure }