From 61faae9b7091e07d365d496f5da5aeb83393d492 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Wed, 3 Nov 2021 14:59:57 -0400 Subject: [PATCH] import spirv-tools-2021.2-2.20210619.git5dd2f76.el9 --- .gitignore | 1 + .spirv-tools.metadata | 1 + SOURCES/spirv-tools-gcc11.patch | 13 +++ SPECS/spirv-tools.spec | 190 ++++++++++++++++++++++++++++++++ 4 files changed, 205 insertions(+) create mode 100644 .gitignore create mode 100644 .spirv-tools.metadata create mode 100644 SOURCES/spirv-tools-gcc11.patch create mode 100644 SPECS/spirv-tools.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cfdba6c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/spirv-tools-5dd2f76918bb2d0d67628e338f60f724f3e02e13.tar.gz diff --git a/.spirv-tools.metadata b/.spirv-tools.metadata new file mode 100644 index 0000000..0d8502c --- /dev/null +++ b/.spirv-tools.metadata @@ -0,0 +1 @@ +55554351545562b9cd12fa5c17d2ae24d73fbe2b SOURCES/spirv-tools-5dd2f76918bb2d0d67628e338f60f724f3e02e13.tar.gz diff --git a/SOURCES/spirv-tools-gcc11.patch b/SOURCES/spirv-tools-gcc11.patch new file mode 100644 index 0000000..f5c82da --- /dev/null +++ b/SOURCES/spirv-tools-gcc11.patch @@ -0,0 +1,13 @@ +diff --git a/source/diagnostic.cpp b/source/diagnostic.cpp +index edc27c8..77c29d7 100644 +--- a/source/diagnostic.cpp ++++ b/source/diagnostic.cpp +@@ -37,7 +37,7 @@ spv_diagnostic spvDiagnosticCreate(const spv_position position, + diagnostic->position = *position; + diagnostic->isTextSource = false; + memset(diagnostic->error, 0, length); +- strncpy(diagnostic->error, message, length); ++ memcpy(diagnostic->error, message, length); + return diagnostic; + } + diff --git a/SPECS/spirv-tools.spec b/SPECS/spirv-tools.spec new file mode 100644 index 0000000..5e4c059 --- /dev/null +++ b/SPECS/spirv-tools.spec @@ -0,0 +1,190 @@ +%undefine __cmake_in_source_build + +%global commit 5dd2f76918bb2d0d67628e338f60f724f3e02e13 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commit_date 20210619 +%global gitrel .%{commit_date}.git%{shortcommit} + +Name: spirv-tools +Version: 2021.2 +Release: 2%{?gitrel}%{?dist} +Summary: API and commands for processing SPIR-V modules + +License: ASL 2.0 +URL: https://github.com/KhronosGroup/SPIRV-Tools +Source0: %url/archive/%{commit}.tar.gz#/%{name}-%{commit}.tar.gz +Patch0: %{name}-gcc11.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-%{commit} + +%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-opt +%{_bindir}/spirv-reduce +%{_bindir}/spirv-val + +%files libs +%{_libdir}/libSPIRV-Tools-link.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 Aug 10 2021 Mohan Boddu - 2021.2-2.20210619.git5dd2f76 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Wed Jul 30 2021 Dave Airlie - 2021.2-1 +- Update to 1.2.182.0 SDK Version + +* Fri Apr 16 2021 Mohan Boddu - 2020.5-6.20201208.gitb27b1af +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Thu Jan 28 2021 Dave Airlie - 2020.5-5 +- Update to 1.2.162.0 SDK version + +* Wed Jan 27 2021 Fedora Release Engineering - 2020.5-4.20201031.gitf7da527 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Dec 04 2020 Jeff Law - 2020.5-3.20201031.gitf7da5277 +- Fix undesirable strncpy call to instead use memcpy to avoid + gcc-11 diagnostic + +* Mon Nov 02 2020 Dave Airlie - 2020.5-2.20201031.gitf7da5277 +- update to latest spirv-tools + +* Tue Aug 04 2020 Dave Airlie - 2029.5-1.20200803.git92a71657 +- update to latest spirv-tools + +* Wed Jul 29 2020 Fedora Release Engineering - 2019.5-3.20200421.git67f4838 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Apr 22 2020 Dave Airlie - 2019.5-2 +- git snapshot for newer glslang/validation layers + +* Wed Jan 29 2020 Dave Airlie - 2019.5-1 +- git snapshot for newer glslang/validation layers + +* Tue Nov 12 2019 Dave Airlie - 2019.4-1 +- git snapshot for newer glslang/validation layers + +* Thu Aug 01 2019 Dave Airlie - 2019.4-0.1 +- git snapshot to let newer vulkan validation layers build +- stats removed upstream + +* Fri Jul 26 2019 Fedora Release Engineering - 2019.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Jun 10 13:46:33 CEST 2019 Robert-André Mauchin - 2019.3-1 +- Release 2019.3 + +* Thu Mar 07 2019 Dave Airlie - 2019.1-2 +- Add patch to let vulkan-validation-layers build + +* Mon Feb 04 2019 Dave Airlie - 2019.1-1 +- Update to 2019.1 release + +* Sun Feb 03 2019 Fedora Release Engineering - 2018.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Jul 23 2018 Leigh Scott - 2018.4-1 +- Update to 2018.4 release + +* Sat Jul 14 2018 Fedora Release Engineering - 2018.3.0-0.3.20180407.git26a698c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jun 25 2018 Dave Airlie - 2018.3.0-0.2.20180407.git26a698c +- Move to python3 and drop the simplejson buildreq. + +* Tue Apr 24 2018 Leigh Scott - 2018.3.0-0.1.20180407.git26a698c +- Bump version to 2018.3.0 to match .pc files + +* Tue Apr 24 2018 Leigh Scott - 2018.1-0.4.20180407.git26a698c +- Bump provides to 2018.3.0 + +* Tue Apr 24 2018 Leigh Scott - 2018.1-0.3.20180407.git26a698c +- Update for vulkan 1.1.73.0 + +* Wed Feb 14 2018 Leigh Scott - 2018.1-0.2.20180205.git9e19fc0 +- Add isa to the provides + +* Fri Feb 09 2018 Leigh Scott - 2018.1-0.1.20180205.git9e19fc0 +- Fix version +- Fix pkgconfig file +- Add version provides to -libs package + +* Fri Feb 09 2018 Leigh Scott - 2016.7-0.5.20180205.git9e19fc0 +- Update for vulkan 1.0.68.0 +- Try building as shared object +- Split libs into -libs subpackage + +* Fri Feb 09 2018 Leigh Scott - 2016.7-0.4.20171023.git5834719 +- Use ninja to build + +* Mon Jan 22 2018 Leigh Scott - 2016.7-0.3.20171023.git5834719 +- Add python prefix to fix the stupid Bodhi tests + +* Wed Jan 03 2018 Leigh Scott - 2016.7-0.2.20171023.git5834719 +- Split binaries into main package + +* Thu Jul 13 2017 Leigh Scott - 2016.7-0.1.20171023.git5834719 +- First build +