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

Accepting request 712360 from X11:Wayland

Browse Source 
- Update to new snapshot 7.11.3276.git10 (4162de4)

OBS-URL: https://build.opensuse.org/request/show/712360
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glslang?expand=0&rev=15
This commit is contained in:
Dominique Leuenberger 2019-06-30 08:20:11 +00:00 committed by Git OBS Bridge
commit ceadf2567c
7 changed files with 34 additions and 37 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="url">git://github.com/KhronosGroup/glslang</param>
<!-- minor part also in glslang/Include/revision.h (and sometimes out of date too) -->
<param name="revision">2f4a8dfd3a596d75e3c26cb7ae9b68886d3a19cf</param>
<param name="parent-tag">7.11.3214</param>
<param name="versionformat">7.11.3214.git@TAG_OFFSET@</param>
<param name="revision">4162de4bbfc58ef37600c23e4e8fcf58e604f382</param>
<param name="parent-tag">8e96e247fadd3b241fe4a5d081ebe1ad45f885bc</param>
<param name="versionformat">7.11.3276.git@TAG_OFFSET@</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>

3
glslang-7.11.3214.git36.tar.xz
View File

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

3
glslang-7.11.3276.git10.tar.xz Normal file
View File

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

18
glslang.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Fri Jun 28 07:50:03 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Update to new snapshot 7.11.3276.git10 (4162de4)
* Add Float16/Int8/Int16 capabilities for private variables and
function parameters.
* Use spvValidatorOptionsSetBeforeHlslLegalization for
pre-legalized HLSL.
* Add support for GL_NV_shader_sm_builtins.
* Add gl_SemanticsVolatile to GL_KHR_memory_scope_semantics,
and make volatile-qualified atomics generate
MemorySemanticsVolatile when using the Vulkan memory model.
* Add missing GL_ARB_shader_ballot builtins to Geometry and
Tessellation shaders.
* SPV: Add a switch for favoring non-NaN operands in min, max,
and clamp.
- Remove nodate.diff (upstreamed)
-------------------------------------------------------------------
Wed Jun 5 10:31:35 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

11
glslang.spec
View File

@ -16,11 +16,11 @@
#
%define version_unconverted 7.11.3214.git36
%define lname libglslang-suse5
%define version_unconverted 7.11.3276.git10
%define lname libglslang-suse6
Name: glslang
Version: 7.11.3214.git36
Version: 7.11.3276.git10
Release: 0
Summary: OpenGL and OpenGL ES shader front end and validator
License: BSD-3-Clause
@ -29,8 +29,7 @@ URL: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/
#Git-URL: https://github.com/KhronosGroup/glslang
Source: %name-%version.tar.xz
Patch1: nodate.diff
Patch2: ver.diff
Patch1: ver.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison
BuildRequires: cmake >= 2.8
@ -92,7 +91,7 @@ cp build/StandAlone/libglslang-default-resource-limits.so "$b/%_libdir/"
%files -n %lname
%defattr(-,root,root)
%_libdir/*.so.suse5*
%_libdir/*.so.suse6*
%files devel
%defattr(-,root,root)

20
nodate.diff
View File

@ -1,20 +0,0 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2017-08-07 20:22:29.456870387 +0200
---
StandAlone/spirv-remap.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: glslang/StandAlone/spirv-remap.cpp
===================================================================
--- glslang.orig/StandAlone/spirv-remap.cpp
+++ glslang/StandAlone/spirv-remap.cpp
@@ -227,7 +227,7 @@ namespace {
}
}
else if (arg == "--version" || arg == "-V") {
- std::cout << basename(argv[0]) << " version 0.97 " << __DATE__ << " " << __TIME__ << std::endl;
+ std::cout << basename(argv[0]) << " version 0.97 " << std::endl;
exit(0);
} else if (arg == "--input" || arg == "-i") {
// Collect input files

10
ver.diff
View File

@ -26,14 +26,14 @@ Index: glslang-7.9.2933.g33/SPIRV/CMakeLists.txt
endif(ENABLE_NV_EXTENSIONS)
add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
+set_target_properties(SPIRV PROPERTIES SOVERSION suse5)
+set_target_properties(SPIRV PROPERTIES SOVERSION suse6)
set_property(TARGET SPIRV PROPERTY FOLDER glslang)
set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
target_include_directories(SPIRV PUBLIC ..)
if (ENABLE_SPVREMAPPER)
add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS})
+ set_target_properties(SPVRemapper PROPERTIES SOVERSION suse5)
+ set_target_properties(SPVRemapper PROPERTIES SOVERSION suse6)
set_property(TARGET SPVRemapper PROPERTY FOLDER glslang)
set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON)
endif()
@ -44,7 +44,7 @@ Index: glslang-7.9.2933.g33/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 suse5)
+set_target_properties(glslang-default-resource-limits PROPERTIES SOVERSION suse6)
set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang)
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)
add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS})
+set_target_properties(glslang PROPERTIES SOVERSION suse5)
+set_target_properties(glslang PROPERTIES SOVERSION suse6)
set_property(TARGET glslang PROPERTY FOLDER glslang)
set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON)
target_link_libraries(glslang OGLCompiler OSDependent)
@ -68,7 +68,7 @@ Index: glslang-7.9.2933.g33/hlsl/CMakeLists.txt
glslang_pch(SOURCES pch.cpp)
add_library(HLSL ${LIB_TYPE} ${SOURCES} ${HEADERS})
+set_target_properties(HLSL PROPERTIES SOVERSION suse5)
+set_target_properties(HLSL PROPERTIES SOVERSION suse6)
set_property(TARGET HLSL PROPERTY FOLDER hlsl)
set_property(TARGET HLSL PROPERTY POSITION_INDEPENDENT_CODE ON)