Accepting request 1061903 from X11:Wayland

- Update to release SDK-1.3.239.0 OBS-URL: https://build.opensuse.org/request/show/1061903 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vulkan-validationlayers?expand=0&rev=40
2023-02-01 15:38:59 +00:00 · 2023-02-01 15:38:59 +00:00 · c96f0780e2
commit c96f0780e2
parent fe2ef49d05 f377ae40d7
6 changed files with 68 additions and 53 deletions
--- a/sdk-1.3.236.0.tar.gz
+++ b/sdk-1.3.236.0.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:68f2cf70b1960f85e931ef56935e6ceda1beeb214f8fa319e6b95128b02b485a
-size 4519779
--- a/sdk-1.3.239.0.tar.gz
+++ b/sdk-1.3.239.0.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7aa7fb46e25e5ef0144d29c92122b631dc7c7c6804a6339f195b368ad53328e4
+size 4549587
--- a/ver.diff
+++ b/ver.diff
@ -4,24 +4,27 @@ Date: 2020-08-19 13:21:33.156157310 +0200
 We do not want static archives in openSUSE, so need to turn on SHARED mode.
 As a result, a version needs to be added.
 ---
- CMakeLists.txt |    3 ++-
+ layers/CMakeLists.txt |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-Index: Vulkan-ValidationLayers-sdk-1.3.236.0/CMakeLists.txt
+Index: Vulkan-ValidationLayers-sdk-1.3.239.0/layers/CMakeLists.txt
 ===================================================================
--- Vulkan-ValidationLayers-sdk-1.3.236.0.orig/CMakeLists.txt
-+++ Vulkan-ValidationLayers-sdk-1.3.236.0/CMakeLists.txt
-@@ -255,11 +255,12 @@ endif()
- # files directly in layers.
+--- Vulkan-ValidationLayers-sdk-1.3.239.0.orig/layers/CMakeLists.txt
+++ Vulkan-ValidationLayers-sdk-1.3.239.0/layers/CMakeLists.txt
+@@ -23,7 +23,7 @@
+ # https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/4640
+ add_compile_definitions(XXH_NO_LONG_LONG)
 
- add_library(VkLayer_utils
-            STATIC
-+            SHARED
-             layers/vk_layer_config.cpp
-             layers/vk_layer_extension_utils.cpp
-             layers/vk_layer_utils.cpp
-             layers/generated/vk_format_utils.cpp)
+-add_library(VkLayer_utils STATIC)
+add_library(VkLayer_utils SHARED)
+ target_sources(VkLayer_utils PRIVATE
+     generated/vk_format_utils.h
+     generated/vk_format_utils.cpp
+@@ -53,6 +53,7 @@ target_sources(VkLayer_utils PRIVATE
+     xxhash.h
+     xxhash.c
+ )
 +set_target_properties(VkLayer_utils PROPERTIES OUTPUT_NAME "VkLayer_utils-@PACKAGE_VERSION@")
 target_link_libraries(VkLayer_utils PUBLIC Vulkan::Headers)
- if (VVL_ENABLE_ASAN)
-     target_compile_options(VkLayer_utils PRIVATE -fsanitize=address)
+ set_target_properties(VkLayer_utils PROPERTIES LINKER_LANGUAGE CXX)
+ target_include_directories(VkLayer_utils PUBLIC
--- a/vulkan-validationlayers.changes
+++ b/vulkan-validationlayers.changes
@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun Jan 29 12:46:08 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release SDK-1.3.239.0
+  * gpu: Fix VMA memory leak
+  * Add 2d view compatible VU
+  * Add Depth layout check for DS formats
+  * Remove old spirv_inst_iter system
+  * Add support for video core and decode extensions
+  * New pipeline_validation for CoreCheck
+  * New wsi_validation for CoreChecks
+
 -------------------------------------------------------------------
 Fri Dec 23 08:14:13 UTC 2022 - Jan Engelhardt <jengelh@inai.de>

--- a/vulkan-validationlayers.spec
+++ b/vulkan-validationlayers.spec
@ -1,7 +1,7 @@
 #
 # spec file for package vulkan-validationlayers
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -17,9 +17,9 @@


 Name:           vulkan-validationlayers
-Version:        1.3.236.0
+Version:        1.3.239.0
 Release:        0
-%define lname libVkLayer_utils-1_3_236_0
+%define lname libVkLayer_utils-1_3_239_0
 Summary:        Validation layers for Vulkan
 License:        Apache-2.0
 Group:          Development/Tools/Other
@ -28,7 +28,7 @@ Source:         https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/
 Source9:        %name-rpmlintrc
 Patch1:         ver.diff
 Patch2:         xxhash.diff
-BuildRequires:  cmake >= 3.4
+BuildRequires:  cmake >= 3.7.12
 BuildRequires:  gcc-c++ >= 4.8
 BuildRequires:  glslang-devel >= 11.13
 BuildRequires:  memory-constraints
@ -38,7 +38,7 @@ BuildRequires:  spirv-headers >= 1.6.1+sdk236
 BuildRequires:  spirv-tools-devel >= 2022.4+sdk236
 BuildRequires:  vulkan-headers
 BuildRequires:  xxhash-devel
-BuildRequires:  pkgconfig(vulkan) >= 1.3.236
+BuildRequires:  pkgconfig(vulkan) >= 1.3.239
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xcb)
 Conflicts:      vulkan < 1.1
@ -71,7 +71,7 @@ This package contains support files for the VkLayer utility library.

 %prep
 %autosetup -n Vulkan-ValidationLayers-sdk-%version -p1
-perl -i -pe 's{\@PACKAGE_VERSION\@}{%version}' CMakeLists.txt
+perl -i -pe 's{\@PACKAGE_VERSION\@}{%version}' CMakeLists.txt */CMakeLists.txt

 %build
 %limit_build -m 2000
--- a/xxhash.diff
+++ b/xxhash.diff
@ -7,37 +7,37 @@ bundled one), it makes sense to build ValidationLayers itself with the system
 xxhash as well, so that the ABI matches.

 ---
