From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 26 Oct 2022 15:25:01 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1ongOz-002yAj-SB for lore@lore.pengutronix.de; Wed, 26 Oct 2022 15:25:01 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ongOx-00068N-PJ; Wed, 26 Oct 2022 15:24:59 +0200 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ongOP-0005Tq-Kn; Wed, 26 Oct 2022 15:24:25 +0200 From: Philipp Zabel To: ptxdist@pengutronix.de Date: Wed, 26 Oct 2022 15:24:04 +0200 Message-Id: <20221026132404.1059441-6-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221026132404.1059441-1-p.zabel@pengutronix.de> References: <20221026132404.1059441-1-p.zabel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH 6/6] vulkan-tools: version bump 1.3.224.1 -> 1.3.231.0 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Philipp Zabel Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Signed-off-by: Philipp Zabel --- rules/vulkan-tools.in | 9 ++++----- rules/vulkan-tools.make | 8 ++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/rules/vulkan-tools.in b/rules/vulkan-tools.in index 76b312d71bbf..68de172a485f 100644 --- a/rules/vulkan-tools.in +++ b/rules/vulkan-tools.in @@ -6,9 +6,10 @@ config VULKAN_TOOLS select HOST_CMAKE select HOST_GLSLANG select VULKAN_LOADER - select LIBXCB if VULKAN_TOOLS_XCB - select XORG_LIB_X11 if VULKAN_TOOLS_XCB - select WAYLAND if VULKAN_TOOLS_WAYLAND + select LIBXCB if VULKAN_TOOLS_XCB + select XORG_LIB_X11 if VULKAN_TOOLS_XCB + select WAYLAND if VULKAN_TOOLS_WAYLAND + select WAYLAND_PROTOCOLS if VULKAN_TOOLS_WAYLAND help Vulkan Utilities and Tools @@ -16,8 +17,6 @@ if VULKAN_TOOLS config VULKAN_TOOLS_CUBE bool - # build system does not allow cross-compilation of the cube examples - depends on BROKEN prompt "install vkcube" help Install vkcube and vkcubepp examples. diff --git a/rules/vulkan-tools.make b/rules/vulkan-tools.make index 293c2486aba2..6279efde253d 100644 --- a/rules/vulkan-tools.make +++ b/rules/vulkan-tools.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_TOOLS) += vulkan-tools # # Paths and names # -VULKAN_TOOLS_VERSION := 1.3.224.1 -VULKAN_TOOLS_MD5 := 1e0751827d92fbd715687bdce6d374f4 +VULKAN_TOOLS_VERSION := 1.3.231.0 +VULKAN_TOOLS_MD5 := 14730c9e4d46791938e0371c4de30405 VULKAN_TOOLS := vulkan-tools-$(VULKAN_TOOLS_VERSION) VULKAN_TOOLS_SUFFIX := tar.gz VULKAN_TOOLS_URL := https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-$(VULKAN_TOOLS_VERSION).$(VULKAN_TOOLS_SUFFIX) @@ -43,7 +43,7 @@ VULKAN_TOOLS_CONF_OPT := \ -DUSE_CCACHE=OFF \ -DVulkanRegistry_DIR=$(SYSROOT)/usr/share/vulkan -ifdef VULKAN_TOOLS_CUBE +ifdef PTXCONF_VULKAN_TOOLS_CUBE VULKAN_TOOLS_CONF_OPT += \ -DCUBE_WSI_SELECTION=$(call ptx/ifdef, PTXCONF_VULKAN_TOOLS_WAYLAND, WAYLAND, \ $(call ptx/ifdef, PTXCONF_VULKAN_TOOLS_XCB, XCB, DISPLAY)) \ @@ -63,7 +63,7 @@ $(STATEDIR)/vulkan-tools.targetinstall: @$(call install_fixup, vulkan-tools, AUTHOR, "Philipp Zabel ") @$(call install_fixup, vulkan-tools, DESCRIPTION, Vulkan Utilities and Tools) -ifdef VULKAN_TOOLS_CUBE +ifdef PTXCONF_VULKAN_TOOLS_CUBE @$(call install_copy, vulkan-tools, 0, 0, 0755, -, /usr/bin/vkcube) @$(call install_copy, vulkan-tools, 0, 0, 0755, -, /usr/bin/vkcubepp) endif -- 2.30.2