Accepting request 1120774 from X11:Wayland

- Update to release 13.1.1

OBS-URL: https://build.opensuse.org/request/show/1120774
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glslang?expand=0&rev=46
This commit is contained in:
Ana Guerrero 2023-10-30 21:10:01 +00:00 committed by Git OBS Bridge
commit ce88364f53
5 changed files with 24 additions and 30 deletions

View File

@ -1,23 +0,0 @@
From 949e46a187d4d97d6a63495ba76438523f021015 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 23 Aug 2023 00:16:04 +0200
Subject: [PATCH] Revert "CMake: Make glslang-default-resource-limits STATIC"
This reverts commit 6f22e41e0de13aff75807cca9662730d8b3e54b6.
---
glslang/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: glslang-sdk-1.3.261.0/glslang/CMakeLists.txt
===================================================================
--- glslang-sdk-1.3.261.0.orig/glslang/CMakeLists.txt
+++ glslang-sdk-1.3.261.0/glslang/CMakeLists.txt
@@ -195,7 +195,7 @@ set(RESOURCELIMITS_HEADERS
Public/resource_limits_c.h
)
-add_library(glslang-default-resource-limits STATIC ${RESOURCELIMITS_SOURCES} ${RESOURCELIMITS_HEADERS})
+add_library(glslang-default-resource-limits ${RESOURCELIMITS_SOURCES} ${RESOURCELIMITS_HEADERS})
set_target_properties(glslang-default-resource-limits PROPERTIES
VERSION "${GLSLANG_VERSION}"
SOVERSION "${GLSLANG_VERSION_MAJOR}"

View File

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

3
13.1.1.tar.gz Normal file
View File

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

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sun Oct 22 02:09:01 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
- Update to release 13.1.1
* Support GL_EXT_texture_shadow_lod, GL_NV_displacement_micromap
* Add --no-link option
- Drop merged
0001-Revert-CMake-Make-glslang-default-resource-limits-ST.patch
-------------------------------------------------------------------
Wed Sep 6 22:49:08 UTC 2023 - Jan Engelhardt <jengelh@inai.de>

View File

@ -18,7 +18,7 @@
%define lname libglslang13
Name: glslang
Version: 13.0.0
Version: 13.1.1
Release: 0
Summary: OpenGL and OpenGL ES shader front end and validator
License: BSD-3-Clause
@ -27,12 +27,16 @@ 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
Patch1: 0001-Revert-CMake-Make-glslang-default-resource-limits-ST.patch
BuildRequires: bison
BuildRequires: cmake >= 3.14.0
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: python3-base
BuildRequires: spirv-tools-devel
%if 0%{?suse_version} && 0%{?suse_version} < 1599
BuildRequires: gcc11-c++
%else
BuildRequires: c++_compiler
%endif
%description
glslang is a compiler front end for the OpenGL ES and OpenGL shading
@ -87,8 +91,12 @@ but which some downstream packages rely on.
%global _lto_cflags %{?_lto_cflags} -ffat-lto-objects
# ABI keeps on breaking (gh#3052 #3311 #3312)
echo "V_%version { global: *; };" >/tmp/z.sym
%if 0%{?suse_version} && 0%{?suse_version} < 1599
export CC=gcc-11 CXX=g++-11
%endif
# 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" \
-DALLOW_EXTERNAL_SPIRV_TOOLS:BOOL=ON -DENABLE_OPT:BOOL=ON
%make_build
%install