From 76d707d690a293de942cdb9643f0e4c76a00d5df Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere-os.ru>
Date: Wed, 6 Nov 2024 03:11:52 +0300
Subject: [PATCH] import vulkan-tools-1.3.283.0-2.el8_10

---
 .gitignore              |  3 ++-
 .vulkan-tools.metadata  |  3 ++-
 SPECS/vulkan-tools.spec | 40 ++++++++++++++++++++++++++++++++--------
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 05cef39..1bf25b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-SOURCES/Vulkan-Tools-sdk-1.3.250.1.tar.gz
+SOURCES/Vulkan-Tools-sdk-1.3.283.0.tar.gz
+SOURCES/Vulkan-Volk-sdk-1.3.283.0.tar.gz
diff --git a/.vulkan-tools.metadata b/.vulkan-tools.metadata
index b93c0fb..ec9f3c6 100644
--- a/.vulkan-tools.metadata
+++ b/.vulkan-tools.metadata
@@ -1 +1,2 @@
-cee1b1b1002af87104435f10dbff0e2db30e9fa4 SOURCES/Vulkan-Tools-sdk-1.3.250.1.tar.gz
+c7c3109b4f076d91d0397e712b632029ab06ba5b SOURCES/Vulkan-Tools-sdk-1.3.283.0.tar.gz
+649a4f6c8955893f6e433e59c6b5862f2e6018d7 SOURCES/Vulkan-Volk-sdk-1.3.283.0.tar.gz
diff --git a/SPECS/vulkan-tools.spec b/SPECS/vulkan-tools.spec
index c0d5a3f..57ec79e 100644
--- a/SPECS/vulkan-tools.spec
+++ b/SPECS/vulkan-tools.spec
@@ -1,15 +1,15 @@
 Name:           vulkan-tools
-Version:        1.3.250.1
-Release:        1%{?dist}
+Version:        1.3.283.0
+Release:        2%{?dist}
 Summary:        Vulkan tools
 
 License:        ASL 2.0
 URL:            https://github.com/KhronosGroup/Vulkan-Tools
-Source0:        %url/archive/sdk-%{version}.tar.gz#/Vulkan-Tools-sdk-%{version}.tar.gz       
+Source0:        %url/archive/vulkan-sdk-%{version}.tar.gz#/Vulkan-Tools-sdk-%{version}.tar.gz       
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
-BuildRequires:  cmake
+BuildRequires:  cmake3
 BuildRequires:  glslang
 BuildRequires:  ninja-build
 BuildRequires:  python%{python3_pkgversion}-devel
@@ -26,20 +26,36 @@ BuildRequires:  pkgconfig(xcb)
 Provides:       vulkan-demos%{?_isa} = %{version}-%{release}
 Obsoletes:      vulkan-demos < %{version}-%{release}
 
+# vulkan-volk is required but not available in CentOS/RHEL 8
+Source1:        https://github.com/zeux/volk/archive/vulkan-sdk-%{version}.tar.gz#/Vulkan-Volk-sdk-%{version}.tar.gz
+BuildRequires:  vulkan-headers
+
+
 %description
 Vulkan tools
 
 %prep
-%autosetup -n Vulkan-Tools-sdk-%{version}
+%autosetup -n Vulkan-Tools-vulkan-sdk-%{version} -p1
+
+# Extract vulkan-volk in "volk"
+mkdir -p volk
+tar -xvf %{SOURCE1} -C volk --strip-components=1
 
 
 %build
-%cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DGLSLANG_INSTALL_DIR=%{_prefix} .
-%ninja_build
+# vulkan-volk can't be compiled and linked because it contains .a libraries and
+# check-buildroot would complain about debug symbols containing
+# "/builddir/build/BUILDROOT" paths.
+# Instead, add vulkan-volk as a subproject
+echo "add_subdirectory(volk)" >> CMakeLists.txt
+
+%cmake3 -GNinja -DCMAKE_BUILD_TYPE=Release -DGLSLANG_INSTALL_DIR=%{_prefix} \
+        -DCMAKE_CXX_STANDARD_LIBRARIES="-lstdc++fs"
+%cmake3_build
 
 
 %install
-%ninja_install
+%cmake3_install
 
 %files
 %license LICENSE.txt
@@ -47,6 +63,14 @@ Vulkan tools
 %{_bindir}/*
 
 %changelog
+* Fri Sep 13 2024 José Expósito <jexposit@redhat.com> - 1.3.283.0-2
+- Link stdc++fs
+  Resolves: https://issues.redhat.com/browse/RHEL-54288
+
+* Wed Sep 11 2024 José Expósito <jexposit@redhat.com> - 1.3.283.0-1
+- Update to 1.3.283.0 SDK
+  Resolves: https://issues.redhat.com/browse/RHEL-54288
+
 * Wed Jul 12 2023 Dave Airlie <airlied@redhat.com> - 1.3.250.1-1
 - Update to 1.3.250.1