Accepting request 663459 from X11:Wayland

- Update to new upstream release 2019.1 OBS-URL: https://build.opensuse.org/request/show/663459 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/spirv-tools?expand=0&rev=12
2019-01-15 12:14:11 +00:00 · 2019-01-15 12:14:11 +00:00 · 9880bf6313
commit 9880bf6313
parent 55467e61ef 44b9df5781
7 changed files with 70 additions and 38 deletions
--- a/6
+++ b/6
@ -3,9 +3,9 @@
 		<param name="scm">git</param>
 		<param name="url">https://github.com/KhronosGroup/SPIRV-Tools</param>
 		<param name="filename">spirv-tools</param>
-		<param name="revision">v2018.6</param>
-		<param name="parent-tag">v2018.6</param>
-		<param name="versionformat">2018.6.g@TAG_OFFSET@</param>
+		<param name="revision">v2019.1</param>
+		<param name="parent-tag">v2019.1</param>
+		<param name="versionformat">2019.1</param>
 	</service>
 	<service name="recompress" mode="disabled">
 		<param name="file">*.tar</param>
--- a/baselibs.conf
+++ b/baselibs.conf
@ -1,2 +1,4 @@
-libSPIRV-Tools-suse8
+libSPIRV-Tools-suse9
 spirv-tools-devel
+	requires -spirv-tools-<targettype>
+	requires "libSPIRV-Tools-suse9-<targettype> = <version>"
--- a/spirv-tools-2018.6.g0.tar.xz
+++ b/spirv-tools-2018.6.g0.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d103d6f25eb55b3500a7679d342fe9faad4720e6c4baf298510b0f52881fe484
-size 949676
--- a/spirv-tools-2019.1.tar.xz
+++ b/spirv-tools-2019.1.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:582a2cb5592aa56f5456dcff3fac8b3c8ed52d56544e214eaa1ef2e3967abbc1
+size 1019516
--- a/spirv-tools.changes
+++ b/spirv-tools.changes
@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Jan  7 21:33:03 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
+
+- 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 <jengelh@inai.de>

--- 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
--- 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}