forked from pool/glslang
Accepting request 1030978 from X11:Wayland
- Update to release 11.12 OBS-URL: https://build.opensuse.org/request/show/1030978 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glslang?expand=0&rev=38
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
8af297789c
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:26c216c3062512c018cbdd752224b8dad703b7e5bb90bf338ba2dbb5d4f11438
|
||||
size 3542123
|
||||
3
11.12.0.tar.gz
Normal file
3
11.12.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7795a97450fecd9779f3d821858fbc2d1a3bf1dd602617d95b685ccbcabc302f
|
||||
size 3655891
|
||||
74
abibreak_bump.diff
Normal file
74
abibreak_bump.diff
Normal file
@ -0,0 +1,74 @@
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: 2022-10-25 02:00:05.861368368 +0200
|
||||
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(-)
|
||||
|
||||
Index: glslang-11.12.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)
|
||||
|
||||
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_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)
|
||||
|
||||
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_property(TARGET SPVRemapper PROPERTY FOLDER glslang)
|
||||
set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||
endif()
|
||||
Index: glslang-11.12.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
|
||||
${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_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
|
||||
===================================================================
|
||||
--- 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
|
||||
POSITION_INDEPENDENT_CODE ON
|
||||
VERSION "${GLSLANG_VERSION}"
|
||||
- SOVERSION "${GLSLANG_VERSION_MAJOR}")
|
||||
+ SOVERSION "${GLSLANG_VERSION_MAJOR}.${GLSLANG_VERSION_MINOR}")
|
||||
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
|
||||
===================================================================
|
||||
--- 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")
|
||||
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}")
|
||||
|
||||
if(WIN32 AND BUILD_SHARED_LIBS)
|
||||
set_target_properties(HLSL PROPERTIES PREFIX "")
|
||||
@ -1 +1 @@
|
||||
libglslang11
|
||||
libglslang11_12
|
||||
|
||||
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 24 19:30:21 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to release 11.12
|
||||
* Add support for GL_EXT_mesh_shader
|
||||
* Add support for NonSemantic.Shader.DebugInfo.100
|
||||
* Make OpEmitMeshTasksEXT a terminal instruction
|
||||
* Make gl_SubGroupARB a flat in int in Vulkan
|
||||
* Add support for GL_EXT_opacity_micromap
|
||||
* Add preamble support to C interface
|
||||
- Add abibreak_bump.diff
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 9 10:35:49 UTC 2022 - Ralf Habacker <ralf.habacker@freenet.de>
|
||||
|
||||
|
||||
@ -16,9 +16,9 @@
|
||||
#
|
||||
|
||||
|
||||
%define lname libglslang11
|
||||
%define lname libglslang11_12
|
||||
Name: glslang
|
||||
Version: 11.11.0
|
||||
Version: 11.12.0
|
||||
Release: 0
|
||||
Summary: OpenGL and OpenGL ES shader front end and validator
|
||||
License: BSD-3-Clause
|
||||
@ -27,7 +27,8 @@ URL: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/
|
||||
#Git-URL: https://github.com/KhronosGroup/glslang
|
||||
Source: https://github.com/KhronosGroup/glslang/archive/%version.tar.gz
|
||||
Source3: baselibs.conf
|
||||
Patch0: 0001-build-set-SOVERSION-on-all-libraries.patch
|
||||
Patch1: 0001-build-set-SOVERSION-on-all-libraries.patch
|
||||
Patch2: abibreak_bump.diff
|
||||
BuildRequires: bison
|
||||
BuildRequires: cmake >= 2.8
|
||||
BuildRequires: fdupes
|
||||
@ -92,7 +93,6 @@ for i in libOGLCompiler libOSDependent libGenericCodeGen libMachineIndependent;
|
||||
ln -s libglslang.so "$b/%_libdir/$i.so"
|
||||
rm -f "$b/%_libdir/$i.a"
|
||||
done
|
||||
sed -i 's,\.a",\.so",g' %buildroot%{_datadir}/glslang/glslang-targets-*.cmake
|
||||
|
||||
%fdupes %buildroot/%_prefix
|
||||
|
||||
@ -116,6 +116,5 @@ sed -i 's,\.a",\.so",g' %buildroot%{_datadir}/glslang/glslang-targets-*.cmake
|
||||
%_libdir/libSPVRemapper.so
|
||||
%_libdir/libglslang.so
|
||||
%_includedir/*
|
||||
%_datadir/%name/
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user