diff --git a/fix-gcc12-build.patch b/fix-gcc12-build.patch new file mode 100644 index 0000000..4ceeeef --- /dev/null +++ b/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/spirv-tools.spec b/spirv-tools.spec index 717a241..b5780d9 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -1,5 +1,5 @@ Name: spirv-tools -Version: 2022.1 +Version: 2023.2 Release: 1 Summary: API and commands for processing SPIR-V modules @@ -7,6 +7,9 @@ License: ASL 2.0 URL: https://github.com/KhronosGroup/SPIRV-Tools Source0: %url/archive/refs/tags/v%{version}.tar.gz +#patch from:https://src.fedoraproject.org/rpms/spirv-tools/blob/rawhide/f/fix-gcc12-build.patch +Patch6000: fix-gcc12-build.patch + BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: ninja-build @@ -38,7 +41,7 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} Development files for %{name} %prep -%autosetup -p1 -n SPIRV-Tools-2022.1 +%autosetup -p1 -n SPIRV-Tools-2023.2 %build %__mkdir_p %_target_platform @@ -72,6 +75,7 @@ DESTDIR="%{buildroot}" %__cmake --install %_target_platform %{_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 @@ -86,6 +90,9 @@ DESTDIR="%{buildroot}" %__cmake --install %_target_platform %{_libdir}/pkgconfig/SPIRV-Tools.pc %changelog +* Mon Jul 31 2023 zhouwenpei - 2023.2-1 +- update to 2023.2 + * Mon Jul 25 2022 loong_C - 2022.1-1 - update to 2022.1 diff --git a/spirv-tools.yaml b/spirv-tools.yaml new file mode 100644 index 0000000..f547e51 --- /dev/null +++ b/spirv-tools.yaml @@ -0,0 +1,5 @@ +version_control: github +src_repo: KhronosGroup/SPIRV-Tools +tag_prefix: ^v +seperator: "." + diff --git a/v2022.1.tar.gz b/v2022.1.tar.gz deleted file mode 100644 index ebbb5b7..0000000 Binary files a/v2022.1.tar.gz and /dev/null differ diff --git a/v2023.2.tar.gz b/v2023.2.tar.gz new file mode 100644 index 0000000..da56256 Binary files /dev/null and b/v2023.2.tar.gz differ