diff --git a/0001-build-set-SOVERSION-on-all-libraries.patch b/0001-build-set-SOVERSION-on-all-libraries.patch deleted file mode 100644 index 82b3547..0000000 --- a/0001-build-set-SOVERSION-on-all-libraries.patch +++ /dev/null @@ -1,64 +0,0 @@ -From ed00a83502072235206615a8148814e74fdfc711 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Tue, 18 Aug 2020 17:12:16 +0200 -Subject: [PATCH] build: set SOVERSION on all libraries -References: https://github.com/KhronosGroup/glslang/pull/2373 - -Commit fbe9a23baf2cb020fe3f80d68d972e2a97d9b954 erroneously -only added SOVERSION to libglslang.so, but none of the others -that are produced. - -Signed-off-by: Jan Engelhardt ---- - SPIRV/CMakeLists.txt | 2 ++ - StandAlone/CMakeLists.txt | 1 + - hlsl/CMakeLists.txt | 1 + - 3 files changed, 4 insertions(+) - -diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt -index d699dadd..75202255 100644 ---- a/SPIRV/CMakeLists.txt -+++ b/SPIRV/CMakeLists.txt -@@ -69,6 +69,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_property(TARGET SPIRV PROPERTY FOLDER glslang) - set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON) - target_include_directories(SPIRV PUBLIC -@@ -79,6 +80,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_property(TARGET SPVRemapper PROPERTY FOLDER glslang) - set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON) - endif() -diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt -index 8038c043..ea3a31c2 100644 ---- a/StandAlone/CMakeLists.txt -+++ b/StandAlone/CMakeLists.txt -@@ -34,6 +34,7 @@ - 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_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang) - set_property(TARGET glslang-default-resource-limits PROPERTY POSITION_INDEPENDENT_CODE ON) - -diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt -index 62faa195..a73761ba 100644 ---- a/hlsl/CMakeLists.txt -+++ b/hlsl/CMakeLists.txt -@@ -40,6 +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}") - - if(WIN32 AND BUILD_SHARED_LIBS) - set_target_properties(HLSL PROPERTIES PREFIX "") --- -2.28.0 - diff --git a/12.0.0.tar.gz b/12.0.0.tar.gz deleted file mode 100644 index 8de09a4..0000000 --- a/12.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7cb45842ec1d4b6ea775d624c3d2d8ba9450aa416b0482b0cc7e4fdd399c3d75 -size 3682791 diff --git a/12.1.0.tar.gz b/12.1.0.tar.gz new file mode 100644 index 0000000..f30a3db --- /dev/null +++ b/12.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1515e840881d1128fb6d831308433f731808f818f2103881162f3ffd47b15cd5 +size 3686676 diff --git a/glslang.changes b/glslang.changes index eb8938b..1061ae2 100644 --- a/glslang.changes +++ b/glslang.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Mar 28 18:53:03 UTC 2023 - Enrico Belleri + +- Update to release 12.1.0: + * Reject non-float inputs/outputs for version less than 120 + * Fix invalid BufferBlock decoration for SPIR-V 1.3 and above + * Add HLSL relaxed-precision float/int matrix expansions + * Block decorate Vulkan structs with RuntimeArrays + * Support InterlockedAdd on float types +- Delete 0001-build-set-SOVERSION-on-all-libraries.patch: + fixed upstream +- Split part of glslang-devel to glslang-nonstd-devel. + ------------------------------------------------------------------- Sun Jan 29 12:53:11 UTC 2023 - Jan Engelhardt diff --git a/glslang.spec b/glslang.spec index 4fca3c8..035a068 100644 --- a/glslang.spec +++ b/glslang.spec @@ -18,7 +18,7 @@ %define lname libglslang12 Name: glslang -Version: 12.0.0 +Version: 12.1.0 Release: 0 Summary: OpenGL and OpenGL ES shader front end and validator License: BSD-3-Clause @@ -27,9 +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 -Patch1: 0001-build-set-SOVERSION-on-all-libraries.patch BuildRequires: bison -BuildRequires: cmake >= 2.8 +BuildRequires: cmake >= 3.14.0 BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: python3-base @@ -66,6 +65,20 @@ range (IDs are not as tightly packed around zero), but will compress better when multiple modules are compressed together, since compressor's dictionary can find better cross module commonality. +%package nonstd-devel +Summary: Secondary set of header files for glslang +Group: Development/Libraries/C and C++ +Requires: %lname = %version +BuildArch: noarch + +%description nonstd-devel +glslang is a compiler front end for the OpenGL ES and OpenGL shading +languages. It implements a strict interpretation of the +specifications for these languages. + +This package contains additional headers that are not officially installed, +but which some downstream packages rely on. + %prep %autosetup -p1 @@ -78,14 +91,30 @@ echo "V_%version { global: *; };" >/tmp/z.sym %install %global _lto_cflags %_lto_cflags -ffat-lto-objects +od="$PWD" %cmake_install + b="%buildroot" +pushd "$b" +( + find usr/include -mindepth 1 -type d -printf "%%%%dir /%p\n" + find usr/include "(" -type f -o -type l ")" -printf "/%p\n" +) | sort >"$od/devel.files" +popd + mkdir -p "$b/%_includedir" cp -a SPIRV glslang "$b/%_includedir/" find "$b/%_includedir/" -type f ! -iname "*.h" -a ! -iname "*.hpp" -print -delete ln -s SPIRV/spirv.hpp "$b/%_includedir/" find "$b/%_includedir/" -type f -exec chmod a-x "{}" "+" -cp build/StandAlone/libglslang-default-resource-limits.so "$b/%_libdir/" + +pushd "$b" +( + find usr/include -mindepth 1 -type d -printf "%%%%dir /%p\n" + find usr/include "(" -type f -o -type l ")" -printf "/%p\n" +) | sort >"$od/devel_full.files" +popd +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. @@ -102,7 +131,7 @@ done %files -n %lname %_libdir/*.so.12* -%files devel +%files devel -f devel.files %_bindir/gls* %_bindir/spirv* %_libdir/cmake/ @@ -115,6 +144,7 @@ done %_libdir/libSPIRV.so %_libdir/libSPVRemapper.so %_libdir/libglslang.so -%_includedir/* + +%files nonstd-devel -f devel2.files %changelog