diff --git a/0001-Revert-CMake-Make-glslang-default-resource-limits-ST.patch b/0001-Revert-CMake-Make-glslang-default-resource-limits-ST.patch new file mode 100644 index 0000000..76afac9 --- /dev/null +++ b/0001-Revert-CMake-Make-glslang-default-resource-limits-ST.patch @@ -0,0 +1,23 @@ +From 949e46a187d4d97d6a63495ba76438523f021015 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +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}" diff --git a/12.2.0.tar.gz b/12.2.0.tar.gz deleted file mode 100644 index 81294e1..0000000 --- a/12.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:870d17030fda7308c1521fb2e01a9e93cbe4b130bc8274e90d00e127432ab6f6 -size 3706316 diff --git a/glslang.changes b/glslang.changes index 5716c1d..6da01f4 100644 --- a/glslang.changes +++ b/glslang.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Aug 22 10:09:15 UTC 2023 - Jan Engelhardt + +- Update to release 12.3.1+SDK-1.3.261.0 + * Add support for pre and post HLSL qualifier validation + * HLSL: support binary literals + * Implement support for GL_KHR_cooperative_matrix extension + * Remove OSDependent TLS functions +- Add 0001-Revert-CMake-Make-glslang-default-resource-limits-ST.patch + ------------------------------------------------------------------- Mon May 29 10:38:28 UTC 2023 - Jan Engelhardt diff --git a/glslang.spec b/glslang.spec index b03fa01..af32fb8 100644 --- a/glslang.spec +++ b/glslang.spec @@ -18,15 +18,16 @@ %define lname libglslang12 Name: glslang -Version: 12.2.0 +Version: 12.3.1+sdk261 Release: 0 Summary: OpenGL and OpenGL ES shader front end and validator License: BSD-3-Clause Group: Development/Libraries/C and C++ 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 +Source: https://github.com/KhronosGroup/glslang/archive/sdk-1.3.261.0.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 @@ -80,10 +81,11 @@ This package contains additional headers that are not officially installed, but which some downstream packages rely on. %prep -%autosetup -p1 +%autosetup -p1 -n %name-sdk-1.3.261.0 %build %global _lto_cflags %{?_lto_cflags} -ffat-lto-objects +# ABI keeps on breaking (gh#3052 #3311 #3312) 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" @@ -118,6 +120,7 @@ comm -13 "$od/devel.files" "$od/devel_full.files" >"$od/devel2.files" # 3rd party programs use -lOGLCompiler (because pristine glslang shipped .a files), # so satisfy them under our shared build. +mkdir -p "$b/%_libdir" for i in libOGLCompiler libOSDependent libGenericCodeGen libMachineIndependent; do ln -s libglslang.so "$b/%_libdir/$i.so" rm -f "$b/%_libdir/$i.a" @@ -135,7 +138,6 @@ done %_bindir/gls* %_bindir/spirv* %_libdir/cmake/ -%_libdir/*resource*.so %_libdir/libGenericCodeGen.so %_libdir/libHLSL.so %_libdir/libMachineIndependent.so @@ -144,6 +146,7 @@ done %_libdir/libSPIRV.so %_libdir/libSPVRemapper.so %_libdir/libglslang.so +%_libdir/libglslang-default-resource-limits.so %files nonstd-devel -f devel2.files diff --git a/sdk-1.3.261.0.tar.gz b/sdk-1.3.261.0.tar.gz new file mode 100644 index 0000000..af45ef3 --- /dev/null +++ b/sdk-1.3.261.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:19fd5c35ec62d7584189e4c4f73378d4343eb655c49818e4bd8a408d6b822f60 +size 3705459