- layers/CMakeLists.txt |    6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
+ layers/CMakeLists.txt |    6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)

-Index: Vulkan-ValidationLayers-sdk-1.3.236.0/layers/CMakeLists.txt
+Index: Vulkan-ValidationLayers-sdk-1.3.239.0/layers/CMakeLists.txt
 ===================================================================
--- Vulkan-ValidationLayers-sdk-1.3.236.0.orig/layers/CMakeLists.txt
-+++ Vulkan-ValidationLayers-sdk-1.3.236.0/layers/CMakeLists.txt
-@@ -45,8 +45,6 @@ if(BUILD_LAYER_SUPPORT_FILES)
-         vk_layer_logging.h
-         vk_layer_utils.h
-         vk_layer_utils.cpp
-        xxhash.h
-        xxhash.c
-         generated/vk_format_utils.h
-         generated/vk_format_utils.cpp
-         generated/vk_validation_error_messages.h
-@@ -149,8 +147,7 @@ set(CORE_VALIDATION_LIBRARY_FILES
-     generated/synchronization_validation_types.cpp
-     gpu_validation.cpp
-     generated/corechecks_optick_instrumentation.cpp
+--- Vulkan-ValidationLayers-sdk-1.3.239.0.orig/layers/CMakeLists.txt
+++ Vulkan-ValidationLayers-sdk-1.3.239.0/layers/CMakeLists.txt
+@@ -50,8 +50,6 @@ target_sources(VkLayer_utils PRIVATE
+     vk_layer_logging.cpp
+     vk_layer_utils.h
+     vk_layer_utils.cpp
+-    xxhash.h
 -    xxhash.c
-    xxhash.h)
-+)
- 
- set(OBJECT_LIFETIMES_LIBRARY_FILES
-     generated/object_tracker.cpp
-@@ -279,6 +276,7 @@ endif()
- target_link_libraries(VkLayer_khronos_validation PRIVATE
-     ${SPIRV_TOOLS_TARGET}
-     SPIRV-Tools-opt
-+    -lxxhash
-     SPIRV-Headers::SPIRV-Headers
+ )
+ set_target_properties(VkLayer_utils PROPERTIES OUTPUT_NAME "VkLayer_utils-@PACKAGE_VERSION@")
+ target_link_libraries(VkLayer_utils PUBLIC Vulkan::Headers)
+@@ -259,8 +257,6 @@ target_sources(VkLayer_khronos_validatio
+     video_validation.cpp
+     vk_layer_settings_ext.h
+     wsi_validation.cpp
+-    xxhash.c
+-    xxhash.h
 )
 
+ target_compile_definitions(VkLayer_khronos_validation PUBLIC ${KHRONOS_LAYER_COMPILE_DEFINITIONS})
+@@ -279,7 +275,7 @@ if (USE_ROBIN_HOOD_HASHING)
+ endif()
+ # Order matters here. VkLayer_utils should be the last link library to ensure mimalloc overrides are picked up correctly.
+ # Otherwise, libraries after VkLayer_utils will not benefit from this performance improvement.
+-target_link_libraries(VkLayer_khronos_validation PRIVATE VVL-SPIRV-LIBS VkLayer_utils)
+target_link_libraries(VkLayer_khronos_validation PRIVATE VVL-SPIRV-LIBS VkLayer_utils -lxxhash)
+ 
+ # There are 2 primary deliverables for the validation layers.
+ # - The actual library VkLayer_khronos_validation.(dll|so|dylib)