diff --git a/.gitignore b/.gitignore index 5b39681..ae0e751 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ /Vulkan-ValidationLayers-sdk-1.3.224.0.tar.gz /Vulkan-ValidationLayers-sdk-1.3.239.0.tar.gz /Vulkan-ValidationLayers-sdk-1.3.250.1.tar.gz +/Vulkan-Utility-Libraries-sdk-1.3.283.0.tar.gz +/Vulkan-ValidationLayers-sdk-1.3.283.0.tar.gz diff --git a/sources b/sources index 8a65254..94deaca 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (Vulkan-ValidationLayers-sdk-1.3.250.1.tar.gz) = beeabb8c81991cc25b582844c87f5fde1e1c20b12eaf41803d792674bfa66f5bcfeffd8fa0759234a7f17401457a321ca054ceffed7996bdf521ba7a1efdce35 +SHA512 (Vulkan-Utility-Libraries-sdk-1.3.283.0.tar.gz) = 5f9ca8b54a2da85f0096c5834d13829fe5675a8f2de1d7c10901a6539880b5215d22af3f000db7bdda3ea8ad9d5c6c83aa74486f299f5293cd65aa95da7523d7 +SHA512 (Vulkan-ValidationLayers-sdk-1.3.283.0.tar.gz) = fc2ca2c79be8e01fc39a7802644d5e10b5196317eaac246a17b73093409739e771ac267c1ed8aad08ba68afdebc583702980f195a5f93421a0c041da3f4b6e49 diff --git a/vulkan-validation-layers.spec b/vulkan-validation-layers.spec index d3f3245..37abc52 100644 --- a/vulkan-validation-layers.spec +++ b/vulkan-validation-layers.spec @@ -1,15 +1,18 @@ Name: vulkan-validation-layers -Version: 1.3.250.1 +Version: 1.3.283.0 Release: 1%{?dist} Summary: Vulkan validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup/Vulkan-ValidationLayers -Source0: %url/archive/sdk-%{version}.tar.gz#/Vulkan-ValidationLayers-sdk-%{version}.tar.gz +Source0: %url/archive/vulkan-sdk-%{version}.tar.gz#/Vulkan-ValidationLayers-sdk-%{version}.tar.gz + +# vulkan-utility-libraries is required but not available in CentOS/RHEL 8 +Source1: https://github.com/KhronosGroup/Vulkan-Utility-Libraries/archive/vulkan-sdk-%{version}.tar.gz#/Vulkan-Utility-Libraries-sdk-%{version}.tar.gz BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: cmake +BuildRequires: cmake3 BuildRequires: glslang-devel BuildRequires: ninja-build BuildRequires: python%{python3_pkgversion}-devel @@ -25,40 +28,40 @@ BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xcb) -Requires: spirv-tools-libs >= 2019.4-1.20191109 %description Vulkan validation layers -%package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: vulkan-headers - -%description devel -The %{name}-devel package contains libraries and header files for -developing applications that use %{name}. - %prep -%autosetup -p1 -n Vulkan-ValidationLayers-sdk-%{version} +%autosetup -p1 -n Vulkan-ValidationLayers-vulkan-sdk-%{version} +# Extract vulkan-utility-libraries in "utility" +mkdir -p utility +tar -xvf %{SOURCE1} -C utility --strip-components=1 %build +# vulkan-utility-libraries 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-utility-libraries as a subproject +echo "add_subdirectory(utility)" >> CMakeLists.txt + # Decrease debuginfo verbosity to reduce memory consumption even more %global optflags %(echo %{optflags} | sed 's/-g /-g1 /') +%global optflags %(echo %{optflags} | sed 's/-O2 /-O1 /') - -%cmake -GNinja \ - -DCMAKE_BUILD_TYPE=Release \ +%cmake3 -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_WERROR=OFF \ -DGLSLANG_INSTALL_DIR=%{_prefix} \ -DBUILD_LAYER_SUPPORT_FILES:BOOL=ON \ -DUSE_ROBIN_HOOD_HASHING:BOOL=OFF \ - -DSPIRV_HEADERS_INCLUDE_DIR=%{_includedir} \ - -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/vulkan/ . -%ninja_build + -DSPIRV_HEADERS_INSTALL_DIR=%{_prefix} \ + -DVULKAN_HEADERS_INSTALL_DIR=%{_prefix} \ + -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} +%cmake_build %install -%ninja_install +%cmake_install %ldconfig_scriptlets @@ -70,11 +73,11 @@ developing applications that use %{name}. %{_datadir}/vulkan/explicit_layer.d/*.json %{_libdir}/libVkLayer_*.so -%files devel -%{_includedir}/vulkan/ -%{_libdir}/libVkLayer_utils.a - %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-54290 + * Wed Jul 12 2023 Dave Airlie - 1.3.250.1-1 - Update to 1.3.250.1