$ git diff --patch-with-stat --summary c12f6e763a2d95be593e580cc6fc110e0a119c7a..6427b91393baa6c98e53407c1485ae7a50a5db30
.abf.yml | 2 +-
vulkan-loader-1.2.162-fix-pkgconfig-file.patch | 15 +++++++--------
vulkan-loader-fix-header-version-detection.patch | 21 ---------------------
vulkan-loader.spec | 19 ++++++++++++-------
4 files changed, 20 insertions(+), 37 deletions(-)
delete mode 100644 vulkan-loader-fix-header-version-detection.patch
diff --git a/.abf.yml b/.abf.yml
index 00d85a6..86672a1 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- Vulkan-Loader-1.3.231.tar.gz: dd1c576259d4ee1df76e774a940109cc304dd3bf
+ Vulkan-Loader-1.3.243.tar.gz: b726643170b756b7a2037965b31eae953dcf5dd3
diff --git a/vulkan-loader-1.2.162-fix-pkgconfig-file.patch b/vulkan-loader-1.2.162-fix-pkgconfig-file.patch
index 372e613..a717972 100644
--- a/vulkan-loader-1.2.162-fix-pkgconfig-file.patch
+++ b/vulkan-loader-1.2.162-fix-pkgconfig-file.patch
@@ -1,12 +1,11 @@
-diff -uraN Vulkan-Loader-1.2.166/loader/vulkan.pc.in omv-Vulkan-Loader-1.2.166/loader/vulkan.pc.in
---- Vulkan-Loader-1.2.166/loader/vulkan.pc.in 2021-01-05 18:45:38.000000000 +0100
-+++ omv-Vulkan-Loader-1.2.166/loader/vulkan.pc.in 2021-01-12 14:55:14.029957279 +0100
-@@ -6,7 +6,7 @@
- Name: @CMAKE_PROJECT_NAME@
+diff -Naur Vulkan-Loader-1.3.243/loader/vulkan.pc.in Vulkan-Loader-1.3.243.tpg/loader/vulkan.pc.in
+--- Vulkan-Loader-1.3.243/loader/vulkan.pc.in 2023-03-13 19:18:04.000000000 +0000
++++ Vulkan-Loader-1.3.243.tpg/loader/vulkan.pc.in 2023-03-16 15:56:38.576574020 +0000
+@@ -6,6 +6,6 @@
+ Name: @VULKAN_LOADER_PKG_CONFIG_NAME@
Description: Vulkan Loader
- Version: @VK_API_VERSION@
+ Version: @VULKAN_LOADER_VERSION@
-Libs: -L${libdir} -lvulkan@VULKAN_LIB_SUFFIX@
+Libs: -lvulkan
- Libs.private: @PRIVATE_LIBS@
+ @PRIVATE_LIBS@
Cflags: -I${includedir}
-
diff --git a/vulkan-loader-fix-header-version-detection.patch b/vulkan-loader-fix-header-version-detection.patch
deleted file mode 100644
index 2f8acc9..0000000
--- a/vulkan-loader-fix-header-version-detection.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up Vulkan-Loader-1.2.174/cmake/FindVulkanHeaders.cmake.omv~ Vulkan-Loader-1.2.174/cmake/FindVulkanHeaders.cmake
---- Vulkan-Loader-1.2.174/cmake/FindVulkanHeaders.cmake.omv~ 2021-04-15 00:51:19.084365224 +0200
-+++ Vulkan-Loader-1.2.174/cmake/FindVulkanHeaders.cmake 2021-04-15 00:54:39.610583857 +0200
-@@ -120,13 +120,13 @@ foreach(VulkanHeaders_line ${VulkanHeade
-
- # First, handle the case where we have a major/minor version
- # Format is:
-- # #define VK_API_VERSION_X_Y VK_MAKE_VERSION(X, Y, 0)
-+ # #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, X, Y, VK_HEADER_VERSION)
- # We grab the major version (X) and minor version (Y) out of the parentheses
-- string(REGEX MATCH "VK_MAKE_VERSION\\(.*\\)" VulkanHeaders_out ${VulkanHeaders_line})
-+ string(REGEX MATCH "VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION\\(.*\\)" VulkanHeaders_out ${VulkanHeaders_line})
- string(REGEX MATCHALL "[0-9]+" VulkanHeaders_MAJOR_MINOR "${VulkanHeaders_out}")
- if (VulkanHeaders_MAJOR_MINOR)
-- list (GET VulkanHeaders_MAJOR_MINOR 0 VulkanHeaders_cur_major)
-- list (GET VulkanHeaders_MAJOR_MINOR 1 VulkanHeaders_cur_minor)
-+ list (GET VulkanHeaders_MAJOR_MINOR 1 VulkanHeaders_cur_major)
-+ list (GET VulkanHeaders_MAJOR_MINOR 2 VulkanHeaders_cur_minor)
- if (${VulkanHeaders_cur_major} GREATER ${VulkanHeaders_VERSION_MAJOR})
- set(VulkanHeaders_VERSION_MAJOR ${VulkanHeaders_cur_major})
- set(VulkanHeaders_VERSION_MINOR ${VulkanHeaders_cur_minor})
diff --git a/vulkan-loader.spec b/vulkan-loader.spec
index 7f1a6a0..4861a82 100644
--- a/vulkan-loader.spec
+++ b/vulkan-loader.spec
@@ -3,10 +3,10 @@
%endif
%define oname Vulkan-Loader
-
-%define libname %mklibname vulkan 1
+%define major 1
+%define libname %mklibname vulkan %{major}
%define devname %mklibname vulkan -d
-%define lib32name %mklib32name vulkan 1
+%define lib32name %mklib32name vulkan %{major}
%define dev32name %mklib32name vulkan -d
%ifarch %{ix86}
@@ -15,10 +15,10 @@
%global optflags %{optflags} -O3
%endif
+Summary: Vulkan ICD desktop loader
Name: vulkan-loader
-Version: 1.3.231
+Version: 1.3.243
Release: 1
-Summary: Vulkan ICD desktop loader
License: ASL 2.0
URL: https://github.com/KhronosGroup/Vulkan-Loader
Source0: https://github.com/KhronosGroup/Vulkan-Loader/archive/v%{version}/%{oname}-%{version}.tar.gz
@@ -36,6 +36,7 @@ BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(libffi)
+BuildRequires: pkgconfig(xcb)
Requires: %{libname} = %{EVRD}
%if %{with compat32}
BuildRequires: devel(libwayland-client)
@@ -47,6 +48,7 @@ BuildRequires: devel(libXrandr)
BuildRequires: devel(libXau)
BuildRequires: devel(libXdmcp)
BuildRequires: devel(libffi)
+BuildRequires: devel(libxcb)
%endif
%description
@@ -57,6 +59,7 @@ loader for Windows, Linux, and MacOS.
Summary: Vulkan ICD loader library
Group: System/Libraries
Requires: %{name} >= %{EVRD}
+Recommends: dri-drivers
%description -n %{libname}
The Vulkan ICD loader library.
@@ -141,12 +144,14 @@ validation layers, between an application and the drivers.
%build
%if %{with compat32}
%cmake32 \
+ -DVULKAN_HEADERS_INSTALL_DIR=%{_prefix} \
-G Ninja
%ninja_build
cd ..
%endif
%cmake \
+ -DVULKAN_HEADERS_INSTALL_DIR=%{_prefix} \
-GNinja
%ninja_build
@@ -174,7 +179,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/vulkan/{explicit,implicit}_layer.d/ \
%dir %{_datadir}/vulkan/implicit_layer.d/
%files -n %{libname}
-%{_libdir}/libvulkan.so.1*
+%{_libdir}/libvulkan.so.%{major}*
%files -n %{devname}
%{_libdir}/pkgconfig/vulkan.pc
@@ -182,7 +187,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/vulkan/{explicit,implicit}_layer.d/ \
%if %{with compat32}
%files -n %{lib32name}
-%{_prefix}/lib/libvulkan.so.1*
+%{_prefix}/lib/libvulkan.so.%{major}*
%files -n %{dev32name}
%{_prefix}/lib/pkgconfig/vulkan.pc