Accepting request 459293 from X11:Wayland

- Update to 3.0.g1115
- Drop gccwarn.diff (resolved upstream)

OBS-URL: https://build.opensuse.org/request/show/459293
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glslang?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger 2017-03-02 18:27:21 +00:00 committed by Git OBS Bridge
commit 5379356204
5 changed files with 15 additions and 29 deletions

View File

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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0f91c04ea12b343e87a466abba9abfe09ac9619519ccb77accd9faebe9468767
size 959920

3
glslang-3.0.g1115.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:71d9e0616315e920a0f991cd2d819c808c071e69bc1fc4b6036284ef99a9b3d4
size 981552

View File

@ -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 Sat Feb 4 23:45:26 UTC 2017 - jengelh@inai.de

View File

@ -16,10 +16,10 @@
# #
%define version_unconverted 3.0.g1077 %define version_unconverted 3.0.g1115
Name: glslang Name: glslang
Version: 3.0.g1077 Version: 3.0.g1115
Release: 0 Release: 0
Summary: OpenGL and OpenGL ES shader front end and validator Summary: OpenGL and OpenGL ES shader front end and validator
License: BSD-3-Clause License: BSD-3-Clause
@ -27,7 +27,6 @@ Group: Development/Libraries/C and C++
Url: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ Url: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/
Source: %name-%version.tar.xz Source: %name-%version.tar.xz
Patch1: gccwarn.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison BuildRequires: bison
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
@ -57,7 +56,6 @@ compressor's dictionary can find better cross module commonality.
%prep %prep
%setup -q %setup -q
%patch -P 1 -p1
%build %build
%cmake %cmake