From 155eeea44cffee655e9348adb7f3ccdf8e87c0c8de29d9dfacfea5e88aa4a5fe Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 20 Feb 2017 15:44:47 +0000
Subject: [PATCH 1/2] - Update to 3.0.g1115

OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=20
---
 gccwarn.diff             | 22 ----------------------
 glslang-3.0.g1077.tar.xz |  3 ---
 glslang-3.0.g1115.tar.xz |  3 +++
 glslang.changes          | 10 ++++++++++
 glslang.spec             |  4 ++--
 5 files changed, 15 insertions(+), 27 deletions(-)
 delete mode 100644 gccwarn.diff
 delete mode 100644 glslang-3.0.g1077.tar.xz
 create mode 100644 glslang-3.0.g1115.tar.xz

diff --git a/gccwarn.diff b/gccwarn.diff
deleted file mode 100644
index e2b3b45..0000000
--- a/gccwarn.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-Date: 2017-02-05 00:54:29.893127773 +0100
-
-hlslGrammar.cpp:2333:44: warning: no return statement in function
-returning non-void [-Wreturn-type]
-   tFinalize& operator=(tFinalize&) { }
-
-References: https://github.com/KhronosGroup/glslang/issues/718
-
-diff --git a/hlsl/hlslGrammar.cpp b/hlsl/hlslGrammar.cpp
-index 6c204137..bbb96f97 100755
---- a/hlsl/hlslGrammar.cpp
-+++ b/hlsl/hlslGrammar.cpp
-@@ -2330,7 +2330,7 @@ bool HlslGrammar::acceptPostfixExpression(TIntermTyped*& node)
-         ~tFinalize() { parseContext.finalizeFlattening(); }
-        HlslParseContext& parseContext;
-     private:
--        tFinalize& operator=(tFinalize&) { }
-+        tFinalize &operator=(tFinalize &) { return *this; }
-     } finalize(parseContext);
- 
-     // Initialize the flattening accumulation data, so we can track data across multiple bracket or
diff --git a/glslang-3.0.g1077.tar.xz b/glslang-3.0.g1077.tar.xz
deleted file mode 100644
index 1e02355..0000000
--- a/glslang-3.0.g1077.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0f91c04ea12b343e87a466abba9abfe09ac9619519ccb77accd9faebe9468767
-size 959920
diff --git a/glslang-3.0.g1115.tar.xz b/glslang-3.0.g1115.tar.xz
new file mode 100644
index 0000000..2541ebb
--- /dev/null
+++ b/glslang-3.0.g1115.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:71d9e0616315e920a0f991cd2d819c808c071e69bc1fc4b6036284ef99a9b3d4
+size 981552
diff --git a/glslang.changes b/glslang.changes
index 54923a1..9e3ee57 100644
--- a/glslang.changes
+++ b/glslang.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Feb 20 15:12:17 UTC 2017 - jengelh@inai.de
+
+- Update to 3.0.g1115
+  * Added --vn option to generate a C header file containing a
+    variable assigned to the hex representation of the shader.
+  * HLSL: Type sanitization: create non-IO types for var decl and
+    fn param/ret.
+- Drop gccwarn.diff (resolved upstream)
+
 -------------------------------------------------------------------
 Sat Feb  4 23:45:26 UTC 2017 - jengelh@inai.de
 
diff --git a/glslang.spec b/glslang.spec
index e610a80..68d6499 100644
--- a/glslang.spec
+++ b/glslang.spec
@@ -16,10 +16,10 @@
 #
 
 
-%define version_unconverted 3.0.g1077
+%define version_unconverted 3.0.g1115
 
 Name:           glslang
-Version:        3.0.g1077
+Version:        3.0.g1115
 Release:        0
 Summary:        OpenGL and OpenGL ES shader front end and validator
 License:        BSD-3-Clause

From a849a0a558109d7a30fe644e35b03fbbfb12d769a20a12ad50db1ad815370f66 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 20 Feb 2017 16:29:58 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=21

---
 glslang.spec | 2 --
 1 file changed, 2 deletions(-)

diff --git a/glslang.spec b/glslang.spec
index 68d6499..9934ef7 100644
--- a/glslang.spec
+++ b/glslang.spec
@@ -27,7 +27,6 @@ Group:          Development/Libraries/C and C++
 Url:            https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/
 
 Source:         %name-%version.tar.xz
-Patch1:         gccwarn.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  bison
 BuildRequires:  cmake >= 2.8
@@ -57,7 +56,6 @@ compressor's dictionary can find better cross module commonality.
 
 %prep
 %setup -q
-%patch -P 1 -p1
 
 %build
 %cmake