diff --git a/gccwarn.diff b/gccwarn.diff new file mode 100644 index 0000000..e2b3b45 --- /dev/null +++ b/gccwarn.diff @@ -0,0 +1,22 @@ +From: Jan Engelhardt +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 new file mode 100644 index 0000000..1e02355 --- /dev/null +++ b/glslang-3.0.g1077.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f91c04ea12b343e87a466abba9abfe09ac9619519ccb77accd9faebe9468767 +size 959920 diff --git a/glslang-3.0.g900.tar.xz b/glslang-3.0.g900.tar.xz deleted file mode 100644 index e20ae81..0000000 --- a/glslang-3.0.g900.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:91248da5bff319731727e9ca7d651c0c0080f2a84b5ee2f13e5d3bdbc04b32d6 -size 897292 diff --git a/glslang.changes b/glslang.changes index 4ec22bb..54923a1 100644 --- a/glslang.changes +++ b/glslang.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sat Feb 4 23:45:26 UTC 2017 - jengelh@inai.de + +- Update to 3.0.g1077 + * Support SPV_NV_viewport_array2 and SPV_NV_stereo_view_rendering + * Implement SPV_KHR_subgroup_vote + * Add EOpD3DCOLORtoUBYTE4 decomposition + * Add support for SPV_NV_geometry_shader_passthrough and + SPV_NV_sample_mask_override_coverage + * Add UAV (image) binding offset and HLSL register support +- Add gccwarn.diff + ------------------------------------------------------------------- Mon Oct 31 22:28:28 UTC 2016 - jengelh@inai.de diff --git a/glslang.spec b/glslang.spec index 495e105..e610a80 100644 --- a/glslang.spec +++ b/glslang.spec @@ -1,7 +1,7 @@ # # spec file for package glslang # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,10 +16,10 @@ # -%define version_unconverted 3.0.g900 +%define version_unconverted 3.0.g1077 Name: glslang -Version: 3.0.g900 +Version: 3.0.g1077 Release: 0 Summary: OpenGL and OpenGL ES shader front end and validator License: BSD-3-Clause @@ -27,6 +27,7 @@ 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 @@ -56,6 +57,7 @@ compressor's dictionary can find better cross module commonality. %prep %setup -q +%patch -P 1 -p1 %build %cmake