The Boost Software License, added in upstream commit 33b96396113a
("docs: Update LICENSE.txt"), covers inplace_function and parallel
hashmap implementations.Signed-off-by: Philipp Zabel <[email protected]> --- rules/vulkan-validationlayers.make | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/rules/vulkan-validationlayers.make b/rules/vulkan-validationlayers.make index 5aa10682298f..3d95b9fe64f0 100644 --- a/rules/vulkan-validationlayers.make +++ b/rules/vulkan-validationlayers.make @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_VULKAN_VALIDATIONLAYERS) += vulkan-validationlayers # # Paths and names # -VULKAN_VALIDATIONLAYERS_VERSION := 1.4.309.0 -VULKAN_VALIDATIONLAYERS_MD5 := ca5e1f1a770da38c1adc733e004c6c03 +VULKAN_VALIDATIONLAYERS_VERSION := 1.4.313.0 +VULKAN_VALIDATIONLAYERS_MD5 := f35f7c7220c5db126e62cc5b87eb1087 VULKAN_VALIDATIONLAYERS := vulkan-validationlayers-$(VULKAN_VALIDATIONLAYERS_VERSION) VULKAN_VALIDATIONLAYERS_SUFFIX := tar.gz VULKAN_VALIDATIONLAYERS_URL := https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/vulkan-sdk-$(VULKAN_VALIDATIONLAYERS_VERSION).$(VULKAN_VALIDATIONLAYERS_SUFFIX) VULKAN_VALIDATIONLAYERS_SOURCE := $(SRCDIR)/$(VULKAN_VALIDATIONLAYERS).$(VULKAN_VALIDATIONLAYERS_SUFFIX) VULKAN_VALIDATIONLAYERS_DIR := $(BUILDDIR)/$(VULKAN_VALIDATIONLAYERS) -VULKAN_VALIDATIONLAYERS_LICENSE := Apache-2.0 AND MIT -VULKAN_VALIDATIONLAYERS_LICENSE_FILES := file://LICENSE.txt;md5=cd3c0bc366cd9b6a906e22f0bcb5910f +VULKAN_VALIDATIONLAYERS_LICENSE := Apache-2.0 AND MIT AND BSL-1.0 +VULKAN_VALIDATIONLAYERS_LICENSE_FILES := file://LICENSE.txt;md5=b1a17d548e004bfbbfaa0c40988b6b31 # ---------------------------------------------------------------------------- # Prepare @@ -38,12 +38,14 @@ VULKAN_VALIDATIONLAYERS_CONF_OPT := \ -DBUILD_WSI_WAYLAND_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_VALIDATIONLAYERS_WAYLAND) \ -DBUILD_WSI_XCB_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_VALIDATIONLAYERS_XCB) \ -DBUILD_WSI_XLIB_SUPPORT=OFF \ + -DDEBUG_CAPTURE_KEYBOARD=OFF \ -DUPDATE_DEPS=OFF \ - -DUSE_ROBIN_HOOD_HASHING=OFF \ + -DUSE_CUSTOM_HASH_MAP=ON \ -DVVL_CODEGEN=OFF \ -DVVL_ENABLE_ASAN=OFF \ -DVVL_ENABLE_TRACY=OFF \ -DVVL_ENABLE_TRACY_CPU_MEMORY=OFF \ + -DVVL_ENABLE_UBSAN=OFF \ -DVVL_TRACY_CALLSTACK=OFF # ---------------------------------------------------------------------------- -- 2.39.5
