From f0be5cee0686c614c9178643450f1462c5ad18601d7a2c55c5fa10927b2d8199 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 12 Nov 2018 16:55:07 +0000 Subject: [PATCH 1/2] - Update to new upstream release 7.9.2933 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=36 --- _service | 6 +++--- glslang-7.8.2853.g9.tar.xz | 3 --- glslang-7.9.2933.g33.tar.xz | 3 +++ glslang.changes | 11 +++++++++++ glslang.spec | 9 +++++---- ver.diff | 34 +++++++++++++++++----------------- 6 files changed, 39 insertions(+), 27 deletions(-) delete mode 100644 glslang-7.8.2853.g9.tar.xz create mode 100644 glslang-7.9.2933.g33.tar.xz diff --git a/_service b/_service index 5ca3d85..1de7787 100644 --- a/_service +++ b/_service @@ -3,9 +3,9 @@ git git://github.com/KhronosGroup/glslang - e7df8e0b76af2fb9f58124be6b95688e5dbcdb7a - 7.8.2853 - 7.8.2853.g@TAG_OFFSET@ + d509a5eec6f5a65b3ffdfa0a19096f338d2582be + 43bb5bd1885913d4edd16304c08d37f34d4a44b7 + 7.9.2933.g@TAG_OFFSET@ *.tar diff --git a/glslang-7.8.2853.g9.tar.xz b/glslang-7.8.2853.g9.tar.xz deleted file mode 100644 index 67dedc6..0000000 --- a/glslang-7.8.2853.g9.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e49be2cc513162cddad001f8caa5868631fe87cb6b2fa6d91f37d8c4569aa334 -size 1364904 diff --git a/glslang-7.9.2933.g33.tar.xz b/glslang-7.9.2933.g33.tar.xz new file mode 100644 index 0000000..bd2c0ed --- /dev/null +++ b/glslang-7.9.2933.g33.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dde2e8d21b08624364a7f3e560676c02cfb90e7bfa68a9c34a15263123130ab2 +size 1411632 diff --git a/glslang.changes b/glslang.changes index 8927805..913bc33 100644 --- a/glslang.changes +++ b/glslang.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Nov 12 16:12:41 UTC 2018 - Jan Engelhardt + +- Update to new upstream release 7.9.2933 + * Add a SPIRV-Tools validator + * GLSL: Remove use of "__" in the implementation of keywords + having "__". + * Add GL_EXT_shader_atomic_int64 + * Add ES 320 support and additional error checks for + SPV_NV_mesh_shader. + ------------------------------------------------------------------- Fri Aug 24 07:02:34 UTC 2018 - jengelh@inai.de diff --git a/glslang.spec b/glslang.spec index 163fc3a..107c221 100644 --- a/glslang.spec +++ b/glslang.spec @@ -12,19 +12,20 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define version_unconverted 7.8.2853.g9 +%define version_unconverted 7.9.2933.g33 Name: glslang -Version: 7.8.2853.g9 +Version: 7.9.2933.g33 Release: 0 Summary: OpenGL and OpenGL ES shader front end and validator License: BSD-3-Clause Group: Development/Libraries/C and C++ -Url: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ +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 diff --git a/ver.diff b/ver.diff index e358150..f0c4aa4 100644 --- a/ver.diff +++ b/ver.diff @@ -10,11 +10,11 @@ Unversioned libraries suck! hlsl/CMakeLists.txt | 1 + 4 files changed, 5 insertions(+) -Index: glslang-7.8.2853.g9/SPIRV/CMakeLists.txt +Index: glslang-7.9.2933.g33/SPIRV/CMakeLists.txt =================================================================== ---- glslang-7.8.2853.g9.orig/SPIRV/CMakeLists.txt -+++ glslang-7.8.2853.g9/SPIRV/CMakeLists.txt -@@ -42,12 +42,14 @@ if(ENABLE_NV_EXTENSIONS) +--- glslang-7.9.2933.g33.orig/SPIRV/CMakeLists.txt ++++ glslang-7.9.2933.g33/SPIRV/CMakeLists.txt +@@ -44,12 +44,14 @@ if(ENABLE_NV_EXTENSIONS) endif(ENABLE_NV_EXTENSIONS) add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS}) @@ -29,10 +29,10 @@ Index: glslang-7.8.2853.g9/SPIRV/CMakeLists.txt set_property(TARGET SPVRemapper PROPERTY FOLDER glslang) set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON) endif() -Index: glslang-7.8.2853.g9/StandAlone/CMakeLists.txt +Index: glslang-7.9.2933.g33/StandAlone/CMakeLists.txt =================================================================== ---- glslang-7.8.2853.g9.orig/StandAlone/CMakeLists.txt -+++ glslang-7.8.2853.g9/StandAlone/CMakeLists.txt +--- glslang-7.9.2933.g33.orig/StandAlone/CMakeLists.txt ++++ glslang-7.9.2933.g33/StandAlone/CMakeLists.txt @@ -1,5 +1,6 @@ add_library(glslang-default-resource-limits ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp) @@ -40,24 +40,24 @@ Index: glslang-7.8.2853.g9/StandAlone/CMakeLists.txt set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang) set_property(TARGET glslang-default-resource-limits PROPERTY POSITION_INDEPENDENT_CODE ON) -Index: glslang-7.8.2853.g9/glslang/CMakeLists.txt +Index: glslang-7.9.2933.g33/glslang/CMakeLists.txt =================================================================== ---- glslang-7.8.2853.g9.orig/glslang/CMakeLists.txt -+++ glslang-7.8.2853.g9/glslang/CMakeLists.txt -@@ -81,6 +81,7 @@ set(HEADERS - # set(BISON_GLSLParser_OUTPUT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/MachineIndependent/glslang_tab.cpp) +--- glslang-7.9.2933.g33.orig/glslang/CMakeLists.txt ++++ glslang-7.9.2933.g33/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 suse1) set_property(TARGET glslang PROPERTY FOLDER glslang) set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON) target_link_libraries(glslang OGLCompiler OSDependent) -Index: glslang-7.8.2853.g9/hlsl/CMakeLists.txt +Index: glslang-7.9.2933.g33/hlsl/CMakeLists.txt =================================================================== ---- glslang-7.8.2853.g9.orig/hlsl/CMakeLists.txt -+++ glslang-7.8.2853.g9/hlsl/CMakeLists.txt -@@ -18,6 +18,7 @@ set(HEADERS - hlslParseables.h) +--- glslang-7.9.2933.g33.orig/hlsl/CMakeLists.txt ++++ glslang-7.9.2933.g33/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 suse1) From a050107269ba71bfb10f41cf73e87b3e1e5a5a01b2158365062b52b0fb18efc1 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 12 Nov 2018 17:04:58 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=37 --- glslang.spec | 14 +++++++------- ver.diff | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/glslang.spec b/glslang.spec index 107c221..c81a3ff 100644 --- a/glslang.spec +++ b/glslang.spec @@ -40,11 +40,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-suse1 +%package -n libglslang-suse2 Summary: OpenGL and OpenGL ES shader front end implementation Group: System/Libraries -%description -n libglslang-suse1 +%description -n libglslang-suse2 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 +52,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-suse1 = %version +Requires: libglslang-suse2 = %version %description devel glslang is a compiler front end for the OpenGL ES and OpenGL shading @@ -85,12 +85,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-suse1 -p /sbin/ldconfig -%postun -n libglslang-suse1 -p /sbin/ldconfig +%post -n libglslang-suse2 -p /sbin/ldconfig +%postun -n libglslang-suse2 -p /sbin/ldconfig -%files -n libglslang-suse1 +%files -n libglslang-suse2 %defattr(-,root,root) -%_libdir/*.so.suse1* +%_libdir/*.so.suse2* %files devel %defattr(-,root,root) diff --git a/ver.diff b/ver.diff index f0c4aa4..39822c5 100644 --- a/ver.diff +++ b/ver.diff @@ -18,14 +18,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 suse1) ++set_target_properties(SPIRV PROPERTIES SOVERSION suse2) 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 suse1) ++ set_target_properties(SPVRemapper PROPERTIES SOVERSION suse2) set_property(TARGET SPVRemapper PROPERTY FOLDER glslang) set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON) endif() @@ -36,7 +36,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 suse1) ++set_target_properties(glslang-default-resource-limits PROPERTIES SOVERSION suse2) set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang) set_property(TARGET glslang-default-resource-limits PROPERTY POSITION_INDEPENDENT_CODE ON) @@ -48,7 +48,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 suse1) ++set_target_properties(glslang PROPERTIES SOVERSION suse2) set_property(TARGET glslang PROPERTY FOLDER glslang) set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON) target_link_libraries(glslang OGLCompiler OSDependent) @@ -60,7 +60,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 suse1) ++set_target_properties(HLSL PROPERTIES SOVERSION suse2) set_property(TARGET HLSL PROPERTY FOLDER hlsl) set_property(TARGET HLSL PROPERTY POSITION_INDEPENDENT_CODE ON)