From 1c21319026c49eb3d9bfefe65cafd1cfd5efa5ed Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 25 Feb 2022 16:43:40 +1000 Subject: [PATCH] Update to latest 1.3.204.0 Resolves: rhbz#2016882 --- .gitignore | 1 + fix-spirv-tools-shared.patch | 12 ++++++++++++ sources | 2 +- try-fix-headers.patch | 11 +++++++++++ vulkan-validation-layers.spec | 9 +++++++-- 5 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 fix-spirv-tools-shared.patch create mode 100644 try-fix-headers.patch diff --git a/.gitignore b/.gitignore index e989f4a..cb82d6e 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /Vulkan-ValidationLayers-sdk-1.2.154.0.tar.gz /Vulkan-ValidationLayers-sdk-1.2.162.0.tar.gz /Vulkan-ValidationLayers-sdk-1.2.182.0.tar.gz +/Vulkan-ValidationLayers-sdk-1.3.204.0.tar.gz diff --git a/fix-spirv-tools-shared.patch b/fix-spirv-tools-shared.patch new file mode 100644 index 0000000..2c9b502 --- /dev/null +++ b/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 b/sources index 6ea2456..c3cc0c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Vulkan-ValidationLayers-sdk-1.2.182.0.tar.gz) = 2871a6fdc0bf6baa3a6a33ebcf0c243a5e39d7614036e539002ebca967533943af7cce0f292baeede47a100bda45da9cf55c113fb0c7d78818e16f80ceb75f89 +SHA512 (Vulkan-ValidationLayers-sdk-1.3.204.0.tar.gz) = 9f0649d2e3eccd52a093b4d9c3446d7f05ad4938a6950042fc2c3cf05f6ca2f513706385fc39cf4559344a4770fcc4375306904a233d0edd48b6eff5f17f1b0f diff --git a/try-fix-headers.patch b/try-fix-headers.patch new file mode 100644 index 0000000..f08cca1 --- /dev/null +++ b/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/vulkan-validation-layers.spec b/vulkan-validation-layers.spec index 0d00d52..31c9aa9 100644 --- a/vulkan-validation-layers.spec +++ b/vulkan-validation-layers.spec @@ -1,6 +1,6 @@ Name: vulkan-validation-layers -Version: 1.2.182.0 -Release: 3%{?dist} +Version: 1.3.204.0 +Release: 1%{?dist} Summary: Vulkan validation layers License: ASL 2.0 @@ -8,6 +8,8 @@ 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++ @@ -73,6 +75,9 @@ developing applications that use %{name}. %{_includedir}/vulkan/ %changelog +* Fri Feb 25 2022 Dave Airlie - 1.3.204.0-1 +- Update to latest 1.3.204.0 + * Tue Aug 10 2021 Mohan Boddu - 1.2.182.0-3 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688