diff --git a/_service b/_service index 3467264..4d70481 100644 --- a/_service +++ b/_service @@ -3,9 +3,9 @@ git https://github.com/KhronosGroup/SPIRV-Tools spirv-tools - v2018.6 - v2018.6 - 2018.6.g@TAG_OFFSET@ + v2019.1 + v2019.1 + 2019.1 *.tar diff --git a/baselibs.conf b/baselibs.conf index e97dc51..18cc9eb 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,4 @@ -libSPIRV-Tools-suse8 +libSPIRV-Tools-suse9 spirv-tools-devel + requires -spirv-tools- + requires "libSPIRV-Tools-suse9- = " diff --git a/spirv-tools-2018.6.g0.tar.xz b/spirv-tools-2018.6.g0.tar.xz deleted file mode 100644 index cebab4d..0000000 --- a/spirv-tools-2018.6.g0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d103d6f25eb55b3500a7679d342fe9faad4720e6c4baf298510b0f52881fe484 -size 949676 diff --git a/spirv-tools-2019.1.tar.xz b/spirv-tools-2019.1.tar.xz new file mode 100644 index 0000000..4c4d351 --- /dev/null +++ b/spirv-tools-2019.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:582a2cb5592aa56f5456dcff3fac8b3c8ed52d56544e214eaa1ef2e3967abbc1 +size 1019516 diff --git a/spirv-tools.changes b/spirv-tools.changes index b258466..43c8899 100644 --- a/spirv-tools.changes +++ b/spirv-tools.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Jan 7 21:33:03 UTC 2019 - Jan Engelhardt + +- Update to new upstream release 2019.1 + * Created a new tool called spirv-reduce. + * New optimization pass to update the memory model from GLSL450 + to VulkanKHR. + * Recognize OpTypeAccelerationStructureNV as a type instruction + and ray tracing storage classes. + * Add --target-env flag to spirv-opt. + * Add --webgpu-mode flag to run optimizations for webgpu. + * Outupt disassembled line number instead of byte offset in + validation errors. + ------------------------------------------------------------------- Sat Nov 10 12:24:41 UTC 2018 - Jan Engelhardt diff --git a/spirv-tools.spec b/spirv-tools.spec index 657abfc..a3f7770 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -1,7 +1,7 @@ # # spec file for package spirv-tools # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,11 +16,11 @@ # -%define version_unconverted 2018.6.g0 -%define lname libSPIRV-Tools-suse8 +%define version_unconverted 2019.1 +%define lname libSPIRV-Tools-suse9 Name: spirv-tools -Version: 2018.6.g0 +Version: 2019.1 Release: 0 Summary: API and commands for processing SPIR-V modules License: Apache-2.0 @@ -35,9 +35,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: cmake >= 2.8.12 BuildRequires: gcc-c++ +BuildRequires: pkg-config BuildRequires: python3-base BuildRequires: python3-xml -BuildRequires: spirv-headers >= 1.3.g44 +BuildRequires: spirv-headers >= 1.3.g60 %description The package includes an assembler, binary module parser, @@ -87,6 +88,7 @@ make %{?_smp_mflags} %_libdir/libSPIRV-Tools-comp.so.* %_libdir/libSPIRV-Tools-link.so.* %_libdir/libSPIRV-Tools-opt.so.* +%_libdir/libSPIRV-Tools-reduce.so.* %_libdir/libSPIRV-Tools-shared.so.* %files devel @@ -94,6 +96,7 @@ make %{?_smp_mflags} %_libdir/libSPIRV-Tools-comp.so %_libdir/libSPIRV-Tools-link.so %_libdir/libSPIRV-Tools-opt.so +%_libdir/libSPIRV-Tools-reduce.so %_libdir/libSPIRV-Tools-shared.so %_libdir/pkgconfig/SPIRV-Tools.pc %_libdir/pkgconfig/SPIRV-Tools-shared.pc diff --git a/ver.diff b/ver.diff index 592d2fb..5484d1d 100644 --- a/ver.diff +++ b/ver.diff @@ -4,65 +4,78 @@ Date: 2016-06-13 11:46:16.846841814 +0200 Unversioned libraries suck! --- - source/CMakeLists.txt | 2 ++ - source/comp/CMakeLists.txt | 1 + - source/link/CMakeLists.txt | 1 + - source/opt/CMakeLists.txt | 1 + - 4 files changed, 5 insertions(+) + source/CMakeLists.txt | 2 ++ + source/comp/CMakeLists.txt | 1 + + source/link/CMakeLists.txt | 1 + + source/opt/CMakeLists.txt | 1 + + source/reduce/CMakeLists.txt | 1 + + 5 files changed, 6 insertions(+) -Index: spirv-tools-2018.6.g0/source/CMakeLists.txt +Index: spirv-tools-2019.1/source/CMakeLists.txt =================================================================== ---- spirv-tools-2018.6.g0.orig/source/CMakeLists.txt -+++ spirv-tools-2018.6.g0/source/CMakeLists.txt -@@ -348,6 +348,7 @@ set_source_files_properties( +--- spirv-tools-2019.1.orig/source/CMakeLists.txt ++++ spirv-tools-2019.1/source/CMakeLists.txt +@@ -335,6 +335,7 @@ set_source_files_properties( spvtools_pch(SPIRV_SOURCES pch_source) add_library(${SPIRV_TOOLS} ${SPIRV_SOURCES}) -+set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse8) ++set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse9) spvtools_default_compile_options(${SPIRV_TOOLS}) target_include_directories(${SPIRV_TOOLS} PUBLIC ${spirv-tools_SOURCE_DIR}/include -@@ -358,6 +359,7 @@ set_property(TARGET ${SPIRV_TOOLS} PROPE - spvtools_check_symbol_exports(${SPIRV_TOOLS}) +@@ -346,6 +347,7 @@ spvtools_check_symbol_exports(${SPIRV_TO + add_dependencies( ${SPIRV_TOOLS} core_tables enum_string_mapping extinst_tables ) add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES}) -+set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES SOVERSION suse8) ++set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES SOVERSION suse9) spvtools_default_compile_options(${SPIRV_TOOLS}-shared) target_include_directories(${SPIRV_TOOLS}-shared PUBLIC ${spirv-tools_SOURCE_DIR}/include -Index: spirv-tools-2018.6.g0/source/comp/CMakeLists.txt +Index: spirv-tools-2019.1/source/comp/CMakeLists.txt =================================================================== ---- spirv-tools-2018.6.g0.orig/source/comp/CMakeLists.txt -+++ spirv-tools-2018.6.g0/source/comp/CMakeLists.txt +--- spirv-tools-2019.1.orig/source/comp/CMakeLists.txt ++++ spirv-tools-2019.1/source/comp/CMakeLists.txt @@ -29,6 +29,7 @@ if(SPIRV_BUILD_COMPRESSION) move_to_front.h move_to_front.cpp) -+ set_target_properties(SPIRV-Tools-comp PROPERTIES SOVERSION suse8) ++ set_target_properties(SPIRV-Tools-comp PROPERTIES SOVERSION suse9) spvtools_default_compile_options(SPIRV-Tools-comp) target_include_directories(SPIRV-Tools-comp PUBLIC ${spirv-tools_SOURCE_DIR}/include -Index: spirv-tools-2018.6.g0/source/link/CMakeLists.txt +Index: spirv-tools-2019.1/source/link/CMakeLists.txt =================================================================== ---- spirv-tools-2018.6.g0.orig/source/link/CMakeLists.txt -+++ spirv-tools-2018.6.g0/source/link/CMakeLists.txt +--- spirv-tools-2019.1.orig/source/link/CMakeLists.txt ++++ spirv-tools-2019.1/source/link/CMakeLists.txt @@ -14,6 +14,7 @@ add_library(SPIRV-Tools-link linker.cpp ) -+set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse8) ++set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse9) spvtools_default_compile_options(SPIRV-Tools-link) target_include_directories(SPIRV-Tools-link -Index: spirv-tools-2018.6.g0/source/opt/CMakeLists.txt +Index: spirv-tools-2019.1/source/opt/CMakeLists.txt =================================================================== ---- spirv-tools-2018.6.g0.orig/source/opt/CMakeLists.txt -+++ spirv-tools-2018.6.g0/source/opt/CMakeLists.txt -@@ -194,6 +194,7 @@ spvtools_pch(SPIRV_TOOLS_OPT_SOURCES pch +--- spirv-tools-2019.1.orig/source/opt/CMakeLists.txt ++++ spirv-tools-2019.1/source/opt/CMakeLists.txt +@@ -202,6 +202,7 @@ spvtools_pch(SPIRV_TOOLS_OPT_SOURCES pch add_library(SPIRV-Tools-opt ${SPIRV_TOOLS_OPT_SOURCES}) -+set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse8) ++set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse9) spvtools_default_compile_options(SPIRV-Tools-opt) target_include_directories(SPIRV-Tools-opt PUBLIC ${spirv-tools_SOURCE_DIR}/include +Index: spirv-tools-2019.1/source/reduce/CMakeLists.txt +=================================================================== +--- spirv-tools-2019.1.orig/source/reduce/CMakeLists.txt ++++ spirv-tools-2019.1/source/reduce/CMakeLists.txt +@@ -58,6 +58,7 @@ target_include_directories(SPIRV-Tools-r + PUBLIC ${SPIRV_HEADER_INCLUDE_DIR} + PRIVATE ${spirv-tools_BINARY_DIR} + ) ++set_target_properties(SPIRV-Tools-reduce PROPERTIES SOVERSION suse9) + # The reducer reuses a lot of functionality from the SPIRV-Tools library. + target_link_libraries(SPIRV-Tools-reduce + PUBLIC ${SPIRV_TOOLS}