mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Philipp Zabel <p.zabel@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH 3/6] vulkan-tools: version bump 1.2.182.0 -> 1.2.189.0
Date: Wed,  8 Sep 2021 13:32:33 +0200	[thread overview]
Message-ID: <20210908113236.15651-3-p.zabel@pengutronix.de> (raw)
In-Reply-To: <20210908113236.15651-1-p.zabel@pengutronix.de>

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/vulkan-tools.make | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/rules/vulkan-tools.make b/rules/vulkan-tools.make
index 5aad65f68cd5..790d155b86a2 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.2.182.0
-VULKAN_TOOLS_MD5	:= 2ddffc4937434adfda18df8555eb8ae2
+VULKAN_TOOLS_VERSION	:= 1.2.189.0
+VULKAN_TOOLS_MD5	:= fa7ffd59db04489bb96c39acf0ecbb09
 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)
@@ -31,20 +31,24 @@ VULKAN_TOOLS_LICENSE_FILES := file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c
 VULKAN_TOOLS_CONF_TOOL	:= cmake
 VULKAN_TOOLS_CONF_OPT	:= \
 	$(CROSS_CMAKE_USR) \
-	-DCMAKE_INSTALL_LIBDIR=/usr/lib \
 	-DBUILD_CUBE=$(call ptx/onoff, PTXCONF_VULKAN_TOOLS_CUBE) \
-	-DCUBE_WSI_SELECTION=$(call ptx/ifdef, PTXCONF_VULKAN_TOOLS_WAYLAND, WAYLAND, \
-			$(call ptx/ifdef, PTXCONF_VULKAN_TOOLS_XCB, XCB, DISPLAY)) \
-	-DBUILD_VULKANINFO=ON \
 	-DBUILD_ICD=OFF \
-	-DINSTALL_ICD=OFF \
-	-DUSE_CCACHE=OFF \
+	-DBUILD_VULKANINFO=ON \
+	-DBUILD_WERROR=ON \
+	-DBUILD_WSI_DIRECTFB_SUPPORT=OFF \
+	-DBUILD_WSI_WAYLAND_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_TOOLS_WAYLAND) \
 	-DBUILD_WSI_XCB_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_TOOLS_XCB) \
 	-DBUILD_WSI_XLIB_SUPPORT=OFF \
-	-DBUILD_WSI_WAYLAND_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_TOOLS_WAYLAND) \
-	-DBUILD_WSI_DIRECTFB_SUPPORT=OFF \
-	-DVulkanRegistry_DIR=$(SYSROOT)/usr/share/vulkan \
+	-DINSTALL_ICD=OFF \
+	-DUSE_CCACHE=OFF \
+	-DVulkanRegistry_DIR=$(SYSROOT)/usr/share/vulkan
+
+ifdef 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)) \
 	-DGLSLANG_INSTALL_DIR=$(PTXDIST_SYSROOT_HOST)/bin
+endif
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


  parent reply	other threads:[~2021-09-08 11:32 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-08 11:32 [ptxdist] [PATCH 1/6] spirv-tools: version bump 2021.2 -> 2021.3 Philipp Zabel
2021-09-08 11:32 ` [ptxdist] [PATCH 2/6] vulkan-loader: version bump 1.2.182.0 -> 1.2.189.0 Philipp Zabel
2021-10-07 10:18   ` [ptxdist] [APPLIED] " Michael Olbrich
2021-09-08 11:32 ` Philipp Zabel [this message]
2021-10-07 10:18   ` [ptxdist] [APPLIED] vulkan-tools: " Michael Olbrich
2021-09-08 11:32 ` [ptxdist] [PATCH 4/6] vulkan-validationlayers: " Philipp Zabel
2021-10-07 10:18   ` [ptxdist] [APPLIED] " Michael Olbrich
2021-09-08 11:32 ` [ptxdist] [PATCH 5/6] glslang: version bump 11.5.0 -> 11.6.0 Philipp Zabel
2021-10-07 10:18   ` [ptxdist] [APPLIED] " Michael Olbrich
2021-09-08 11:32 ` [ptxdist] [PATCH 6/6] shaderc: version bump 2021.1 -> 2021.2 Philipp Zabel
2021-10-07 10:18   ` [ptxdist] [APPLIED] " Michael Olbrich
2021-10-07 10:18 ` [ptxdist] [APPLIED] spirv-tools: version bump 2021.2 -> 2021.3 Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210908113236.15651-3-p.zabel@pengutronix.de \
    --to=p.zabel@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox