1
0
Jan Engelhardt 2023-04-19 22:07:47 +00:00 committed by Git OBS Bridge
parent d5e2cd9276
commit b9bb1a8e45
6 changed files with 52 additions and 23 deletions

16
gcc13.diff Normal file
View File

@ -0,0 +1,16 @@
---
layers/external/vma/vk_mem_alloc.h | 1 +
1 file changed, 1 insertion(+)
Index: Vulkan-ValidationLayers-1.3.247/layers/external/vma/vk_mem_alloc.h
===================================================================
--- Vulkan-ValidationLayers-1.3.247.orig/layers/external/vma/vk_mem_alloc.h
+++ Vulkan-ValidationLayers-1.3.247/layers/external/vma/vk_mem_alloc.h
@@ -35,6 +35,7 @@
#ifndef AMD_VULKAN_MEMORY_ALLOCATOR_H
#define AMD_VULKAN_MEMORY_ALLOCATOR_H
+#include <cstdio>
/** \mainpage Vulkan Memory Allocator

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fd9f6c24027de177b2fb0eb6385542d62f4c21665a8d4cc7e1c118688e0836de
size 4624249

3
v1.3.247.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f24b37ada8545389239b7fb3caa5e2dd93acede96c23a471dc8dd8cbae2bcbf9
size 4778794

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed Apr 19 21:08:03 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
- Update to release 1.3.247
* layers: Add shader identifier tracking
* layers: Add Map/UnmapMemory2KHR support to the state tracker
* layers: Validate image view sampler conversion format
* layers: Add VK_QCOM_image_processing
* layers: Add VK_EXT_pipeline_robustness
* layers: Add full screen info to validate swapchain
- Add gcc13.diff
-------------------------------------------------------------------
Wed Mar 29 18:35:13 UTC 2023 - Jan Engelhardt <jengelh@inai.de>

View File

@ -17,15 +17,16 @@
Name: vulkan-validationlayers
Version: 1.3.243.0
Version: 1.3.247
Release: 0
%define lname libVkLayer_utils-1_3_243_0
%define lname libVkLayer_utils-1_3_247_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/sdk-%version.tar.gz
Source: https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/refs/tags/v%version.tar.gz
Patch2: xxhash.diff
Patch3: gcc13.diff
BuildRequires: cmake >= 3.7.12
BuildRequires: gcc-c++ >= 4.8
BuildRequires: glslang-devel >= 12
@ -48,7 +49,7 @@ Vulkan is a 3D graphics and compute API.
This package contains the Khronos official Vulkan validation layers.
%prep
%autosetup -n Vulkan-ValidationLayers-sdk-%version -p1
%autosetup -n Vulkan-ValidationLayers-%version -p1
perl -i -pe 's{\@PACKAGE_VERSION\@}{%version}' CMakeLists.txt */CMakeLists.txt
%build

View File

@ -10,25 +10,25 @@ xxhash as well, so that the ABI matches.
layers/CMakeLists.txt | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
Index: Vulkan-ValidationLayers-sdk-1.3.243.0/layers/CMakeLists.txt
Index: Vulkan-ValidationLayers-1.3.247/layers/CMakeLists.txt
===================================================================
--- Vulkan-ValidationLayers-sdk-1.3.243.0.orig/layers/CMakeLists.txt
+++ Vulkan-ValidationLayers-sdk-1.3.243.0/layers/CMakeLists.txt
@@ -41,8 +41,6 @@ target_sources(VkLayer_utils PRIVATE
vk_layer_logging.cpp
vk_layer_utils.h
vk_layer_utils.cpp
- xxhash.h
- xxhash.cpp
)
# XXH_NO_LONG_LONG: removes compilation of algorithms relying on 64-bit types (XXH3 and XXH64). Only XXH32 will be compiled.
@@ -53,7 +51,7 @@ target_sources(VkLayer_utils PRIVATE
--- Vulkan-ValidationLayers-1.3.247.orig/layers/CMakeLists.txt
+++ Vulkan-ValidationLayers-1.3.247/layers/CMakeLists.txt
@@ -19,8 +19,6 @@ target_sources(VkLayer_utils PRIVATE
containers/custom_containers.h
error_message/logging.h
error_message/logging.cpp
- external/xxhash.h
- external/xxhash.cpp
generated/vk_format_utils.h
generated/vk_format_utils.cpp
generated/vk_validation_error_messages.h
@@ -51,7 +49,7 @@ target_sources(VkLayer_utils PRIVATE
# https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/4640
target_compile_definitions(VkLayer_utils PUBLIC XXH_NO_LONG_LONG)
-target_link_libraries(VkLayer_utils PUBLIC Vulkan::Headers)
+target_link_libraries(VkLayer_utils PUBLIC Vulkan::Headers -lxxhash)
target_include_directories(VkLayer_utils PUBLIC
.
generated # Needed otherwise VkLayer_utils won't install properly.
target_include_directories(VkLayer_utils SYSTEM PRIVATE external)
target_include_directories(VkLayer_utils PUBLIC .)