diff options
| author | Philipp Zabel <p.zabel@pengutronix.de> | 2021-09-08 13:32:33 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-09-08 16:00:30 +0200 |
| commit | c96cdd5a80450527280655f68cbec3444b5fc327 (patch) | |
| tree | 1dbd7cf5aa569f768c95840a4c9899a26e20facf | |
| parent | 3d0d96a142a4126a33f06af9e611af5b2846c21c (diff) | |
| download | ptxdist-c96cdd5a80450527280655f68cbec3444b5fc327.tar.gz ptxdist-c96cdd5a80450527280655f68cbec3444b5fc327.tar.xz | |
vulkan-tools: version bump 1.2.182.0 -> 1.2.189.0
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Message-Id: <20210908113236.15651-3-p.zabel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/vulkan-tools.make | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/rules/vulkan-tools.make b/rules/vulkan-tools.make index 5aad65f68..790d155b8 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 |