From e36c64fef09312473e432fcd07ab81581eba9f9301120996263e2449cabe356d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 17 Nov 2017 13:56:14 +0000 Subject: [PATCH] - Update to new snapshot 2017.0.g103 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-tools?expand=0&rev=15 --- _service | 4 +-- baselibs.conf | 2 +- spirv-tools-2016.7~g154.tar.xz | 3 -- spirv-tools-2017.0.g103.tar.xz | 3 ++ spirv-tools.changes | 10 +++++++ spirv-tools.spec | 12 ++++---- ver.diff | 51 +++++++++++++++++++++------------- 7 files changed, 55 insertions(+), 30 deletions(-) delete mode 100644 spirv-tools-2016.7~g154.tar.xz create mode 100644 spirv-tools-2017.0.g103.tar.xz diff --git a/_service b/_service index a9cd35e..c9c97ac 100644 --- a/_service +++ b/_service @@ -3,8 +3,8 @@ git https://github.com/KhronosGroup/SPIRV-Tools spirv-tools - 68c5f0436f1d4f1f137e608780190865d0b193ca - 2016.7~g@TAG_OFFSET@ + d16403a + 2017.0.g@TAG_OFFSET@ *.tar diff --git a/baselibs.conf b/baselibs.conf index c65be78..1cd1183 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libSPIRV-Tools-suse3 +libSPIRV-Tools-suse4 diff --git a/spirv-tools-2016.7~g154.tar.xz b/spirv-tools-2016.7~g154.tar.xz deleted file mode 100644 index af9d624..0000000 --- a/spirv-tools-2016.7~g154.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:72cfa99edb8b069fb56c736e5fc9c5d580cda66bf7fc0f38b8ee51e1ac511982 -size 389740 diff --git a/spirv-tools-2017.0.g103.tar.xz b/spirv-tools-2017.0.g103.tar.xz new file mode 100644 index 0000000..7dfb3c9 --- /dev/null +++ b/spirv-tools-2017.0.g103.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b5a0442de1979b02c6dc7631eea60baaba70614561d99df1afe31085886eda6 +size 508352 diff --git a/spirv-tools.changes b/spirv-tools.changes index 7e91d18..5ebd7eb 100644 --- a/spirv-tools.changes +++ b/spirv-tools.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Nov 17 13:32:51 UTC 2017 - jengelh@inai.de + +- Update to new snapshot 2017.0.g103 + * Update MARK-V to version 1.01 + * Add new checks to validate arithmetics pass + * Recognize SPV_AMD_shader_fragment_mask + * Add validate logicals pass to the validator + * Detach MARK-V from the validator + ------------------------------------------------------------------- Tue Jul 18 09:01:25 UTC 2017 - jengelh@inai.de diff --git a/spirv-tools.spec b/spirv-tools.spec index 84be379..eba55bb 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -16,11 +16,11 @@ # -%define version_unconverted 2016.7~g154 -%define lname libSPIRV-Tools-suse3 +%define version_unconverted 2017.0.g103 +%define lname libSPIRV-Tools-suse4 Name: spirv-tools -Version: 2016.7~g154 +Version: 2017.0.g103 Release: 0 Summary: API and commands for processing SPIR-V modules License: Apache-2.0 @@ -38,7 +38,7 @@ BuildRequires: gcc-c++ BuildRequires: python BuildRequires: python-xml BuildRequires: python3 -BuildRequires: spirv-headers +BuildRequires: spirv-headers >= 1.2 %description The package includes an assembler, binary module parser, @@ -70,7 +70,7 @@ integration into other code bases directly. %patch -P 1 -P 2 -p1 %build -%cmake -D"SPIRV-Headers_SOURCE_DIR=%_prefix" +%cmake -D"SPIRV-Headers_SOURCE_DIR=%_prefix" -DSPIRV_BUILD_COMPRESSION=BOOL:ON make %{?_smp_mflags} %install @@ -89,12 +89,14 @@ b="%buildroot" %defattr(-,root,root) %_libdir/libSPIRV-Tools.so.* %_libdir/libSPIRV-Tools-comp.so.* +%_libdir/libSPIRV-Tools-link.so.* %_libdir/libSPIRV-Tools-opt.so.* %files devel %defattr(-,root,root) %_libdir/libSPIRV-Tools.so %_libdir/libSPIRV-Tools-comp.so +%_libdir/libSPIRV-Tools-link.so %_libdir/libSPIRV-Tools-opt.so %_includedir/spirv-tools/ diff --git a/ver.diff b/ver.diff index 045846d..9227410 100644 --- a/ver.diff +++ b/ver.diff @@ -6,14 +6,15 @@ Unversioned libraries suck! --- source/CMakeLists.txt | 1 + source/comp/CMakeLists.txt | 1 + + source/link/CMakeLists.txt | 1 + source/opt/CMakeLists.txt | 1 + - 3 files changed, 3 insertions(+) + 4 files changed, 4 insertions(+) -Index: spirv-tools-2016.7~g154/source/CMakeLists.txt +Index: spirv-tools-2017.0.g103/source/CMakeLists.txt =================================================================== ---- spirv-tools-2016.7~g154.orig/source/CMakeLists.txt -+++ spirv-tools-2016.7~g154/source/CMakeLists.txt -@@ -281,6 +281,7 @@ set_source_files_properties( +--- spirv-tools-2017.0.g103.orig/source/CMakeLists.txt ++++ spirv-tools-2017.0.g103/source/CMakeLists.txt +@@ -288,6 +288,7 @@ set_source_files_properties( PROPERTIES OBJECT_DEPENDS "${SPIRV_TOOLS_BUILD_VERSION_INC}") add_library(${SPIRV_TOOLS} ${SPIRV_SOURCES}) @@ -21,24 +22,36 @@ Index: spirv-tools-2016.7~g154/source/CMakeLists.txt spvtools_default_compile_options(${SPIRV_TOOLS}) target_include_directories(${SPIRV_TOOLS} PUBLIC ${spirv-tools_SOURCE_DIR}/include -Index: spirv-tools-2016.7~g154/source/comp/CMakeLists.txt +Index: spirv-tools-2017.0.g103/source/comp/CMakeLists.txt =================================================================== ---- spirv-tools-2016.7~g154.orig/source/comp/CMakeLists.txt -+++ spirv-tools-2016.7~g154/source/comp/CMakeLists.txt -@@ -13,6 +13,7 @@ - # limitations under the License. +--- spirv-tools-2017.0.g103.orig/source/comp/CMakeLists.txt ++++ spirv-tools-2017.0.g103/source/comp/CMakeLists.txt +@@ -14,6 +14,7 @@ - add_library(SPIRV-Tools-comp markv_codec.cpp) -+set_target_properties(SPIRV-Tools-comp PROPERTIES SOVERSION suse3) + if(SPIRV_BUILD_COMPRESSION) + add_library(SPIRV-Tools-comp markv_codec.cpp) ++ set_target_properties(SPIRV-Tools-comp PROPERTIES SOVERSION suse4) - spvtools_default_compile_options(SPIRV-Tools-comp) - target_include_directories(SPIRV-Tools-comp -Index: spirv-tools-2016.7~g154/source/opt/CMakeLists.txt + spvtools_default_compile_options(SPIRV-Tools-comp) + target_include_directories(SPIRV-Tools-comp +Index: spirv-tools-2017.0.g103/source/link/CMakeLists.txt =================================================================== ---- spirv-tools-2016.7~g154.orig/source/opt/CMakeLists.txt -+++ spirv-tools-2016.7~g154/source/opt/CMakeLists.txt -@@ -82,6 +82,7 @@ add_library(SPIRV-Tools-opt - unify_const_pass.cpp +--- spirv-tools-2017.0.g103.orig/source/link/CMakeLists.txt ++++ spirv-tools-2017.0.g103/source/link/CMakeLists.txt +@@ -14,6 +14,7 @@ + add_library(SPIRV-Tools-link + linker.cpp + ) ++set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse4) + + spvtools_default_compile_options(SPIRV-Tools-link) + target_include_directories(SPIRV-Tools-link +Index: spirv-tools-2017.0.g103/source/opt/CMakeLists.txt +=================================================================== +--- spirv-tools-2017.0.g103.orig/source/opt/CMakeLists.txt ++++ spirv-tools-2017.0.g103/source/opt/CMakeLists.txt +@@ -106,6 +106,7 @@ add_library(SPIRV-Tools-opt + instruction_list.cpp ) +set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse3)