jengelh/vulkan-validationlayers
SHA256
1
0
Fork 0
forked from pool/vulkan-validationlayers
Code Pull Requests Activity

Accepting request 1066257 from X11:Wayland

Browse Source 
- Rework xxhash.diff, remove ver.diff,
  cure unresolved symbols [boo#1208172].
- Delete vulkan-validationlayers-devel

OBS-URL: https://build.opensuse.org/request/show/1066257
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vulkan-validationlayers?expand=0&rev=41
This commit is contained in:
Dominique Leuenberger 2023-02-17 15:44:07 +00:00 committed by Git OBS Bridge
commit a5f855a14b
5 changed files with 15 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ver.diff
View File

@ -1,30 +0,0 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2020-08-19 13:21:33.156157310 +0200
We do not want static archives in openSUSE, so need to turn on SHARED mode.
As a result, a version needs to be added.
---
layers/CMakeLists.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: Vulkan-ValidationLayers-sdk-1.3.239.0/layers/CMakeLists.txt
===================================================================
--- Vulkan-ValidationLayers-sdk-1.3.239.0.orig/layers/CMakeLists.txt
+++ Vulkan-ValidationLayers-sdk-1.3.239.0/layers/CMakeLists.txt
@@ -23,7 +23,7 @@
# https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/4640
add_compile_definitions(XXH_NO_LONG_LONG)
-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
@@ -53,6 +53,7 @@ target_sources(VkLayer_utils PRIVATE
xxhash.h
xxhash.c
)
+set_target_properties(VkLayer_utils PROPERTIES OUTPUT_NAME "VkLayer_utils-@PACKAGE_VERSION@")
target_link_libraries(VkLayer_utils PUBLIC Vulkan::Headers)
set_target_properties(VkLayer_utils PROPERTIES LINKER_LANGUAGE CXX)
target_include_directories(VkLayer_utils PUBLIC

2
vulkan-validationlayers-rpmlintrc
View File

@ -1,2 +0,0 @@
# for 15.3's rpmlint which is a bit dumber
addFilter("vulkan-validationlayers.x86_64: E: shlib-policy-name-error .* libVkLayer_khronos_validation")

7
vulkan-validationlayers.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Feb 16 18:27:17 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
- Rework xxhash.diff, remove ver.diff,
cure unresolved symbols [boo#1208172].
- Delete vulkan-validationlayers-devel
-------------------------------------------------------------------
Sun Jan 29 12:46:08 UTC 2023 - Jan Engelhardt <jengelh@inai.de>

35
vulkan-validationlayers.spec
View File

@ -25,8 +25,6 @@ License: Apache-2.0
Group: Development/Tools/Other
URL: https://github.com/KhronosGroup/Vulkan-ValidationLayers
Source: https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/refs/tags/sdk-%version.tar.gz
Source9: %name-rpmlintrc
Patch1: ver.diff
Patch2: xxhash.diff
BuildRequires: cmake >= 3.7.12
BuildRequires: gcc-c++ >= 4.8
@ -49,26 +47,6 @@ Vulkan is a 3D graphics and compute API.
This package contains the Khronos official Vulkan validation layers.
%package -n %lname
Summary: Vulkan validation layer utility library
Group: System/Libraries
%description -n %lname
Vulkan is a 3D graphics and compute API.
This package contains a utility library.
%package devel
Summary: Vulkan validation layer support files
Group: Development/Libraries/C and C++
Requires: %lname = %version
Requires: xxhash-devel
%description devel
Vulkan is a 3D graphics and compute API.
This package contains support files for the VkLayer utility library.
%prep
%autosetup -n Vulkan-ValidationLayers-sdk-%version -p1
perl -i -pe 's{\@PACKAGE_VERSION\@}{%version}' CMakeLists.txt */CMakeLists.txt
@ -94,22 +72,11 @@ export CXX="$PWD/gxx"
%install
%cmake_install
b="%buildroot"
ln -sv "libVkLayer_utils-%version.so" "$b/%_libdir/libVkLayer_utils.so"
rm -f "$b/%_includedir"/xxhash.*
%post -n %lname -p /sbin/ldconfig
%postun -n %lname -p /sbin/ldconfig
rm -Rfv "$b/%_includedir" "$b/%_libdir"/*.a
%files
%license LICENSE.txt
%_libdir/libVkLayer_khr*.so
%_datadir/vulkan/
%files -n %lname
%_libdir/libVkLayer_utils-%version.so
%files devel
%_includedir/*
%_libdir/libVkLayer_utils.so
%changelog

20
xxhash.diff
View File

@ -14,16 +14,19 @@ Index: Vulkan-ValidationLayers-sdk-1.3.239.0/layers/CMakeLists.txt
===================================================================
--- Vulkan-ValidationLayers-sdk-1.3.239.0.orig/layers/CMakeLists.txt
+++ Vulkan-ValidationLayers-sdk-1.3.239.0/layers/CMakeLists.txt
@@ -50,8 +50,6 @@ target_sources(VkLayer_utils PRIVATE
@@ -50,10 +50,8 @@ target_sources(VkLayer_utils PRIVATE
vk_layer_logging.cpp
vk_layer_utils.h
vk_layer_utils.cpp
- xxhash.h
- xxhash.c
)
set_target_properties(VkLayer_utils PROPERTIES OUTPUT_NAME "VkLayer_utils-@PACKAGE_VERSION@")
target_link_libraries(VkLayer_utils PUBLIC Vulkan::Headers)
@@ -259,8 +257,6 @@ target_sources(VkLayer_khronos_validatio
-target_link_libraries(VkLayer_utils PUBLIC Vulkan::Headers)
+target_link_libraries(VkLayer_utils PUBLIC Vulkan::Headers -lxxhash)
set_target_properties(VkLayer_utils PROPERTIES LINKER_LANGUAGE CXX)
target_include_directories(VkLayer_utils PUBLIC
.
@@ -258,8 +256,6 @@ target_sources(VkLayer_khronos_validatio
video_validation.cpp
vk_layer_settings_ext.h
wsi_validation.cpp
@ -32,12 +35,3 @@ Index: Vulkan-ValidationLayers-sdk-1.3.239.0/layers/CMakeLists.txt
)
target_compile_definitions(VkLayer_khronos_validation PUBLIC ${KHRONOS_LAYER_COMPILE_DEFINITIONS})
@@ -279,7 +275,7 @@ if (USE_ROBIN_HOOD_HASHING)
endif()
# Order matters here. VkLayer_utils should be the last link library to ensure mimalloc overrides are picked up correctly.
# Otherwise, libraries after VkLayer_utils will not benefit from this performance improvement.
-target_link_libraries(VkLayer_khronos_validation PRIVATE VVL-SPIRV-LIBS VkLayer_utils)
+target_link_libraries(VkLayer_khronos_validation PRIVATE VVL-SPIRV-LIBS VkLayer_utils -lxxhash)
# There are 2 primary deliverables for the validation layers.
# - The actual library VkLayer_khronos_validation.(dll|so|dylib)