From 40a5b2e8c22cecaf37bd54e0db87ef862d8d3740d5bd150db01e16560755dd07 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 10 Feb 2021 10:45:19 +0000 Subject: [PATCH 1/6] - Add gcc11.diff [boo#1181882] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-tools?expand=0&rev=59 --- gcc11.diff | 37 +++++++++++++++++++++++++++++++++++++ spirv-tools.changes | 5 +++++ spirv-tools.spec | 5 ++++- 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 gcc11.diff diff --git a/gcc11.diff b/gcc11.diff new file mode 100644 index 0000000..b2b5bf8 --- /dev/null +++ b/gcc11.diff @@ -0,0 +1,37 @@ +From: Jan Engelhardt +Date: 2021-02-10 11:35:55.577457480 +0100 + +gcc-11 is just too picky. +Unrelatedly, -Werror is stupid for distributions. + +--- + CMakeLists.txt | 2 +- + source/diagnostic.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +Index: SPIRV-Tools-2020.6/CMakeLists.txt +=================================================================== +--- SPIRV-Tools-2020.6.orig/CMakeLists.txt ++++ SPIRV-Tools-2020.6/CMakeLists.txt +@@ -106,7 +106,7 @@ if(${COMPILER_IS_LIKE_GNU}) + endif() + + if(${SPIRV_WERROR}) +- set(SPIRV_WARNINGS ${SPIRV_WARNINGS} -Werror) ++ set(SPIRV_WARNINGS ${SPIRV_WARNINGS}) + endif() + elseif(MSVC) + set(SPIRV_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /wd4800) +Index: SPIRV-Tools-2020.6/source/diagnostic.cpp +=================================================================== +--- SPIRV-Tools-2020.6.orig/source/diagnostic.cpp ++++ SPIRV-Tools-2020.6/source/diagnostic.cpp +@@ -37,7 +37,7 @@ spv_diagnostic spvDiagnosticCreate(const + diagnostic->position = *position; + diagnostic->isTextSource = false; + memset(diagnostic->error, 0, length); +- strncpy(diagnostic->error, message, length); ++ strcpy(diagnostic->error, message); + return diagnostic; + } + diff --git a/spirv-tools.changes b/spirv-tools.changes index 7af859d..87829a9 100644 --- a/spirv-tools.changes +++ b/spirv-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 10 10:37:23 UTC 2021 - Jan Engelhardt + +- Add gcc11.diff [boo#1181882] + ------------------------------------------------------------------- Tue Dec 8 12:30:46 UTC 2020 - Jan Engelhardt diff --git a/spirv-tools.spec b/spirv-tools.spec index 0a62031..4530e99 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -1,7 +1,7 @@ # # spec file for package spirv-tools # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,6 +31,7 @@ Source: https://github.com/KhronosGroup/SPIRV-Tools/archive/v%version.ta Source9: baselibs.conf Patch1: ver.diff Patch2: gcc48.diff +Patch3: gcc11.diff BuildRequires: bison BuildRequires: cmake >= 2.8.12 BuildRequires: gcc-c++ @@ -68,6 +69,8 @@ integration into other code bases directly. %autosetup -p1 -n SPIRV-Tools-%version %build +# silence false positive +export CFLAGS="%optflags -Wno-error=stringop-overflow" CXXFLAGS="$CFLAGS" %cmake -DSPIRV-Headers_SOURCE_DIR="%_prefix" \ -DSPIRV_TOOLS_BUILD_STATIC:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=ON %cmake_build From 194430dce021fc40fe4bc3478f0d29a6d7b9a60936d9b9b7ab2702c17fdf18ac Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 10 Feb 2021 11:52:51 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-tools?expand=0&rev=60 --- spirv-tools.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/spirv-tools.spec b/spirv-tools.spec index 4530e99..8697087 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -69,8 +69,6 @@ integration into other code bases directly. %autosetup -p1 -n SPIRV-Tools-%version %build -# silence false positive -export CFLAGS="%optflags -Wno-error=stringop-overflow" CXXFLAGS="$CFLAGS" %cmake -DSPIRV-Headers_SOURCE_DIR="%_prefix" \ -DSPIRV_TOOLS_BUILD_STATIC:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=ON %cmake_build From 7afcc44a91e7ede2088f68cbc3f3271788b47d39c6b2b2a85ddd96de2c7ca80c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 10 Feb 2021 15:26:17 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-tools?expand=0&rev=61 --- spirv-tools.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/spirv-tools.spec b/spirv-tools.spec index 8697087..6586dba 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -38,6 +38,7 @@ BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: python3-base BuildRequires: python3-xml +BuildRequires: spirv-headers < 1.5.4.g28 BuildRequires: spirv-headers >= 1.5.3.g22 %description From 68047c19659b32b0aabccdefb357f947bb5a72ac9b8cc8275ee91813692bd5f9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 1 Mar 2021 06:58:08 +0000 Subject: [PATCH 4/6] - Update to release 2020.7 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-tools?expand=0&rev=62 --- spirv-tools.changes | 9 +++++++++ spirv-tools.spec | 5 ++--- v2020.6.tar.gz | 3 --- v2020.7.tar.gz | 3 +++ 4 files changed, 14 insertions(+), 6 deletions(-) delete mode 100644 v2020.6.tar.gz create mode 100644 v2020.7.tar.gz diff --git a/spirv-tools.changes b/spirv-tools.changes index 87829a9..fd6b1f1 100644 --- a/spirv-tools.changes +++ b/spirv-tools.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Mar 1 06:56:04 UTC 2021 - Jan Engelhardt + +- Update to release 2020.7 + * Support pending Intel extensions + * Remove WebGPU support + * Validator: add Vulkan EXT builtins + * Optimizer: Run DCE when SPV_KHR_shader_clock is used + ------------------------------------------------------------------- Wed Feb 10 10:37:23 UTC 2021 - Jan Engelhardt diff --git a/spirv-tools.spec b/spirv-tools.spec index 6586dba..4f12c0b 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -20,7 +20,7 @@ %define lname libSPIRV-Tools-suse19 Name: spirv-tools -Version: 2020.6 +Version: 2020.7 Release: 0 Summary: API and commands for processing SPIR-V modules License: Apache-2.0 @@ -38,8 +38,7 @@ BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: python3-base BuildRequires: python3-xml -BuildRequires: spirv-headers < 1.5.4.g28 -BuildRequires: spirv-headers >= 1.5.3.g22 +BuildRequires: spirv-headers >= 1.5.3.g32 %description The package includes an assembler, binary module parser, diff --git a/v2020.6.tar.gz b/v2020.6.tar.gz deleted file mode 100644 index 88963fd..0000000 --- a/v2020.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de2392682df8def7ac666a2a320cd475751badf4790b01c7391b7644ecb550a3 -size 2595300 diff --git a/v2020.7.tar.gz b/v2020.7.tar.gz new file mode 100644 index 0000000..2f13257 --- /dev/null +++ b/v2020.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c06eed1c7a1018b232768481184b5ae4d91d614d7bd7358dc2fe306bd0a39c6e +size 2585866 From c4f194266972bc8d7fe6b7582c19e67f6b20a59df42a951a64c8399eda7a16c5 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 1 Mar 2021 09:30:10 +0000 Subject: [PATCH 5/6] back out gcc11.diff OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-tools?expand=0&rev=63 --- gcc11.diff | 37 ------------------------------------- spirv-tools.changes | 5 ----- spirv-tools.spec | 1 - 3 files changed, 43 deletions(-) delete mode 100644 gcc11.diff diff --git a/gcc11.diff b/gcc11.diff deleted file mode 100644 index b2b5bf8..0000000 --- a/gcc11.diff +++ /dev/null @@ -1,37 +0,0 @@ -From: Jan Engelhardt -Date: 2021-02-10 11:35:55.577457480 +0100 - -gcc-11 is just too picky. -Unrelatedly, -Werror is stupid for distributions. - ---- - CMakeLists.txt | 2 +- - source/diagnostic.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -Index: SPIRV-Tools-2020.6/CMakeLists.txt -=================================================================== ---- SPIRV-Tools-2020.6.orig/CMakeLists.txt -+++ SPIRV-Tools-2020.6/CMakeLists.txt -@@ -106,7 +106,7 @@ if(${COMPILER_IS_LIKE_GNU}) - endif() - - if(${SPIRV_WERROR}) -- set(SPIRV_WARNINGS ${SPIRV_WARNINGS} -Werror) -+ set(SPIRV_WARNINGS ${SPIRV_WARNINGS}) - endif() - elseif(MSVC) - set(SPIRV_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /wd4800) -Index: SPIRV-Tools-2020.6/source/diagnostic.cpp -=================================================================== ---- SPIRV-Tools-2020.6.orig/source/diagnostic.cpp -+++ SPIRV-Tools-2020.6/source/diagnostic.cpp -@@ -37,7 +37,7 @@ spv_diagnostic spvDiagnosticCreate(const - diagnostic->position = *position; - diagnostic->isTextSource = false; - memset(diagnostic->error, 0, length); -- strncpy(diagnostic->error, message, length); -+ strcpy(diagnostic->error, message); - return diagnostic; - } - diff --git a/spirv-tools.changes b/spirv-tools.changes index fd6b1f1..18bfd95 100644 --- a/spirv-tools.changes +++ b/spirv-tools.changes @@ -7,11 +7,6 @@ Mon Mar 1 06:56:04 UTC 2021 - Jan Engelhardt * Validator: add Vulkan EXT builtins * Optimizer: Run DCE when SPV_KHR_shader_clock is used -------------------------------------------------------------------- -Wed Feb 10 10:37:23 UTC 2021 - Jan Engelhardt - -- Add gcc11.diff [boo#1181882] - ------------------------------------------------------------------- Tue Dec 8 12:30:46 UTC 2020 - Jan Engelhardt diff --git a/spirv-tools.spec b/spirv-tools.spec index 4f12c0b..b6f32a0 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -31,7 +31,6 @@ Source: https://github.com/KhronosGroup/SPIRV-Tools/archive/v%version.ta Source9: baselibs.conf Patch1: ver.diff Patch2: gcc48.diff -Patch3: gcc11.diff BuildRequires: bison BuildRequires: cmake >= 2.8.12 BuildRequires: gcc-c++ From 8c2be903d4bbdb031bfcfe43af742aaf0f55aa3986ecd6e34744af46db628858 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 11 Mar 2021 14:03:40 +0000 Subject: [PATCH 6/6] - Bump SONAME because of ABI change underneath [boo#1183350]. OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-tools?expand=0&rev=64 --- baselibs.conf | 4 ++-- spirv-tools.changes | 6 ++++++ spirv-tools.spec | 2 +- ver.diff | 14 +++++++------- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 382bec3..ab0c9d0 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libSPIRV-Tools-suse19 +libSPIRV-Tools-suse20 spirv-tools-devel requires -spirv-tools- - requires "libSPIRV-Tools-suse19- = " + requires "libSPIRV-Tools-suse20- = " diff --git a/spirv-tools.changes b/spirv-tools.changes index 18bfd95..bb83f00 100644 --- a/spirv-tools.changes +++ b/spirv-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 11 14:00:16 UTC 2021 - Jan Engelhardt + +- Bump SONAME because of ABI change underneath [boo#1183350]. + This I had missed in the 2020.7 update. + ------------------------------------------------------------------- Mon Mar 1 06:56:04 UTC 2021 - Jan Engelhardt diff --git a/spirv-tools.spec b/spirv-tools.spec index b6f32a0..9ed3608 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -17,7 +17,7 @@ %define _lto_cflags %nil -%define lname libSPIRV-Tools-suse19 +%define lname libSPIRV-Tools-suse20 Name: spirv-tools Version: 2020.7 diff --git a/ver.diff b/ver.diff index 625a9b2..82b8895 100644 --- a/ver.diff +++ b/ver.diff @@ -19,7 +19,7 @@ Index: SPIRV-Tools-2020.6/source/CMakeLists.txt add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES}) spirv_tools_default_target_options(${SPIRV_TOOLS}-shared) set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES CXX_VISIBILITY_PRESET hidden) -+set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES SOVERSION suse19) ++set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES SOVERSION suse20) target_compile_definitions(${SPIRV_TOOLS}-shared PRIVATE SPIRV_TOOLS_IMPLEMENTATION PUBLIC SPIRV_TOOLS_SHAREDLIB @@ -27,7 +27,7 @@ Index: SPIRV-Tools-2020.6/source/CMakeLists.txt spirv_tools_default_target_options(${SPIRV_TOOLS}-static) # The static target does not have the '-static' suffix. set_target_properties(${SPIRV_TOOLS}-static PROPERTIES OUTPUT_NAME "${SPIRV_TOOLS}") -+ set_target_properties(${SPIRV_TOOLS}-static PROPERTIES SOVERSION suse19) ++ set_target_properties(${SPIRV_TOOLS}-static PROPERTIES SOVERSION suse20) # Create the "${SPIRV_TOOLS}" target as an alias to either "${SPIRV_TOOLS}-static" # or "${SPIRV_TOOLS}-shared" depending on the value of BUILD_SHARED_LIBS. @@ -35,7 +35,7 @@ Index: SPIRV-Tools-2020.6/source/CMakeLists.txt set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static ${SPIRV_TOOLS}-shared) else() add_library(${SPIRV_TOOLS} ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_SOURCES}) -+ set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse19) ++ set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse20) spirv_tools_default_target_options(${SPIRV_TOOLS}) set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS} ${SPIRV_TOOLS}-shared) endif() @@ -47,7 +47,7 @@ Index: SPIRV-Tools-2020.6/source/fuzz/CMakeLists.txt spvtools_pch(SPIRV_TOOLS_FUZZ_SOURCES pch_source_fuzz) add_library(SPIRV-Tools-fuzz ${SPIRV_TOOLS_FUZZ_SOURCES}) -+ set_target_properties(SPIRV-Tools-fuzz PROPERTIES SOVERSION suse19) ++ set_target_properties(SPIRV-Tools-fuzz PROPERTIES SOVERSION suse20) spvtools_default_compile_options(SPIRV-Tools-fuzz) @@ -59,7 +59,7 @@ Index: SPIRV-Tools-2020.6/source/link/CMakeLists.txt add_library(SPIRV-Tools-link ${SPIRV_TOOLS_LIBRARY_TYPE} linker.cpp ) -+set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse19) ++set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse20) spvtools_default_compile_options(SPIRV-Tools-link) target_include_directories(SPIRV-Tools-link @@ -71,7 +71,7 @@ Index: SPIRV-Tools-2020.6/source/opt/CMakeLists.txt add_library(SPIRV-Tools-opt ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_TOOLS_OPT_SOURCES}) -+set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse19) ++set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse20) spvtools_default_compile_options(SPIRV-Tools-opt) target_include_directories(SPIRV-Tools-opt PUBLIC @@ -83,7 +83,7 @@ Index: SPIRV-Tools-2020.6/source/reduce/CMakeLists.txt $ PRIVATE ${spirv-tools_BINARY_DIR} ) -+set_target_properties(SPIRV-Tools-reduce PROPERTIES SOVERSION suse19) ++set_target_properties(SPIRV-Tools-reduce PROPERTIES SOVERSION suse20) # The reducer reuses a lot of functionality from the SPIRV-Tools library. target_link_libraries(SPIRV-Tools-reduce PUBLIC ${SPIRV_TOOLS_FULL_VISIBILITY}