diff --git a/_service b/_service
index ce77fb6..3810b06 100644
--- a/_service
+++ b/_service
@@ -3,9 +3,9 @@
git
https://github.com/KhronosGroup/SPIRV-Tools
spirv-tools
- v2018.2
- v2018.2
- 2018.2
+ v2018.4
+ v2018.4
+ 2018.4.g@TAG_OFFSET@
*.tar
diff --git a/baselibs.conf b/baselibs.conf
index ce8b5bd..8b6b4b9 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,2 +1,2 @@
-libSPIRV-Tools-suse6
+libSPIRV-Tools-suse7
spirv-tools-devel
diff --git a/gcc48.diff b/gcc48.diff
index 3e8a47c..8bc935c 100644
--- a/gcc48.diff
+++ b/gcc48.diff
@@ -14,10 +14,10 @@ were ignored.
tools/io.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
-Index: spirv-tools-2016.7~g135/tools/io.h
+Index: spirv-tools-2018.4.g0/tools/io.h
===================================================================
---- spirv-tools-2016.7~g135.orig/tools/io.h
-+++ spirv-tools-2016.7~g135/tools/io.h
+--- spirv-tools-2018.4.g0.orig/tools/io.h
++++ spirv-tools-2018.4.g0/tools/io.h
@@ -38,7 +38,8 @@ bool ReadFile(const char* filename, cons
return false;
}
@@ -25,6 +25,6 @@ Index: spirv-tools-2016.7~g135/tools/io.h
- if (sizeof(T) != 1 && (ftell(fp) % sizeof(T))) {
+ long ftx = ftell(fp);
+ if (sizeof(T) != 1 && ftx % sizeof(T) != 0) {
- fprintf(stderr, "error: corrupted word found in file '%s'\n", filename);
- return false;
- }
+ fprintf(
+ stderr,
+ "error: file size should be a multiple of %zd; file '%s' corrupt\n",
diff --git a/spirv-tools-2018.2.tar.xz b/spirv-tools-2018.2.tar.xz
deleted file mode 100644
index 9097d18..0000000
--- a/spirv-tools-2018.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:288192fc724b92445f87ffdaa35fce2151df2c06ef09ca1a57a7bbfc351c5aab
-size 722924
diff --git a/spirv-tools-2018.4.g0.tar.xz b/spirv-tools-2018.4.g0.tar.xz
new file mode 100644
index 0000000..aaafe75
--- /dev/null
+++ b/spirv-tools-2018.4.g0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f9ef3b163f918543b048a2c0a0f04a4090df1e7080f7db9256a0034ff412d55f
+size 909184
diff --git a/spirv-tools.changes b/spirv-tools.changes
index aef8c27..9a2d80b 100644
--- a/spirv-tools.changes
+++ b/spirv-tools.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Fri Aug 24 19:05:26 UTC 2018 - jengelh@inai.de
+
+- Update to new upstream release 2018.4
+ * Added missing SPV extension strings.
+ * Taught DecorationManager about OpDecorateStringGOOGLE.
+ * Added recent Google extensions to optimizer whitelists.
+ * Added a loop peeling utility.
+ * Added Vulkan validation rules for BuiltIn variables and
+ Vulkan specific atomic result type restriction.
+ * New spirv-1.3 rules for control barrier.
+ * Added OpPhi validation rules.
+ * Use standard SPIR-V version scheme for version requirement.
+ * ZIV and SIV loop dependence analysis.
+ * Added a loop peeling pass, register liveness analysis,
+ a loop fusion pass, and the --strip-reflect pass.
+ * Support for SPV_KHR_8bit_storage.
+
-------------------------------------------------------------------
Wed Mar 28 10:20:48 UTC 2018 - meissner@suse.com
diff --git a/spirv-tools.spec b/spirv-tools.spec
index 588737a..2980280 100644
--- a/spirv-tools.spec
+++ b/spirv-tools.spec
@@ -16,11 +16,11 @@
#
-%define version_unconverted 2018.2
-%define lname libSPIRV-Tools-suse6
+%define version_unconverted 2018.4.g0
+%define lname libSPIRV-Tools-suse7
Name: spirv-tools
-Version: 2018.2
+Version: 2018.4.g0
Release: 0
Summary: API and commands for processing SPIR-V modules
License: Apache-2.0
diff --git a/ver.diff b/ver.diff
index 57dc768..60776af 100644
--- a/ver.diff
+++ b/ver.diff
@@ -18,7 +18,7 @@ Index: spirv-tools-2018.2/source/CMakeLists.txt
PROPERTIES OBJECT_DEPENDS "${SPIRV_TOOLS_BUILD_VERSION_INC}")
add_library(${SPIRV_TOOLS} ${SPIRV_SOURCES})
-+set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse6)
++set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse7)
spvtools_default_compile_options(${SPIRV_TOOLS})
target_include_directories(${SPIRV_TOOLS}
PUBLIC ${spirv-tools_SOURCE_DIR}/include
@@ -26,7 +26,7 @@ Index: spirv-tools-2018.2/source/CMakeLists.txt
spvtools_check_symbol_exports(${SPIRV_TOOLS})
add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES})
-+set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES SOVERSION suse6)
++set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES SOVERSION suse7)
spvtools_default_compile_options(${SPIRV_TOOLS}-shared)
target_include_directories(${SPIRV_TOOLS}-shared
PUBLIC ${spirv-tools_SOURCE_DIR}/include
@@ -38,7 +38,7 @@ Index: spirv-tools-2018.2/source/comp/CMakeLists.txt
if(SPIRV_BUILD_COMPRESSION)
add_library(SPIRV-Tools-comp markv_codec.cpp)
-+ set_target_properties(SPIRV-Tools-comp PROPERTIES SOVERSION suse6)
++ set_target_properties(SPIRV-Tools-comp PROPERTIES SOVERSION suse7)
spvtools_default_compile_options(SPIRV-Tools-comp)
target_include_directories(SPIRV-Tools-comp
@@ -50,7 +50,7 @@ Index: spirv-tools-2018.2/source/link/CMakeLists.txt
add_library(SPIRV-Tools-link
linker.cpp
)
-+set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse6)
++set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse7)
spvtools_default_compile_options(SPIRV-Tools-link)
target_include_directories(SPIRV-Tools-link
@@ -62,7 +62,7 @@ Index: spirv-tools-2018.2/source/opt/CMakeLists.txt
workaround1209.cpp
)
-+set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse6)
++set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse7)
spvtools_default_compile_options(SPIRV-Tools-opt)
target_include_directories(SPIRV-Tools-opt
PUBLIC ${spirv-tools_SOURCE_DIR}/include