forked from pool/glslang
- Update to release 11.13
OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=102
This commit is contained in:
Git OBS Bridge
parent
60ae158b10
commit
a5d580b87d
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7795a97450fecd9779f3d821858fbc2d1a3bf1dd602617d95b685ccbcabc302f
|
||||
size 3655891
|
||||
3
11.13.0.tar.gz
Normal file
3
11.13.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:592c98aeb03b3e81597ddaf83633c4e63068d14b18a766fd11033bad73127162
|
||||
size 3658039
|
||||
@ -5,70 +5,65 @@ References: https://github.com/KhronosGroup/glslang/issues/3052
|
||||
The ABI break in commit 11.12.0~18^2 causes programs to no longer run.
|
||||
Induce a SONAME change.
|
||||
---
|
||||
SPIRV/CMakeLists.txt | 4 ++--
|
||||
StandAlone/CMakeLists.txt | 2 +-
|
||||
glslang/CMakeLists.txt | 2 +-
|
||||
hlsl/CMakeLists.txt | 2 +-
|
||||
4 files changed, 5 insertions(+), 5 deletions(-)
|
||||
SPIRV/CMakeLists.txt | 2 ++
|
||||
StandAlone/CMakeLists.txt | 1 +
|
||||
glslang/CMakeLists.txt | 1 +
|
||||
hlsl/CMakeLists.txt | 1 +
|
||||
4 files changed, 5 insertions(+)
|
||||
|
||||
Index: glslang-11.12.0/SPIRV/CMakeLists.txt
|
||||
Index: glslang-11.13.0/SPIRV/CMakeLists.txt
|
||||
===================================================================
|
||||
--- glslang-11.12.0.orig/SPIRV/CMakeLists.txt
|
||||
+++ glslang-11.12.0/SPIRV/CMakeLists.txt
|
||||
@@ -70,7 +70,7 @@ set(SPVREMAP_HEADERS
|
||||
doc.h)
|
||||
--- glslang-11.13.0.orig/SPIRV/CMakeLists.txt
|
||||
+++ glslang-11.13.0/SPIRV/CMakeLists.txt
|
||||
@@ -72,6 +72,7 @@ set(SPVREMAP_HEADERS
|
||||
|
||||
add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
|
||||
-set_target_properties(SPIRV PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}")
|
||||
+set_target_properties(SPIRV PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}.${GLSLANG_VERSION_MINOR}")
|
||||
set_target_properties(SPIRV PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}")
|
||||
+set_target_properties(SPIRV PROPERTIES LINK_FLAGS "-Wl,--version-script=/tmp/z.sym")
|
||||
set_property(TARGET SPIRV PROPERTY FOLDER glslang)
|
||||
set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||
target_include_directories(SPIRV PUBLIC
|
||||
@@ -81,7 +81,7 @@ glslang_add_build_info_dependency(SPIRV)
|
||||
|
||||
@@ -83,6 +84,7 @@ glslang_add_build_info_dependency(SPIRV)
|
||||
if (ENABLE_SPVREMAPPER)
|
||||
add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS})
|
||||
- set_target_properties(SPVRemapper PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}")
|
||||
+ set_target_properties(SPVRemapper PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}.${GLSLANG_VERSION_MINOR}")
|
||||
set_target_properties(SPVRemapper PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}")
|
||||
+ set_target_properties(SPVRemapper PROPERTIES LINK_FLAGS "-Wl,--version-script=/tmp/z.sym")
|
||||
set_property(TARGET SPVRemapper PROPERTY FOLDER glslang)
|
||||
set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||
endif()
|
||||
Index: glslang-11.12.0/StandAlone/CMakeLists.txt
|
||||
Index: glslang-11.13.0/StandAlone/CMakeLists.txt
|
||||
===================================================================
|
||||
--- glslang-11.12.0.orig/StandAlone/CMakeLists.txt
|
||||
+++ glslang-11.12.0/StandAlone/CMakeLists.txt
|
||||
@@ -50,7 +50,7 @@ add_custom_command(
|
||||
add_library(glslang-default-resource-limits
|
||||
--- glslang-11.13.0.orig/StandAlone/CMakeLists.txt
|
||||
+++ glslang-11.13.0/StandAlone/CMakeLists.txt
|
||||
@@ -51,6 +51,7 @@ add_library(glslang-default-resource-lim
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/resource_limits_c.cpp)
|
||||
-set_target_properties(glslang-default-resource-limits PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}")
|
||||
+set_target_properties(glslang-default-resource-limits PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}.${GLSLANG_VERSION_MINOR}")
|
||||
set_target_properties(glslang-default-resource-limits PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}")
|
||||
+set_target_properties(glslang-default-resource-limits PROPERTIES LINK_FLAGS "-Wl,--version-script=/tmp/z.sym")
|
||||
set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang)
|
||||
set_property(TARGET glslang-default-resource-limits PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||
|
||||
Index: glslang-11.12.0/glslang/CMakeLists.txt
|
||||
Index: glslang-11.13.0/glslang/CMakeLists.txt
|
||||
===================================================================
|
||||
--- glslang-11.12.0.orig/glslang/CMakeLists.txt
|
||||
+++ glslang-11.12.0/glslang/CMakeLists.txt
|
||||
@@ -169,7 +169,7 @@ set_target_properties(glslang PROPERTIES
|
||||
FOLDER glslang
|
||||
--- glslang-11.13.0.orig/glslang/CMakeLists.txt
|
||||
+++ glslang-11.13.0/glslang/CMakeLists.txt
|
||||
@@ -172,6 +172,7 @@ set_target_properties(glslang PROPERTIES
|
||||
POSITION_INDEPENDENT_CODE ON
|
||||
VERSION "${GLSLANG_VERSION}"
|
||||
- SOVERSION "${GLSLANG_VERSION_MAJOR}")
|
||||
+ SOVERSION "${GLSLANG_VERSION_MAJOR}.${GLSLANG_VERSION_MINOR}")
|
||||
SOVERSION "${GLSLANG_VERSION_MAJOR}")
|
||||
+set_target_properties(glslang PROPERTIES LINK_FLAGS "-Wl,--version-script=/tmp/z.sym")
|
||||
target_link_libraries(glslang PRIVATE OGLCompiler OSDependent MachineIndependent)
|
||||
target_include_directories(glslang PUBLIC
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
|
||||
Index: glslang-11.12.0/hlsl/CMakeLists.txt
|
||||
Index: glslang-11.13.0/hlsl/CMakeLists.txt
|
||||
===================================================================
|
||||
--- glslang-11.12.0.orig/hlsl/CMakeLists.txt
|
||||
+++ glslang-11.12.0/hlsl/CMakeLists.txt
|
||||
@@ -40,7 +40,7 @@
|
||||
add_library(HLSL ${LIB_TYPE} "stub.cpp")
|
||||
--- glslang-11.13.0.orig/hlsl/CMakeLists.txt
|
||||
+++ glslang-11.13.0/hlsl/CMakeLists.txt
|
||||
@@ -41,6 +41,7 @@ add_library(HLSL ${LIB_TYPE} "stub.cpp")
|
||||
set_property(TARGET HLSL PROPERTY FOLDER hlsl)
|
||||
set_property(TARGET HLSL PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||
-set_target_properties(HLSL PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}")
|
||||
+set_target_properties(HLSL PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}.${GLSLANG_VERSION_MINOR}")
|
||||
set_target_properties(HLSL PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}")
|
||||
+set_target_properties(HLSL PROPERTIES LINK_FLAGS "-Wl,--version-script=/tmp/z.sym")
|
||||
|
||||
if(WIN32 AND BUILD_SHARED_LIBS)
|
||||
set_target_properties(HLSL PROPERTIES PREFIX "")
|
||||
|
||||
@ -1 +1 @@
|
||||
libglslang11_12
|
||||
libglslang11
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 15 14:11:52 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to release 11.13
|
||||
* Fix incorrect parse message of mesh shader
|
||||
* Test for spv1.6 + memory model HelperInvocation
|
||||
* Add EliminateDeadOutputStores to API.
|
||||
* GL_ARM_shader_core_builtins support
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 24 19:30:21 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
||||
@ -16,9 +16,9 @@
|
||||
#
|
||||
|
||||
|
||||
%define lname libglslang11_12
|
||||
%define lname libglslang11
|
||||
Name: glslang
|
||||
Version: 11.12.0
|
||||
Version: 11.13.0
|
||||
Release: 0
|
||||
Summary: OpenGL and OpenGL ES shader front end and validator
|
||||
License: BSD-3-Clause
|
||||
@ -72,6 +72,7 @@ compressor's dictionary can find better cross module commonality.
|
||||
|
||||
%build
|
||||
%global _lto_cflags %{?_lto_cflags} -ffat-lto-objects
|
||||
echo "V_%version { global: *; };" >/tmp/z.sym
|
||||
# Trim -Wl,--no-undefined for now (https://github.com/KhronosGroup/glslang/issues/1484)
|
||||
%cmake -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now"
|
||||
%make_build
|
||||
|
||||
Loading…
Reference in New Issue
Block a user