From 91cada0ff377844c5907ae85a3507ab96bd69c3d Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 27 Apr 2022 15:14:43 +1000 Subject: [PATCH] drop unused patches. --- fix-spirv-tools-shared.patch | 12 ------------ try-fix-headers.patch | 11 ----------- vulkan-validation-layers.spec | 2 -- 3 files changed, 25 deletions(-) delete mode 100644 fix-spirv-tools-shared.patch delete mode 100644 try-fix-headers.patch diff --git a/fix-spirv-tools-shared.patch b/fix-spirv-tools-shared.patch deleted file mode 100644 index 2c9b502..0000000 --- a/fix-spirv-tools-shared.patch +++ /dev/null @@ -1,12 +0,0 @@ -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/try-fix-headers.patch b/try-fix-headers.patch deleted file mode 100644 index f08cca1..0000000 --- a/try-fix-headers.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 b0bf3e9..7edca34 100644 --- a/vulkan-validation-layers.spec +++ b/vulkan-validation-layers.spec @@ -8,8 +8,6 @@ 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++