From 6adc586327f5151b4a5860ad644c27a11687bf14aa8ee4c83eeb0bed2c8a95a0 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 8 Apr 2020 10:59:55 +0000 Subject: [PATCH] - Update to snapshot 8.13.3727+git4 (9c3204a1) OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=69 --- _service | 6 ++--- glslang-8.13.3559+git20.tar.xz | 3 --- glslang-8.13.3727+git4.tar.xz | 3 +++ glslang.changes | 14 +++++++++++ glslang.spec | 11 +++------ ver.diff | 45 +++++++++++++++++----------------- 6 files changed, 47 insertions(+), 35 deletions(-) delete mode 100644 glslang-8.13.3559+git20.tar.xz create mode 100644 glslang-8.13.3727+git4.tar.xz diff --git a/_service b/_service index 6bd793d..26ca226 100644 --- a/_service +++ b/_service @@ -3,9 +3,9 @@ git https://github.com/KhronosGroup/glslang - b0ada803 - 8.13.3559 - 8.13.3559+git@TAG_OFFSET@ + 9c3204a1fde09ba7b98b1779047bf8d3491244a5 + e157435c1 + 8.13.3727+git@TAG_OFFSET@ *.tar diff --git a/glslang-8.13.3559+git20.tar.xz b/glslang-8.13.3559+git20.tar.xz deleted file mode 100644 index 5f282f9..0000000 --- a/glslang-8.13.3559+git20.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24c6f34efcf91a7275f42198db3bfeca9f33297f0ff5f94e5f321fd6b8316aba -size 1676964 diff --git a/glslang-8.13.3727+git4.tar.xz b/glslang-8.13.3727+git4.tar.xz new file mode 100644 index 0000000..f87483d --- /dev/null +++ b/glslang-8.13.3727+git4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55d3ddfe02e5bb4d7991867becda8f46a9d6933e229b7b77d4e30e11d7a48d2a +size 1707868 diff --git a/glslang.changes b/glslang.changes index 5ed384b..0de13ca 100644 --- a/glslang.changes +++ b/glslang.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Apr 8 10:42:02 UTC 2020 - Jan Engelhardt + +- Update to snapshot 8.13.3727+git4 (9c3204a1) + * Add constant expression with mod. + * Add Tess machine dependent built-in variables initialization + for GLES 3.2. + * Added original glslang_c_interface implementation. + * SPV_AMD_shader_image_load_store_lod is now validated by + spirv-tools. + * GL_EXT_debug_printf implementation. + * SPV headers: Bump up to the latest header. + * Add support for GLSL_EXT_ray_tracing. + ------------------------------------------------------------------- Mon Feb 3 10:09:18 UTC 2020 - Antonio Larrosa diff --git a/glslang.spec b/glslang.spec index 5848704..e139f53 100644 --- a/glslang.spec +++ b/glslang.spec @@ -17,11 +17,11 @@ # lname needs a bump for every change in commit (_service) -%define version_unconverted 8.13.3559+git20 -%define lname libglslang-suse9 +%define version_unconverted 8.13.3727+git4 +%define lname libglslang-suse10 Name: glslang -Version: 8.13.3559+git20 +Version: 8.13.3727+git4 Release: 0 Summary: OpenGL and OpenGL ES shader front end and validator License: BSD-3-Clause @@ -31,7 +31,6 @@ URL: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ Source: %name-%version.tar.xz Patch1: ver.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: cmake >= 2.8 BuildRequires: fdupes @@ -101,11 +100,9 @@ ln -s libglslang.so "$b/%_libdir/libOSDependent.so" %postun -n %lname -p /sbin/ldconfig %files -n %lname -%defattr(-,root,root) -%_libdir/*.so.suse9* +%_libdir/*.so.suse10* %files devel -%defattr(-,root,root) %_bindir/gls* %_bindir/spirv* %_libdir/cmake/ diff --git a/ver.diff b/ver.diff index 5c535ce..2c9348d 100644 --- a/ver.diff +++ b/ver.diff @@ -18,58 +18,59 @@ There is no ABI stability to expect here. hlsl/CMakeLists.txt | 1 + 4 files changed, 5 insertions(+) -Index: glslang-8.13.3559+git20/SPIRV/CMakeLists.txt +Index: glslang-8.13.3727+git4/SPIRV/CMakeLists.txt =================================================================== ---- glslang-8.13.3559+git20.orig/SPIRV/CMakeLists.txt -+++ glslang-8.13.3559+git20/SPIRV/CMakeLists.txt -@@ -34,6 +34,7 @@ set(SPVREMAP_HEADERS +--- glslang-8.13.3727+git4.orig/SPIRV/CMakeLists.txt ++++ glslang-8.13.3727+git4/SPIRV/CMakeLists.txt +@@ -35,6 +35,7 @@ set(SPVREMAP_HEADERS doc.h) add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS}) -+set_target_properties(SPIRV PROPERTIES SOVERSION suse9) ++set_target_properties(SPIRV PROPERTIES SOVERSION suse10) set_property(TARGET SPIRV PROPERTY FOLDER glslang) set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON) target_include_directories(SPIRV PUBLIC -@@ -42,6 +43,7 @@ target_include_directories(SPIRV PUBLIC +@@ -43,6 +44,7 @@ target_include_directories(SPIRV PUBLIC if (ENABLE_SPVREMAPPER) add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) -+ set_target_properties(SPVRemapper PROPERTIES SOVERSION suse9) ++ set_target_properties(SPVRemapper PROPERTIES SOVERSION suse10) set_property(TARGET SPVRemapper PROPERTY FOLDER glslang) set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON) endif() -Index: glslang-8.13.3559+git20/StandAlone/CMakeLists.txt +Index: glslang-8.13.3727+git4/StandAlone/CMakeLists.txt =================================================================== ---- glslang-8.13.3559+git20.orig/StandAlone/CMakeLists.txt -+++ glslang-8.13.3559+git20/StandAlone/CMakeLists.txt -@@ -1,5 +1,6 @@ +--- glslang-8.13.3727+git4.orig/StandAlone/CMakeLists.txt ++++ glslang-8.13.3727+git4/StandAlone/CMakeLists.txt +@@ -1,6 +1,7 @@ add_library(glslang-default-resource-limits - ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp) -+set_target_properties(glslang-default-resource-limits PROPERTIES SOVERSION suse9) + ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/resource_limits_c.cpp) ++set_target_properties(glslang-default-resource-limits PROPERTIES SOVERSION suse10) set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang) set_property(TARGET glslang-default-resource-limits PROPERTY POSITION_INDEPENDENT_CODE ON) -Index: glslang-8.13.3559+git20/glslang/CMakeLists.txt +Index: glslang-8.13.3727+git4/glslang/CMakeLists.txt =================================================================== ---- glslang-8.13.3559+git20.orig/glslang/CMakeLists.txt -+++ glslang-8.13.3559+git20/glslang/CMakeLists.txt -@@ -79,6 +79,7 @@ set(HEADERS +--- glslang-8.13.3727+git4.orig/glslang/CMakeLists.txt ++++ glslang-8.13.3727+git4/glslang/CMakeLists.txt +@@ -83,6 +83,7 @@ set(HEADERS glslang_pch(SOURCES MachineIndependent/pch.cpp) add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS}) -+set_target_properties(glslang PROPERTIES SOVERSION suse9) ++set_target_properties(glslang PROPERTIES SOVERSION suse10) set_property(TARGET glslang PROPERTY FOLDER glslang) set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON) target_link_libraries(glslang OGLCompiler OSDependent) -Index: glslang-8.13.3559+git20/hlsl/CMakeLists.txt +Index: glslang-8.13.3727+git4/hlsl/CMakeLists.txt =================================================================== ---- glslang-8.13.3559+git20.orig/hlsl/CMakeLists.txt -+++ glslang-8.13.3559+git20/hlsl/CMakeLists.txt +--- glslang-8.13.3727+git4.orig/hlsl/CMakeLists.txt ++++ glslang-8.13.3727+git4/hlsl/CMakeLists.txt @@ -20,6 +20,7 @@ set(HEADERS glslang_pch(SOURCES pch.cpp) add_library(HLSL ${LIB_TYPE} ${SOURCES} ${HEADERS}) -+set_target_properties(HLSL PROPERTIES SOVERSION suse9) ++set_target_properties(HLSL PROPERTIES SOVERSION suse10) set_property(TARGET HLSL PROPERTY FOLDER hlsl) set_property(TARGET HLSL PROPERTY POSITION_INDEPENDENT_CODE ON)