.gitignore

@@ -1,2 +1 @@
-SOURCES/Vulkan-Tools-sdk-1.3.283.0.tar.gz
+SOURCES/Vulkan-Tools-sdk-1.3.250.1.tar.gz
-SOURCES/Vulkan-Volk-sdk-1.3.283.0.tar.gz

.vulkan-tools.metadata

@@ -1,2 +1 @@
-c7c3109b4f076d91d0397e712b632029ab06ba5b SOURCES/Vulkan-Tools-sdk-1.3.283.0.tar.gz
+cee1b1b1002af87104435f10dbff0e2db30e9fa4 SOURCES/Vulkan-Tools-sdk-1.3.250.1.tar.gz
-649a4f6c8955893f6e433e59c6b5862f2e6018d7 SOURCES/Vulkan-Volk-sdk-1.3.283.0.tar.gz

SPECS/vulkan-tools.spec

@@ -1,15 +1,15 @@
 Name:           vulkan-tools
-Version:        1.3.283.0
+Version:        1.3.250.1
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Vulkan tools
 
 License:        ASL 2.0
 URL:            https://github.com/KhronosGroup/Vulkan-Tools
-Source0:        %url/archive/vulkan-sdk-%{version}.tar.gz#/Vulkan-Tools-sdk-%{version}.tar.gz       
+Source0:        %url/archive/sdk-%{version}.tar.gz#/Vulkan-Tools-sdk-%{version}.tar.gz       
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
-BuildRequires:  cmake3
+BuildRequires:  cmake
 BuildRequires:  glslang
 BuildRequires:  ninja-build
 BuildRequires:  python%{python3_pkgversion}-devel
@@ -26,36 +26,20 @@ 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-vulkan-sdk-%{version} -p1
+%autosetup -n Vulkan-Tools-sdk-%{version}
-
-# Extract vulkan-volk in "volk"
-mkdir -p volk
-tar -xvf %{SOURCE1} -C volk --strip-components=1
 
 
 %build
-# vulkan-volk can't be compiled and linked because it contains .a libraries and
+%cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DGLSLANG_INSTALL_DIR=%{_prefix} .
-# check-buildroot would complain about debug symbols containing
+%ninja_build
-# "/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
-%cmake3_install
+%ninja_install
 
 %files
 %license LICENSE.txt
@@ -63,14 +47,6 @@ echo "add_subdirectory(volk)" >> CMakeLists.txt
 %{_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