Accepting request 685794 from X11:Wayland
- Update to new upstream snapshot 7.11.3113.git55 (f925eefb) OBS-URL: https://build.opensuse.org/request/show/685794 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glslang?expand=0&rev=13
This commit is contained in:
commit
8ef6991c3f
4
_service
4
_service
@ -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">7.11.3113</param>
|
<param name="revision">f925eefb</param>
|
||||||
<param name="parent-tag">7.11.3113</param>
|
<param name="parent-tag">7.11.3113</param>
|
||||||
<param name="versionformat">7.11.3113</param>
|
<param name="versionformat">7.11.3113.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-7.11.3113.git55.tar.xz
Normal file
3
glslang-7.11.3113.git55.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:238771793bdd4df154534653b5a30a6ccfe721a803cd2964db3f73df2824de90
|
||||||
|
size 1462940
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:f646ac38ce9e193611425502c032f5d7739a0c8cf423233996cee6555c8b2db1
|
|
||||||
size 1449120
|
|
@ -1,3 +1,25 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Mar 16 18:40:53 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
- Update to new upstream snapshot 7.11.3113.git55 (f925eefb)
|
||||||
|
to be in line with spirv-headers.
|
||||||
|
* Implement GL_NV_cooperative_matrix
|
||||||
|
* Fixup leak of TString
|
||||||
|
* Add option to reflect all block members, inactive or active.
|
||||||
|
* Add option to reflect buffer blocks & variables separately to
|
||||||
|
uniforms.
|
||||||
|
* Reflect array stride, top-level array stride, and block
|
||||||
|
member count.
|
||||||
|
* Reflect pipeline outputs as well as inputs, optionally from
|
||||||
|
other stages.
|
||||||
|
* Add an option to report array variables with trailing [0]
|
||||||
|
suffix.
|
||||||
|
* Include array index in reflected uniform names more
|
||||||
|
consistently.
|
||||||
|
* Add options to control how reflection information is built
|
||||||
|
* Move TObjectReflection into public interface to clean up
|
||||||
|
reflection.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 19 09:48:37 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
|
Tue Feb 19 09:48:37 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
18
glslang.spec
18
glslang.spec
@ -16,10 +16,10 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%define version_unconverted 7.11.3113
|
%define version_unconverted 7.11.3113.git55
|
||||||
|
|
||||||
Name: glslang
|
Name: glslang
|
||||||
Version: 7.11.3113
|
Version: 7.11.3113.git55
|
||||||
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-suse3
|
%package -n libglslang-suse4
|
||||||
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-suse3
|
%description -n libglslang-suse4
|
||||||
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-suse3 = %version
|
Requires: libglslang-suse4 = %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-suse3 -p /sbin/ldconfig
|
%post -n libglslang-suse4 -p /sbin/ldconfig
|
||||||
%postun -n libglslang-suse3 -p /sbin/ldconfig
|
%postun -n libglslang-suse4 -p /sbin/ldconfig
|
||||||
|
|
||||||
%files -n libglslang-suse3
|
%files -n libglslang-suse4
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%_libdir/*.so.suse3*
|
%_libdir/*.so.suse4*
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
|
10
ver.diff
10
ver.diff
@ -26,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 suse3)
|
+set_target_properties(SPIRV PROPERTIES SOVERSION suse4)
|
||||||
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 suse3)
|
+ set_target_properties(SPVRemapper PROPERTIES SOVERSION suse4)
|
||||||
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()
|
||||||
@ -44,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 suse3)
|
+set_target_properties(glslang-default-resource-limits PROPERTIES SOVERSION suse4)
|
||||||
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)
|
||||||
|
|
||||||
@ -56,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 suse3)
|
+set_target_properties(glslang PROPERTIES SOVERSION suse4)
|
||||||
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)
|
||||||
@ -68,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 suse3)
|
+set_target_properties(HLSL PROPERTIES SOVERSION suse4)
|
||||||
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)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user