rpms/vulkan-validation-layers
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixup patches

Browse Source
This commit is contained in:
Dave Airlie 2023-01-31 12:09:30 +10:00
parent 1c80f44f65
commit 0335441c25
3 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
disable-werror.patch
View File

@ -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()

22
fix_shared.patch
View File

@ -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

3
vulkan-validation-layers.spec
View File

@ -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