diff --git a/.gitignore b/.gitignore index eed940e..9d7a5bf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,34 +7,3 @@ /Vulkan-ValidationLayers-sdk-1.1.114.0.tar.gz /Vulkan-ValidationLayers-sdk-1.1.126.0.tar.gz /Vulkan-ValidationLayers-sdk-1.2.131.1.tar.gz -/Vulkan-ValidationLayers-sdk-1.2.135.0.tar.gz -/Vulkan-ValidationLayers-sdk-1.2.148.0.tar.gz -/Vulkan-ValidationLayers-sdk-1.2.154.0.tar.gz -/Vulkan-ValidationLayers-sdk-1.2.162.0.tar.gz -/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 diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index 3329127..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# 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 diff --git a/0001-add-missing-VK_LAYER_EXPORTs.patch b/0001-add-missing-VK_LAYER_EXPORTs.patch deleted file mode 100644 index 9850547..0000000 --- a/0001-add-missing-VK_LAYER_EXPORTs.patch +++ /dev/null @@ -1,53 +0,0 @@ -From f519c98e77ae1e48efeda49db144e786dd99339b Mon Sep 17 00:00:00 2001 -From: Dave Airlie -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> custom_stype_info; -+VK_LAYER_EXPORT extern std::vector> 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> custom_stype_info; -+VK_LAYER_EXPORT extern std::vector> 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> custom_stype_info{}; -+ VK_LAYER_EXPORT std::vector> custom_stype_info{}; - - template - ValidationObjectType* ValidationObject::GetValidationObject() const { --- -2.39.1 - diff --git a/fix_shared.patch b/fix_shared.patch new file mode 100644 index 0000000..8082da8 --- /dev/null +++ b/fix_shared.patch @@ -0,0 +1,12 @@ +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 diff --git a/sources b/sources index 84bebd0..cfd68b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Vulkan-ValidationLayers-sdk-1.4.350.0.tar.gz) = 7005b696069d5580ffd1942f115b32a7b3fd2aa24bf9666222174e2d6f4d8471e5df7433b49c08360f9126dbd02cd4009dfcee4a6642948b8e36d658aad4d72b +SHA512 (Vulkan-ValidationLayers-sdk-1.2.131.1.tar.gz) = da2c5123792173249ced860b22348f80fd35c6c867b5c7be459328663f81ea32e12c526672d4d9c9bfb071415868d4ef4e95b1acc408bfaf7fe9e9ee31b6aa4b diff --git a/vulkan-validation-layers.spec b/vulkan-validation-layers.spec index 53915bb..a5a2732 100644 --- a/vulkan-validation-layers.spec +++ b/vulkan-validation-layers.spec @@ -1,23 +1,21 @@ Name: vulkan-validation-layers -Version: 1.4.350.0 -Release: %autorelease +Version: 1.2.131.1 +Release: 1%{?dist} Summary: Vulkan validation layers -License: Apache-2.0 +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 +Source0: %url/archive/sdk-%{version}.tar.gz#/Vulkan-ValidationLayers-sdk-%{version}.tar.gz +Patch0: fix_shared.patch BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: cmake +BuildRequires: cmake3 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,31 +27,34 @@ 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-vulkan-sdk-%{version} +%autosetup -p1 -n Vulkan-ValidationLayers-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 -%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 + +%cmake3 -GNinja \ + -DCMAKE_BUILD_TYPE=Release \ + -DGLSLANG_INSTALL_DIR=%{_prefix} \ + -DBUILD_LAYER_SUPPORT_FILES:BOOL=ON \ + -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/vulkan/ . +%ninja_build %install -%cmake_install +%ninja_install %ldconfig_scriptlets @@ -65,5 +66,48 @@ Vulkan validation layers %{_datadir}/vulkan/explicit_layer.d/*.json %{_libdir}/libVkLayer_*.so +%files devel +%{_includedir}/vulkan/ + %changelog -%autochangelog +* Wed Jan 29 2020 Dave Airlie - 1.2.131.1-1 +- Update validation layers to 1.2.131.1 + +* Wed Nov 13 2019 Dave Airlie - 1.1.126.0-1 +- Update validation layers to 1.1.126.0 + +* Wed Jul 31 2019 Dave Airlie - 1.1.114.0-1 +- Update validation layers to 1.1.114.0 + +* Sat Jul 27 2019 Fedora Release Engineering - 1.1.108.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Jun 25 2019 Dave Airlie - 1.1.108.0-1 +- Update valdiation layers to 1.1.108.0 + +* Wed Mar 06 2019 Dave Airlie - 1.1.101.0-1 +- Update valdiation layers to 1.1.101.0 + +* Wed Feb 13 2019 Dave Airlie - 1.1.97.0-1 +- Update validation layers to 1.1.97.0 + +* Wed Feb 13 2019 Dave Airlie - 1.1.92.0-1 +- Update validation layers to 1.1.92.0 + +* Sun Feb 03 2019 Fedora Release Engineering - 1.1.82.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Aug 07 2018 Leigh Scott - 1.1.82.0-1 +- Update to 1.1.82.0 + +* Sat Jul 14 2018 Fedora Release Engineering - 1.1.77.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 26 2018 Leigh Scott - 1.1.77.0-3 +- Workaround i686 build issue + +* Tue Jun 26 2018 Leigh Scott - 1.1.77.0-2 +- Exclude i686 due to 'virtual memory exhausted' FTBFS + +* Sat Jun 23 2018 Leigh Scott - 1.1.77.0-1 +- Initial package