3 changed files with 68 additions and 55 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1 @@
-SOURCES/Vulkan-Utility-Libraries-sdk-1.3.283.0.tar.gz
-SOURCES/Vulkan-ValidationLayers-sdk-1.3.283.0.tar.gz
+SOURCES/Vulkan-ValidationLayers-sdk-1.3.268.0.tar.gz
--- a/.vulkan-validation-layers.metadata
+++ b/.vulkan-validation-layers.metadata
@ -1,2 +1 @@
-68939c3fdd039989313139f41e999a32f15043dd SOURCES/Vulkan-Utility-Libraries-sdk-1.3.283.0.tar.gz
-bdc6adb09db8470740d0ea498d0bfdb9dc48ead2 SOURCES/Vulkan-ValidationLayers-sdk-1.3.283.0.tar.gz
+ab4f6a1679d66bca68e9f3305d4b67e0b6cb7723 SOURCES/Vulkan-ValidationLayers-sdk-1.3.268.0.tar.gz
--- a/SPECS/vulkan-validation-layers.spec
+++ b/SPECS/vulkan-validation-layers.spec
@ -1,19 +1,12 @@
 Name:           vulkan-validation-layers
-Version:        1.3.283.0
-Release:        3%{?dist}
+Version:        1.3.268.0
+Release:        2%{?dist}
 Summary:        Vulkan validation layers

 License:        ASL 2.0
 URL:            https://github.com/KhronosGroup/Vulkan-ValidationLayers
 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
-
-Obsoletes:      vulkan-validation-layers-devel <= 1.3.250.1-1
-Provides:       vulkan-validation-layers-devel = %{version}-%{release}
-Provides:       vulkan-validation-layers-devel%{?_isa} = %{version}-%{release}
-
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  cmake3
@ -24,6 +17,7 @@ BuildRequires:  spirv-tools-devel
 BuildRequires:  spirv-headers-devel
 BuildRequires:  vulkan-headers
 BuildRequires:  vulkan-loader-devel
+BuildRequires:  vulkan-utility-libraries-devel
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-cursor)
 BuildRequires:  pkgconfig(wayland-server)
@ -38,30 +32,19 @@ Vulkan validation layers
 %prep
 %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 /')

 %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_INSTALL_DIR=%{_prefix} \
        -DVULKAN_HEADERS_INSTALL_DIR=%{_prefix} \
-        -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
-        -DCMAKE_CXX_STANDARD_LIBRARIES="-lstdc++fs"
+        -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}
 %cmake_build


@ -79,50 +62,67 @@ echo "add_subdirectory(utility)" >> CMakeLists.txt
 %{_libdir}/libVkLayer_*.so

 %changelog
-* Fri Sep 13 2024 José Expósito <jexposit@redhat.com> - 1.3.283.0-3
- Provides/Obsoletes vulkan-validation-layers-devel
-  Resolves: https://issues.redhat.com/browse/RHEL-54290
+* Tue Jan 23 2024 José Expósito <jexposit@redhat.com> - 1.3.268.0-2
+- Remove dependency to vulkan-utility-libraries-devel

-* 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-54290
+* Wed Jan 17 2024 José Expósito <jexposit@redhat.com> - 1.3.268.0-1
+- Update to 1.3.268.0 SDK

-* 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-54290
+* Fri Jul 07 2023 Dave Airlie <airlied@redhat.com> - 1.3.250.1-1
+- Update to latest 1.3.250.1

-* Wed Jul 12 2023 Dave Airlie <airlied@redhat.com> - 1.3.250.1-1
- Update to 1.3.250.1
+* Wed Feb 15 2023 Dave Airlie <airlied@redhat.com> - 1.3.239.0-1
+- Update to latest 1.3.239.0

-* Wed Feb 15 2023 Dave Airlie <airlied@redhat.com> - 1.3.239.0-2
- Try and fix validation layer exports
+* Fri Aug 26 2022 Dave Airlie <airlied@redhat.com> - 1.3.224.0-1
+- Update to latest 1.3.224.0

