- Update to new snapshot 2019.4~git33

OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-tools?expand=0&rev=37
2019-06-04 13:30:47 +00:00 · 2019-06-04 13:30:47 +00:00 · 5937675390
commit 5937675390
parent 97f85d7a37
7 changed files with 54 additions and 46 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">2ac348b5</param>
-		<param name="parent-tag">61dfd8492b6e324f684863ecbd79c299a06e6517</param>
-		<param name="versionformat">2019.2.git@TAG_OFFSET@</param>
+		<param name="revision">2c0111e6eba779cf30e8c7f5a733ea0762895ba0</param>
+		<param name="parent-tag">84aa4946edb7e9b50d9625e2288ecf3e0ddf9327</param>
+		<param name="versionformat">2019.4~git@TAG_OFFSET@</param>
 	</service>
 	<service name="recompress" mode="disabled">
 		<param name="file">*.tar</param>
--- a/baselibs.conf
+++ b/baselibs.conf
@ -1,4 +1,4 @@
-libSPIRV-Tools-suse11
+libSPIRV-Tools-suse12
 spirv-tools-devel
 	requires -spirv-tools-<targettype>
-	requires "libSPIRV-Tools-suse11-<targettype> = <version>"
+	requires "libSPIRV-Tools-suse12-<targettype> = <version>"
--- a/spirv-tools-2019.2.git25.tar.xz
+++ b/spirv-tools-2019.2.git25.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:65cb75a277b913596e9bdafccb90b177e8a5836265b524ff47170190c62d588a
-size 1057564
--- a/spirv-tools-2019.4~git33.tar.xz
+++ b/spirv-tools-2019.4~git33.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:289010824cf954659996e5c6af675f901a11a1126dc3a02e4a43e288fe5e6886
+size 1041040
--- a/spirv-tools.changes
+++ b/spirv-tools.changes
@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Jun  4 12:23:07 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to new snapshot 2019.4~git33
+  * Support SPIR-V 1.4
+  * Add library for spirv-fuzz
+  * Add spirv-fuzz tool.
+  * Add "split block" transformation.
+  * Add validation for SPV_EXT_fragment_shader_interlock
+
 -------------------------------------------------------------------
 Sun Mar 17 13:25:59 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

--- a/spirv-tools.spec
+++ b/spirv-tools.spec
@ -16,11 +16,11 @@
 #


-%define version_unconverted 2019.2.git25
-%define lname libSPIRV-Tools-suse11
+%define version_unconverted 2019.4~git33
+%define lname libSPIRV-Tools-suse12

 Name:           spirv-tools
-Version:        2019.2.git25
+Version:        2019.4~git33
 Release:        0
 Summary:        API and commands for processing SPIR-V modules
 License:        Apache-2.0
@ -70,7 +70,7 @@ integration into other code bases directly.
 %autopatch -p1

 %build
-%cmake -D"SPIRV-Headers_SOURCE_DIR=%_prefix" -DSPIRV_BUILD_COMPRESSION=BOOL:ON
+%cmake -D"SPIRV-Headers_SOURCE_DIR=%_prefix"
 make %{?_smp_mflags}

 %install
@ -85,7 +85,6 @@ make %{?_smp_mflags}

 %files -n %lname
 %_libdir/libSPIRV-Tools.so.*
-%_libdir/libSPIRV-Tools-comp.so.*
 %_libdir/libSPIRV-Tools-link.so.*
 %_libdir/libSPIRV-Tools-opt.so.*
 %_libdir/libSPIRV-Tools-reduce.so.*
@ -93,7 +92,6 @@ make %{?_smp_mflags}

 %files devel
 %_libdir/libSPIRV-Tools.so
-%_libdir/libSPIRV-Tools-comp.so
 %_libdir/libSPIRV-Tools-link.so
 %_libdir/libSPIRV-Tools-opt.so
 %_libdir/libSPIRV-Tools-reduce.so
--- a/ver.diff
+++ b/ver.diff
@ -5,77 +5,77 @@ Unversioned libraries suck!

 ---
 source/CMakeLists.txt        |    2 ++
- source/comp/CMakeLists.txt   |    1 +
+ source/fuzz/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-2019.1/source/CMakeLists.txt
+Index: spirv-tools-2019.4~git33/source/CMakeLists.txt
 ===================================================================
