From a897b6356918837a0c0e6b71dde042a90aa83245d00e013122325a98c94d1a65 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 23 Jul 2024 07:56:48 +0200 Subject: [PATCH] vulkan-validationlayers 1.3.290 --- vulkan-sdk-1.3.283.0.tar.gz | 3 --- vulkan-sdk-1.3.290.0.tar.gz | 3 +++ vulkan-validationlayers.spec | 18 +++++++++--------- xxhash.diff | 16 ++++++++-------- 4 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 vulkan-sdk-1.3.283.0.tar.gz create mode 100644 vulkan-sdk-1.3.290.0.tar.gz diff --git a/vulkan-sdk-1.3.283.0.tar.gz b/vulkan-sdk-1.3.283.0.tar.gz deleted file mode 100644 index fb7f4e4..0000000 --- a/vulkan-sdk-1.3.283.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05f607f95076b463fab68d2bd9cd7bc0a981602abe5ecaf6fe61648d17e34201 -size 5230566 diff --git a/vulkan-sdk-1.3.290.0.tar.gz b/vulkan-sdk-1.3.290.0.tar.gz new file mode 100644 index 0000000..5b237eb --- /dev/null +++ b/vulkan-sdk-1.3.290.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59be2c0a5bdbfdbdebdcda48bd65ffa3b219f681c73a90fc683cd4708c1b79de +size 5270142 diff --git a/vulkan-validationlayers.spec b/vulkan-validationlayers.spec index 4ccb3c1..ca5a0b4 100644 --- a/vulkan-validationlayers.spec +++ b/vulkan-validationlayers.spec @@ -17,13 +17,13 @@ Name: vulkan-validationlayers -Version: 1.3.283.0 +Version: 1.3.290 Release: 0 Summary: Validation layers for Vulkan License: Apache-2.0 Group: Development/Tools/Other URL: https://github.com/KhronosGroup/Vulkan-ValidationLayers -Source: https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/refs/tags/vulkan-sdk-%version.tar.gz +Source: https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/refs/tags/vulkan-sdk-%version.0.tar.gz Patch2: xxhash.diff BuildRequires: cmake >= 3.7.12 %if 0%{?suse_version} >= 1599 @@ -31,16 +31,16 @@ BuildRequires: gcc-c++ %else BuildRequires: gcc11-c++ %endif -BuildRequires: glslang-devel >= 14.2 +BuildRequires: glslang-devel >= 14.3 BuildRequires: memory-constraints BuildRequires: pkg-config BuildRequires: python3-base -BuildRequires: spirv-headers >= 1.6.1+sdk283 -BuildRequires: spirv-tools-devel >= 2024.1 -BuildRequires: vulkan-headers -BuildRequires: vulkan-utility-libraries-devel >= 1.3.283 +BuildRequires: spirv-headers >= 1.6.1+sdk290 +BuildRequires: spirv-tools-devel >= 2024.3 +BuildRequires: vulkan-headers >= %version +BuildRequires: vulkan-utility-libraries-devel >= %version BuildRequires: xxhash-devel -BuildRequires: pkgconfig(vulkan) >= 1.3.283 +BuildRequires: pkgconfig(vulkan) >= %version BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb) Conflicts: vulkan < 1.1 @@ -52,7 +52,7 @@ Vulkan is a 3D graphics and compute API. This package contains the Khronos official Vulkan validation layers. %prep -%autosetup -n Vulkan-ValidationLayers-vulkan-sdk-%version -p1 +%autosetup -n Vulkan-ValidationLayers-vulkan-sdk-%version.0 -p1 perl -i -pe 's{\@PACKAGE_VERSION\@}{%version}' CMakeLists.txt */CMakeLists.txt %build diff --git a/xxhash.diff b/xxhash.diff index 19e692f..ba6b539 100644 --- a/xxhash.diff +++ b/xxhash.diff @@ -11,19 +11,19 @@ xxhash as well, so that the ABI matches. layers/utils/hash_util.cpp | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) -Index: Vulkan-ValidationLayers-vulkan-sdk-1.3.283.0/layers/CMakeLists.txt +Index: Vulkan-ValidationLayers-vulkan-sdk-1.3.290.0/layers/CMakeLists.txt =================================================================== ---- Vulkan-ValidationLayers-vulkan-sdk-1.3.283.0.orig/layers/CMakeLists.txt -+++ Vulkan-ValidationLayers-vulkan-sdk-1.3.283.0/layers/CMakeLists.txt +--- Vulkan-ValidationLayers-vulkan-sdk-1.3.290.0.orig/layers/CMakeLists.txt ++++ Vulkan-ValidationLayers-vulkan-sdk-1.3.290.0/layers/CMakeLists.txt @@ -29,7 +29,6 @@ target_sources(VkLayer_utils PRIVATE error_message/error_location.h error_message/error_strings.h error_message/record_object.h - external/xxhash.h + external/inplace_function.h ${API_TYPE}/generated/error_location_helper.cpp ${API_TYPE}/generated/error_location_helper.h - ${API_TYPE}/generated/feature_requirements_helper.cpp -@@ -71,6 +70,7 @@ target_link_libraries(VkLayer_utils PUBL +@@ -74,6 +73,7 @@ target_link_libraries(VkLayer_utils PUBL Vulkan::SafeStruct Vulkan::UtilityHeaders ${CMAKE_DL_LIBS} @@ -31,10 +31,10 @@ Index: Vulkan-ValidationLayers-vulkan-sdk-1.3.283.0/layers/CMakeLists.txt ) target_include_directories(VkLayer_utils SYSTEM PRIVATE external) target_include_directories(VkLayer_utils PUBLIC . ${API_TYPE}) -Index: Vulkan-ValidationLayers-vulkan-sdk-1.3.283.0/layers/utils/hash_util.cpp +Index: Vulkan-ValidationLayers-vulkan-sdk-1.3.290.0/layers/utils/hash_util.cpp =================================================================== ---- Vulkan-ValidationLayers-vulkan-sdk-1.3.283.0.orig/layers/utils/hash_util.cpp -+++ Vulkan-ValidationLayers-vulkan-sdk-1.3.283.0/layers/utils/hash_util.cpp +--- Vulkan-ValidationLayers-vulkan-sdk-1.3.290.0.orig/layers/utils/hash_util.cpp ++++ Vulkan-ValidationLayers-vulkan-sdk-1.3.290.0/layers/utils/hash_util.cpp @@ -23,12 +23,9 @@ #define XXH_IMPLEMENTATION