Hello community,
here is the log from the commit of package vulkan-validationlayers for
openSUSE:Factory checked in at 2020-08-29 20:31:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vulkan-validationlayers (Old)
and /work/SRC/openSUSE:Factory/.vulkan-validationlayers.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vulkan-validationlayers"
Sat Aug 29 20:31:37 2020 rev:21 rq:830444 version:1.2.151
Changes:
--------
---
/work/SRC/openSUSE:Factory/vulkan-validationlayers/vulkan-validationlayers.changes
2020-08-12 12:29:43.504190296 +0200
+++
/work/SRC/openSUSE:Factory/.vulkan-validationlayers.new.3399/vulkan-validationlayers.changes
2020-08-29 20:31:40.793195722 +0200
@@ -1,0 +2,23 @@
+Sat Aug 29 08:12:15 UTC 2020 - Jan Engelhardt <[email protected]>
+
+- Add xxhash.diff.
+
+-------------------------------------------------------------------
+Thu Aug 20 16:08:36 UTC 2020 - Jan Engelhardt <[email protected]>
+
+- Update to release 1.2.151
+ * Add renderpass compat checks for FDM and Multiview use
+ * Add vkCmdResolveImage size VUIDs
+
+-------------------------------------------------------------------
+Thu Aug 20 09:09:54 UTC 2020 - Martin Liška <[email protected]>
+
+- Use memoryperjob constraint instead of %limit_build macro.
+
+-------------------------------------------------------------------
+Wed Aug 19 11:24:44 UTC 2020 - Jan Engelhardt <[email protected]>
+
+- Produce and install support header files [boo#1175024]
+- Add ver.diff
+
+-------------------------------------------------------------------
Old:
----
v1.2.148.tar.gz
New:
----
_constraints
v1.2.151.tar.gz
ver.diff
xxhash.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vulkan-validationlayers.spec ++++++
--- /var/tmp/diff_new_pack.4aVrDU/_old 2020-08-29 20:31:42.421196407 +0200
+++ /var/tmp/diff_new_pack.4aVrDU/_new 2020-08-29 20:31:42.425196409 +0200
@@ -17,8 +17,9 @@
Name: vulkan-validationlayers
-Version: 1.2.148
+Version: 1.2.151
Release: 0
+%define lname libVkLayer_utils-1_2_151
Summary: Validation layers for Vulkan
License: Apache-2.0
Group: Development/Tools/Other
@@ -26,14 +27,16 @@
Source:
https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/v%version.tar.gz
Source9: %name-rpmlintrc
+Patch1: ver.diff
+Patch2: xxhash.diff
BuildRequires: cmake >= 3.4
BuildRequires: gcc-c++ >= 4.8
BuildRequires: glslang-devel >= 8.13.3727
-BuildRequires: memory-constraints
BuildRequires: pkg-config
BuildRequires: python3-base
BuildRequires: spirv-headers
BuildRequires: spirv-tools-devel >= 2020.2
+BuildRequires: xxhash-devel
BuildRequires: pkgconfig(vulkan) >= 1.2.130
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcb)
@@ -41,28 +44,59 @@
Obsoletes: vulkan < 1.1
%description
-Vulkan is a 3D graphics and compute API providing cross-platform
-access to modern GPUs with low overhead and targeting realtime
-graphics applications such as games and interactive media.
+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-%version
+%autosetup -n Vulkan-ValidationLayers-%version -p1
+perl -i -pe 's{\@PACKAGE_VERSION\@}{%version}' CMakeLists.txt
%build
-%limit_build -m 2000
-%cmake -DGLSLANG_INSTALL_DIR="%_bindir"
-DSPIRV_HEADERS_INSTALL_DIR="%_includedir"
+%cmake -DGLSLANG_INSTALL_DIR="%_bindir" \
+ -DSPIRV_HEADERS_INSTALL_DIR="%_includedir" \
+ -DBUILD_LAYER_SUPPORT_FILES=ON
make %{?_smp_mflags}
%install
%cmake_install
-# no header files
-rm -f "%buildroot/%_libdir"/*.a
+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
%files
%license LICENSE.txt
-%_libdir/libVkLayer*.so
+%_libdir/libVkLayer_khr*.so
%_datadir/vulkan/
+%files -n %lname
+%_libdir/libVkLayer_utils-%version.so
+
+%files devel
+%_includedir/*
+%_libdir/libVkLayer_utils.so
+
%changelog
++++++ _constraints ++++++
<?xml version="1.0" encoding="UTF-8"?>
<constraints>
<hardware>
<memoryperjob>
<size unit="M">2000</size>
</memoryperjob>
</hardware>
</constraints>++++++ v1.2.148.tar.gz -> v1.2.151.tar.gz ++++++
++++ 11395 lines of diff (skipped)
++++++ ver.diff ++++++
From: Jan Engelhardt <[email protected]>
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.
---
CMakeLists.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: Vulkan-ValidationLayers-1.2.148/CMakeLists.txt
===================================================================
--- Vulkan-ValidationLayers-1.2.148.orig/CMakeLists.txt
+++ Vulkan-ValidationLayers-1.2.148/CMakeLists.txt
@@ -320,11 +320,12 @@ set(SCRIPTS_DIR "${PROJECT_SOURCE_DIR}/s
# files directly in layers.
add_library(VkLayer_utils
- STATIC
+ SHARED
layers/vk_layer_config.cpp
layers/vk_layer_extension_utils.cpp
layers/vk_layer_utils.cpp
layers/vk_format_utils.cpp)
+set_target_properties(VkLayer_utils PROPERTIES OUTPUT_NAME
"VkLayer_utils-@PACKAGE_VERSION@")
target_link_libraries(VkLayer_utils PUBLIC Vulkan::Headers)
if(WIN32)
target_compile_definitions(VkLayer_utils PUBLIC _CRT_SECURE_NO_WARNINGS)
++++++ xxhash.diff ++++++
From: Jan Engelhardt <[email protected]>
Date: 2020-08-29 10:10:12.022296526 +0200
Avoid the installation of a custom xxhash.h header. Since vk_*.h header files
still include xxhash.h (and now would source the system xxhash instead of the
bundled one), it makes sense to build ValidationLayers itself with the system
xxhash as well, so that the ABI matches.
---
layers/CMakeLists.txt | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
Index: Vulkan-ValidationLayers/layers/CMakeLists.txt
===================================================================
--- Vulkan-ValidationLayers.orig/layers/CMakeLists.txt
+++ Vulkan-ValidationLayers/layers/CMakeLists.txt
@@ -61,8 +61,6 @@ if(BUILD_LAYER_SUPPORT_FILES)
vk_layer_utils.h
vk_layer_utils.cpp
vk_loader_platform.h
- xxhash.h
- xxhash.c
generated/vk_validation_error_messages.h
generated/vk_layer_dispatch_table.h
generated/vk_dispatch_table_helper.h
@@ -195,7 +193,7 @@ set(CORE_VALIDATION_LIBRARY_FILES
shader_validation.cpp
shader_validation.h
gpu_validation.cpp
- xxhash.c)
+)
set(OBJECT_LIFETIMES_LIBRARY_FILES
generated/object_tracker.cpp
@@ -253,7 +251,7 @@ if(BUILD_LAYERS)
target_include_directories(VkLayer_khronos_validation PRIVATE
${GLSLANG_SPIRV_INCLUDE_DIR})
target_include_directories(VkLayer_khronos_validation PRIVATE
${SPIRV_TOOLS_INCLUDE_DIR})
target_include_directories(VkLayer_khronos_validation PRIVATE
${SPIRV_HEADERS_INCLUDE_DIR})
- target_link_libraries(VkLayer_khronos_validation PRIVATE
${SPIRV_TOOLS_LIBRARIES})
+ target_link_libraries(VkLayer_khronos_validation PRIVATE
${SPIRV_TOOLS_LIBRARIES} -lxxhash)
# The output file needs Unix "/" separators or Windows "\" separators On
top of that, Windows separators actually need to be doubled
# because the json format uses backslash escapes