--- spirv-tools-2019.1.orig/source/CMakeLists.txt
-+++ spirv-tools-2019.1/source/CMakeLists.txt
-@@ -335,6 +335,7 @@ set_source_files_properties(
+--- spirv-tools-2019.4~git33.orig/source/CMakeLists.txt
+++ spirv-tools-2019.4~git33/source/CMakeLists.txt
+@@ -336,6 +336,7 @@ set_source_files_properties(
 spvtools_pch(SPIRV_SOURCES pch_source)
 
 add_library(${SPIRV_TOOLS} ${SPIRV_SOURCES})
-+set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse11)
+set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse12)
 spvtools_default_compile_options(${SPIRV_TOOLS})
 target_include_directories(${SPIRV_TOOLS}
   PUBLIC ${spirv-tools_SOURCE_DIR}/include
-@@ -346,6 +347,7 @@ spvtools_check_symbol_exports(${SPIRV_TO
+@@ -347,6 +348,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 suse11)
+set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES SOVERSION suse12)
 spvtools_default_compile_options(${SPIRV_TOOLS}-shared)
 target_include_directories(${SPIRV_TOOLS}-shared
   PUBLIC ${spirv-tools_SOURCE_DIR}/include
-Index: spirv-tools-2019.1/source/comp/CMakeLists.txt
+Index: spirv-tools-2019.4~git33/source/fuzz/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)
+--- spirv-tools-2019.4~git33.orig/source/fuzz/CMakeLists.txt
+++ spirv-tools-2019.4~git33/source/fuzz/CMakeLists.txt
+@@ -62,6 +62,7 @@ if(SPIRV_BUILD_FUZZER)
+   spvtools_pch(SPIRV_TOOLS_FUZZ_SOURCES pch_source_fuzz)
 
-+  set_target_properties(SPIRV-Tools-comp PROPERTIES SOVERSION suse11)
-   spvtools_default_compile_options(SPIRV-Tools-comp)
-   target_include_directories(SPIRV-Tools-comp
-     PUBLIC ${spirv-tools_SOURCE_DIR}/include
-Index: spirv-tools-2019.1/source/link/CMakeLists.txt
+   add_library(SPIRV-Tools-fuzz ${SPIRV_TOOLS_FUZZ_SOURCES})
+  set_target_properties(SPIRV-Tools-fuzz PROPERTIES SOVERSION suse12)
+ 
+   spvtools_default_compile_options(SPIRV-Tools-fuzz)
+   target_compile_definitions(SPIRV-Tools-fuzz PUBLIC -DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_USE_UNALIGNED=0)
+Index: spirv-tools-2019.4~git33/source/link/CMakeLists.txt
 ===================================================================
--- spirv-tools-2019.1.orig/source/link/CMakeLists.txt
-+++ spirv-tools-2019.1/source/link/CMakeLists.txt
+--- spirv-tools-2019.4~git33.orig/source/link/CMakeLists.txt
+++ spirv-tools-2019.4~git33/source/link/CMakeLists.txt
@@ -14,6 +14,7 @@
 add_library(SPIRV-Tools-link
   linker.cpp
 )
-+set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse11)
+set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse12)
 
 spvtools_default_compile_options(SPIRV-Tools-link)
 target_include_directories(SPIRV-Tools-link
-Index: spirv-tools-2019.1/source/opt/CMakeLists.txt
+Index: spirv-tools-2019.4~git33/source/opt/CMakeLists.txt
 ===================================================================
--- 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
+--- spirv-tools-2019.4~git33.orig/source/opt/CMakeLists.txt
+++ spirv-tools-2019.4~git33/source/opt/CMakeLists.txt
+@@ -221,6 +221,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 suse11)
+set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse12)
 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
+Index: spirv-tools-2019.4~git33/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
+--- spirv-tools-2019.4~git33.orig/source/reduce/CMakeLists.txt
+++ spirv-tools-2019.4~git33/source/reduce/CMakeLists.txt
+@@ -83,6 +83,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 suse11)
+set_target_properties(SPIRV-Tools-reduce PROPERTIES SOVERSION suse12)
 # The reducer reuses a lot of functionality from the SPIRV-Tools library.
 target_link_libraries(SPIRV-Tools-reduce
   PUBLIC ${SPIRV_TOOLS}