Accepting request 766381 from X11:Wayland
- Update to snapshot 8.13.3559+git20 (b0ada803) OBS-URL: https://build.opensuse.org/request/show/766381 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glslang?expand=0&rev=20
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
a3602a6910
6
_service
6
_service
@ -3,9 +3,9 @@
|
||||
<param name="scm">git</param>
|
||||
<param name="url">https://github.com/KhronosGroup/glslang</param>
|
||||
<!-- minor part also in glslang/Include/revision.h (and sometimes out of date too) -->
|
||||
<param name="revision">7.13.3496</param>
|
||||
<param name="parent-tag">7.13.3496</param>
|
||||
<param name="versionformat">7.13.3496</param>
|
||||
<param name="revision">b0ada803</param>
|
||||
<param name="parent-tag">8.13.3559</param>
|
||||
<param name="versionformat">8.13.3559+git@TAG_OFFSET@</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
<param name="file">*.tar</param>
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5d03420783e4a848444c61ccadca64d8aa9ae105cb9ac48cd243fca08d24ff46
|
||||
size 1670196
|
||||
3
glslang-8.13.3559+git20.tar.xz
Normal file
3
glslang-8.13.3559+git20.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:24c6f34efcf91a7275f42198db3bfeca9f33297f0ff5f94e5f321fd6b8316aba
|
||||
size 1676964
|
||||
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Jan 19 11:38:09 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to snapshot 8.13.3559+git20 (b0ada803)
|
||||
* SPIR-V: Aggressively prune unreachable merge, continue target.
|
||||
* INTEL_shader_integer_functions2: Add basic extension
|
||||
tracking, add compiler front-end support, add SPIR-V
|
||||
generation.
|
||||
* Add support for ARB_sample_shading, ARB_texture_multisample,
|
||||
ARB_uniform_buffer_object, ARB_gpu_shader_fp64.
|
||||
* SPV/Vulkan: Add support for Vulkan 1.2, which defaults to
|
||||
SPIR-V 1.5.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 7 08:25:53 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
||||
12
glslang.spec
12
glslang.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package glslang
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,11 +17,11 @@
|
||||
|
||||
|
||||
# lname needs a bump for every change in commit (_service)
|
||||
%define version_unconverted 7.13.3496
|
||||
%define lname libglslang-suse8
|
||||
%define version_unconverted 8.13.3559+git20
|
||||
%define lname libglslang-suse9
|
||||
|
||||
Name: glslang
|
||||
Version: 7.13.3496
|
||||
Version: 8.13.3559+git20
|
||||
Release: 0
|
||||
Summary: OpenGL and OpenGL ES shader front end and validator
|
||||
License: BSD-3-Clause
|
||||
@ -102,13 +102,13 @@ ln -s libglslang.so "$b/%_libdir/libOSDependent.so"
|
||||
|
||||
%files -n %lname
|
||||
%defattr(-,root,root)
|
||||
%_libdir/*.so.suse8*
|
||||
%_libdir/*.so.suse9*
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%_bindir/gls*
|
||||
%_bindir/spirv*
|
||||
%_prefix/lib/cmake/
|
||||
%_libdir/cmake/
|
||||
%_libdir/*resource*.so
|
||||
%_libdir/libHLSL.so
|
||||
%_libdir/libOGLCompiler.so
|
||||
|
||||
34
ver.diff
34
ver.diff
@ -18,15 +18,15 @@ There is no ABI stability to expect here.
|
||||
hlsl/CMakeLists.txt | 1 +
|
||||
4 files changed, 5 insertions(+)
|
||||
|
||||
Index: glslang-7.13.3496/SPIRV/CMakeLists.txt
|
||||
Index: glslang-8.13.3559+git20/SPIRV/CMakeLists.txt
|
||||
===================================================================
|
||||
--- glslang-7.13.3496.orig/SPIRV/CMakeLists.txt
|
||||
+++ glslang-7.13.3496/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
|
||||
doc.h)
|
||||
|
||||
add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
|
||||
+set_target_properties(SPIRV PROPERTIES SOVERSION suse8)
|
||||
+set_target_properties(SPIRV PROPERTIES SOVERSION suse9)
|
||||
set_property(TARGET SPIRV PROPERTY FOLDER glslang)
|
||||
set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||
target_include_directories(SPIRV PUBLIC
|
||||
@ -34,42 +34,42 @@ Index: glslang-7.13.3496/SPIRV/CMakeLists.txt
|
||||
|
||||
if (ENABLE_SPVREMAPPER)
|
||||
add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS})
|
||||
+ set_target_properties(SPVRemapper PROPERTIES SOVERSION suse8)
|
||||
+ set_target_properties(SPVRemapper PROPERTIES SOVERSION suse9)
|
||||
set_property(TARGET SPVRemapper PROPERTY FOLDER glslang)
|
||||
set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||
endif()
|
||||
Index: glslang-7.13.3496/StandAlone/CMakeLists.txt
|
||||
Index: glslang-8.13.3559+git20/StandAlone/CMakeLists.txt
|
||||
===================================================================
|
||||
--- glslang-7.13.3496.orig/StandAlone/CMakeLists.txt
|
||||
+++ glslang-7.13.3496/StandAlone/CMakeLists.txt
|
||||
--- glslang-8.13.3559+git20.orig/StandAlone/CMakeLists.txt
|
||||
+++ glslang-8.13.3559+git20/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 suse8)
|
||||
+set_target_properties(glslang-default-resource-limits PROPERTIES SOVERSION suse9)
|
||||
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.13.3496/glslang/CMakeLists.txt
|
||||
Index: glslang-8.13.3559+git20/glslang/CMakeLists.txt
|
||||
===================================================================
|
||||
--- glslang-7.13.3496.orig/glslang/CMakeLists.txt
|
||||
+++ glslang-7.13.3496/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_pch(SOURCES MachineIndependent/pch.cpp)
|
||||
|
||||
add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS})
|
||||
+set_target_properties(glslang PROPERTIES SOVERSION suse8)
|
||||
+set_target_properties(glslang PROPERTIES SOVERSION suse9)
|
||||
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.13.3496/hlsl/CMakeLists.txt
|
||||
Index: glslang-8.13.3559+git20/hlsl/CMakeLists.txt
|
||||
===================================================================
|
||||
--- glslang-7.13.3496.orig/hlsl/CMakeLists.txt
|
||||
+++ glslang-7.13.3496/hlsl/CMakeLists.txt
|
||||
--- glslang-8.13.3559+git20.orig/hlsl/CMakeLists.txt
|
||||
+++ glslang-8.13.3559+git20/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 suse8)
|
||||
+set_target_properties(HLSL PROPERTIES SOVERSION suse9)
|
||||
set_property(TARGET HLSL PROPERTY FOLDER hlsl)
|
||||
set_property(TARGET HLSL PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user