diff --git a/shared.diff b/shared.diff index d2dd842..bb82787 100644 --- a/shared.diff +++ b/shared.diff @@ -2,19 +2,20 @@ From: Jan Engelhardt Date: 2024-01-19 11:52:08.473079444 +0100 --- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) -Index: volk-vulkan-sdk-1.3.275.0/CMakeLists.txt +Index: volk-vulkan-sdk-1.3.280.0/CMakeLists.txt =================================================================== ---- volk-vulkan-sdk-1.3.275.0.orig/CMakeLists.txt -+++ volk-vulkan-sdk-1.3.275.0/CMakeLists.txt -@@ -31,7 +31,7 @@ endif() +--- volk-vulkan-sdk-1.3.280.0.orig/CMakeLists.txt ++++ volk-vulkan-sdk-1.3.280.0/CMakeLists.txt +@@ -31,7 +31,8 @@ endif() # Static library if(NOT VOLK_HEADERS_ONLY OR VOLK_INSTALL) - add_library(volk STATIC volk.h volk.c) + add_library(volk SHARED volk.h volk.c) ++ set_target_properties(volk PROPERTIES OUTPUT_NAME "volk-@PACKAGE_VERSION@") add_library(volk::volk ALIAS volk) target_include_directories(volk PUBLIC $ diff --git a/vulkan-sdk-1.3.275.0.tar.gz b/vulkan-sdk-1.3.275.0.tar.gz deleted file mode 100644 index a6205c4..0000000 --- a/vulkan-sdk-1.3.275.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b68d24e139190e49e5eafd72894f6e85c80472b8745bddc6ef91d6bf339df813 -size 60947 diff --git a/vulkan-sdk-1.3.280.0.tar.gz b/vulkan-sdk-1.3.280.0.tar.gz new file mode 100644 index 0000000..6aebad3 --- /dev/null +++ b/vulkan-sdk-1.3.280.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af9c98d09284eef29f6826bb1620bfe551a91a864fce707416b83c255efe3c25 +size 62436 diff --git a/vulkan-volk.changes b/vulkan-volk.changes index 7d82bfb..4161cf8 100644 --- a/vulkan-volk.changes +++ b/vulkan-volk.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 21 09:00:18 UTC 2024 - Jan Engelhardt + +- Update to release SDK-1.3.280.0 + * No changelog was provided + ------------------------------------------------------------------- Tue Feb 27 10:23:31 UTC 2024 - Jan Engelhardt @@ -6,5 +12,5 @@ Tue Feb 27 10:23:31 UTC 2024 - Jan Engelhardt ------------------------------------------------------------------- Fri Jan 19 11:00:52 UTC 2024 - Jan Engelhardt -- Initial package (version 1.3.275.0) for build.opensuse.org +- Initial package (version SDK-1.3.275.0) for build.opensuse.org - Add shared.diff diff --git a/vulkan-volk.spec b/vulkan-volk.spec index decd64d..3328659 100644 --- a/vulkan-volk.spec +++ b/vulkan-volk.spec @@ -17,7 +17,8 @@ Name: vulkan-volk -Version: 1.3.275.0 +%define lname libvolk-1_3_280_0 +Version: 1.3.280.0 Release: 0 Summary: Meta loader for the Vulkan API License: MIT @@ -33,12 +34,12 @@ BuildRequires: pkgconfig(vulkan) %description A meta loader for Vulkan. -%package -n libvolk +%package -n %lname Summary: Meta loader for the Vulkan API Group: System/Libraries Conflicts: volk-devel -%description -n libvolk +%description -n %lname volk is a meta loader for Vulkan. It loads entrypoints required to use Vulkan by means of dlopen-ing libvulkan.so.1. volk simplifies the use of Vulkan extensions by loading all associated entrypoints. volk @@ -59,28 +60,25 @@ Headers needed for programs to utilize the Vulkan VOLK meta loader. %prep %autosetup -p1 -n volk-vulkan-sdk-%version +perl -i -lpe 's{\@PACKAGE_VERSION\@}{%version}g' CMakeLists.txt %build -# Minimal re-versioning so rpm detects upgrades at least. Might change later. -sv="$PWD/lib.v" -ver=$(echo %version | cut -d+ -f1) -echo "VOLK_$ver { global: *; };" >"$sv" -%cmake -DVOLK_INSTALL=ON \ - -DCMAKE_SHARED_LINKER_FLAGS:STRING="-Wl,--version-script=$sv" +%cmake -DVOLK_INSTALL=ON %cmake_build %install %cmake_install +ln -s libvolk-%version.so "%buildroot/%_libdir/libvolk.so" -%post -n libvolk -p /sbin/ldconfig -%postun -n libvolk -p /sbin/ldconfig +%ldconfig_scriptlets -n %lname -%files -n libvolk -%_libdir/libvolk.so +%files -n %lname +%_libdir/libvolk-%version.so %files devel %_includedir/volk* %_libdir/cmake/ +%_libdir/libvolk.so %doc LICENSE.md README.md %changelog