Accepting request 707924 from X11:Wayland
- Update to new snapshot 7.11.3214.git16 (2f4a8dfd) OBS-URL: https://build.opensuse.org/request/show/707924 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glslang?expand=0&rev=14
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
0baf31107c
8
_service
8
_service
@ -2,10 +2,10 @@
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="scm">git</param>
|
||||
<param name="url">git://github.com/KhronosGroup/glslang</param>
|
||||
<!-- minor part also in glslang/Include/revision.h -->
|
||||
<param name="revision">f925eefb</param>
|
||||
<param name="parent-tag">7.11.3113</param>
|
||||
<param name="versionformat">7.11.3113.git@TAG_OFFSET@</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>
|
||||
</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:238771793bdd4df154534653b5a30a6ccfe721a803cd2964db3f73df2824de90
|
||||
size 1462940
|
||||
3
glslang-7.11.3214.git36.tar.xz
Normal file
3
glslang-7.11.3214.git36.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:79410c89a7cdac2706dd889ef74a8e57d90c2721e430b20cad0a8844e595f7fd
|
||||
size 1586072
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 5 10:31:35 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to new snapshot 7.11.3214.git16 (2f4a8dfd)
|
||||
* GLSL: Fix tessellation control shader bounding box support.
|
||||
* GLSL: Add error check for an argument dropping the
|
||||
"restrict" qualifier.
|
||||
* Add support for GL_EXT_buffer_reference2.
|
||||
* SPV: Move to the SPIR-V 1.4 header.
|
||||
* Support GL_ARB_fragment_shader_interlock.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Mar 16 18:40:53 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
||||
20
glslang.spec
20
glslang.spec
@ -16,10 +16,11 @@
|
||||
#
|
||||
|
||||
|
||||
%define version_unconverted 7.11.3113.git55
|
||||
%define version_unconverted 7.11.3214.git36
|
||||
%define lname libglslang-suse5
|
||||
|
||||
Name: glslang
|
||||
Version: 7.11.3113.git55
|
||||
Version: 7.11.3214.git36
|
||||
Release: 0
|
||||
Summary: OpenGL and OpenGL ES shader front end and validator
|
||||
License: BSD-3-Clause
|
||||
@ -34,17 +35,18 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: bison
|
||||
BuildRequires: cmake >= 2.8
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: python3-base
|
||||
|
||||
%description
|
||||
glslang is a compiler front end for the OpenGL ES and OpenGL shading
|
||||
languages. It implements a strict interpretation of the
|
||||
specifications for these languages.
|
||||
|
||||
%package -n libglslang-suse4
|
||||
%package -n %lname
|
||||
Summary: OpenGL and OpenGL ES shader front end implementation
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libglslang-suse4
|
||||
%description -n %lname
|
||||
glslang is a compiler front end for the OpenGL ES and OpenGL shading
|
||||
languages. It implements a strict interpretation of the
|
||||
specifications for these languages.
|
||||
@ -52,7 +54,7 @@ specifications for these languages.
|
||||
%package devel
|
||||
Summary: OpenGL and OpenGL ES shader front end and validator
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libglslang-suse4 = %version
|
||||
Requires: %lname = %version
|
||||
|
||||
%description devel
|
||||
glslang is a compiler front end for the OpenGL ES and OpenGL shading
|
||||
@ -85,12 +87,12 @@ ln -s SPIRV/spirv.hpp "$b/%_includedir/"
|
||||
find "$b/%_includedir/" -type f -exec chmod a-x "{}" "+"
|
||||
cp build/StandAlone/libglslang-default-resource-limits.so "$b/%_libdir/"
|
||||
|
||||
%post -n libglslang-suse4 -p /sbin/ldconfig
|
||||
%postun -n libglslang-suse4 -p /sbin/ldconfig
|
||||
%post -n %lname -p /sbin/ldconfig
|
||||
%postun -n %lname -p /sbin/ldconfig
|
||||
|
||||
%files -n libglslang-suse4
|
||||
%files -n %lname
|
||||
%defattr(-,root,root)
|
||||
%_libdir/*.so.suse4*
|
||||
%_libdir/*.so.suse5*
|
||||
|
||||
%files devel
|
||||
%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)
|
||||
|
||||
add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
|
||||
+set_target_properties(SPIRV PROPERTIES SOVERSION suse4)
|
||||
+set_target_properties(SPIRV PROPERTIES SOVERSION suse5)
|
||||
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 suse4)
|
||||
+ set_target_properties(SPVRemapper PROPERTIES SOVERSION suse5)
|
||||
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 suse4)
|
||||
+set_target_properties(glslang-default-resource-limits PROPERTIES SOVERSION suse5)
|
||||
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 suse4)
|
||||
+set_target_properties(glslang PROPERTIES SOVERSION suse5)
|
||||
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 suse4)
|
||||
+set_target_properties(HLSL PROPERTIES SOVERSION suse5)
|
||||
set_property(TARGET HLSL PROPERTY FOLDER hlsl)
|
||||
set_property(TARGET HLSL PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user