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

Accepting request 679486 from X11:Wayland

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/679486
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glslang?expand=0&rev=12
This commit is contained in:
Stephan Kulow 2019-03-01 19:29:22 +00:00 committed by Git OBS Bridge
commit c09bbd9fd4
6 changed files with 51 additions and 21 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">git://github.com/KhronosGroup/glslang</param> <param name="url">git://github.com/KhronosGroup/glslang</param>
<!-- minor part also in glslang/Include/revision.h --> <!-- minor part also in glslang/Include/revision.h -->
<param name="revision">d509a5eec6f5a65b3ffdfa0a19096f338d2582be</param> <param name="revision">7.11.3113</param>
<param name="parent-tag">43bb5bd1885913d4edd16304c08d37f34d4a44b7</param> <param name="parent-tag">7.11.3113</param>
<param name="versionformat">7.9.2933.g@TAG_OFFSET@</param> <param name="versionformat">7.11.3113</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-7.11.3113.tar.xz Normal file
View File

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

3
glslang-7.9.2933.g33.tar.xz
View File

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

22
glslang.changes
View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Tue Feb 19 09:48:37 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Update to new upstream release 7.11.3113
* Implement GL_EXT_scalar_block_layout
* GLSL: Increase supported sizes of XBF strides and offsets
* Update to newer SPIRV-Tools, including VK_EXT_scalar_block_layout
* Implement GL_EXT_fragment_invocation_density
* SPV: Generate OpArrayLength with no signedness
* SPV: For GLSL only, bitcast OpArrayLength result back to int
* Rename GL_KHX_shader_explicit_arithmetic_types to
GL_EXT_shader_explicit_arithmetic_types
* Add support for GL_EXT_YUV_target
-------------------------------------------------------------------
Tue Dec 4 09:10:17 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
- Update to new upstream release 7.10.2984
* Updated type conversion rules for HLSL frontend
* HLSL: implemented c register handling
* HLSL: fix invalid spir-v vector * scalar for float1
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 12 16:12:41 UTC 2018 - Jan Engelhardt <jengelh@inai.de> Mon Nov 12 16:12:41 UTC 2018 - Jan Engelhardt <jengelh@inai.de>

20
glslang.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package glslang # spec file for package glslang
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,10 +16,10 @@
# #
%define version_unconverted 7.9.2933.g33 %define version_unconverted 7.11.3113
Name: glslang Name: glslang
Version: 7.9.2933.g33 Version: 7.11.3113
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
@ -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 languages. It implements a strict interpretation of the
specifications for these languages. specifications for these languages.
%package -n libglslang-suse2 %package -n libglslang-suse3
Summary: OpenGL and OpenGL ES shader front end implementation Summary: OpenGL and OpenGL ES shader front end implementation
Group: System/Libraries Group: System/Libraries
%description -n libglslang-suse2 %description -n libglslang-suse3
glslang is a compiler front end for the OpenGL ES and OpenGL shading glslang is a compiler front end for the OpenGL ES and OpenGL shading
languages. It implements a strict interpretation of the languages. It implements a strict interpretation of the
specifications for these languages. specifications for these languages.
@ -52,7 +52,7 @@ specifications for these languages.
%package devel %package devel
Summary: OpenGL and OpenGL ES shader front end and validator Summary: OpenGL and OpenGL ES shader front end and validator
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libglslang-suse2 = %version Requires: libglslang-suse3 = %version
%description devel %description devel
glslang is a compiler front end for the OpenGL ES and OpenGL shading 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 "{}" "+" find "$b/%_includedir/" -type f -exec chmod a-x "{}" "+"
cp build/StandAlone/libglslang-default-resource-limits.so "$b/%_libdir/" cp build/StandAlone/libglslang-default-resource-limits.so "$b/%_libdir/"
%post -n libglslang-suse2 -p /sbin/ldconfig %post -n libglslang-suse3 -p /sbin/ldconfig
%postun -n libglslang-suse2 -p /sbin/ldconfig %postun -n libglslang-suse3 -p /sbin/ldconfig
%files -n libglslang-suse2 %files -n libglslang-suse3
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/*.so.suse2* %_libdir/*.so.suse3*
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)

18
ver.diff
View File

@ -3,6 +3,14 @@ Date: 2018-08-25 15:28:25.894943233 +0200
Unversioned libraries suck! 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 ++ SPIRV/CMakeLists.txt | 2 ++
StandAlone/CMakeLists.txt | 1 + StandAlone/CMakeLists.txt | 1 +
@ -18,14 +26,14 @@ Index: glslang-7.9.2933.g33/SPIRV/CMakeLists.txt
endif(ENABLE_NV_EXTENSIONS) endif(ENABLE_NV_EXTENSIONS)
add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS}) add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
+set_target_properties(SPIRV PROPERTIES SOVERSION suse2) +set_target_properties(SPIRV PROPERTIES SOVERSION suse3)
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 ..)
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 suse2) + set_target_properties(SPVRemapper PROPERTIES SOVERSION suse3)
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()
@ -36,7 +44,7 @@ Index: glslang-7.9.2933.g33/StandAlone/CMakeLists.txt
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
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 suse2) +set_target_properties(glslang-default-resource-limits PROPERTIES SOVERSION suse3)
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)
@ -48,7 +56,7 @@ Index: glslang-7.9.2933.g33/glslang/CMakeLists.txt
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 suse2) +set_target_properties(glslang PROPERTIES SOVERSION suse3)
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)
@ -60,7 +68,7 @@ Index: glslang-7.9.2933.g33/hlsl/CMakeLists.txt
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 suse2) +set_target_properties(HLSL PROPERTIES SOVERSION suse3)
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)