diff --git a/.gitignore b/.gitignore index c337d2b..fe1fd73 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ /Vulkan-Tools-sdk-1.3.224.0.tar.gz /Vulkan-Tools-sdk-1.3.239.0.tar.gz /Vulkan-Tools-sdk-1.3.250.1.tar.gz +/Vulkan-Tools-sdk-1.3.283.0.tar.gz +/Vulkan-Volk-sdk-1.3.283.0.tar.gz diff --git a/sources b/sources index 02ff986..ed584db 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (Vulkan-Tools-sdk-1.3.250.1.tar.gz) = ebeb723f34acb842db324a9ccabae843c41423ec27aaac0dc20baeee6a8833d4712762e25ff77d97e306912ec19b78e0e906a71394de2bfb401a845bbe61eadf +SHA512 (Vulkan-Tools-sdk-1.3.283.0.tar.gz) = 714e2ff89cbd4171dae5c5825b71210572571965ba86c68f38c1ea62c9ff512e1c0dc278c02786d45d3a775985b40e8c1bd47ab37d22668105fd2e09d7524656 +SHA512 (Vulkan-Volk-sdk-1.3.283.0.tar.gz) = c3c69bfd899bab6b6447534b0c7c82392679c903a5ed2cabd7506ccd96135f332735888f6e2fa71787f6c1eec930bd51aa014db84955d51b5f068af95dcaec4d diff --git a/vulkan-tools.spec b/vulkan-tools.spec index c0d5a3f..447a5fd 100644 --- a/vulkan-tools.spec +++ b/vulkan-tools.spec @@ -1,15 +1,15 @@ Name: vulkan-tools -Version: 1.3.250.1 +Version: 1.3.283.0 Release: 1%{?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,35 @@ 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} +%cmake3_build %install -%ninja_install +%cmake3_install %files %license LICENSE.txt @@ -47,6 +62,10 @@ Vulkan tools %{_bindir}/* %changelog +* Wed Sep 11 2024 José Expósito - 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 - 1.3.250.1-1 - Update to 1.3.250.1