[packages/Vulkan-Loader] - updated to sdk-1.3.243.0
qboosh
qboosh at pld-linux.org
Tue Apr 4 20:57:29 CEST 2023
commit 42c1806ac2068c51b3c4b68adcea173526961567
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Apr 4 21:00:01 2023 +0200
- updated to sdk-1.3.243.0
Vulkan-Loader.spec | 20 ++++++--------------
pc.patch | 43 -------------------------------------------
2 files changed, 6 insertions(+), 57 deletions(-)
---
diff --git a/Vulkan-Loader.spec b/Vulkan-Loader.spec
index 08b949e..39c5ead 100644
--- a/Vulkan-Loader.spec
+++ b/Vulkan-Loader.spec
@@ -4,7 +4,7 @@
%bcond_without wayland # Wayland support in loader
%bcond_without x11 # XLib support in loader
-%define api_version 1.3.224.1
+%define api_version 1.3.243.0
Summary: Vulkan API loader
Summary(pl.UTF-8): Biblioteka wczytująca sterowniki Vulkan
@@ -16,10 +16,9 @@ License: Apache v2.0, parts MIT-like
Group: Libraries
#Source0Download: https://github.com/KhronosGroup/Vulkan-Loader/tags
Source0: https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-%{version}/%{name}-sdk-%{version}.tar.gz
-# Source0-md5: 54b7498c122e2ec8eb3d1dc80c654456
-Patch0: pc.patch
+# Source0-md5: 87284897301309f54a14965796987764
URL: https://github.com/KhronosGroup/Vulkan-Loader/
-BuildRequires: cmake >= 3.10.2
+BuildRequires: cmake >= 3.17.2
%if %{with tests} && %(locale -a | grep -q '^C\.utf8$'; echo $?)
BuildRequires: glibc-localedb-all
%endif
@@ -61,31 +60,24 @@ Pliki nagłówkowe loadera Vulkan.
%prep
%setup -qn %{name}-sdk-%{version}
-%patch0 -p1
%build
-install -d build
-cd build
-
-%cmake .. \
+%cmake -B build \
-DBUILD_TESTS=%{?with_tests:ON}%{!?with_tests:OFF} \
-DBUILD_WSI_WAYLAND_SUPPORT=%{?with_wayland:ON}%{!?with_wayland:OFF} \
-DBUILD_WSI_XLIB_SUPPORT=%{?with_x11:ON}%{!?with_x11:OFF} \
-DBUILD_WSI_XCB_SUPPORT=%{?with_x11:ON}%{!?with_x11:OFF}
-%{__make}
+%{__make} -C build
%if %{with tests}
-cd tests
+cd build/tests
LC_ALL=C.UTF-8 \
LD_LIBRARY_PATH=../loader:layers \
VK_LAYER_PATH=layers \
./run_loader_tests.sh
-cd ..
%endif
-cd ..
-
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_datadir}}/vulkan/{icd.d,explicit_layer.d,implicit_layer.d}
diff --git a/pc.patch b/pc.patch
deleted file mode 100644
index afe6eae..0000000
--- a/pc.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 595993488ace91448d6ab809da0d1dc4a9f4128e Mon Sep 17 00:00:00 2001
-From: Jan Palus <jpalus at fastmail.com>
-Date: Mon, 28 Nov 2022 13:29:21 +0100
-Subject: [PATCH] cmake: fix pkgconfig file for absolute install paths
-
-Fixes #1076
----
- loader/CMakeLists.txt | 7 +++++++
- loader/vulkan.pc.in | 4 ++--
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
-index 2eb704fde..b24c037b4 100644
---- a/loader/CMakeLists.txt
-+++ b/loader/CMakeLists.txt
-@@ -409,6 +409,13 @@ if(PKG_CONFIG_FOUND)
- else()
- set(CMAKE_INSTALL_FULL_LIBDIR_PC ${CMAKE_INSTALL_FULL_LIBDIR})
- endif ()
-+ if ("${CMAKE_INSTALL_PREFIX}" STREQUAL "")
-+ set(CMAKE_INSTALL_REL_LIBDIR_PC ${CMAKE_INSTALL_FULL_LIBDIR_PC})
-+ set(CMAKE_INSTALL_REL_INCLUDEDIR_PC ${CMAKE_INSTALL_FULL_INCLUDEDIR})
-+ else()
-+ file(RELATIVE_PATH CMAKE_INSTALL_REL_LIBDIR_PC ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_LIBDIR_PC})
-+ file(RELATIVE_PATH CMAKE_INSTALL_REL_INCLUDEDIR_PC ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_INCLUDEDIR})
-+ endif()
- configure_file("vulkan.pc.in" "vulkan.pc" @ONLY)
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vulkan.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
- endif()
-diff --git a/loader/vulkan.pc.in b/loader/vulkan.pc.in
-index 82e9f5edc..1d38a22ef 100644
---- a/loader/vulkan.pc.in
-+++ b/loader/vulkan.pc.in
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
--includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-+libdir=${exec_prefix}/@CMAKE_INSTALL_REL_LIBDIR_PC@
-+includedir=${prefix}/@CMAKE_INSTALL_REL_INCLUDEDIR_PC@
-
- Name: @CMAKE_PROJECT_NAME@
- Description: Vulkan Loader
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/Vulkan-Loader.git/commitdiff/42c1806ac2068c51b3c4b68adcea173526961567
More information about the pld-cvs-commit
mailing list