From 391c4d5ba12da0827cee51581e421f39221b27cc7ddc03c36aaa76f7bcc2591d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 13 Aug 2020 08:14:40 +0000 Subject: [PATCH] - Update to release 10.15.3847 (6c7beeafa) OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=71 --- _service | 7 ++-- glslang-10.15.3847.tar.xz | 3 ++ glslang-8.13.3727+git4.tar.xz | 3 -- glslang.changes | 16 ++++++++ glslang.spec | 9 ++--- ver.diff | 76 ----------------------------------- 6 files changed, 26 insertions(+), 88 deletions(-) create mode 100644 glslang-10.15.3847.tar.xz delete mode 100644 glslang-8.13.3727+git4.tar.xz delete mode 100644 ver.diff diff --git a/_service b/_service index 26ca226..6292d03 100644 --- a/_service +++ b/_service @@ -2,10 +2,9 @@ git https://github.com/KhronosGroup/glslang - - 9c3204a1fde09ba7b98b1779047bf8d3491244a5 - e157435c1 - 8.13.3727+git@TAG_OFFSET@ + + 6c7beeafa7a53c876c0dda13afd7f47e1ea6d905 + 10.15.3847 *.tar diff --git a/glslang-10.15.3847.tar.xz b/glslang-10.15.3847.tar.xz new file mode 100644 index 0000000..bfb32af --- /dev/null +++ b/glslang-10.15.3847.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09cc4be444cf6c64d42f3b644a8d35c9799376e1b01fc45f217885c128394ece +size 1752956 diff --git a/glslang-8.13.3727+git4.tar.xz b/glslang-8.13.3727+git4.tar.xz deleted file mode 100644 index f87483d..0000000 --- a/glslang-8.13.3727+git4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:55d3ddfe02e5bb4d7991867becda8f46a9d6933e229b7b77d4e30e11d7a48d2a -size 1707868 diff --git a/glslang.changes b/glslang.changes index 0de13ca..3124a51 100644 --- a/glslang.changes +++ b/glslang.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Aug 13 07:32:15 UTC 2020 - Jan Engelhardt + +- Update to release 10.15.3847 (6c7beeafa) + * Add support for EXT_ray_flags_primitive_culling, + GL_ARB_shader_bit_encoding, GL_ARB_shader_image_size, + GL_ARB_shader_storage_buffer_object, + GL_ARB_shading_language_packing, GL_ARB_texture_query_lod, + GL_ARB_vertex_attrib_64bit, + GL_EXT_shader_implicit_conversions, + GL_EXT_shader_integer_mix, GL_EXT_blend_func_extended + * Add support for primitive culling layout qualifier + * GlslangToSpv: offer a -g0 command line argument similar to gcc + * libglslang is now built with -fvisibility and exports +- Drop ver.diff (issue resolved upstream) + ------------------------------------------------------------------- Wed Apr 8 10:42:02 UTC 2020 - Jan Engelhardt diff --git a/glslang.spec b/glslang.spec index e139f53..f31b91b 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.3727+git4 -%define lname libglslang-suse10 +%define version_unconverted 10.15.3847 +%define lname libglslang10 Name: glslang -Version: 8.13.3727+git4 +Version: 10.15.3847 Release: 0 Summary: OpenGL and OpenGL ES shader front end and validator License: BSD-3-Clause @@ -30,7 +30,6 @@ URL: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ #Git-URL: https://github.com/KhronosGroup/glslang Source: %name-%version.tar.xz -Patch1: ver.diff BuildRequires: bison BuildRequires: cmake >= 2.8 BuildRequires: fdupes @@ -100,7 +99,7 @@ ln -s libglslang.so "$b/%_libdir/libOSDependent.so" %postun -n %lname -p /sbin/ldconfig %files -n %lname -%_libdir/*.so.suse10* +%_libdir/*.so.10* %files devel %_bindir/gls* diff --git a/ver.diff b/ver.diff deleted file mode 100644 index 2c9348d..0000000 --- a/ver.diff +++ /dev/null @@ -1,76 +0,0 @@ -From: Jan Engelhardt -Date: 2018-08-25 15:28:25.894943233 +0200 - -Unversioned libraries suck! - -I loosely remember someone or something suggested that something like semver is in place. -Diffing 7.10.2984 to 7.11.3113 however shows `nm -CD` differences on libSPIRV.so. -There is no ABI stability to expect here. - --T spv::Builder::createLoad(unsigned int, spv::MemoryAccessMask, spv::Scope) -+T spv::Builder::createLoad(unsigned int, spv::MemoryAccessMask, spv::Scope, unsigned int) - - ---- - SPIRV/CMakeLists.txt | 2 ++ - StandAlone/CMakeLists.txt | 1 + - glslang/CMakeLists.txt | 1 + - hlsl/CMakeLists.txt | 1 + - 4 files changed, 5 insertions(+) - -Index: glslang-8.13.3727+git4/SPIRV/CMakeLists.txt -=================================================================== ---- 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 suse10) - set_property(TARGET SPIRV PROPERTY FOLDER glslang) - set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON) - 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 suse10) - set_property(TARGET SPVRemapper PROPERTY FOLDER glslang) - set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON) - endif() -Index: glslang-8.13.3727+git4/StandAlone/CMakeLists.txt -=================================================================== ---- 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 - ${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.3727+git4/glslang/CMakeLists.txt -=================================================================== ---- 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 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.3727+git4/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 suse10) - set_property(TARGET HLSL PROPERTY FOLDER hlsl) - set_property(TARGET HLSL PROPERTY POSITION_INDEPENDENT_CODE ON) -