From e12d942416308b5535973184d776047bff1e02beb0e9f8893fad3c95c178ebb3 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 18 Apr 2022 23:41:31 +0000 Subject: [PATCH] - Update to 2022.2 (SDK-1.3.211.0) OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-tools?expand=0&rev=79 --- SPIRV-Tools-2022.2~sdk204.tar.xz | 3 -- _service | 14 ------ baselibs.conf | 4 +- spirv-tools.changes | 9 ++++ spirv-tools.spec | 11 ++--- v2022.2.tar.gz | 3 ++ ver.diff | 73 +++++++++++++++++++------------- 7 files changed, 64 insertions(+), 53 deletions(-) delete mode 100644 SPIRV-Tools-2022.2~sdk204.tar.xz delete mode 100644 _service create mode 100644 v2022.2.tar.gz diff --git a/SPIRV-Tools-2022.2~sdk204.tar.xz b/SPIRV-Tools-2022.2~sdk204.tar.xz deleted file mode 100644 index eda1f00..0000000 --- a/SPIRV-Tools-2022.2~sdk204.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08df02fb25968db70ffc8732b99786b4f763400c9b92cfd63a27bc1fb3076089 -size 1929076 diff --git a/_service b/_service deleted file mode 100644 index 2cc94cc..0000000 --- a/_service +++ /dev/null @@ -1,14 +0,0 @@ - - - git - https://github.com/KhronosGroup/SPIRV-Tools - sdk-1.3.204.0 - v2022.1 - 2022.2~sdk204 - - - *.tar - xz - - - diff --git a/baselibs.conf b/baselibs.conf index 3b7d175..e8bc44a 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libSPIRV-Tools-suse24 +libSPIRV-Tools-suse25 spirv-tools-devel requires -spirv-tools- - requires "libSPIRV-Tools-suse24- = " + requires "libSPIRV-Tools-suse25- = " diff --git a/spirv-tools.changes b/spirv-tools.changes index 2c7ea1b..38a81ca 100644 --- a/spirv-tools.changes +++ b/spirv-tools.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Apr 18 23:33:42 UTC 2022 - Jan Engelhardt + +- Update to 2022.2 (SDK-1.3.211.0) + * Handle propagation of arrays with decorations + * spirv-opt: Add OpExecutionModeId support + * Support SPV_KHR_uniform_group_instructions + * Introduce spirv-diff + ------------------------------------------------------------------- Sat Feb 19 17:29:05 UTC 2022 - Jan Engelhardt diff --git a/spirv-tools.spec b/spirv-tools.spec index e76f242..910329d 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -17,18 +17,17 @@ %define _lto_cflags %nil -%define lname libSPIRV-Tools-suse24 +%define lname libSPIRV-Tools-suse25 Name: spirv-tools -Version: 2022.2~sdk204 +Version: 2022.2 Release: 0 Summary: API and commands for processing SPIR-V modules License: Apache-2.0 Group: Development/Libraries/C and C++ URL: https://github.com/KhronosGroup/SPIRV-Tools -#Source: https://github.com/KhronosGroup/SPIRV-Tools/archive/v%%version.tar.gz -Source: SPIRV-Tools-%version.tar.xz +Source: https://github.com/KhronosGroup/SPIRV-Tools/archive/v%version.tar.gz Source9: baselibs.conf Patch1: ver.diff Patch2: gcc48.diff @@ -38,7 +37,7 @@ BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: python3-base BuildRequires: python3-xml -BuildRequires: spirv-headers >= 1.6.g6 +BuildRequires: spirv-headers >= 1.6.1+sdk211 %description The package includes an assembler, binary module parser, @@ -89,6 +88,7 @@ perl -i -lpe 's{^#!/usr/bin/env sh$}{#!/bin/sh}' "%buildroot/%_bindir/spirv-less %files -n %lname %_libdir/libSPIRV-Tools.so.* +%_libdir/libSPIRV-Tools-diff.so.* %_libdir/libSPIRV-Tools-link.so.* %_libdir/libSPIRV-Tools-lint.so.* %_libdir/libSPIRV-Tools-opt.so.* @@ -98,6 +98,7 @@ perl -i -lpe 's{^#!/usr/bin/env sh$}{#!/bin/sh}' "%buildroot/%_bindir/spirv-less %files devel %_libdir/cmake/ %_libdir/libSPIRV-Tools.so +%_libdir/libSPIRV-Tools-diff.so %_libdir/libSPIRV-Tools-link.so %_libdir/libSPIRV-Tools-lint.so %_libdir/libSPIRV-Tools-opt.so diff --git a/v2022.2.tar.gz b/v2022.2.tar.gz new file mode 100644 index 0000000..f76e220 --- /dev/null +++ b/v2022.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:909fc7e68049dca611ca2d57828883a86f503b0353ff78bc594eddc65eb882b9 +size 2994426 diff --git a/ver.diff b/ver.diff index 0de6bb7..8c40d51 100644 --- a/ver.diff +++ b/ver.diff @@ -5,22 +5,23 @@ Unversioned libraries suck! --- source/CMakeLists.txt | 3 +++ + source/diff/CMakeLists.txt | 2 ++ source/fuzz/CMakeLists.txt | 1 + source/link/CMakeLists.txt | 1 + source/lint/CMakeLists.txt | 1 + source/opt/CMakeLists.txt | 1 + source/reduce/CMakeLists.txt | 1 + - 6 files changed, 8 insertions(+) + 7 files changed, 10 insertions(+) -Index: SPIRV-Tools-2021.3/source/CMakeLists.txt +Index: SPIRV-Tools-2022.2/source/CMakeLists.txt =================================================================== ---- SPIRV-Tools-2021.3.orig/source/CMakeLists.txt -+++ SPIRV-Tools-2021.3/source/CMakeLists.txt +--- SPIRV-Tools-2022.2.orig/source/CMakeLists.txt ++++ SPIRV-Tools-2022.2/source/CMakeLists.txt @@ -377,6 +377,7 @@ endfunction() 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 suse24) ++set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES SOVERSION suse25) target_compile_definitions(${SPIRV_TOOLS}-shared PRIVATE SPIRV_TOOLS_IMPLEMENTATION PUBLIC SPIRV_TOOLS_SHAREDLIB @@ -28,7 +29,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 suse24) ++ set_target_properties(${SPIRV_TOOLS}-static PROPERTIES SOVERSION suse25) # 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,67 +37,81 @@ 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 suse24) ++ set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse25) spirv_tools_default_target_options(${SPIRV_TOOLS}) set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS} ${SPIRV_TOOLS}-shared) endif() -Index: SPIRV-Tools-2021.3/source/fuzz/CMakeLists.txt +Index: SPIRV-Tools-2022.2/source/diff/CMakeLists.txt =================================================================== ---- SPIRV-Tools-2021.3.orig/source/fuzz/CMakeLists.txt -+++ SPIRV-Tools-2021.3/source/fuzz/CMakeLists.txt +--- SPIRV-Tools-2022.2.orig/source/diff/CMakeLists.txt ++++ SPIRV-Tools-2022.2/source/diff/CMakeLists.txt +@@ -35,7 +35,9 @@ target_link_libraries(SPIRV-Tools-diff + target_link_libraries(SPIRV-Tools-diff + PUBLIC SPIRV-Tools-opt) + ++ + set_property(TARGET SPIRV-Tools-diff PROPERTY FOLDER "SPIRV-Tools libraries") ++set_target_properties(SPIRV-Tools-diff PROPERTIES SOVERSION suse25) + spvtools_check_symbol_exports(SPIRV-Tools-diff) + + if(ENABLE_SPIRV_TOOLS_INSTALL) +Index: SPIRV-Tools-2022.2/source/fuzz/CMakeLists.txt +=================================================================== +--- SPIRV-Tools-2022.2.orig/source/fuzz/CMakeLists.txt ++++ SPIRV-Tools-2022.2/source/fuzz/CMakeLists.txt @@ -439,6 +439,7 @@ if(SPIRV_BUILD_FUZZER) 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 suse24) ++ set_target_properties(SPIRV-Tools-fuzz PROPERTIES SOVERSION suse25) spvtools_default_compile_options(SPIRV-Tools-fuzz) -Index: SPIRV-Tools-2021.3/source/link/CMakeLists.txt +Index: SPIRV-Tools-2022.2/source/link/CMakeLists.txt =================================================================== ---- SPIRV-Tools-2021.3.orig/source/link/CMakeLists.txt -+++ SPIRV-Tools-2021.3/source/link/CMakeLists.txt +--- SPIRV-Tools-2022.2.orig/source/link/CMakeLists.txt ++++ SPIRV-Tools-2022.2/source/link/CMakeLists.txt @@ -14,6 +14,7 @@ add_library(SPIRV-Tools-link ${SPIRV_TOOLS_LIBRARY_TYPE} linker.cpp ) -+set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse24) ++set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse25) spvtools_default_compile_options(SPIRV-Tools-link) target_include_directories(SPIRV-Tools-link -Index: SPIRV-Tools-2021.3/source/lint/CMakeLists.txt +Index: SPIRV-Tools-2022.2/source/lint/CMakeLists.txt =================================================================== ---- SPIRV-Tools-2021.3.orig/source/lint/CMakeLists.txt -+++ SPIRV-Tools-2021.3/source/lint/CMakeLists.txt -@@ -25,6 +25,7 @@ endif() +--- SPIRV-Tools-2022.2.orig/source/lint/CMakeLists.txt ++++ SPIRV-Tools-2022.2/source/lint/CMakeLists.txt +@@ -27,6 +27,7 @@ endif() add_library(SPIRV-Tools-lint ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_TOOLS_LINT_SOURCES}) -+set_target_properties(SPIRV-Tools-lint PROPERTIES SOVERSION suse24) ++set_target_properties(SPIRV-Tools-lint PROPERTIES SOVERSION suse25) spvtools_default_compile_options(SPIRV-Tools-lint) target_include_directories(SPIRV-Tools-lint PUBLIC -Index: SPIRV-Tools-2021.3/source/opt/CMakeLists.txt +Index: SPIRV-Tools-2022.2/source/opt/CMakeLists.txt =================================================================== ---- SPIRV-Tools-2021.3.orig/source/opt/CMakeLists.txt -+++ SPIRV-Tools-2021.3/source/opt/CMakeLists.txt -@@ -235,6 +235,7 @@ spvtools_pch(SPIRV_TOOLS_OPT_SOURCES pch +--- SPIRV-Tools-2022.2.orig/source/opt/CMakeLists.txt ++++ SPIRV-Tools-2022.2/source/opt/CMakeLists.txt +@@ -245,6 +245,7 @@ spvtools_pch(SPIRV_TOOLS_OPT_SOURCES pch add_library(SPIRV-Tools-opt ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_TOOLS_OPT_SOURCES}) -+set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse24) ++set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse25) spvtools_default_compile_options(SPIRV-Tools-opt) target_include_directories(SPIRV-Tools-opt PUBLIC -Index: SPIRV-Tools-2021.3/source/reduce/CMakeLists.txt +Index: SPIRV-Tools-2022.2/source/reduce/CMakeLists.txt =================================================================== ---- SPIRV-Tools-2021.3.orig/source/reduce/CMakeLists.txt -+++ SPIRV-Tools-2021.3/source/reduce/CMakeLists.txt +--- SPIRV-Tools-2022.2.orig/source/reduce/CMakeLists.txt ++++ SPIRV-Tools-2022.2/source/reduce/CMakeLists.txt @@ -92,6 +92,7 @@ target_include_directories(SPIRV-Tools-r $ PRIVATE ${spirv-tools_BINARY_DIR} ) -+set_target_properties(SPIRV-Tools-reduce PROPERTIES SOVERSION suse24) ++set_target_properties(SPIRV-Tools-reduce PROPERTIES SOVERSION suse25) # The reducer reuses a lot of functionality from the SPIRV-Tools library. target_link_libraries(SPIRV-Tools-reduce PUBLIC ${SPIRV_TOOLS_FULL_VISIBILITY}