jengelh/glslang
SHA256
1
0
Fork 0
forked from pool/glslang
Code Pull Requests Activity

- Update to release 11.13

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=102
This commit is contained in:
Jan Engelhardt 2022-12-15 15:22:21 +00:00 committed by Git OBS Bridge
parent 60ae158b10
commit a5d580b87d
6 changed files with 48 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
11.12.0.tar.gz
View File

@ -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
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:592c98aeb03b3e81597ddaf83633c4e63068d14b18a766fd11033bad73127162
size 3658039

69
abibreak_bump.diff
View File

@ -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. The ABI break in commit 11.12.0~18^2 causes programs to no longer run.
Induce a SONAME change. Induce a SONAME change.
--- ---
SPIRV/CMakeLists.txt | 4 ++-- SPIRV/CMakeLists.txt | 2 ++
StandAlone/CMakeLists.txt | 2 +- StandAlone/CMakeLists.txt | 1 +
glslang/CMakeLists.txt | 2 +- glslang/CMakeLists.txt | 1 +
hlsl/CMakeLists.txt | 2 +- hlsl/CMakeLists.txt | 1 +
4 files changed, 5 insertions(+), 5 deletions(-) 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.13.0.orig/SPIRV/CMakeLists.txt
+++ glslang-11.12.0/SPIRV/CMakeLists.txt +++ glslang-11.13.0/SPIRV/CMakeLists.txt
@@ -70,7 +70,7 @@ set(SPVREMAP_HEADERS @@ -72,6 +72,7 @@ set(SPVREMAP_HEADERS
doc.h)
add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${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}")
+set_target_properties(SPIRV PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}.${GLSLANG_VERSION_MINOR}") +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 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
@@ -81,7 +81,7 @@ glslang_add_build_info_dependency(SPIRV) @@ -83,6 +84,7 @@ glslang_add_build_info_dependency(SPIRV)
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 VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}") 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 LINK_FLAGS "-Wl,--version-script=/tmp/z.sym")
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()
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.13.0.orig/StandAlone/CMakeLists.txt
+++ glslang-11.12.0/StandAlone/CMakeLists.txt +++ glslang-11.13.0/StandAlone/CMakeLists.txt
@@ -50,7 +50,7 @@ add_custom_command( @@ -51,6 +51,7 @@ add_library(glslang-default-resource-lim
add_library(glslang-default-resource-limits
${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp
${CMAKE_CURRENT_SOURCE_DIR}/resource_limits_c.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}")
+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 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 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)
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.13.0.orig/glslang/CMakeLists.txt
+++ glslang-11.12.0/glslang/CMakeLists.txt +++ glslang-11.13.0/glslang/CMakeLists.txt
@@ -169,7 +169,7 @@ set_target_properties(glslang PROPERTIES @@ -172,6 +172,7 @@ set_target_properties(glslang PROPERTIES
FOLDER glslang
POSITION_INDEPENDENT_CODE ON POSITION_INDEPENDENT_CODE ON
VERSION "${GLSLANG_VERSION}" VERSION "${GLSLANG_VERSION}"
- SOVERSION "${GLSLANG_VERSION_MAJOR}") SOVERSION "${GLSLANG_VERSION_MAJOR}")
+ SOVERSION "${GLSLANG_VERSION_MAJOR}.${GLSLANG_VERSION_MINOR}") +set_target_properties(glslang PROPERTIES LINK_FLAGS "-Wl,--version-script=/tmp/z.sym")
target_link_libraries(glslang PRIVATE OGLCompiler OSDependent MachineIndependent) target_link_libraries(glslang PRIVATE OGLCompiler OSDependent MachineIndependent)
target_include_directories(glslang PUBLIC target_include_directories(glslang PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..> $<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.13.0.orig/hlsl/CMakeLists.txt
+++ glslang-11.12.0/hlsl/CMakeLists.txt +++ glslang-11.13.0/hlsl/CMakeLists.txt
@@ -40,7 +40,7 @@ @@ -41,6 +41,7 @@ add_library(HLSL ${LIB_TYPE} "stub.cpp")
add_library(HLSL ${LIB_TYPE} "stub.cpp")
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)
-set_target_properties(HLSL PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}") 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 LINK_FLAGS "-Wl,--version-script=/tmp/z.sym")
if(WIN32 AND BUILD_SHARED_LIBS) if(WIN32 AND BUILD_SHARED_LIBS)
set_target_properties(HLSL PROPERTIES PREFIX "") set_target_properties(HLSL PROPERTIES PREFIX "")

2
baselibs.conf
View File

@ -1 +1 @@
libglslang11_12 libglslang11

9
glslang.changes
View File

@ -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> Mon Oct 24 19:30:21 UTC 2022 - Jan Engelhardt <jengelh@inai.de>

5
glslang.spec
View File

@ -16,9 +16,9 @@
# #
%define lname libglslang11_12 %define lname libglslang11
Name: glslang Name: glslang
Version: 11.12.0 Version: 11.13.0
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
@ -72,6 +72,7 @@ compressor's dictionary can find better cross module commonality.
%build %build
%global _lto_cflags %{?_lto_cflags} -ffat-lto-objects %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) # Trim -Wl,--no-undefined for now (https://github.com/KhronosGroup/glslang/issues/1484)
%cmake -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" %cmake -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now"
%make_build %make_build