pool/glslang
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update to snapshot 8.13.3727+git4 (9c3204a1)

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=69
This commit is contained in:
Jan Engelhardt 2020-04-08 10:59:55 +00:00 committed by Git OBS Bridge
parent 769485a2ad
commit 6adc586327
6 changed files with 47 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_service
View File

@ -3,9 +3,9 @@
<param name="scm">git</param> <param name="scm">git</param>
<param name="url">https://github.com/KhronosGroup/glslang</param> <param name="url">https://github.com/KhronosGroup/glslang</param>
<!-- minor part also in glslang/Include/revision.h (and sometimes out of date too) --> <!-- minor part also in glslang/Include/revision.h (and sometimes out of date too) -->
<param name="revision">b0ada803</param> <param name="revision">9c3204a1fde09ba7b98b1779047bf8d3491244a5</param>
<param name="parent-tag">8.13.3559</param> <param name="parent-tag">e157435c1</param>
<param name="versionformat">8.13.3559+git@TAG_OFFSET@</param> <param name="versionformat">8.13.3727+git@TAG_OFFSET@</param>
</service> </service>
<service name="recompress" mode="disabled"> <service name="recompress" mode="disabled">
<param name="file">*.tar</param> <param name="file">*.tar</param>

3
glslang-8.13.3559+git20.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:24c6f34efcf91a7275f42198db3bfeca9f33297f0ff5f94e5f321fd6b8316aba
size 1676964

3
glslang-8.13.3727+git4.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:55d3ddfe02e5bb4d7991867becda8f46a9d6933e229b7b77d4e30e11d7a48d2a
size 1707868

14
glslang.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Apr 8 10:42:02 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
- 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 <alarrosa@suse.com> Mon Feb 3 10:09:18 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>

11
glslang.spec
View File

@ -17,11 +17,11 @@
# lname needs a bump for every change in commit (_service) # lname needs a bump for every change in commit (_service)
%define version_unconverted 8.13.3559+git20 %define version_unconverted 8.13.3727+git4
%define lname libglslang-suse9 %define lname libglslang-suse10
Name: glslang Name: glslang
Version: 8.13.3559+git20 Version: 8.13.3727+git4
Release: 0 Release: 0
Summary: OpenGL and OpenGL ES shader front end and validator Summary: OpenGL and OpenGL ES shader front end and validator
License: BSD-3-Clause License: BSD-3-Clause
@ -31,7 +31,6 @@ URL: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/
Source: %name-%version.tar.xz Source: %name-%version.tar.xz
Patch1: ver.diff Patch1: ver.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison BuildRequires: bison
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: fdupes BuildRequires: fdupes
@ -101,11 +100,9 @@ ln -s libglslang.so "$b/%_libdir/libOSDependent.so"
%postun -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig
%files -n %lname %files -n %lname
%defattr(-,root,root) %_libdir/*.so.suse10*
%_libdir/*.so.suse9*
%files devel %files devel
%defattr(-,root,root)
%_bindir/gls* %_bindir/gls*
%_bindir/spirv* %_bindir/spirv*
%_libdir/cmake/ %_libdir/cmake/

45
ver.diff
View File

@ -18,58 +18,59 @@ There is no ABI stability to expect here.
hlsl/CMakeLists.txt | 1 + hlsl/CMakeLists.txt | 1 +
4 files changed, 5 insertions(+) 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.3727+git4.orig/SPIRV/CMakeLists.txt
+++ glslang-8.13.3559+git20/SPIRV/CMakeLists.txt +++ glslang-8.13.3727+git4/SPIRV/CMakeLists.txt
@@ -34,6 +34,7 @@ set(SPVREMAP_HEADERS @@ -35,6 +35,7 @@ set(SPVREMAP_HEADERS
doc.h) doc.h)
add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS}) 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 FOLDER glslang)
set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
target_include_directories(SPIRV PUBLIC 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) if (ENABLE_SPVREMAPPER)
add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) 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 FOLDER glslang)
set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON)
endif() 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.3727+git4.orig/StandAlone/CMakeLists.txt
+++ glslang-8.13.3559+git20/StandAlone/CMakeLists.txt +++ glslang-8.13.3727+git4/StandAlone/CMakeLists.txt
@@ -1,5 +1,6 @@ @@ -1,6 +1,7 @@
add_library(glslang-default-resource-limits add_library(glslang-default-resource-limits
${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp) ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp
+set_target_properties(glslang-default-resource-limits PROPERTIES SOVERSION suse9) ${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 FOLDER glslang)
set_property(TARGET glslang-default-resource-limits PROPERTY POSITION_INDEPENDENT_CODE ON) 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.3727+git4.orig/glslang/CMakeLists.txt
+++ glslang-8.13.3559+git20/glslang/CMakeLists.txt +++ glslang-8.13.3727+git4/glslang/CMakeLists.txt
@@ -79,6 +79,7 @@ set(HEADERS @@ -83,6 +83,7 @@ set(HEADERS
glslang_pch(SOURCES MachineIndependent/pch.cpp) glslang_pch(SOURCES MachineIndependent/pch.cpp)
add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS}) 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 FOLDER glslang)
set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON)
target_link_libraries(glslang OGLCompiler OSDependent) 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.3727+git4.orig/hlsl/CMakeLists.txt
+++ glslang-8.13.3559+git20/hlsl/CMakeLists.txt +++ glslang-8.13.3727+git4/hlsl/CMakeLists.txt
@@ -20,6 +20,7 @@ set(HEADERS @@ -20,6 +20,7 @@ set(HEADERS
glslang_pch(SOURCES pch.cpp) glslang_pch(SOURCES pch.cpp)
add_library(HLSL ${LIB_TYPE} ${SOURCES} ${HEADERS}) 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 FOLDER hlsl)
set_property(TARGET HLSL PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET HLSL PROPERTY POSITION_INDEPENDENT_CODE ON)