Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

Upstream flipped this to ON by default in 1.4.350.0,
which makes the build try to git clone dependencies
at configure time — that's a no-go in Koji (no git, no network).
With this off, it'll use the system packages from BuildRequires
as before

Signed-off-by: Anusha Srivatsa <asrivats@redhat.com>

.gitignore

@@ -14,3 +14,27 @@
 /Vulkan-ValidationLayers-sdk-1.2.176.1.tar.gz
 /Vulkan-ValidationLayers-sdk-1.2.182.0.tar.gz
 /Vulkan-ValidationLayers-sdk-1.2.189.0.tar.gz
+/Vulkan-ValidationLayers-sdk-1.2.198.0.tar.gz
+/Vulkan-ValidationLayers-sdk-1.3.204.0.tar.gz
+/Vulkan-ValidationLayers-sdk-1.3.211.0.tar.gz
+/Vulkan-ValidationLayers-sdk-1.3.216.0.tar.gz
+/Vulkan-ValidationLayers-sdk-1.3.224.0.tar.gz
+/Vulkan-ValidationLayers-sdk-1.3.231.1.tar.gz
+/Vulkan-ValidationLayers-sdk-1.3.239.0.tar.gz
+/Vulkan-ValidationLayers-sdk-1.3.243.0.tar.gz
+/Vulkan-ValidationLayers-sdk-1.3.250.0.tar.gz
+/Vulkan-ValidationLayers-sdk-1.3.250.1.tar.gz
+/Vulkan-ValidationLayers-sdk-1.3.261.1.tar.gz
+/Vulkan-ValidationLayers-sdk-1.3.268.0.tar.gz
+/Vulkan-ValidationLayers-sdk-1.3.275.0.tar.gz
+/Vulkan-ValidationLayers-sdk-1.3.280.0.tar.gz
+/Vulkan-ValidationLayers-sdk-1.3.283.0.tar.gz
+/Vulkan-ValidationLayers-sdk-1.3.290.0.tar.gz
+/Vulkan-ValidationLayers-sdk-1.3.296.0.tar.gz
+/Vulkan-ValidationLayers-sdk-1.4.304.0.tar.gz
+/Vulkan-ValidationLayers-sdk-1.4.309.0.tar.gz
+/Vulkan-ValidationLayers-sdk-1.4.313.0.tar.gz
+/Vulkan-ValidationLayers-sdk-1.4.321.0.tar.gz
+/Vulkan-ValidationLayers-sdk-1.4.328.1.tar.gz
+/Vulkan-ValidationLayers-sdk-1.4.341.0.tar.gz
+/Vulkan-ValidationLayers-sdk-1.4.350.0.tar.gz

.packit.yaml

@@ -0,0 +1,29 @@
+# packit config for vulkan-validation-layers
+# Build Stage 4 - depends on glslang, vulkan-utility-libraries
+
+jobs:
+  - job: koji_build
+    trigger: commit | koji_build
+    allowed_committers: [all_admins]
+    dist_git_branches:
+      - fedora-all
+    sidetag_group: vulkan-sdk-releases
+    dependencies:
+      - glslang
+      - vulkan-utility-libraries
+
+  - job: bodhi_update
+    trigger: commit
+    dist_git_branches:
+      - fedora-branched
+    sidetag_group: vulkan-sdk-releases
+    dependencies:
+      - spirv-headers
+      - vulkan-headers
+      - spirv-tools
+      - vulkan-loader
+      - glslang
+      - vulkan-utility-libraries
+      - vulkan-volk
+      - vulkan-tools
+      - shaderc

0001-add-missing-VK_LAYER_EXPORTs.patch

