From ee1a4f845e4878ed5347b04ec63867a63093996c9720cf851924637be0ceb2e7 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 28 Jun 2019 07:57:13 +0000 Subject: [PATCH 1/2] - Update to new snapshot 7.11.3276.git10 (4162de4) OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=47 --- _service | 6 +++--- glslang-7.11.3214.git36.tar.xz | 3 --- glslang-7.11.3276.git10.tar.xz | 3 +++ glslang.changes | 18 ++++++++++++++++++ glslang.spec | 7 +++---- nodate.diff | 20 -------------------- 6 files changed, 27 insertions(+), 30 deletions(-) delete mode 100644 glslang-7.11.3214.git36.tar.xz create mode 100644 glslang-7.11.3276.git10.tar.xz delete mode 100644 nodate.diff diff --git a/_service b/_service index 294935d..4ba9dc4 100644 --- a/_service +++ b/_service @@ -3,9 +3,9 @@ git git://github.com/KhronosGroup/glslang - 2f4a8dfd3a596d75e3c26cb7ae9b68886d3a19cf - 7.11.3214 - 7.11.3214.git@TAG_OFFSET@ + 4162de4bbfc58ef37600c23e4e8fcf58e604f382 + 8e96e247fadd3b241fe4a5d081ebe1ad45f885bc + 7.11.3276.git@TAG_OFFSET@ *.tar diff --git a/glslang-7.11.3214.git36.tar.xz b/glslang-7.11.3214.git36.tar.xz deleted file mode 100644 index 995070d..0000000 --- a/glslang-7.11.3214.git36.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:79410c89a7cdac2706dd889ef74a8e57d90c2721e430b20cad0a8844e595f7fd -size 1586072 diff --git a/glslang-7.11.3276.git10.tar.xz b/glslang-7.11.3276.git10.tar.xz new file mode 100644 index 0000000..c1f5755 --- /dev/null +++ b/glslang-7.11.3276.git10.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:070b39ee22f73549e9dc7f157edf2363a0c3631da3cb431c046e9b4c40b9011e +size 1591316 diff --git a/glslang.changes b/glslang.changes index 7816013..f021823 100644 --- a/glslang.changes +++ b/glslang.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Fri Jun 28 07:50:03 UTC 2019 - Jan Engelhardt + +- Update to new snapshot 7.11.3276.git10 (4162de4) + * Add Float16/Int8/Int16 capabilities for private variables and + function parameters. + * Use spvValidatorOptionsSetBeforeHlslLegalization for + pre-legalized HLSL. + * Add support for GL_NV_shader_sm_builtins. + * Add gl_SemanticsVolatile to GL_KHR_memory_scope_semantics, + and make volatile-qualified atomics generate + MemorySemanticsVolatile when using the Vulkan memory model. + * Add missing GL_ARB_shader_ballot builtins to Geometry and + Tessellation shaders. + * SPV: Add a switch for favoring non-NaN operands in min, max, + and clamp. +- Remove nodate.diff (upstreamed) + ------------------------------------------------------------------- Wed Jun 5 10:31:35 UTC 2019 - Jan Engelhardt diff --git a/glslang.spec b/glslang.spec index 128bff2..d4048eb 100644 --- a/glslang.spec +++ b/glslang.spec @@ -16,11 +16,11 @@ # -%define version_unconverted 7.11.3214.git36 +%define version_unconverted 7.11.3276.git10 %define lname libglslang-suse5 Name: glslang -Version: 7.11.3214.git36 +Version: 7.11.3276.git10 Release: 0 Summary: OpenGL and OpenGL ES shader front end and validator License: BSD-3-Clause @@ -29,8 +29,7 @@ URL: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ #Git-URL: https://github.com/KhronosGroup/glslang Source: %name-%version.tar.xz -Patch1: nodate.diff -Patch2: ver.diff +Patch1: ver.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: cmake >= 2.8 diff --git a/nodate.diff b/nodate.diff deleted file mode 100644 index 9889e35..0000000 --- a/nodate.diff +++ /dev/null @@ -1,20 +0,0 @@ -From: Jan Engelhardt -Date: 2017-08-07 20:22:29.456870387 +0200 - ---- - 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 ef7533d7ea1060c5a563cbc8fd9f78ccee77e2f0008e872e0e11aaf0269a8552 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 28 Jun 2019 08:10:56 +0000 Subject: [PATCH 2/2] precautionary bump due to version update OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=48 --- glslang.spec | 4 ++-- ver.diff | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/glslang.spec b/glslang.spec index d4048eb..eb5f6e2 100644 --- a/glslang.spec +++ b/glslang.spec @@ -17,7 +17,7 @@ %define version_unconverted 7.11.3276.git10 -%define lname libglslang-suse5 +%define lname libglslang-suse6 Name: glslang Version: 7.11.3276.git10 @@ -91,7 +91,7 @@ cp build/StandAlone/libglslang-default-resource-limits.so "$b/%_libdir/" %files -n %lname %defattr(-,root,root) -%_libdir/*.so.suse5* +%_libdir/*.so.suse6* %files devel %defattr(-,root,root) diff --git a/ver.diff b/ver.diff index f461bf1..0aa127c 100644 --- a/ver.diff +++ b/ver.diff @@ -26,14 +26,14 @@ Index: glslang-7.9.2933.g33/SPIRV/CMakeLists.txt endif(ENABLE_NV_EXTENSIONS) add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS}) -+set_target_properties(SPIRV PROPERTIES SOVERSION suse5) ++set_target_properties(SPIRV PROPERTIES SOVERSION suse6) set_property(TARGET SPIRV PROPERTY FOLDER glslang) set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON) target_include_directories(SPIRV PUBLIC ..) if (ENABLE_SPVREMAPPER) add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) -+ set_target_properties(SPVRemapper PROPERTIES SOVERSION suse5) ++ set_target_properties(SPVRemapper PROPERTIES SOVERSION suse6) set_property(TARGET SPVRemapper PROPERTY FOLDER glslang) set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON) endif() @@ -44,7 +44,7 @@ Index: glslang-7.9.2933.g33/StandAlone/CMakeLists.txt @@ -1,5 +1,6 @@ add_library(glslang-default-resource-limits ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp) -+set_target_properties(glslang-default-resource-limits PROPERTIES SOVERSION suse5) ++set_target_properties(glslang-default-resource-limits PROPERTIES SOVERSION suse6) set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang) set_property(TARGET glslang-default-resource-limits PROPERTY POSITION_INDEPENDENT_CODE ON) @@ -56,7 +56,7 @@ Index: glslang-7.9.2933.g33/glslang/CMakeLists.txt glslang_pch(SOURCES MachineIndependent/pch.cpp) add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS}) -+set_target_properties(glslang PROPERTIES SOVERSION suse5) ++set_target_properties(glslang PROPERTIES SOVERSION suse6) set_property(TARGET glslang PROPERTY FOLDER glslang) set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON) target_link_libraries(glslang OGLCompiler OSDependent) @@ -68,7 +68,7 @@ Index: glslang-7.9.2933.g33/hlsl/CMakeLists.txt glslang_pch(SOURCES pch.cpp) add_library(HLSL ${LIB_TYPE} ${SOURCES} ${HEADERS}) -+set_target_properties(HLSL PROPERTIES SOVERSION suse5) ++set_target_properties(HLSL PROPERTIES SOVERSION suse6) set_property(TARGET HLSL PROPERTY FOLDER hlsl) set_property(TARGET HLSL PROPERTY POSITION_INDEPENDENT_CODE ON)