From 0335441c2598e7312cd18bae39b552a4cccf7391 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 31 Jan 2023 12:09:30 +1000 Subject: [PATCH] Fixup patches --- disable-werror.patch | 14 -------------- fix_shared.patch | 22 +++++++++++----------- vulkan-validation-layers.spec | 3 --- 3 files changed, 11 insertions(+), 28 deletions(-) delete mode 100644 disable-werror.patch diff --git a/disable-werror.patch b/disable-werror.patch deleted file mode 100644 index 7dafab1..0000000 --- a/disable-werror.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up Vulkan-ValidationLayers-sdk-1.3.231.1/CMakeLists.txt.dave Vulkan-ValidationLayers-sdk-1.3.231.1/CMakeLists.txt ---- Vulkan-ValidationLayers-sdk-1.3.231.1/CMakeLists.txt.dave 2022-11-10 13:45:38.130379846 +1000 -+++ Vulkan-ValidationLayers-sdk-1.3.231.1/CMakeLists.txt 2022-11-10 13:45:54.135656036 +1000 -@@ -171,9 +171,7 @@ if(${CMAKE_C_COMPILER_ID} MATCHES "(GNU| - -fno-builtin-memcmp) - - # Treat warnings as errors for versions of GCC and c++11-compliant Clang versions that are shipped on Ubuntu 18.04 or older. -- if(BUILD_WERROR OR -- (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL 7.3.0) OR -- (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 6.0.0)) -+ if(BUILD_WERROR) - add_compile_options(-Werror) - endif() - diff --git a/fix_shared.patch b/fix_shared.patch index 8082da8..5024498 100644 --- a/fix_shared.patch +++ b/fix_shared.patch @@ -1,12 +1,12 @@ -diff -up Vulkan-ValidationLayers-sdk-1.1.92.0/CMakeLists.txt.dma Vulkan-ValidationLayers-sdk-1.1.92.0/CMakeLists.txt ---- Vulkan-ValidationLayers-sdk-1.1.92.0/CMakeLists.txt.dma 2019-02-13 09:20:44.590959278 +1000 -+++ Vulkan-ValidationLayers-sdk-1.1.92.0/CMakeLists.txt 2019-02-13 09:21:29.178151673 +1000 -@@ -294,7 +294,7 @@ set_target_properties(generate_helper_fi - # files directly in layers. +diff -up Vulkan-ValidationLayers-sdk-1.3.239.0/layers/CMakeLists.txt.dma Vulkan-ValidationLayers-sdk-1.3.239.0/layers/CMakeLists.txt +--- Vulkan-ValidationLayers-sdk-1.3.239.0/layers/CMakeLists.txt.dma 2023-01-31 12:05:35.414802790 +1000 ++++ Vulkan-ValidationLayers-sdk-1.3.239.0/layers/CMakeLists.txt 2023-01-31 12:06:54.380001391 +1000 +@@ -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 +-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 diff --git a/vulkan-validation-layers.spec b/vulkan-validation-layers.spec index 57d135f..996802b 100644 --- a/vulkan-validation-layers.spec +++ b/vulkan-validation-layers.spec @@ -8,9 +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 -# it appears there is a warning with rawhide gcc -Patch1: disable-werror.patch - BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: cmake3