forked from pool/glslang
Accepting request 746193 from X11:Wayland
- Update to release 7.13.3496 OBS-URL: https://build.opensuse.org/request/show/746193 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glslang?expand=0&rev=19
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
136eda2186
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.12.3352</param>
|
||||
<param name="parent-tag">7.12.3352</param>
|
||||
<param name="versionformat">7.12.3352</param>
|
||||
<param name="revision">7.13.3496</param>
|
||||
<param name="parent-tag">7.13.3496</param>
|
||||
<param name="versionformat">7.13.3496</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:48c61c85470d629df0254a0505022f6571b35ed4b823d16814a682e60773af35
|
||||
size 1602496
|
||||
3
glslang-7.13.3496.tar.xz
Normal file
3
glslang-7.13.3496.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5d03420783e4a848444c61ccadca64d8aa9ae105cb9ac48cd243fca08d24ff46
|
||||
size 1670196
|
||||
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 7 08:25:53 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to release 7.13.3496
|
||||
* GL_NV_integer_cooperative_matrix support
|
||||
* Add support for GL_ARB_explicit_uniform_location
|
||||
* SPV 1.5: Switch to the 1.5 header, for SPIR-V 1.5.
|
||||
* Add GL_EXT_shader_subgroup_extended_types support
|
||||
* SPV_KHR_physical_storage_buffer/SPV:
|
||||
Add GL_EXT_buffer_reference_uvec2
|
||||
* Emit SPV_EXT_physical_storage_buffer, not the KHR form.
|
||||
* Promote SPV_EXT_physical_storage_buffer to KHR when required.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 14 21:01:23 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
||||
11
glslang.spec
11
glslang.spec
@ -17,11 +17,11 @@
|
||||
|
||||
|
||||
# lname needs a bump for every change in commit (_service)
|
||||
%define version_unconverted 7.12.3352
|
||||
%define lname libglslang-suse7
|
||||
%define version_unconverted 7.13.3496
|
||||
%define lname libglslang-suse8
|
||||
|
||||
Name: glslang
|
||||
Version: 7.12.3352
|
||||
Version: 7.13.3496
|
||||
Release: 0
|
||||
Summary: OpenGL and OpenGL ES shader front end and validator
|
||||
License: BSD-3-Clause
|
||||
@ -34,6 +34,7 @@ Patch1: ver.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: bison
|
||||
BuildRequires: cmake >= 2.8
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: python3-base
|
||||
|
||||
@ -94,18 +95,20 @@ cp build/StandAlone/libglslang-default-resource-limits.so "$b/%_libdir/"
|
||||
# so satisfy them under our shared build.
|
||||
ln -s libglslang.so "$b/%_libdir/libOGLCompiler.so"
|
||||
ln -s libglslang.so "$b/%_libdir/libOSDependent.so"
|
||||
%fdupes %buildroot/%_prefix
|
||||
|
||||
%post -n %lname -p /sbin/ldconfig
|
||||
%postun -n %lname -p /sbin/ldconfig
|
||||
|
||||
%files -n %lname
|
||||
%defattr(-,root,root)
|
||||
%_libdir/*.so.suse7*
|
||||
%_libdir/*.so.suse8*
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%_bindir/gls*
|
||||
%_bindir/spirv*
|
||||
%_prefix/lib/cmake/
|
||||
%_libdir/*resource*.so
|
||||
%_libdir/libHLSL.so
|
||||
%_libdir/libOGLCompiler.so
|
||||
|
||||
43
ver.diff
43
ver.diff
@ -18,57 +18,58 @@ There is no ABI stability to expect here.
|
||||
hlsl/CMakeLists.txt | 1 +
|
||||
4 files changed, 5 insertions(+)
|
||||
|
||||
Index: glslang-7.9.2933.g33/SPIRV/CMakeLists.txt
|
||||
Index: glslang-7.13.3496/SPIRV/CMakeLists.txt
|
||||
===================================================================
|
||||
--- 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)
|
||||
--- glslang-7.13.3496.orig/SPIRV/CMakeLists.txt
|
||||
+++ glslang-7.13.3496/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 suse7)
|
||||
+set_target_properties(SPIRV PROPERTIES SOVERSION suse8)
|
||||
set_property(TARGET SPIRV PROPERTY FOLDER glslang)
|
||||
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
|
||||
|
||||
if (ENABLE_SPVREMAPPER)
|
||||
add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS})
|
||||
+ set_target_properties(SPVRemapper PROPERTIES SOVERSION suse7)
|
||||
+ set_target_properties(SPVRemapper PROPERTIES SOVERSION suse8)
|
||||
set_property(TARGET SPVRemapper PROPERTY FOLDER glslang)
|
||||
set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||
endif()
|
||||
Index: glslang-7.9.2933.g33/StandAlone/CMakeLists.txt
|
||||
Index: glslang-7.13.3496/StandAlone/CMakeLists.txt
|
||||
===================================================================
|
||||
--- glslang-7.9.2933.g33.orig/StandAlone/CMakeLists.txt
|
||||
+++ glslang-7.9.2933.g33/StandAlone/CMakeLists.txt
|
||||
--- glslang-7.13.3496.orig/StandAlone/CMakeLists.txt
|
||||
+++ glslang-7.13.3496/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 suse7)
|
||||
+set_target_properties(glslang-default-resource-limits PROPERTIES SOVERSION suse8)
|
||||
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.9.2933.g33/glslang/CMakeLists.txt
|
||||
Index: glslang-7.13.3496/glslang/CMakeLists.txt
|
||||
===================================================================
|
||||
--- glslang-7.9.2933.g33.orig/glslang/CMakeLists.txt
|
||||
+++ glslang-7.9.2933.g33/glslang/CMakeLists.txt
|
||||
@@ -83,6 +83,7 @@ set(HEADERS
|
||||
--- glslang-7.13.3496.orig/glslang/CMakeLists.txt
|
||||
+++ glslang-7.13.3496/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 suse7)
|
||||
+set_target_properties(glslang PROPERTIES SOVERSION suse8)
|
||||
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.9.2933.g33/hlsl/CMakeLists.txt
|
||||
Index: glslang-7.13.3496/hlsl/CMakeLists.txt
|
||||
===================================================================
|
||||
--- glslang-7.9.2933.g33.orig/hlsl/CMakeLists.txt
|
||||
+++ glslang-7.9.2933.g33/hlsl/CMakeLists.txt
|
||||
--- glslang-7.13.3496.orig/hlsl/CMakeLists.txt
|
||||
+++ glslang-7.13.3496/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 suse7)
|
||||
+set_target_properties(HLSL PROPERTIES SOVERSION suse8)
|
||||
set_property(TARGET HLSL PROPERTY FOLDER hlsl)
|
||||
set_property(TARGET HLSL PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user