From 259f94e7fa07fa29eb8f9a6646064dfe2f6fe255e0cb379aa3c12694b9b24ec5 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 13 Aug 2020 08:21:26 +0000
Subject: [PATCH] - Update to release 2020.4

OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-tools?expand=0&rev=55
---
 spirv-tools.changes |  8 ++++++++
 spirv-tools.spec    |  4 ++--
 v2020.3.tar.gz      |  3 ---
 v2020.4.tar.gz      |  3 +++
 ver.diff            | 12 ++++++------
 5 files changed, 19 insertions(+), 11 deletions(-)
 delete mode 100644 v2020.3.tar.gz
 create mode 100644 v2020.4.tar.gz

diff --git a/spirv-tools.changes b/spirv-tools.changes
index c152acb..d6f5980 100644
--- a/spirv-tools.changes
+++ b/spirv-tools.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Aug 11 22:43:40 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 2020.4
+   * Memory model support for SPIR-V 1.4
+   * Add new spirv-fuzz tool
+   * Instrument: Add version 2 of record formats
+
 -------------------------------------------------------------------
 Fri May 29 17:21:04 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/spirv-tools.spec b/spirv-tools.spec
index 5741f7a..4c588f3 100644
--- a/spirv-tools.spec
+++ b/spirv-tools.spec
@@ -19,7 +19,7 @@
 %define lname libSPIRV-Tools-suse18
 
 Name:           spirv-tools
-Version:        2020.3
+Version:        2020.4
 Release:        0
 Summary:        API and commands for processing SPIR-V modules
 License:        Apache-2.0
@@ -36,7 +36,7 @@ BuildRequires:  gcc-c++
 BuildRequires:  pkg-config
 BuildRequires:  python3-base
 BuildRequires:  python3-xml
-BuildRequires:  spirv-headers >= 1.5.1.corrected+git24
+BuildRequires:  spirv-headers >= 1.5.3.g18
 
 %description
 The package includes an assembler, binary module parser,
diff --git a/v2020.3.tar.gz b/v2020.3.tar.gz
deleted file mode 100644
index c23cc43..0000000
--- a/v2020.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8b538a1cb2a4275ef9617abcb047d54e8292f975ac1d93323d5dd1e19c85280b
-size 2170858
diff --git a/v2020.4.tar.gz b/v2020.4.tar.gz
new file mode 100644
index 0000000..6641dd7
--- /dev/null
+++ b/v2020.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d6377d2febe831eb78e84593a10d242a4fd52cb12174133151cb48801abdc6d2
+size 2282982
diff --git a/ver.diff b/ver.diff
index 9c85c02..a597f91 100644
--- a/ver.diff
+++ b/ver.diff
@@ -19,7 +19,7 @@ Index: spirv-tools-2019.5~git157/source/CMakeLists.txt
  spvtools_pch(SPIRV_SOURCES pch_source)
  
  add_library(${SPIRV_TOOLS} ${SPIRV_SOURCES})
-+set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse17)
++set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse18)
  spvtools_default_compile_options(${SPIRV_TOOLS})
  target_include_directories(${SPIRV_TOOLS}
    PUBLIC
@@ -27,7 +27,7 @@ Index: spirv-tools-2019.5~git157/source/CMakeLists.txt
  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 suse17)
++set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES SOVERSION suse18)
  spvtools_default_compile_options(${SPIRV_TOOLS}-shared)
  target_include_directories(${SPIRV_TOOLS}-shared
    PUBLIC
@@ -39,7 +39,7 @@ Index: spirv-tools-2019.5~git157/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 suse17)
++  set_target_properties(SPIRV-Tools-fuzz PROPERTIES SOVERSION suse18)
  
    spvtools_default_compile_options(SPIRV-Tools-fuzz)
    target_compile_definitions(SPIRV-Tools-fuzz PUBLIC -DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_USE_UNALIGNED=0)
@@ -51,7 +51,7 @@ Index: spirv-tools-2019.5~git157/source/link/CMakeLists.txt
  add_library(SPIRV-Tools-link
    linker.cpp
  )
-+set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse17)
++set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse18)
  
  spvtools_default_compile_options(SPIRV-Tools-link)
  target_include_directories(SPIRV-Tools-link
@@ -63,7 +63,7 @@ Index: spirv-tools-2019.5~git157/source/opt/CMakeLists.txt
  
  add_library(SPIRV-Tools-opt ${SPIRV_TOOLS_OPT_SOURCES})
  
-+set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse17)
++set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse18)
  spvtools_default_compile_options(SPIRV-Tools-opt)
  target_include_directories(SPIRV-Tools-opt
    PUBLIC
@@ -75,7 +75,7 @@ Index: spirv-tools-2019.5~git157/source/reduce/CMakeLists.txt
  	$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
    PRIVATE ${spirv-tools_BINARY_DIR}
  )
-+set_target_properties(SPIRV-Tools-reduce PROPERTIES SOVERSION suse17)
++set_target_properties(SPIRV-Tools-reduce PROPERTIES SOVERSION suse18)
  # The reducer reuses a lot of functionality from the SPIRV-Tools library.
  target_link_libraries(SPIRV-Tools-reduce
    PUBLIC ${SPIRV_TOOLS}