@@ -0,0 +1,53 @@
+From f519c98e77ae1e48efeda49db144e786dd99339b Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Wed, 15 Feb 2023 17:37:08 +1000
+Subject: [PATCH] add missing VK_LAYER_EXPORTs
+
+---
+ layers/layer_options.h             | 2 +-
+ layers/stateless/stateless_validation.h      | 2 +-
+ scripts/generators/layer_chassis_generator.py | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/layers/layer_options.h b/layers/layer_options.h
+index 97909a5ed..d19e42c01 100644
+--- a/layers/layer_options.h
++++ b/layers/layer_options.h
+@@ -22,7 +22,7 @@
+ 
+ #define OBJECT_LAYER_NAME "VK_LAYER_KHRONOS_validation"
+ 
+-extern std::vector<std::pair<uint32_t, uint32_t>> custom_stype_info;
++VK_LAYER_EXPORT extern std::vector<std::pair<uint32_t, uint32_t>> custom_stype_info;
+ 
+ // Process validation features, flags and settings specified through extensions, a layer settings file, or environment variables
+ 
+diff --git a/layers/stateless/stateless_validation.h b/layers/stateless/stateless_validation.h
+index e0f21b7a6..2fb8c6142 100644
+--- a/layers/stateless/stateless_validation.h
++++ b/layers/stateless/stateless_validation.h
+@@ -31,7 +31,7 @@
+ [[maybe_unused]] static const char *kVUID_PVError_ExtensionNotEnabled = "UNASSIGNED-GeneralParameterError-ExtensionNotEnabled";
+ [[maybe_unused]] static const char *kVUID_PVError_ApiVersionViolation = "UNASSIGNED-API-Version-Violation";
+ 
+-extern std::vector<std::pair<uint32_t, uint32_t>> custom_stype_info;
++VK_LAYER_EXPORT extern std::vector<std::pair<uint32_t, uint32_t>> custom_stype_info;
+ 
+ // String returned by string_VkStructureType for an unrecognized type.
+ const std::string UnsupportedStructureTypeString = "Unhandled VkStructureType";
+diff --git a/scripts/generators/layer_chassis_generator.py b/scripts/generators/layer_chassis_generator.py
+index be76d4204..62b442e8b 100644
+--- a/scripts/generators/layer_chassis_generator.py
++++ b/scripts/generators/layer_chassis_generator.py
+@@ -845,7 +845,7 @@ class LayerChassisOutputGenerator(BaseGenerator):
+ 
+         out.append('''
+             // Global list of sType,size identifiers
+-            std::vector<std::pair<uint32_t, uint32_t>> custom_stype_info{};
++            VK_LAYER_EXPORT std::vector<std::pair<uint32_t, uint32_t>> custom_stype_info{};
+ 
+             template <typename ValidationObjectType>
+             ValidationObjectType* ValidationObject::GetValidationObject() const {
+-- 
+2.39.1
+

add-missing-export.patch

@@ -1,24 +0,0 @@
-diff -up Vulkan-ValidationLayers-sdk-1.2.182.0/layers/vk_layer_config.cpp.dma Vulkan-ValidationLayers-sdk-1.2.182.0/layers/vk_layer_config.cpp
---- Vulkan-ValidationLayers-sdk-1.2.182.0/layers/vk_layer_config.cpp.dma	2021-08-07 08:13:46.344320103 +1000
-+++ Vulkan-ValidationLayers-sdk-1.2.182.0/layers/vk_layer_config.cpp	2021-08-07 08:14:22.130893289 +1000
-@@ -68,7 +68,7 @@ class ConfigFile {
- 
- static ConfigFile layer_config;
- 
--string GetEnvironment(const char *variable) {
-+VK_LAYER_EXPORT string GetEnvironment(const char *variable) {
- #if !defined(__ANDROID__) && !defined(_WIN32)
-     const char *output = getenv(variable);
-     return output == NULL ? "" : output;
-diff -up Vulkan-ValidationLayers-sdk-1.2.182.0/layers/vk_layer_config.h.dma Vulkan-ValidationLayers-sdk-1.2.182.0/layers/vk_layer_config.h
---- Vulkan-ValidationLayers-sdk-1.2.182.0/layers/vk_layer_config.h.dma	2021-08-07 08:14:04.352608540 +1000
-+++ Vulkan-ValidationLayers-sdk-1.2.182.0/layers/vk_layer_config.h	2021-08-07 08:14:15.237782885 +1000
-@@ -33,7 +33,7 @@
- #define SECONDARY_VK_REGISTRY_HIVE_STR "HKEY_CURRENT_USER"
- #endif
- 
--std::string GetEnvironment(const char *variable);
-+VK_LAYER_EXPORT std::string GetEnvironment(const char *variable);
- 
- #ifdef __cplusplus
- extern "C" {

fix_shared.patch

@@ -1,12 +0,0 @@
-diff -up Vulkan-ValidationLayers-sdk-1.1.92.0/CMakeLists.txt.dma Vulkan-ValidationLayers-sdk-1.1.92.0/CMakeLists.txt
---- Vulkan-ValidationLayers-sdk-1.1.92.0/CMakeLists.txt.dma	2019-02-13 09:20:44.590959278 +1000
-+++ Vulkan-ValidationLayers-sdk-1.1.92.0/CMakeLists.txt	2019-02-13 09:21:29.178151673 +1000
-@@ -294,7 +294,7 @@ set_target_properties(generate_helper_fi
- # files directly in layers.
- 
- add_library(VkLayer_utils
--            STATIC
-+            SHARED
-             layers/vk_layer_config.cpp
-             layers/vk_layer_extension_utils.cpp
-             layers/vk_layer_utils.cpp

sources

@@ -1 +1 @@
-SHA512 (Vulkan-ValidationLayers-sdk-1.2.189.0.tar.gz) = 2e398e47887147038122fed1f4abdfbd4f44ebdbc4d79640def48384202b37886d15f01784b57f62adfb6da0643abb65169fc4a6709b14f602d21d360dd68dd9
+SHA512 (Vulkan-ValidationLayers-sdk-1.4.350.0.tar.gz) = 7005b696069d5580ffd1942f115b32a7b3fd2aa24bf9666222174e2d6f4d8471e5df7433b49c08360f9126dbd02cd4009dfcee4a6642948b8e36d658aad4d72b

vulkan-validation-layers.spec

@@ -1,23 +1,23 @@
 Name:           vulkan-validation-layers
-Version:        1.2.189.0
-Release:        1%{?dist}
+Version:        1.4.350.0
+Release:        %autorelease
 Summary:        Vulkan validation layers
 
-License:        ASL 2.0
+License:        Apache-2.0
 URL:            https://github.com/KhronosGroup/Vulkan-ValidationLayers
-Source0:        %url/archive/sdk-%{version}.tar.gz#/Vulkan-ValidationLayers-sdk-%{version}.tar.gz
-Patch0:         fix_shared.patch
-Patch1:         add-missing-export.patch
+Source0:        %url/archive/vulkan-sdk-%{version}.tar.gz#/Vulkan-ValidationLayers-sdk-%{version}.tar.gz
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
-BuildRequires:  cmake3
+BuildRequires:  cmake
 BuildRequires:  glslang-devel
 BuildRequires:  ninja-build
 BuildRequires:  python%{python3_pkgversion}-devel
 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)
@@ -29,30 +29,26 @@ BuildRequires:  pkgconfig(xcb)
 %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}
 
 
 %build
 # Decrease debuginfo verbosity to reduce memory consumption even more
+%ifarch %{ix86}
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %global optflags %(echo %{optflags} | sed 's/-O2 /-O1 /')
+%endif
 
-%cmake3 -DCMAKE_BUILD_TYPE=Release \
-        -DGLSLANG_INSTALL_DIR=%{_prefix} \
-        -DBUILD_LAYER_SUPPORT_FILES:BOOL=ON \
-        -DUSE_ROBIN_HOOD_HASHING:BOOL=OFF \
-        -DSPIRV_HEADERS_INSTALL_DIR=%{_includedir}/spirv \
-        -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/vulkan/
+%cmake -DCMAKE_BUILD_TYPE=Release \
+       -DUPDATE_DEPS=OFF \
+       -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}
 %cmake_build
 
 
@@ -65,92 +61,9 @@ developing applications that use %{name}.
 
 %files
 %license LICENSE.txt
-%doc README.md CONTRIBUTING.md LAYER_CONFIGURATION.md
+%doc README.md CONTRIBUTING.md
 %{_datadir}/vulkan/explicit_layer.d/*.json
 %{_libdir}/libVkLayer_*.so
 
-%files devel
-%{_includedir}/vulkan/
-
 %changelog
-* Wed Sep 08 2021 Dave Airlie <airlied@redhat.com> - 1.2.189.0-1
-- Update to latest 1.2.189.0
-
-* Sat Aug 07 2021 Dave Airlie <airlied@redhat.com> - 1.2.182.0-3
-- fix validation layers missing export
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.182.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jul 07 2021 Dave Airlie <airlied@redhat.com> - 1.2.182.0-1
-- Update to latest 1.2.182.0 release
-
-* Tue May 18 2021 Dave Airlie <airlied@redhat.com> - 1.2.176.1-1
-- Update to latest 1.2.176.1 release
-
-* 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 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
-
-* 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
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.77.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jun 26 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.1.77.0-3
-- Workaround i686 build issue
-
-* Tue Jun 26 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.1.77.0-2
-- Exclude i686 due to 'virtual memory exhausted' FTBFS
-
-* Sat Jun 23 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.1.77.0-1
-- Initial package
+%autochangelog