From 8b2b211b13f0d3fe0457d2b248c4c4ab4b2b97a658a80ea04b2a003d39305e6f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 27 Jun 2024 08:33:38 +0000 Subject: [PATCH] [info=623f22a90e0ceec499021e0f70da91e1a61a65ba321150a58646fd1173174d87] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/vulkan-utility-libraries?expand=0&rev=14 --- .gitattributes | 23 ++++++++ .gitignore | 1 + _scmsync.obsinfo | 4 ++ build.specials.obscpio | 3 + shared.diff | 52 +++++++++++++++++ vulkan-sdk-1.3.283.0.tar.gz | 3 + vulkan-utility-libraries.changes | 27 +++++++++ vulkan-utility-libraries.spec | 98 ++++++++++++++++++++++++++++++++ 8 files changed, 211 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 _scmsync.obsinfo create mode 100644 build.specials.obscpio create mode 100644 shared.diff create mode 100644 vulkan-sdk-1.3.283.0.tar.gz create mode 100644 vulkan-utility-libraries.changes create mode 100644 vulkan-utility-libraries.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo new file mode 100644 index 0000000..5499f68 --- /dev/null +++ b/_scmsync.obsinfo @@ -0,0 +1,4 @@ +mtime: 1715969092 +commit: 623f22a90e0ceec499021e0f70da91e1a61a65ba321150a58646fd1173174d87 +url: https://src.opensuse.org/pool/vulkan-utility-libraries +revision: factory diff --git a/build.specials.obscpio b/build.specials.obscpio new file mode 100644 index 0000000..4d85b23 --- /dev/null +++ b/build.specials.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cfcf25a6563f7af14b1af7f6dee272834ba4eaaf0fcc2a5d20541a32d97f39d8 +size 256 diff --git a/shared.diff b/shared.diff new file mode 100644 index 0000000..fe5522d --- /dev/null +++ b/shared.diff @@ -0,0 +1,52 @@ +From: Jan Engelhardt +Date: 2023-10-27 07:34:46.251955161 +0200 + +Static libraries are a no-go in our distro. +--- + CMakeLists.txt | 2 -- + src/layer/CMakeLists.txt | 3 ++- + src/vulkan/CMakeLists.txt | 3 ++- + 3 files changed, 4 insertions(+), 4 deletions(-) + +Index: Vulkan-Utility-Libraries-vulkan-sdk-1.3.283.0/CMakeLists.txt +=================================================================== +--- Vulkan-Utility-Libraries-vulkan-sdk-1.3.283.0.orig/CMakeLists.txt ++++ Vulkan-Utility-Libraries-vulkan-sdk-1.3.283.0/CMakeLists.txt +@@ -15,8 +15,6 @@ set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_EXTENSIONS OFF) + set(CMAKE_POSITION_INDEPENDENT_CODE ON) +-set(CMAKE_CXX_VISIBILITY_PRESET "hidden") +-set(CMAKE_C_VISIBILITY_PRESET "hidden") + set(CMAKE_VISIBILITY_INLINES_HIDDEN "YES") + + # This variable enables downstream users to customize the target API +Index: Vulkan-Utility-Libraries-vulkan-sdk-1.3.283.0/src/layer/CMakeLists.txt +=================================================================== +--- Vulkan-Utility-Libraries-vulkan-sdk-1.3.283.0.orig/src/layer/CMakeLists.txt ++++ Vulkan-Utility-Libraries-vulkan-sdk-1.3.283.0/src/layer/CMakeLists.txt +@@ -5,8 +5,9 @@ + # SPDX-License-Identifier: Apache-2.0 + set(CMAKE_FOLDER "${CMAKE_FOLDER}/VulkanLayerSettings") + +-add_library(VulkanLayerSettings STATIC) ++add_library(VulkanLayerSettings SHARED) + add_library(Vulkan::LayerSettings ALIAS VulkanLayerSettings) ++set_target_properties(VulkanLayerSettings PROPERTIES LIBRARY_OUTPUT_NAME VulkanLayerSettings-@PACKAGE_VERSION@) + + target_sources(VulkanLayerSettings PRIVATE + vk_layer_settings.cpp +Index: Vulkan-Utility-Libraries-vulkan-sdk-1.3.283.0/src/vulkan/CMakeLists.txt +=================================================================== +--- Vulkan-Utility-Libraries-vulkan-sdk-1.3.283.0.orig/src/vulkan/CMakeLists.txt ++++ Vulkan-Utility-Libraries-vulkan-sdk-1.3.283.0/src/vulkan/CMakeLists.txt +@@ -5,7 +5,8 @@ + # SPDX-License-Identifier: Apache-2.0 + set(CMAKE_FOLDER "${CMAKE_FOLDER}/VulkanSafeStruct") + +-add_library(VulkanSafeStruct STATIC) ++add_library(VulkanSafeStruct SHARED) ++set_target_properties(VulkanSafeStruct PROPERTIES LIBRARY_OUTPUT_NAME VulkanSafeStruct-@PACKAGE_VERSION@) + add_library(Vulkan::SafeStruct ALIAS VulkanSafeStruct) + + target_sources(VulkanSafeStruct PRIVATE diff --git a/vulkan-sdk-1.3.283.0.tar.gz b/vulkan-sdk-1.3.283.0.tar.gz new file mode 100644 index 0000000..0b598df --- /dev/null +++ b/vulkan-sdk-1.3.283.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:765a2bb9767e77cd168dfac870533d60b7e8e0031a0738bbe060ca0d4c4e7a03 +size 538236 diff --git a/vulkan-utility-libraries.changes b/vulkan-utility-libraries.changes new file mode 100644 index 0000000..9fc5dbb --- /dev/null +++ b/vulkan-utility-libraries.changes @@ -0,0 +1,27 @@ +------------------------------------------------------------------- +Thu May 16 12:31:59 UTC 2024 - Jan Engelhardt + +- Update to release SDK-1.3.283.0 + * safestruct: Remove safe_VkDescriptorDataEXT + +------------------------------------------------------------------- +Thu Mar 21 10:10:00 UTC 2024 - Jan Engelhardt + +- Update to release SDK-1.3.280.0 + * No changes, version bump only + +------------------------------------------------------------------- +Fri Jan 19 11:35:34 UTC 2024 - Jan Engelhardt + +- Update to release SDK-1.3.275.0 + * Minor improvements to VK_EXT_layer_settings documentation + +------------------------------------------------------------------- +Wed Nov 15 10:29:10 UTC 2023 - Jan Engelhardt + +- Turn off symbol hiding in shared.diff [boo#1217046] + +------------------------------------------------------------------- +Fri Oct 27 05:19:18 UTC 2023 - Jan Engelhardt + +- Initial package for build.opensuse.org (version 1.3.268.0) diff --git a/vulkan-utility-libraries.spec b/vulkan-utility-libraries.spec new file mode 100644 index 0000000..ef39be8 --- /dev/null +++ b/vulkan-utility-libraries.spec @@ -0,0 +1,98 @@ +# +# spec file for package vulkan-utility-libraries +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%define lname libVulkanLayerSettings-1_3_283_0 +Name: vulkan-utility-libraries +Version: 1.3.283.0 +Release: 0 +Summary: Utility libraries for Vulkan +License: Apache-2.0 +Group: Development/Libraries/C and C++ +URL: https://github.com/KhronosGroup/Vulkan-Utility-Libraries +Source: https://github.com/KhronosGroup/Vulkan-Utility-Libraries/archive/refs/tags/vulkan-sdk-%version.tar.gz +Patch1: shared.diff +%if 0%{?suse_version} && 0%{?suse_version} < 1599 +BuildRequires: gcc11-c++ +%else +BuildRequires: c++_compiler +%endif +BuildRequires: cmake >= 3.17.2 +BuildRequires: pkg-config +BuildRequires: vulkan-headers >= 1.3.280 +Obsoletes: vulkan < %version-%release +Provides: vulkan = %version-%release + +%description +The Vulkan::LayerSettings library standardizes layer +configuration code for various SDK layer deliverables. + +%package -n %lname +Summary: Utility library for Vulkan +Group: System/Libraries + +%description -n %lname +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. + +The Vulkan::LayerSettings library standardizes layer +configuration code for various SDK layer deliverables. + +%package devel +Summary: Utility library for Vulkan +Group: Development/Libraries/C and C++ +Requires: %lname = %version-%release + +%description devel +The Vulkan::LayerSettings library standardizes layer +configuration code for various SDK layer deliverables. + +This package contains the headers and build system integration. + +%prep +%autosetup -p1 -n Vulkan-Utility-Libraries-vulkan-sdk-%version +find . -type f -name CMakeLists.txt -exec perl -i -lpe 's{\@PACKAGE_VERSION\@}{%version}g' {} + + +%build +%if 0%{?suse_version} && 0%{?suse_version} < 1599 +# Need something that knows +export CC=gcc-11 CXX=g++-11 +%endif +%cmake +%cmake_build + +%install +%cmake_install +ln -s libVulkanLayerSettings-%version.so "%buildroot/%_libdir/libVulkanLayerSettings.so" +ln -s libVulkanSafeStruct-%version.so "%buildroot/%_libdir/libVulkanSafeStruct.so" + +%ldconfig_scriptlets -n %lname + +%files -n %lname +# lockstep updated (SLPP ยง6) +%_libdir/libVulkanLayerSettings-*.so +%_libdir/libVulkanSafeStruct-*.so + +%files devel +%_includedir/vulkan/ +%_libdir/cmake/ +%_libdir/libVulkanLayerSettings.so +%_libdir/libVulkanSafeStruct.so +%license LICENSE.md + +%changelog