From c42f8bbebbe3950593f84ba32e3706a68c2b19335b873c7c06e932a10e5fd4af Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 16 Feb 2023 19:09:02 +0000 Subject: [PATCH 1/3] - Rework xxhash.diff, remove ver.diff and libVkLayer_utils.so, cure unresolved symbols [boo#1208172]. OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/vulkan-validationlayers?expand=0&rev=113 --- ver.diff | 30 ------------------------------ vulkan-validationlayers.changes | 6 ++++++ vulkan-validationlayers.spec | 8 +------- xxhash.diff | 20 +++++++------------- 4 files changed, 14 insertions(+), 50 deletions(-) delete mode 100644 ver.diff diff --git a/ver.diff b/ver.diff deleted file mode 100644 index 81f2518..0000000 --- a/ver.diff +++ /dev/null @@ -1,30 +0,0 @@ -From: Jan Engelhardt -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 diff --git a/vulkan-validationlayers.changes b/vulkan-validationlayers.changes index b4c4df8..0e4c394 100644 --- a/vulkan-validationlayers.changes +++ b/vulkan-validationlayers.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 16 18:27:17 UTC 2023 - Jan Engelhardt + +- Rework xxhash.diff, remove ver.diff and libVkLayer_utils.so, + cure unresolved symbols [boo#1208172]. + ------------------------------------------------------------------- Sun Jan 29 12:46:08 UTC 2023 - Jan Engelhardt diff --git a/vulkan-validationlayers.spec b/vulkan-validationlayers.spec index f6330ad..c7d7e02 100644 --- a/vulkan-validationlayers.spec +++ b/vulkan-validationlayers.spec @@ -26,7 +26,6 @@ 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 @@ -94,8 +93,7 @@ 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.* +rm -fv "$b/%_includedir"/xxhash.* "$b/%_libdir"/*.a %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig @@ -105,11 +103,7 @@ rm -f "$b/%_includedir"/xxhash.* %_libdir/libVkLayer_khr*.so %_datadir/vulkan/ -%files -n %lname -%_libdir/libVkLayer_utils-%version.so - %files devel %_includedir/* -%_libdir/libVkLayer_utils.so %changelog diff --git a/xxhash.diff b/xxhash.diff index 7cf7dde..bb6dc08 100644 --- a/xxhash.diff +++ b/xxhash.diff @@ -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) From 12cf8ee43dd68155fcce7aa84333c0f4c7f0781d45f05bb8b514b25c24b2aaca Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 16 Feb 2023 19:23:08 +0000 Subject: [PATCH 2/3] - Delete vulkan-validationlayers-devel OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/vulkan-validationlayers?expand=0&rev=114 --- vulkan-validationlayers.changes | 3 ++- vulkan-validationlayers.spec | 28 +--------------------------- 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/vulkan-validationlayers.changes b/vulkan-validationlayers.changes index 0e4c394..0792389 100644 --- a/vulkan-validationlayers.changes +++ b/vulkan-validationlayers.changes @@ -1,8 +1,9 @@ ------------------------------------------------------------------- Thu Feb 16 18:27:17 UTC 2023 - Jan Engelhardt -- Rework xxhash.diff, remove ver.diff and libVkLayer_utils.so, +- 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 diff --git a/vulkan-validationlayers.spec b/vulkan-validationlayers.spec index c7d7e02..da1478a 100644 --- a/vulkan-validationlayers.spec +++ b/vulkan-validationlayers.spec @@ -48,26 +48,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 @@ -93,17 +73,11 @@ export CXX="$PWD/gxx" %install %cmake_install b="%buildroot" -rm -fv "$b/%_includedir"/xxhash.* "$b/%_libdir"/*.a - -%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 devel -%_includedir/* - %changelog From a15a3cbe7a27344ce62093df96b050be5aac995bbab3841395d00770aac4df1d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 16 Feb 2023 19:34:45 +0000 Subject: [PATCH 3/3] delete unused rpmlintrc OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/vulkan-validationlayers?expand=0&rev=115 --- vulkan-validationlayers-rpmlintrc | 2 -- vulkan-validationlayers.spec | 1 - 2 files changed, 3 deletions(-) delete mode 100644 vulkan-validationlayers-rpmlintrc diff --git a/vulkan-validationlayers-rpmlintrc b/vulkan-validationlayers-rpmlintrc deleted file mode 100644 index 7495abd..0000000 --- a/vulkan-validationlayers-rpmlintrc +++ /dev/null @@ -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") diff --git a/vulkan-validationlayers.spec b/vulkan-validationlayers.spec index da1478a..9db57f0 100644 --- a/vulkan-validationlayers.spec +++ b/vulkan-validationlayers.spec @@ -25,7 +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 Patch2: xxhash.diff BuildRequires: cmake >= 3.7.12 BuildRequires: gcc-c++ >= 4.8