From 31d3c23a26b82fdd3d927258ec1ba1dc8c9ac4cd8177da2c019c577376c7a4fc Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 5 May 2021 09:46:14 +0000 Subject: [PATCH] - Update to release 2021.1 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-tools?expand=0&rev=68 --- baselibs.conf | 4 ++-- gcc48.diff | 26 +++++++++++++------------- spirv-tools.changes | 11 +++++++++++ spirv-tools.spec | 6 +++--- v2020.7.tar.gz | 3 --- v2021.1.tar.gz | 3 +++ ver.diff | 14 +++++++------- 7 files changed, 39 insertions(+), 28 deletions(-) delete mode 100644 v2020.7.tar.gz create mode 100644 v2021.1.tar.gz diff --git a/baselibs.conf b/baselibs.conf index ab0c9d0..11233cb 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libSPIRV-Tools-suse20 +libSPIRV-Tools-suse21 spirv-tools-devel requires -spirv-tools- - requires "libSPIRV-Tools-suse20- = " + requires "libSPIRV-Tools-suse21- = " diff --git a/gcc48.diff b/gcc48.diff index 8bc935c..9c1d0da 100644 --- a/gcc48.diff +++ b/gcc48.diff @@ -14,17 +14,17 @@ were ignored. tools/io.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: spirv-tools-2018.4.g0/tools/io.h +Index: SPIRV-Tools-2021.1/tools/io.h =================================================================== ---- spirv-tools-2018.4.g0.orig/tools/io.h -+++ spirv-tools-2018.4.g0/tools/io.h -@@ -38,7 +38,8 @@ bool ReadFile(const char* filename, cons - return false; - } - } else { -- if (sizeof(T) != 1 && (ftell(fp) % sizeof(T))) { -+ long ftx = ftell(fp); -+ if (sizeof(T) != 1 && ftx % sizeof(T) != 0) { - fprintf( - stderr, - "error: file size should be a multiple of %zd; file '%s' corrupt\n", +--- SPIRV-Tools-2021.1.orig/tools/io.h ++++ SPIRV-Tools-2021.1/tools/io.h +@@ -60,7 +60,8 @@ bool WasFileCorrectlyRead(FILE* file, co + return false; + } + } else { +- if (sizeof(T) != 1 && (ftell(file) % sizeof(T))) { ++ long ftx = ftell(file); ++ if (sizeof(T) != 1 && ftx % sizeof(T) != 0) { + fprintf( + stderr, + "error: file size should be a multiple of %zd; file '%s' corrupt\n", diff --git a/spirv-tools.changes b/spirv-tools.changes index d17063f..54a367c 100644 --- a/spirv-tools.changes +++ b/spirv-tools.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed May 5 09:30:43 UTC 2021 - Jan Engelhardt + +- Update to release 2021.1 + * Support SPV_KHR_linkonce_odr, SPV_KHR_expect_assume + * Fixes for the vscode language server extension + * Validator: + * Add validation for SPV_EXT_shader_atomic_float_min_max + * Add Vulkan Execution Scope checks + * Vulkan 64-bit OpAtomicStore check + ------------------------------------------------------------------- Thu Mar 18 14:20:22 UTC 2021 - Jan Engelhardt diff --git a/spirv-tools.spec b/spirv-tools.spec index c9748e5..96645a9 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -17,10 +17,10 @@ %define _lto_cflags %nil -%define lname libSPIRV-Tools-suse20 +%define lname libSPIRV-Tools-suse21 Name: spirv-tools -Version: 2020.7 +Version: 2021.1 Release: 0 Summary: API and commands for processing SPIR-V modules License: Apache-2.0 @@ -37,7 +37,7 @@ BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: python3-base BuildRequires: python3-xml -BuildRequires: spirv-headers >= 1.5.3.g32 +BuildRequires: spirv-headers >= 1.5.4.g48 %description The package includes an assembler, binary module parser, diff --git a/v2020.7.tar.gz b/v2020.7.tar.gz deleted file mode 100644 index 2f13257..0000000 --- a/v2020.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c06eed1c7a1018b232768481184b5ae4d91d614d7bd7358dc2fe306bd0a39c6e -size 2585866 diff --git a/v2021.1.tar.gz b/v2021.1.tar.gz new file mode 100644 index 0000000..1d79e47 --- /dev/null +++ b/v2021.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd42f6d766ac50f1a1ab46ce96d59e24ab28fb9779a71fccfa8bad760842c274 +size 2608588 diff --git a/ver.diff b/ver.diff index 82b8895..0bb90ec 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 suse20) ++set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES SOVERSION suse21) 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 suse20) ++ set_target_properties(${SPIRV_TOOLS}-static PROPERTIES SOVERSION suse21) # 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 suse20) ++ set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse21) 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 suse20) ++ set_target_properties(SPIRV-Tools-fuzz PROPERTIES SOVERSION suse21) 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 suse20) ++set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse21) 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 suse20) ++set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse21) 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 suse20) ++set_target_properties(SPIRV-Tools-reduce PROPERTIES SOVERSION suse21) # The reducer reuses a lot of functionality from the SPIRV-Tools library. target_link_libraries(SPIRV-Tools-reduce PUBLIC ${SPIRV_TOOLS_FULL_VISIBILITY}