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 23B10158089 for ; Tue, 19 Sep 2023 01:17:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6D4782BC017; Tue, 19 Sep 2023 01:17:00 +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 5337C2BC017 for ; Tue, 19 Sep 2023 01:17:00 +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 55183335C60 for ; Tue, 19 Sep 2023 01:16:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CC06811C9 for ; Tue, 19 Sep 2023 01:16:57 +0000 (UTC) From: "Nick Sarnie" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" Message-ID: <1695086066.53af8fd4069bc353a47285da50132dc84298d547.sarnex@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-1.3.261-r1.ebuild dev-util/vulkan-tools/vulkan-tools-9999.ebuild X-VCS-Directories: dev-util/vulkan-tools/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: 53af8fd4069bc353a47285da50132dc84298d547 X-VCS-Branch: master Date: Tue, 19 Sep 2023 01:16:57 +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: 1626f219-d513-423b-bf8a-a80b71666254 X-Archives-Hash: 70deaccc02dfb7a8bc81d01b7d5db3bc commit: 53af8fd4069bc353a47285da50132dc84298d547 Author: Nick Sarnie gentoo org> AuthorDate: Tue Sep 19 01:05:08 2023 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Tue Sep 19 01:14:26 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53af8fd4 dev-util/vulkan-tools: Support multiple window systems Closes: https://bugs.gentoo.org/907071 Closes: https://bugs.gentoo.org/912402 Signed-off-by: Nick Sarnie gentoo.org> .../{vulkan-tools-9999.ebuild => vulkan-tools-1.3.261-r1.ebuild} | 6 ++++-- dev-util/vulkan-tools/vulkan-tools-9999.ebuild | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.261-r1.ebuild similarity index 93% copy from dev-util/vulkan-tools/vulkan-tools-9999.ebuild copy to dev-util/vulkan-tools/vulkan-tools-1.3.261-r1.ebuild index 1269dcab52ee..aeda890581ac 100644 --- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-1.3.261-r1.ebuild @@ -24,8 +24,7 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="cube wayland +X" -# Cube demo only supports one window system at a time -REQUIRED_USE="cube? ( ^^ ( X wayland ) )" +REQUIRED_USE="cube? ( || ( X wayland ) )" BDEPEND="${PYTHON_DEPS} cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] ) @@ -51,6 +50,9 @@ pkg_setup() { /usr/bin/vkcube /usr/bin/vkcubepp ) + use cube && use wayland && MULTILIB_CHOST_TOOLS+=( + /usr/bin/vkcube-wayland + ) python-any-r1_pkg_setup } diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild index 1269dcab52ee..aeda890581ac 100644 --- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild @@ -24,8 +24,7 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="cube wayland +X" -# Cube demo only supports one window system at a time -REQUIRED_USE="cube? ( ^^ ( X wayland ) )" +REQUIRED_USE="cube? ( || ( X wayland ) )" BDEPEND="${PYTHON_DEPS} cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] ) @@ -51,6 +50,9 @@ pkg_setup() { /usr/bin/vkcube /usr/bin/vkcubepp ) + use cube && use wayland && MULTILIB_CHOST_TOOLS+=( + /usr/bin/vkcube-wayland + ) python-any-r1_pkg_setup }