From e956e07429087e024f283670266ba20df01af74a Mon Sep 17 00:00:00 2001 From: AlmaLinux RelEng Bot Date: Mon, 30 Mar 2026 10:28:26 -0400 Subject: [PATCH] import CS glslang-16.0.0-1.el9 --- .gitignore | 2 +- .glslang.metadata | 2 +- SOURCES/0001-pkg-config-compatibility.patch | 39 ++-- SPECS/glslang.spec | 236 +++++--------------- 4 files changed, 73 insertions(+), 206 deletions(-) diff --git a/.gitignore b/.gitignore index 6eee335..bce7a71 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/glslang-sdk-1.4.313.0.tar.gz +SOURCES/glslang-sdk-1.4.328.1.tar.gz diff --git a/.glslang.metadata b/.glslang.metadata index 904632a..ba10932 100644 --- a/.glslang.metadata +++ b/.glslang.metadata @@ -1 +1 @@ -4b7f76df0c4590a668657f3ad8e7d071d4df9dbe SOURCES/glslang-sdk-1.4.313.0.tar.gz +7f9d484861ff78ee38093c4c1c37a247a842d49d SOURCES/glslang-sdk-1.4.328.1.tar.gz diff --git a/SOURCES/0001-pkg-config-compatibility.patch b/SOURCES/0001-pkg-config-compatibility.patch index 769240b..b462835 100644 --- a/SOURCES/0001-pkg-config-compatibility.patch +++ b/SOURCES/0001-pkg-config-compatibility.patch @@ -1,4 +1,4 @@ -From 011ff910c1836508d323cbe1c55cf0359eb69705 Mon Sep 17 00:00:00 2001 +From 6341a4feb4ed81aef3c3fcf0cb901393c41a5f5a Mon Sep 17 00:00:00 2001 From: Anusha Srivatsa Date: Wed, 26 Mar 2025 16:15:29 -0400 Subject: [PATCH] Bring in the changes from upstream @@ -18,10 +18,10 @@ Signed-off-by: Anusha Srivatsa create mode 100644 glslang/glslang.pc.cmake.in diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7e78c0b5..798b3b90 100644 +index da2fa6d5..6085d282 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -122,6 +122,13 @@ endif() +@@ -120,6 +120,13 @@ endif() option(ENABLE_PCH "Enables Precompiled header" ON) @@ -35,7 +35,7 @@ index 7e78c0b5..798b3b90 100644 if(ENABLE_SPIRV) add_compile_definitions(ENABLE_SPIRV) endif() -@@ -279,27 +286,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External) +@@ -277,27 +284,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External) add_subdirectory(External) endif() @@ -64,7 +64,7 @@ index 7e78c0b5..798b3b90 100644 message(STATUS "optimizer enabled") add_compile_definitions(ENABLE_OPT=1) else() -@@ -358,9 +345,6 @@ if (GLSLANG_ENABLE_INSTALL) +@@ -353,9 +340,6 @@ if (GLSLANG_ENABLE_INSTALL) file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake.in" [=[ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) @@ -90,21 +90,18 @@ index 826b5c59..4169c6ff 100644 -endif() diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt -index 91469d4f..b0ac8268 100644 +index 9bac0005..964cff2e 100644 --- a/SPIRV/CMakeLists.txt +++ b/SPIRV/CMakeLists.txt -@@ -94,6 +94,9 @@ target_include_directories(SPIRV PUBLIC +@@ -85,14 +85,24 @@ target_include_directories(SPIRV PUBLIC $) glslang_only_export_explicit_symbols(SPIRV) +set(SPIRV_NAME spirv) +set(SPIRV_VERSION 1.5.5) + - if (ENABLE_SPVREMAPPER) - add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) - add_library(glslang::SPVRemapper ALIAS SPVRemapper) -@@ -112,10 +115,17 @@ if(WIN32 AND BUILD_SHARED_LIBS) - endif() + if(WIN32 AND BUILD_SHARED_LIBS) + set_target_properties(SPIRV PROPERTIES PREFIX "") endif() +target_include_directories(SPIRV PUBLIC ${SPIRV_TOOLS_INCLUDE_DIRS}) @@ -124,8 +121,8 @@ index 91469d4f..b0ac8268 100644 else() target_link_libraries(SPIRV INTERFACE glslang) endif() -@@ -132,5 +142,9 @@ if(GLSLANG_ENABLE_INSTALL) - +@@ -104,5 +114,9 @@ endif() + if(GLSLANG_ENABLE_INSTALL) install(TARGETS SPIRV EXPORT glslang-targets) + # spirv.pc Configuration @@ -166,7 +163,7 @@ index 00000000..dfcad940 + Cflags: -I${includedir} \ No newline at end of file diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt -index 18a24ce3..4e9e910f 100644 +index e7707524..c8584c06 100644 --- a/StandAlone/CMakeLists.txt +++ b/StandAlone/CMakeLists.txt @@ -62,6 +62,14 @@ set(LIBRARIES @@ -191,13 +188,13 @@ index 18a24ce3..4e9e910f 100644 -target_include_directories(glslang-standalone PUBLIC - $) - if(ENABLE_SPIRV) - if(ENABLE_SPVREMAPPER) + if(WIN32) + source_group("Source" FILES ${SOURCES}) diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt -index eb1dc68e..9262bc8c 100644 +index 1bf4c1f2..9733ceb5 100644 --- a/glslang/CMakeLists.txt +++ b/glslang/CMakeLists.txt -@@ -254,6 +254,8 @@ if(GLSLANG_ENABLE_INSTALL) +@@ -255,6 +255,8 @@ if(GLSLANG_ENABLE_INSTALL) if(NOT BUILD_SHARED_LIBS) install(TARGETS MachineIndependent EXPORT glslang-targets) install(TARGETS GenericCodeGen EXPORT glslang-targets) @@ -221,9 +218,9 @@ index 00000000..594db293 + Description: OpenGL and OpenGL ES shader front end and validator + Requires: + Version: @VERSION@ -+ Libs: -L${libdir} -lglslang -lOSDependent -lSPVRemapper ++ Libs: -L${libdir} -lglslang -lOSDependent + Cflags: -I${includedir} \ No newline at end of file -- -2.47.1 +2.51.1 diff --git a/SPECS/glslang.spec b/SPECS/glslang.spec index a279e10..dcbb63f 100644 --- a/SPECS/glslang.spec +++ b/SPECS/glslang.spec @@ -1,18 +1,8 @@ -## START: Set by rpmautospec -## (rpmautospec version 0.6.5) -## RPMAUTOSPEC: autorelease, autochangelog -%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 1; - base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); - print(release_number + base_release_number - 1); -}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} -## END: Set by rpmautospec - -%global sdkver 1.4.313.0 +%global sdkver 1.4.328.1 Name: glslang -Version: 15.3.0 -Release: %autorelease +Version: 16.0.0 +Release: 1%{?dist} Summary: OpenGL and OpenGL ES shader front end and validator License: BSD-2-Clause AND BSD-3-Clause AND GPL-3.0-or-later AND Apache-2.0 @@ -64,16 +54,14 @@ popd %endif %files -%doc README.md README-spirv-remap.txt +%doc README.md %{_bindir}/glslang %{_bindir}/glslangValidator -%{_bindir}/spirv-remap %files devel %{_includedir}/glslang/ %{_libdir}/libOSDependent.a %{_libdir}/libSPIRV.a -%{_libdir}/libSPVRemapper.a %{_libdir}/libglslang.a %{_libdir}/libGenericCodeGen.a %{_libdir}/libMachineIndependent.a @@ -83,21 +71,14 @@ popd %{_libdir}/cmake/* %changelog -## START: Generated by rpmautospec -* Thu Jun 19 2025 Anusha Srivatsa - 15.3.0-1 -- Update to SDK v1.4.313 +* Wed 07 2026 José Expósito - 16.0.0-1 +- Update to 1.4.328.1 SDK -* Tue Jan 21 2025 José Expósito - 15.1.0-1 +* Mon Jan 20 2025 José Expósito - 15.1.0-1 - Update to 1.4.304.0 SDK -* Tue Oct 29 2024 Troy Dawson - 14.2.0-5 -- Bump release for October 2024 mass rebuild: - -* Mon Jun 24 2024 Troy Dawson - 14.2.0-4 -- Bump release for June 2024 mass rebuild - * Thu May 30 2024 José Expósito - 14.2.0-3 -- License: AND must be all capital letters +- Fix license identifiers * Thu May 30 2024 José Expósito - 14.2.0-2 - Update license identifiers @@ -105,180 +86,70 @@ popd * Tue May 28 2024 José Expósito - 14.2.0-1 - Update to 1.3.283.0 SDK -* Wed Jan 24 2024 Fedora Release Engineering - 13.1.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild +* Wed Jan 17 2024 José Expósito - 13.1.1-1 +- Update to 1.3.268.0 SDK -* Fri Jan 19 2024 Fedora Release Engineering - 13.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild +* Fri Jul 07 2023 Dave Airlie - 11.9.0-5 +- Latest snapshot used in 1.3.250.1 sdk -* Thu Nov 02 2023 José Expósito - 13.1.1-1 -- update to 1.3.268.0 SDK +* Wed Feb 15 2023 Dave Airlie - 11.9.0-4 +- Latest snapshot used in 1.3.239 sdk -* Tue Sep 05 2023 Dave Airlie - 11.9.0-21 -- readd old name - -* Tue Sep 05 2023 Dave Airlie - 11.9.0-20 -- new filename for main executable - -* Tue Sep 05 2023 Dave Airlie - 11.9.0-19 -- update pkg config patch - -* Tue Sep 05 2023 Dave Airlie - 11.9.0-18 -- update to 1.3.261.1 sdk - -* Mon Sep 04 2023 Dave Airlie - 11.9.0-17 -- update ASL to Apache, need to recheck others - -* Wed Jul 19 2023 Fedora Release Engineering - 11.9.0-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 20 2023 Dave Airlie - 11.9.0-15 -- update to 1.3.250.0 glslang - -* Mon Apr 24 2023 Dave Airlie - 11.9.0-14 -- update to 1.3.243.0 sdk - -* Sun Apr 23 2023 Dave Airlie - 11.9.0-13 -- update to 1.3.243.0 sdk - -* Tue Jan 31 2023 Dave Airlie - 11.9.0-12 -- update to 1.3.239.0 sdk - -* Thu Jan 19 2023 Fedora Release Engineering - 11.9.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Nov 09 2022 Dave Airlie - 11.9.0-10 -- glslang doesn't seem to use datadir anymore - -* Wed Nov 09 2022 Dave Airlie - 11.9.0-9 -- add update patch file - -* Wed Nov 09 2022 Dave Airlie - 11.9.0-8 -- update to 1.3.231.1 sdk - -* Wed Aug 31 2022 Lukáš Zaoral - 11.9.0-7 -- spec: do not install files in %%check section - -* Wed Aug 24 2022 Dave Airlie - 11.9.0-6 +* Fri Aug 26 2022 Dave Airlie - 11.9.0-3 - Latest snapshot used in 1.3.224 sdk -* Wed Aug 24 2022 Dave Airlie - 11.9.0-5 -- Latest snapshot used in 1.3.224 sdk - -* Thu Jul 21 2022 Fedora Release Engineering - 11.9.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jun 17 2022 Dave Airlie - 11.9.0-3 +* Wed Jun 22 2022 Dave Airlie - 11.9.0-2 - Latest snapshot used in 1.3.216 sdk -* Wed Apr 27 2022 Dave Airlie - 11.9.0-2 -- Latest snapshot used in 1.3.211 sdk - -* Tue Feb 15 2022 Dave Airlie - 11.9.0-1 +* Fri Feb 25 2022 Dave Airlie - 11.9.0-1.20220202.git2742e95 - Latest snapshot used in 1.3.204 sdk -* Sat Jan 29 2022 Jan Grulich - 11.7.0-5 -- Fix encoding/decoding of string literals for bug-endian systems +* Mon Aug 09 2021 Mohan Boddu - 11.5.0-2.20210623.gitae2a562 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 -* Thu Jan 20 2022 Fedora Release Engineering - 11.7.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Dec 06 2021 Dave Airlie - 11.7.0-3 -- Fix for spirv-tools ABI - -* Tue Nov 23 2021 Dave Airlie - 11.7.0-2 -- update patch - -* Tue Nov 23 2021 Dave Airlie - 11.7.0-1 -- Latest snapshot used in 1.2.198 sdk - -* Tue Sep 07 2021 Dave Airlie - 11.6.0-1 -- Latest snapshot used in 1.2.189 sdk - -* Thu Jul 22 2021 Fedora Release Engineering - 11.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jul 06 2021 Dave Airlie - 11.5.0-1 +* Fri Jul 30 2021 Dave Airlie - 11.5.0-1 - Latest snapshot used in 1.2.182 sdk -* Tue May 18 2021 Dave Airlie - 11.4.0-1 -- Latest snapshot used in 1.2.176 sdk +* Thu Apr 15 2021 Mohan Boddu - 11.0.0-5.20201208.gitc594de2 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 -* Thu Jan 28 2021 Dave Airlie - 11.0.0-7 -- add sources - -* Thu Jan 28 2021 Dave Airlie - 11.0.0-6 +* Thu Jan 28 2021 Dave Airlie - 11.0.0-4.20201208.gitc594de2 - Latest snapshot used in 1.2.162 sdk -* Tue Jan 26 2021 Fedora Release Engineering - 11.0.0-5 +* Tue Jan 26 2021 Fedora Release Engineering - 11.0.0-3.20201104.gitd550beb - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild -* Tue Nov 03 2020 Dave Airlie - 11.0.0-4 +* Wed Nov 04 2020 Dave Airlie - 11.0.0-2 - Latest upstream snapshot -* Tue Nov 03 2020 Dave Airlie - 11.0.0-3 +* Wed Aug 05 2020 Dave Airlie - 11.0.0-1 - Latest upstream snapshot -* Wed Aug 05 2020 Dave Airlie - 11.0.0-2 -- glslang: fix build - -* Tue Aug 04 2020 Dave Airlie - 11.0.0-1 -- Latest upstream snapshot - -* Mon Aug 03 2020 Dave Airlie - 8.13.3559-12 -- fix cmake_install - -* Mon Aug 03 2020 Dave Airlie - 8.13.3559-11 +* Tue Aug 04 2020 Dave Airlie - 8.13.3559-5 - Use cmake macros. -* Sat Aug 01 2020 Fedora Release Engineering - 8.13.3559-10 +* Sat Aug 01 2020 Fedora Release Engineering - 8.13.3559-4.2020421.gitc9b28b9 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild -* Mon Jul 27 2020 Fedora Release Engineering - 8.13.3559-9 +* Mon Jul 27 2020 Fedora Release Engineering - 8.13.3559-3.2020421.gitc9b28b9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild -* Wed Apr 22 2020 Dave Airlie - 8.13.3559-8 -- glslang: fix pkg-config patch more - -* Wed Apr 22 2020 Dave Airlie - 8.13.3559-7 -- fixup patch - -* Wed Apr 22 2020 Dave Airlie - 8.13.3559-6 +* Wed Apr 22 2020 Dave Airlie - 8.13.3559-2 - Update to latest git snapshot -* Sun Feb 02 2020 Robert-André Mauchin - 8.13.3559-5 -- Revert "Revert "rm unneeded include files"" - -* Sun Feb 02 2020 Robert-André Mauchin - 8.13.3559-4 -- Revert "rm unneeded include files" - -* Wed Jan 29 2020 Dave Airlie - 8.13.3559-3 -- rm unneeded include files - -* Wed Jan 29 2020 Dave Airlie - 8.13.3559-2 -- update to latest sources - * Wed Jan 29 2020 Dave Airlie - 8.13.3559-1 - Update to latest git snapshot -* Tue Jan 28 2020 Fedora Release Engineering - 7.13.3496-6 +* Tue Jan 28 2020 Fedora Release Engineering - 7.13.3496-3.20191102.git7f77b2e - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild -* Thu Dec 19 2019 leigh123linux - 7.13.3496-5 +* Thu Dec 19 2019 Leigh Scott - 7.13.3496-2.20191102.git7f77b2e - Add patch for 'Fix a couple relative header paths in header' -* Wed Nov 13 2019 Dave Airlie - 7.13.3496-4 -- Latest upstream snapshot for validation layers build - -* Wed Nov 13 2019 Dave Airlie - 7.13.3496-3 -- glslang: pkg-config/cmake fixes - -* Wed Nov 13 2019 Dave Airlie - 7.13.3496-2 -- Fixup test running - * Wed Nov 13 2019 Dave Airlie - 7.13.3496-1 -- rebase to newer master +- Latest upstream snapshot for validation layers build * Sat Aug 03 2019 Dave Airlie - 7.11.3214-3 - Latest upstream snapshot for validation layers build @@ -286,48 +157,47 @@ popd * Thu Jul 25 2019 Fedora Release Engineering - 7.11.3214-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild -* Mon Jun 10 2019 Robert-André Mauchin - 7.11.3214-1 -- Release 7.11.3214 Add patch to build against system spirv-tools +* Mon Jun 10 01:27:27 CEST 2019 Robert-André Mauchin - 7.11.3214-1 +- Release 7.11.3214 +- Add patch to build against system spirv-tools -* Fri Mar 29 2019 Dave Airlie - 3.1-14 -- update to latest glslang snapshot +* Fri Mar 29 2019 Dave Airlie - 3.1-0.13.20190329.gite0d59bb +- Update for vulkan 1.1.101.0 -* Tue Feb 12 2019 Dave Airlie - 3.1-13 +* Tue Feb 12 2019 Dave Airlie - 3.1-0.12.20190212.git05d12a9 - Update for vulkan 1.1.92.0 -* Thu Jan 31 2019 Fedora Release Engineering - 3.1-12 +* Thu Jan 31 2019 Fedora Release Engineering - 3.1-0.11.20180727.gite99a268 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild -* Tue Aug 07 2018 leigh123linux - 3.1-11 +* Tue Aug 07 2018 Leigh Scott - 3.1-0.10.20180727.gite99a268 - Update for vulkan 1.1.82.0 -* Fri Jul 13 2018 Fedora Release Engineering - 3.1-10 +* Fri Jul 13 2018 Fedora Release Engineering - 3.1-0.9.20180416.git3bb4c48 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild -* Tue Apr 24 2018 leigh123linux - 3.1-9 -- fix build - -* Mon Apr 23 2018 leigh123linux - 3.1-8 +* Mon Apr 23 2018 Leigh Scott - 3.1-0.8.20180416.git3bb4c48 - Update for vulkan 1.1.73.0 -* Thu Mar 08 2018 Adam Williamson - 3.1-7 +* Wed Mar 07 2018 Adam Williamson - 3.1-0.7.20180205.git2651cca - Rebuild to fix GCC 8 mis-compilation + See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64") -* Fri Feb 09 2018 leigh123linux - 3.1-6 +* Fri Feb 09 2018 Leigh Scott - 3.1-0.6.20180205.git2651cca - Update for vulkan 1.0.68.0 -* Fri Feb 09 2018 leigh123linux - 3.1-5 +* Fri Feb 09 2018 Leigh Scott - 3.1-0.5.20171028.git715c353 - Use ninja to build -* Wed Feb 07 2018 Fedora Release Engineering - 3.1-4 +* Wed Feb 07 2018 Fedora Release Engineering - 3.1-0.4.20171028.git715c353 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild -* Wed Jan 03 2018 leigh123linux - 3.1-3 +* Wed Jan 03 2018 Leigh Scott - 3.1-0.3.20171028.git715c353 - Exclude s390x and ppc64 from check section -* Wed Jan 03 2018 leigh123linux - 3.1-2 +* Wed Jan 03 2018 Leigh Scott - 3.1-0.2.20171028.git715c353 - Add check section to run tests +- Split binaries into main package -* Tue Jan 02 2018 leigh123linux - 3.1-1 +* Thu Jul 13 2017 Leigh Scott - 3.1-0.1.20171028.git715c353 - First build -## END: Generated by rpmautospec