From fe21ef2f4e9320fd14ee0f111ac71ab27822847aa5b349185a0de42226ccc932 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 5 Jun 2019 11:35:38 +0000 Subject: [PATCH] - Update to new snapshot 7.11.3214.git16 (2f4a8dfd) OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=44 --- _service | 8 ++++---- glslang-7.11.3113.git55.tar.xz | 3 --- glslang-7.11.3214.git36.tar.xz | 3 +++ glslang.changes | 11 +++++++++++ glslang.spec | 19 ++++++++++--------- ver.diff | 10 +++++----- 6 files changed, 33 insertions(+), 21 deletions(-) delete mode 100644 glslang-7.11.3113.git55.tar.xz create mode 100644 glslang-7.11.3214.git36.tar.xz diff --git a/_service b/_service index b08d40f..294935d 100644 --- a/_service +++ b/_service @@ -2,10 +2,10 @@ git git://github.com/KhronosGroup/glslang - - f925eefb - 7.11.3113 - 7.11.3113.git@TAG_OFFSET@ + + 2f4a8dfd3a596d75e3c26cb7ae9b68886d3a19cf + 7.11.3214 + 7.11.3214.git@TAG_OFFSET@ *.tar diff --git a/glslang-7.11.3113.git55.tar.xz b/glslang-7.11.3113.git55.tar.xz deleted file mode 100644 index d77a9cf..0000000 --- a/glslang-7.11.3113.git55.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:238771793bdd4df154534653b5a30a6ccfe721a803cd2964db3f73df2824de90 -size 1462940 diff --git a/glslang-7.11.3214.git36.tar.xz b/glslang-7.11.3214.git36.tar.xz new file mode 100644 index 0000000..995070d --- /dev/null +++ b/glslang-7.11.3214.git36.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79410c89a7cdac2706dd889ef74a8e57d90c2721e430b20cad0a8844e595f7fd +size 1586072 diff --git a/glslang.changes b/glslang.changes index 90d5046..7816013 100644 --- a/glslang.changes +++ b/glslang.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Jun 5 10:31:35 UTC 2019 - Jan Engelhardt + +- Update to new snapshot 7.11.3214.git16 (2f4a8dfd) + * GLSL: Fix tessellation control shader bounding box support. + * GLSL: Add error check for an argument dropping the + "restrict" qualifier. + * Add support for GL_EXT_buffer_reference2. + * SPV: Move to the SPIR-V 1.4 header. + * Support GL_ARB_fragment_shader_interlock. + ------------------------------------------------------------------- Sat Mar 16 18:40:53 UTC 2019 - Jan Engelhardt diff --git a/glslang.spec b/glslang.spec index 2ce465d..2e6c28b 100644 --- a/glslang.spec +++ b/glslang.spec @@ -16,10 +16,11 @@ # -%define version_unconverted 7.11.3113.git55 +%define version_unconverted 7.11.3214.git36 +%define lname libglslang-suse5 Name: glslang -Version: 7.11.3113.git55 +Version: 7.11.3214.git36 Release: 0 Summary: OpenGL and OpenGL ES shader front end and validator License: BSD-3-Clause @@ -40,11 +41,11 @@ glslang is a compiler front end for the OpenGL ES and OpenGL shading languages. It implements a strict interpretation of the specifications for these languages. -%package -n libglslang-suse4 +%package -n %lname Summary: OpenGL and OpenGL ES shader front end implementation Group: System/Libraries -%description -n libglslang-suse4 +%description -n %lname glslang is a compiler front end for the OpenGL ES and OpenGL shading languages. It implements a strict interpretation of the specifications for these languages. @@ -52,7 +53,7 @@ specifications for these languages. %package devel Summary: OpenGL and OpenGL ES shader front end and validator Group: Development/Libraries/C and C++ -Requires: libglslang-suse4 = %version +Requires: %lname = %version %description devel glslang is a compiler front end for the OpenGL ES and OpenGL shading @@ -85,12 +86,12 @@ ln -s SPIRV/spirv.hpp "$b/%_includedir/" find "$b/%_includedir/" -type f -exec chmod a-x "{}" "+" cp build/StandAlone/libglslang-default-resource-limits.so "$b/%_libdir/" -%post -n libglslang-suse4 -p /sbin/ldconfig -%postun -n libglslang-suse4 -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig -%files -n libglslang-suse4 +%files -n %lname %defattr(-,root,root) -%_libdir/*.so.suse4* +%_libdir/*.so.suse5* %files devel %defattr(-,root,root) diff --git a/ver.diff b/ver.diff index d5c4580..f461bf1 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 suse4) ++set_target_properties(SPIRV PROPERTIES SOVERSION suse5) 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 suse4) ++ set_target_properties(SPVRemapper PROPERTIES SOVERSION suse5) 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 suse4) ++set_target_properties(glslang-default-resource-limits PROPERTIES SOVERSION suse5) 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 suse4) ++set_target_properties(glslang PROPERTIES SOVERSION suse5) 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 suse4) ++set_target_properties(HLSL PROPERTIES SOVERSION suse5) set_property(TARGET HLSL PROPERTY FOLDER hlsl) set_property(TARGET HLSL PROPERTY POSITION_INDEPENDENT_CODE ON)