- Update to release 2022.1

OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-tools?expand=0&rev=77
2022-01-26 20:59:15 +00:00 · 2022-01-26 20:59:15 +00:00 · 7869799fd8
commit 7869799fd8
parent 31e7d1ed21
7 changed files with 26 additions and 1369 deletions
--- a/baselibs.conf
+++ b/baselibs.conf
@ -1,4 +1,4 @@
-libSPIRV-Tools-suse23
+libSPIRV-Tools-suse24
 spirv-tools-devel
 	requires -spirv-tools-<targettype>
-	requires "libSPIRV-Tools-suse23-<targettype> = <version>"
+	requires "libSPIRV-Tools-suse24-<targettype> = <version>"
--- a/spirv-tools-big-endian.patch
+++ b/spirv-tools-big-endian.patch
--- a/spirv-tools.changes
+++ b/spirv-tools.changes
@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jan 26 20:39:57 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 2022.1
+  * Basic support for SPIR-V 1.6
+  * spirv-opt: add pass to Spread Volatile semantics
+- Drop spirv-tools-big-endian.patch (merged)
+
 -------------------------------------------------------------------
 Thu Dec  9 19:09:40 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>

--- a/spirv-tools.spec
+++ b/spirv-tools.spec
@ -1,7 +1,7 @@
 #
 # spec file for package spirv-tools
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -17,10 +17,10 @@


 %define _lto_cflags %nil
-%define lname libSPIRV-Tools-suse23
+%define lname libSPIRV-Tools-suse24

 Name:           spirv-tools
-Version:        2021.4
+Version:        2022.1
 Release:        0
 Summary:        API and commands for processing SPIR-V modules
 License:        Apache-2.0
@ -31,14 +31,13 @@ Source:         https://github.com/KhronosGroup/SPIRV-Tools/archive/v%version.ta
 Source9:        baselibs.conf
 Patch1:         ver.diff
 Patch2:         gcc48.diff
-Patch3:         spirv-tools-big-endian.patch
 BuildRequires:  bison
 BuildRequires:  cmake >= 2.8.12
 BuildRequires:  gcc-c++
 BuildRequires:  pkg-config
 BuildRequires:  python3-base
 BuildRequires:  python3-xml
-BuildRequires:  spirv-headers >= 1.5.5.g9
+BuildRequires:  spirv-headers >= 1.6.g6

 %description
 The package includes an assembler, binary module parser,
@ -70,7 +69,7 @@ integration into other code bases directly.

 %build
 %if 0%{?suse_version} >= 1550
-export CXXFLAGS="%optflags -Wno-error=stringop-truncation"
+#export CXXFLAGS="%optflags -Wno-error=stringop-truncation"
 %endif
 %cmake -DSPIRV-Headers_SOURCE_DIR="%_prefix" \
 	-DSPIRV_TOOLS_BUILD_STATIC:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=ON
--- a/v2021.4.tar.gz
+++ b/v2021.4.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d68de260708dda785d109ff1ceeecde2d2ab71142fa5bf59061bb9f47dd3bb2c
-size 2887505
--- a/v2022.1.tar.gz
+++ b/v2022.1.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:844c0f590a0ab9237cec947e27cfc75bd14f39a68fc3b37d8f1b9e1b21490a58
+size 2904582
--- a/ver.diff
+++ b/ver.diff
@ -20,7 +20,7 @@ Index: SPIRV-Tools-2021.3/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 suse23)
+set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES SOVERSION suse24)
 target_compile_definitions(${SPIRV_TOOLS}-shared
   PRIVATE SPIRV_TOOLS_IMPLEMENTATION
   PUBLIC SPIRV_TOOLS_SHAREDLIB
@ -28,7 +28,7 @@ Index: SPIRV-Tools-2021.3/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 suse23)
+  set_target_properties(${SPIRV_TOOLS}-static PROPERTIES SOVERSION suse24)
 
   # 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.
@ -36,7 +36,7 @@ Index: SPIRV-Tools-2021.3/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 suse23)
+  set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse24)
   spirv_tools_default_target_options(${SPIRV_TOOLS})
   set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS} ${SPIRV_TOOLS}-shared)
 endif()
@ -48,7 +48,7 @@ Index: SPIRV-Tools-2021.3/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 suse23)
+  set_target_properties(SPIRV-Tools-fuzz PROPERTIES SOVERSION suse24)
 
   spvtools_default_compile_options(SPIRV-Tools-fuzz)
 
@ -60,7 +60,7 @@ Index: SPIRV-Tools-2021.3/source/link/CMakeLists.txt
 add_library(SPIRV-Tools-link ${SPIRV_TOOLS_LIBRARY_TYPE}
   linker.cpp
 )
-+set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse23)
+set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse24)
 
 spvtools_default_compile_options(SPIRV-Tools-link)
 target_include_directories(SPIRV-Tools-link
@ -72,7 +72,7 @@ Index: SPIRV-Tools-2021.3/source/lint/CMakeLists.txt
 
 add_library(SPIRV-Tools-lint ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_TOOLS_LINT_SOURCES})
 
-+set_target_properties(SPIRV-Tools-lint PROPERTIES SOVERSION suse23)
+set_target_properties(SPIRV-Tools-lint PROPERTIES SOVERSION suse24)
 spvtools_default_compile_options(SPIRV-Tools-lint)
 target_include_directories(SPIRV-Tools-lint
   PUBLIC
@ -84,7 +84,7 @@ Index: SPIRV-Tools-2021.3/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 suse23)
+set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse24)
 spvtools_default_compile_options(SPIRV-Tools-opt)
 target_include_directories(SPIRV-Tools-opt
   PUBLIC
@ -96,7 +96,7 @@ Index: SPIRV-Tools-2021.3/source/reduce/CMakeLists.txt
 	$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
   PRIVATE ${spirv-tools_BINARY_DIR}
 )
-+set_target_properties(SPIRV-Tools-reduce PROPERTIES SOVERSION suse23)
+set_target_properties(SPIRV-Tools-reduce PROPERTIES SOVERSION suse24)
 # The reducer reuses a lot of functionality from the SPIRV-Tools library.
 target_link_libraries(SPIRV-Tools-reduce
   PUBLIC ${SPIRV_TOOLS_FULL_VISIBILITY}