-* Tue Feb 14 2023 Dave Airlie <airlied@redhat.com> - 1.3.239.0-1
- Update to 1.3.239.0
+* Wed Jun 22 2022 Dave Airlie <airlied@redhat.com> - 1.3.216.0-1
+- Update to latest 1.3.216.0

-* Wed Aug 24 2022 Dave Airlie <airlied@redhat.com> - 1.3.224.0-1
- Update to 1.3.224.0
+* Fri Feb 25 2022 Dave Airlie <airlied@redhat.com> - 1.3.204.0-1
+- Update to latest 1.3.204.0

-* Mon Jun 20 2022 Dave Airlie <airlied@redhat.com> - 1.3.216.0-1
- Update to 1.3.216.0
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.182.0-3
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688

-* Tue Feb 22 2022 Dave Airlie <airlied@redhat.com> - 1.3.204.0-1
- Update to 1.3.204.0
+* Sat Aug 07 2021 Dave Airlie <airlied@redhat.com> - 1.2.182.0-2
+- add missing GetEnvironment export

-* Mon Feb 01 2021 Dave Airlie <airlied@redhat.com> - 1.2.162.0-1
- Update to 1.2.162.0
+* Fri Jul 30 2021 Dave Airlie <airlied@redhat.com> - 1.2.182.0-1
+- Update to latest 1.2.182.0 sdk
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.162.0-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Fri Jan 29 2021 Dave Airlie <airlied@redhat.com> - 1.2.162.0-1
+- Update to latest 1.2.162.0 release
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.154.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Dec 17 2020 Adam Jackson <ajax@redhat.com> - 1.2.154.0-2
+- Add LAYER_CONFIGURATION.md to the docs
+
+* Wed Nov 04 2020 Dave Airlie <airlied@redhat.com> - 1.2.154.0-1
+- Update to 1.2.154.0

 * Wed Aug 05 2020 Dave Airlie <airlied@redhat.com> - 1.2.148.0-1
 - Update to 1.2.148.0

+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.135.0-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.135.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Apr 22 2020 Dave Airlie <airlied@redhat.com> - 1.2.135.0-1
+- Update validation layers to 1.2.135.0
+
 * Wed Jan 29 2020 Dave Airlie <airlied@redhat.com> - 1.2.131.1-1
- Update for 8.2.0 for vulkan 1.2
-
-* Sat Dec 07 2019 Dave Airlie <airlied@redhat.com> - 1.1.126.0-3
- Update for 8.2.0
-
-* Fri Nov 29 2019 Dave Airlie <airlied@redhat.com> - 1.1.126.0-2
- Add explicit spirv toos libs requires
+- Update validation layers to 1.2.131.1

 * Wed Nov 13 2019 Dave Airlie <airlied@redhat.com> - 1.1.126.0-1
 - Update validation layers to 1.1.126.0
@ -130,9 +130,24 @@ echo "add_subdirectory(utility)" >> CMakeLists.txt
 * Wed Jul 31 2019 Dave Airlie <airlied@redhat.com> - 1.1.114.0-1
 - Update validation layers to 1.1.114.0

+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.108.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Jun 25 2019 Dave Airlie <airlied@redhat.com> - 1.1.108.0-1
+- Update valdiation layers to 1.1.108.0
+
 * Wed Mar 06 2019 Dave Airlie <airlied@redhat.com> - 1.1.101.0-1
 - Update valdiation layers to 1.1.101.0

+* Wed Feb 13 2019 Dave Airlie <airlied@redhat.com> - 1.1.97.0-1
+- Update validation layers to 1.1.97.0
+
+* Wed Feb 13 2019 Dave Airlie <airlied@redhat.com> - 1.1.92.0-1
+- Update validation layers to 1.1.92.0
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.82.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Tue Aug 07 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.1.82.0-1
 - Update to 1.1.82.0