From 5ddae9f6165adad7f4e7fd051454360872fca7b0f65028c0474c0471f1071dde Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 7 Aug 2017 18:26:10 +0000 Subject: [PATCH 1/2] - Update to new snapshot 3.0.g1516 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=23 --- glslang-3.0.g1115.tar.xz | 3 --- glslang-3.0.g1516.tar.xz | 3 +++ glslang.changes | 29 +++++++++++++++++++++++++++++ glslang.spec | 11 ++++------- nodate.diff | 17 +++++++++++++++++ 5 files changed, 53 insertions(+), 10 deletions(-) delete mode 100644 glslang-3.0.g1115.tar.xz create mode 100644 glslang-3.0.g1516.tar.xz create mode 100644 nodate.diff diff --git a/glslang-3.0.g1115.tar.xz b/glslang-3.0.g1115.tar.xz deleted file mode 100644 index 2541ebb..0000000 --- a/glslang-3.0.g1115.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:71d9e0616315e920a0f991cd2d819c808c071e69bc1fc4b6036284ef99a9b3d4 -size 981552 diff --git a/glslang-3.0.g1516.tar.xz b/glslang-3.0.g1516.tar.xz new file mode 100644 index 0000000..10cc8a8 --- /dev/null +++ b/glslang-3.0.g1516.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f7ef4ba0a5244f40ada31c27056cc798e3ee6cc8dc7e93f5ad3346990e33fc1 +size 1114000 diff --git a/glslang.changes b/glslang.changes index 9e3ee57..f300db3 100644 --- a/glslang.changes +++ b/glslang.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Mon Aug 7 18:14:24 UTC 2017 - jengelh@inai.de + +- Update to new snapshot 3.0.g1516 + * SPV: Handle nested opaque types as function parameters. + * SPV: Implement new extensions GL_KHX_device_group and + GL_KHX_multiview. + * HLSL: Fix #747: accept 'struct' in front of previously + user-defined type name. + * Rename KHX to EXT to match the released specs. + * PP: Recognize the '::' token, and translate appropriately to + GLSL/HLSL token. + * Added 'GL_core_profile' and 'GL_compatibility_profile' macro + definition to preamble. + * HLSL: Add scoping operator, accept static member functions, + and support calling them. + * HLSL: require tessellation factors to be fixed size arrays + * HLSL: Add namespace grammar and some basic semantics. + * Implement the SPV_KHR_16bit_storage, + GL_AMD_texture_gather_bias_lod, GL_AMD_gpu_shader_int16, + GL_EXT_shadow_samplers, GL_ARB_shader_stencil_export, + GL_OVR_multiview, GL_OVR_multiview2 + SPV_KHR_post_depth_coverage extensions. + * Fix NULL pointer dereference in TParseContext::builtInOpCheck. + * GLSL 4.6: Implement atomic counter ops and + SPV_KHR_shader_atomic_counter_ops. + * GLSL 4.6: Implement draw parameters. + * GLSL 4.6: Implement shader group vote. + ------------------------------------------------------------------- Mon Feb 20 15:12:17 UTC 2017 - jengelh@inai.de diff --git a/glslang.spec b/glslang.spec index 9934ef7..6437828 100644 --- a/glslang.spec +++ b/glslang.spec @@ -16,10 +16,10 @@ # -%define version_unconverted 3.0.g1115 +%define version_unconverted 3.0.g1516 Name: glslang -Version: 3.0.g1115 +Version: 3.0.g1516 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: nodate.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 @@ -64,11 +66,6 @@ make %{?_smp_mflags} %install b="%buildroot" %cmake_install -# So much fail in this source package.. -if test "%_lib" != lib; then - mkdir -p "$b/%_libdir" - mv "$b/%_prefix/lib"/*.a "$b/%_libdir/" -fi mkdir -p "$b/%_includedir" cp -a SPIRV glslang "$b/%_includedir/" find "$b/%_includedir/" -type f ! -iname "*.h" -a ! -iname "*.hpp" -print -delete diff --git a/nodate.diff b/nodate.diff new file mode 100644 index 0000000..0608ba4 --- /dev/null +++ b/nodate.diff @@ -0,0 +1,17 @@ +--- + StandAlone/spirv-remap.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: glslang/StandAlone/spirv-remap.cpp +=================================================================== +--- glslang.orig/StandAlone/spirv-remap.cpp ++++ glslang/StandAlone/spirv-remap.cpp +@@ -227,7 +227,7 @@ namespace { + } + } + else if (arg == "--version" || arg == "-V") { +- std::cout << basename(argv[0]) << " version 0.97 " << __DATE__ << " " << __TIME__ << std::endl; ++ std::cout << basename(argv[0]) << " version 0.97 " << std::endl; + exit(0); + } else if (arg == "--input" || arg == "-i") { + // Collect input files From 834527e03ad84a49037c642703fddd3d6b67511a607da29e858c0d3a9761b328 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 7 Aug 2017 18:46:20 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=24 --- glslang.changes | 1 + nodate.diff | 3 +++ 2 files changed, 4 insertions(+) diff --git a/glslang.changes b/glslang.changes index f300db3..4005e49 100644 --- a/glslang.changes +++ b/glslang.changes @@ -26,6 +26,7 @@ Mon Aug 7 18:14:24 UTC 2017 - jengelh@inai.de SPV_KHR_shader_atomic_counter_ops. * GLSL 4.6: Implement draw parameters. * GLSL 4.6: Implement shader group vote. +- Add nodate.diff ------------------------------------------------------------------- Mon Feb 20 15:12:17 UTC 2017 - jengelh@inai.de diff --git a/nodate.diff b/nodate.diff index 0608ba4..9889e35 100644 --- a/nodate.diff +++ b/nodate.diff @@ -1,3 +1,6 @@ +From: Jan Engelhardt +Date: 2017-08-07 20:22:29.456870387 +0200 + --- StandAlone/spirv-remap.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)