From 1b49af0ff25498e02d449f5095f940f1aad22c50 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 10 May 2022 03:08:24 -0400 Subject: [PATCH] import vulkan-validation-layers-1.3.204.0-1.el8 --- .gitignore | 2 +- .vulkan-validation-layers.metadata | 2 +- SOURCES/fix-spirv-tools-shared.patch | 12 ++++++++++++ SOURCES/try-fix-headers.patch | 11 +++++++++++ SPECS/vulkan-validation-layers.spec | 21 +++++++-------------- 5 files changed, 32 insertions(+), 16 deletions(-) create mode 100644 SOURCES/fix-spirv-tools-shared.patch create mode 100644 SOURCES/try-fix-headers.patch diff --git a/.gitignore b/.gitignore index e2af6f8..10b7801 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/Vulkan-ValidationLayers-sdk-1.2.198.0.tar.gz +SOURCES/Vulkan-ValidationLayers-sdk-1.3.204.0.tar.gz diff --git a/.vulkan-validation-layers.metadata b/.vulkan-validation-layers.metadata index a1859ac..089079d 100644 --- a/.vulkan-validation-layers.metadata +++ b/.vulkan-validation-layers.metadata @@ -1 +1 @@ -63bf7f912945912def63a309b86ce05a432df564 SOURCES/Vulkan-ValidationLayers-sdk-1.2.198.0.tar.gz +ee1bf12c2c1998a7a0495a1380b74f72ce276db4 SOURCES/Vulkan-ValidationLayers-sdk-1.3.204.0.tar.gz diff --git a/SOURCES/fix-spirv-tools-shared.patch b/SOURCES/fix-spirv-tools-shared.patch new file mode 100644 index 0000000..2c9b502 --- /dev/null +++ b/SOURCES/fix-spirv-tools-shared.patch @@ -0,0 +1,12 @@ +diff -up Vulkan-ValidationLayers-sdk-1.3.204.0/layers/CMakeLists.txt.dma Vulkan-ValidationLayers-sdk-1.3.204.0/layers/CMakeLists.txt +--- Vulkan-ValidationLayers-sdk-1.3.204.0/layers/CMakeLists.txt.dma 2022-02-16 12:57:50.396556235 +1000 ++++ Vulkan-ValidationLayers-sdk-1.3.204.0/layers/CMakeLists.txt 2022-02-16 12:57:54.312630300 +1000 +@@ -315,7 +315,7 @@ if(BUILD_LAYERS) + target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR}) + endif() + +- target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools-static SPIRV-Tools-opt) ++ target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools SPIRV-Tools-opt) + + + # The output file needs Unix "/" separators or Windows "\" separators On top of that, Windows separators actually need to be doubled diff --git a/SOURCES/try-fix-headers.patch b/SOURCES/try-fix-headers.patch new file mode 100644 index 0000000..f08cca1 --- /dev/null +++ b/SOURCES/try-fix-headers.patch @@ -0,0 +1,11 @@ +diff -up Vulkan-ValidationLayers-sdk-1.3.204.0/CMakeLists.txt.dma Vulkan-ValidationLayers-sdk-1.3.204.0/CMakeLists.txt +--- Vulkan-ValidationLayers-sdk-1.3.204.0/CMakeLists.txt.dma 2022-02-16 12:29:43.131617038 +1000 ++++ Vulkan-ValidationLayers-sdk-1.3.204.0/CMakeLists.txt 2022-02-16 12:29:48.095711141 +1000 +@@ -256,7 +256,6 @@ if (USE_ROBIN_HOOD_HASHING) + endif() + endif() + +-set(SPIRV_HEADERS_INCLUDE_DIR "" CACHE STRING "") + if(BUILD_LAYERS OR BUILD_TESTS) + if (SPIRV_HEADERS_INCLUDE_DIR STREQUAL "") + find_package(SPIRV-Headers REQUIRED CONFIG) diff --git a/SPECS/vulkan-validation-layers.spec b/SPECS/vulkan-validation-layers.spec index 2be06ec..f92b543 100644 --- a/SPECS/vulkan-validation-layers.spec +++ b/SPECS/vulkan-validation-layers.spec @@ -1,6 +1,6 @@ Name: vulkan-validation-layers -Version: 1.2.198.0 -Release: 4%{?dist} +Version: 1.3.204.0 +Release: 1%{?dist} Summary: Vulkan validation layers License: ASL 2.0 @@ -8,6 +8,9 @@ URL: https://github.com/KhronosGroup/Vulkan-ValidationLayers Source0: %url/archive/sdk-%{version}.tar.gz#/Vulkan-ValidationLayers-sdk-%{version}.tar.gz Patch0: fix_shared.patch Patch1: add-missing-export.patch +Patch2: try-fix-headers.patch +Patch3: fix-spirv-tools-shared.patch + BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: cmake @@ -45,7 +48,6 @@ developing applications that use %{name}. %build # Decrease debuginfo verbosity to reduce memory consumption even more %global optflags %(echo %{optflags} | sed 's/-g /-g1 /') -%global optflags %(echo %{optflags} | sed 's/-O2 /-O1 /') %cmake -GNinja \ @@ -75,17 +77,8 @@ developing applications that use %{name}. %{_includedir}/vulkan/ %changelog -* Fri Dec 10 2021 Dave Airlie - 1.2.198.0-4 -- Rebuild for spirv-tools ABI - -* Thu Dec 09 2021 Dave Airlie - 1.2.198.0-3 -- Rebuild for spirv-tools - -* Wed Dec 01 2021 Dave Airlie - 1.2.198.0-2 -- Update to 1.2.198.0 - -* Wed Sep 08 2021 Dave Airlie - 1.2.189.0-2 -- Update to 1.2.189.0 SDK +* Tue Feb 22 2022 Dave Airlie - 1.3.204.0-1 +- Update to 1.3.204.0 * Mon Feb 01 2021 Dave Airlie - 1.2.162.0-1 - Update to 1.2.162.0