commit 700956331c372767cdcf51d75aba2577395162bb Author: MSVSphere Packaging Team Date: Tue Nov 26 19:21:16 2024 +0300 import spirv-tools-2024.2-2.el10 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d62d41c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/SPIRV-Tools-sdk-1.3.283.0.tar.gz diff --git a/.spirv-tools.metadata b/.spirv-tools.metadata new file mode 100644 index 0000000..e6a9c86 --- /dev/null +++ b/.spirv-tools.metadata @@ -0,0 +1 @@ +b96c7ad5e38f678a16b3e3f0fb7be5f98178b036 SOURCES/SPIRV-Tools-sdk-1.3.283.0.tar.gz diff --git a/SOURCES/fix-gcc12-build.patch b/SOURCES/fix-gcc12-build.patch new file mode 100644 index 0000000..4ceeeef --- /dev/null +++ b/SOURCES/fix-gcc12-build.patch @@ -0,0 +1,12 @@ +diff -up SPIRV-Tools-45dd184c790d6bfc78a5a74a10c37e888b1823fa/source/spirv_target_env.cpp.dma ./SPIRV-Tools-45dd184c790d6bfc78a5a74a10c37e888b1823fa/source/spirv_target_env.cpp +--- SPIRV-Tools-45dd184c790d6bfc78a5a74a10c37e888b1823fa/source/spirv_target_env.cpp.dma 2022-02-16 08:20:38.927239298 +1000 ++++ SPIRV-Tools-45dd184c790d6bfc78a5a74a10c37e888b1823fa/source/spirv_target_env.cpp 2022-02-16 08:20:42.262301854 +1000 +@@ -397,6 +397,8 @@ std::string spvLogStringForEnv(spv_targe + return "Unknown"; + } + ++// workaround gcc12/stdlibc++ -Wrestrict bug. ++#pragma GCC diagnostic ignored "-Wrestrict" + std::string spvTargetEnvList(const int pad, const int wrap) { + std::string ret; + size_t max_line_len = wrap - pad; // The first line isn't padded diff --git a/SPECS/spirv-tools.spec b/SPECS/spirv-tools.spec new file mode 100644 index 0000000..3aaa589 --- /dev/null +++ b/SPECS/spirv-tools.spec @@ -0,0 +1,357 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.6.1) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 2; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + +%undefine __cmake_in_source_build + +%global sdkver 1.3.283.0 + +Name: spirv-tools +Version: 2024.2 +Release: %autorelease +Summary: API and commands for processing SPIR-V modules + +License: Apache-2.0 +URL: https://github.com/KhronosGroup/SPIRV-Tools +Source0: %url/archive/vulkan-sdk-%{sdkver}.tar.gz#/SPIRV-Tools-sdk-%{sdkver}.tar.gz + +Patch0: fix-gcc12-build.patch + +BuildRequires: cmake3 +BuildRequires: gcc-c++ +BuildRequires: ninja-build +%if 0%{?rhel} == 7 +BuildRequires: python36-devel +%else +BuildRequires: python3-devel +%endif +BuildRequires: python3-rpm-macros +BuildRequires: spirv-headers-devel +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description +The package includes an assembler, binary module parser, +disassembler, and validator for SPIR-V.. + +%package libs +Summary: Library files for %{name} +Provides: %{name}-libs%{?_isa} = %{version} + +%description libs +library files for %{name} + +%package devel +Summary: Development files for %{name} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description devel +Development files for %{name} + +%prep +%autosetup -p1 -n SPIRV-Tools-vulkan-sdk-%{sdkver} + +%build +%cmake3 -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_LIBDIR=%{_lib} \ + -DSPIRV-Headers_SOURCE_DIR=%{_prefix} \ + -DPYTHON_EXECUTABLE=%{__python3} \ + -DSPIRV_TOOLS_BUILD_STATIC=OFF \ + -GNinja +%cmake3_build + +%install +%cmake3_install + +%ldconfig_scriptlets libs + +%files +%license LICENSE +%doc README.md CHANGES +%{_bindir}/spirv-as +%{_bindir}/spirv-cfg +%{_bindir}/spirv-dis +%{_bindir}/spirv-lesspipe.sh +%{_bindir}/spirv-link +%{_bindir}/spirv-lint +%{_bindir}/spirv-objdump +%{_bindir}/spirv-opt +%{_bindir}/spirv-reduce +%{_bindir}/spirv-val + +%files libs +%{_libdir}/libSPIRV-Tools-diff.so +%{_libdir}/libSPIRV-Tools-link.so +%{_libdir}/libSPIRV-Tools-lint.so +%{_libdir}/libSPIRV-Tools-opt.so +%{_libdir}/libSPIRV-Tools.so +%{_libdir}/libSPIRV-Tools-reduce.so +%{_libdir}/libSPIRV-Tools-shared.so + +%files devel +%{_includedir}/spirv-tools/ +%{_libdir}/cmake/* +%{_libdir}/pkgconfig/SPIRV-Tools-shared.pc +%{_libdir}/pkgconfig/SPIRV-Tools.pc + +%changelog +* Tue Nov 26 2024 MSVSphere Packaging Team - 2024.2-2 +- Rebuilt for MSVSphere 10 + +## START: Generated by rpmautospec +* Mon Jun 24 2024 Troy Dawson - 2024.2-2 +- Bump release for June 2024 mass rebuild + +* Tue May 28 2024 José Expósito - 2024.2-1 +- Update to 1.3.283.0 SDK + +* Sat Jan 27 2024 Fedora Release Engineering - 2023.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Oct 30 2023 José Expósito - 2023.3-1 +- update to 1.3.268.0 SDK + +* Tue Sep 05 2023 Dave Airlie - 2023.2-7 +- update to 1.3.261.1 sdk + +* Mon Sep 04 2023 Dave Airlie - 2023.2-6 +- migrated to SPDX license + +* Sat Jul 22 2023 Fedora Release Engineering - 2023.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 20 2023 Dave Airlie - 2023.2-4 +- add spirv-objdump + +* Tue Jun 20 2023 Dave Airlie - 2023.2-3 +- update to 1.3.250.0 spec release + +* Thu Apr 20 2023 Dave Airlie - 2023.2-2 +- drop unneeded patch + +* Thu Apr 20 2023 Dave Airlie - 2023.2-1 +- update to 1.3.243 sdk release + +* Wed Feb 15 2023 Dave Airlie - 2023.1-2 +- restore spirv-tools ABI + +* Tue Jan 31 2023 Dave Airlie - 2023.1-1 +- update to 1.3.239.0 sdk release + +* Sat Jan 21 2023 Fedora Release Engineering - 2022.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Nov 09 2022 Dave Airlie - 2022.2-6 +- update spirv-tools to 1.3.231.1 sdk + +* Wed Aug 24 2022 Dave Airlie - 2022.2-5 +- Rebase to 1.3.224 SDK Version + +* Sat Jul 23 2022 Fedora Release Engineering - 2022.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jun 16 2022 Dave Airlie - 2022.2-3 +- Rebase to 1.3.216 SDK Version + +* Wed Apr 27 2022 Dave Airlie - 2022.2-2 +- Add new diff shared library. + +* Wed Apr 27 2022 Dave Airlie - 2022.2-1 +- Rebase to 1.3.211 SDK Version + +* Tue Feb 15 2022 Dave Airlie - 2022.1-3 +- fix the fix. + +* Tue Feb 15 2022 Dave Airlie - 2022.1-2 +- fix gcc12 build + +* Tue Feb 15 2022 Dave Airlie - 2022.1-1 +- Rebase to 1.3.204 SDK Version + +* Sat Jan 29 2022 Jan Grulich - 2021.4-5 +- Fix endianness of string literals + +* Sat Jan 22 2022 Fedora Release Engineering - 2021.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Dec 09 2021 Dave Airlie - 2021.4-3 +- retain compat with both ABIs + +* Mon Dec 06 2021 Dave Airlie - 2021.4-2 +- Restore previous ABI + +* Tue Nov 23 2021 Dave Airlie - 2021.4-1 +- Update to 1.2.198.0 SDK Version + +* Tue Nov 23 2021 Dave Airlie - 2021.3-4 +- Update to 1.2.198.0 SDK Version + +* Tue Sep 07 2021 Dave Airlie - 2021.3-3 +- Update to 1.2.189.0 SDK Version + +* Tue Sep 07 2021 Dave Airlie - 2021.3-2 +- Update to 1.2.189.0 SDK Version + +* Tue Sep 07 2021 Dave Airlie - 2021.3-1 +- Update to 1.2.189.0 SDK Version + +* Fri Jul 23 2021 Fedora Release Engineering - 2021.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jul 06 2021 Dave Airlie - 2021.2-1 +- Update to 1.2.182.0 SDK Version + +* Tue May 18 2021 Dave Airlie - 2021.1-1 +- Update to 1.2.176.1 SDK version + +* Thu Jan 28 2021 Dave Airlie - 2020.5-10 +- Update to 1.2.162.0 SDK version + +* Wed Jan 27 2021 Fedora Release Engineering - 2020.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Dec 05 2020 Jeff Law - 2020.5-8 +- Fix undesirable strncpy call to instead use memcpy to avoid gcc-11 + diagnostic + +* Tue Nov 03 2020 Dave Airlie - 2020.5-7 +- spirv-tools fix whitespace + +* Tue Nov 03 2020 Dave Airlie - 2020.5-6 +- fixup latest spirv-tools build + +* Mon Nov 02 2020 Dave Airlie - 2020.5-5 +- update to latest spirv-tools + +* Mon Nov 02 2020 Dave Airlie - 2020.5-4 +- update to latest spirv-tools + +* Tue Aug 04 2020 Dave Airlie - 2020.5-3 +- spirv-tools: just revert upstream problem + +* Tue Aug 04 2020 Dave Airlie - 2020.5-2 +- fix spirv-tools shared library name + +* Tue Aug 04 2020 Dave Airlie - 2020.5-1 +- try and fix shared spirv-tools libraries + +* Tue Aug 04 2020 Dave Airlie - 2019.5-7 +- update to latest spirv-tools + +* Wed Jul 29 2020 Fedora Release Engineering - 2019.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 08 2020 Igor Raits - 2019.5-5 +- Improve compatibility with new CMake macro + +* Wed Apr 22 2020 Dave Airlie - 2019.5-4 +- git snapshot for newer glslang/validation layers + +* Tue Jan 28 2020 Dave Airlie - 2019.5-3 +- drop unneeded patch + +* Tue Jan 28 2020 Dave Airlie - 2019.5-2 +- update new sources + +* Tue Jan 28 2020 Dave Airlie - 2019.5-1 +- git snapshot for newer glslang/validation layers + +* Tue Nov 12 2019 Dave Airlie - 2019.4-5 +- add unused cmake files + +* Tue Nov 12 2019 Dave Airlie - 2019.4-4 +- nuke unused cmake files for now + +* Tue Nov 12 2019 Dave Airlie - 2019.4-3 +- git snapshot for newer glslang/validation layers + +* Fri Aug 02 2019 Dave Airlie - 2019.4-2 +- git snapshot to let newer vulkan validation layers build stats removed + upstream + +* Thu Aug 01 2019 Dave Airlie - 2019.4-1 +- git snapshot to let newer vulkan validation layers build + +* Fri Jul 26 2019 Fedora Release Engineering - 2019.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Jun 10 2019 Robert-André Mauchin - 2019.3-1 +- Release 2019.3 + +* Wed Mar 06 2019 Dave Airlie - 2019.1-4 +- Add patch to let vulkan-validation-layers build + +* Wed Feb 20 2019 Michael Cronenworth - 2019.1-3 +- Add EPEL 7 support + +* Mon Feb 04 2019 Dave Airlie - 2019.1-2 +- fix compilation + +* Mon Feb 04 2019 Dave Airlie - 2019.1-1 +- Update to 2019.1 release + +* Sun Feb 03 2019 Fedora Release Engineering - 2018.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Sep 18 2018 Adam Jackson - 2018.4-3 +- BuildRequires: python3-devel for RHEL compatibility + +* Mon Jul 23 2018 leigh123linux - 2018.4-2 +- Add Br python3-rpm-macros + +* Mon Jul 23 2018 leigh123linux - 2018.4-1 +- Update to 2018.4 release + +* Sat Jul 14 2018 Fedora Release Engineering - 2018.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jun 25 2018 Dave Airlie - 2018.3.0-3 +- drop python specifier + +* Mon Jun 25 2018 Dave Airlie - 2018.3.0-2 +- Move to python3 and drop the simplejson buildreq. + +* Tue Apr 24 2018 leigh123linux - 2018.3.0-1 +- Bump version to 2018.3.0 to match .pc files + +* Tue Apr 24 2018 leigh123linux - 2018.1-4 +- Bump provides to 2018.3.0 + +* Tue Apr 24 2018 leigh123linux - 2018.1-3 +- Update for vulkan 1.1.73.0 + +* Wed Feb 14 2018 leigh123linux - 2018.1-2 +- Add isa to the provides + +* Sat Feb 10 2018 leigh123linux - 2018.1-1 +- Fix version + +* Fri Feb 09 2018 leigh123linux - 2016.7-8 +- Fix pkgconfig file + +* Fri Feb 09 2018 leigh123linux - 2016.7-7 +- Split libs into -libs subpackage + +* Fri Feb 09 2018 leigh123linux - 2016.7-6 +- Update for vulkan 1.0.68.0 + +* Fri Feb 09 2018 leigh123linux - 2016.7-5 +- Use ninja to build + +* Mon Jan 22 2018 leigh123linux - 2016.7-4 +- Add python prefix to fix the stupid Bodhi tests + +* Tue Jan 09 2018 leigh123linux - 2016.7-3 +- add prefix for python-simplejson + +* Wed Jan 03 2018 leigh123linux - 2016.7-2 +- Split binaries into main package + +* Tue Jan 02 2018 leigh123linux - 2016.7-1 +- First build +## END: Generated by rpmautospec