diff --git a/0001-pkg-config-compatibility.patch b/0001-pkg-config-compatibility.patch index 941a36f..769240b 100644 --- a/0001-pkg-config-compatibility.patch +++ b/0001-pkg-config-compatibility.patch @@ -1,7 +1,27 @@ -diff -up glslang-sdk-1.3.275.0/CMakeLists.txt.dma glslang-sdk-1.3.275.0/CMakeLists.txt ---- glslang-sdk-1.3.275.0/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000 -+++ glslang-sdk-1.3.275.0/CMakeLists.txt 2023-09-05 13:21:45.113297799 +1000 -@@ -106,6 +106,13 @@ endif() +From 011ff910c1836508d323cbe1c55cf0359eb69705 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 + +Signed-off-by: Anusha Srivatsa +--- + CMakeLists.txt | 32 ++++++++------------------------ + External/CMakeLists.txt | 6 ------ + SPIRV/CMakeLists.txt | 20 +++++++++++++++++--- + SPIRV/SpvTools.cpp | 2 +- + SPIRV/spirv.pc.cmake.in | 11 +++++++++++ + StandAlone/CMakeLists.txt | 10 ++++++++-- + glslang/CMakeLists.txt | 2 ++ + glslang/glslang.pc.cmake.in | 11 +++++++++++ + 8 files changed, 58 insertions(+), 36 deletions(-) + create mode 100644 SPIRV/spirv.pc.cmake.in + create mode 100644 glslang/glslang.pc.cmake.in + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7e78c0b5..798b3b90 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -122,6 +122,13 @@ endif() option(ENABLE_PCH "Enables Precompiled header" ON) @@ -15,7 +35,7 @@ diff -up glslang-sdk-1.3.275.0/CMakeLists.txt.dma glslang-sdk-1.3.275.0/CMakeLis if(ENABLE_SPIRV) add_compile_definitions(ENABLE_SPIRV) endif() -@@ -264,27 +271,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External) +@@ -279,27 +286,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External) add_subdirectory(External) endif() @@ -27,7 +47,7 @@ diff -up glslang-sdk-1.3.275.0/CMakeLists.txt.dma glslang-sdk-1.3.275.0/CMakeLis - find_package(SPIRV-Tools-opt) - if(NOT TARGET SPIRV-Tools-opt) - if(ENABLE_OPT) -- message(WARNING "ENABLE_OPT set but SPIR-V tools not found! Disabling SPIR-V optimization.") +- message(SEND_ERROR "ENABLE_OPT set but SPIR-V tools not found! Disabling SPIR-V optimization.") - endif() - set(ENABLE_OPT OFF) - endif() @@ -42,9 +62,9 @@ diff -up glslang-sdk-1.3.275.0/CMakeLists.txt.dma glslang-sdk-1.3.275.0/CMakeLis -if(ENABLE_OPT) +if(${SPIRV_TOOLS_FOUND} EQUAL 1) message(STATUS "optimizer enabled") - add_definitions(-DENABLE_OPT=1) + add_compile_definitions(ENABLE_OPT=1) else() -@@ -349,9 +336,6 @@ if (GLSLANG_ENABLE_INSTALL) +@@ -358,9 +345,6 @@ if (GLSLANG_ENABLE_INSTALL) file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake.in" [=[ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) @@ -54,9 +74,10 @@ diff -up glslang-sdk-1.3.275.0/CMakeLists.txt.dma glslang-sdk-1.3.275.0/CMakeLis @INSTALL_CONFIG_UNIX@ include("@PACKAGE_PATH_EXPORT_TARGETS@") ]=]) -diff -up glslang-sdk-1.3.275.0/External/CMakeLists.txt.dma glslang-sdk-1.3.275.0/External/CMakeLists.txt ---- glslang-sdk-1.3.275.0/External/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000 -+++ glslang-sdk-1.3.275.0/External/CMakeLists.txt 2023-09-05 13:21:45.113297799 +1000 +diff --git a/External/CMakeLists.txt b/External/CMakeLists.txt +index 826b5c59..4169c6ff 100644 +--- a/External/CMakeLists.txt ++++ b/External/CMakeLists.txt @@ -68,10 +68,4 @@ if(GLSLANG_TESTS) endif() endif() @@ -68,42 +89,13 @@ diff -up glslang-sdk-1.3.275.0/External/CMakeLists.txt.dma glslang-sdk-1.3.275.0 - endif() -endif() - -diff -up glslang-sdk-1.3.275.0/glslang/CMakeLists.txt.dma glslang-sdk-1.3.275.0/glslang/CMakeLists.txt ---- glslang-sdk-1.3.275.0/glslang/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000 -+++ glslang-sdk-1.3.275.0/glslang/CMakeLists.txt 2023-09-05 13:21:45.114297825 +1000 -@@ -232,6 +232,8 @@ if(GLSLANG_ENABLE_INSTALL) - if(NOT BUILD_SHARED_LIBS) - install(TARGETS MachineIndependent EXPORT glslang-targets) - install(TARGETS GenericCodeGen EXPORT glslang-targets) -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - endif() - - set(PUBLIC_HEADERS - -diff -up glslang-sdk-1.3.275.0/glslang/glslang.pc.cmake.in.dma glslang-sdk-1.3.275.0/glslang/glslang.pc.cmake.in ---- glslang-sdk-1.3.275.0/glslang/glslang.pc.cmake.in.dma 2023-09-05 13:21:45.115297852 +1000 -+++ glslang-sdk-1.3.275.0/glslang/glslang.pc.cmake.in 2023-09-05 13:21:45.115297852 +1000 -@@ -0,0 +1,11 @@ -+ prefix=@CMAKE_INSTALL_PREFIX@ -+ exec_prefix=@CMAKE_INSTALL_PREFIX@ -+ libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -+ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -+ -+ Name: @PROJECT_NAME@ -+ Description: OpenGL and OpenGL ES shader front end and validator -+ Requires: -+ Version: @VERSION@ -+ Libs: -L${libdir} -lglslang -lOSDependent -lSPVRemapper -+ Cflags: -I${includedir} -\ No newline at end of file -diff -up glslang-sdk-1.3.275.0/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.275.0/SPIRV/CMakeLists.txt ---- glslang-sdk-1.3.275.0/SPIRV/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000 -+++ glslang-sdk-1.3.275.0/SPIRV/CMakeLists.txt 2023-09-05 13:21:45.116297879 +1000 -@@ -92,6 +92,9 @@ target_include_directories(SPIRV PUBLIC - $ +diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt +index 91469d4f..b0ac8268 100644 +--- a/SPIRV/CMakeLists.txt ++++ b/SPIRV/CMakeLists.txt +@@ -94,6 +94,9 @@ target_include_directories(SPIRV PUBLIC $) + glslang_only_export_explicit_symbols(SPIRV) +set(SPIRV_NAME spirv) +set(SPIRV_VERSION 1.5.5) @@ -111,7 +103,7 @@ diff -up glslang-sdk-1.3.275.0/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.275.0/SP if (ENABLE_SPVREMAPPER) add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) add_library(glslang::SPVRemapper ALIAS SPVRemapper) -@@ -105,10 +109,17 @@ if(WIN32 AND BUILD_SHARED_LIBS) +@@ -112,10 +115,17 @@ if(WIN32 AND BUILD_SHARED_LIBS) endif() endif() @@ -132,7 +124,7 @@ diff -up glslang-sdk-1.3.275.0/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.275.0/SP else() target_link_libraries(SPIRV INTERFACE glslang) endif() -@@ -125,5 +125,9 @@ if(GLSLANG_ENABLE_INSTALL) +@@ -132,5 +142,9 @@ if(GLSLANG_ENABLE_INSTALL) install(TARGETS SPIRV EXPORT glslang-targets) @@ -142,9 +134,24 @@ diff -up glslang-sdk-1.3.275.0/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.275.0/SP + install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/) endif() -diff -up glslang-sdk-1.3.275.0/SPIRV/spirv.pc.cmake.in.dma glslang-sdk-1.3.275.0/SPIRV/spirv.pc.cmake.in ---- glslang-sdk-1.3.275.0/SPIRV/spirv.pc.cmake.in.dma 2023-09-05 13:21:45.116297879 +1000 -+++ glslang-sdk-1.3.275.0/SPIRV/spirv.pc.cmake.in 2023-09-05 13:21:45.116297879 +1000 +diff --git a/SPIRV/SpvTools.cpp b/SPIRV/SpvTools.cpp +index d1b411f2..d4470676 100644 +--- a/SPIRV/SpvTools.cpp ++++ b/SPIRV/SpvTools.cpp +@@ -43,7 +43,7 @@ + #include + + #include "SpvTools.h" +-#include "spirv-tools/optimizer.hpp" ++#include + #include "glslang/MachineIndependent/localintermediate.h" + + namespace glslang { +diff --git a/SPIRV/spirv.pc.cmake.in b/SPIRV/spirv.pc.cmake.in +new file mode 100644 +index 00000000..dfcad940 +--- /dev/null ++++ b/SPIRV/spirv.pc.cmake.in @@ -0,0 +1,11 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ @@ -158,25 +165,13 @@ diff -up glslang-sdk-1.3.275.0/SPIRV/spirv.pc.cmake.in.dma glslang-sdk-1.3.275.0 + Libs: -L${libdir} -lSPIRV + Cflags: -I${includedir} \ No newline at end of file -diff -up glslang-sdk-1.3.275.0/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.275.0/SPIRV/SpvTools.cpp ---- glslang-sdk-1.3.275.0/SPIRV/SpvTools.cpp.dma 2023-08-09 04:49:36.000000000 +1000 -+++ glslang-sdk-1.3.275.0/SPIRV/SpvTools.cpp 2023-09-05 13:21:45.117297906 +1000 -@@ -43,7 +43,7 @@ - #include - - #include "SpvTools.h" --#include "spirv-tools/optimizer.hpp" -+#include - #include "glslang/MachineIndependent/localintermediate.h" - - namespace glslang { - -diff -up glslang-sdk-1.3.275.0/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.275.0/StandAlone/CMakeLists.txt ---- glslang-sdk-1.3.275.0/StandAlone/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000 -+++ glslang-sdk-1.3.275.0/StandAlone/CMakeLists.txt 2023-09-05 13:22:23.806333232 +1000 -@@ -61,6 +61,14 @@ set(LIBRARIES - glslang - glslang-default-resource-limits) +diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt +index 18a24ce3..4e9e910f 100644 +--- a/StandAlone/CMakeLists.txt ++++ b/StandAlone/CMakeLists.txt +@@ -62,6 +62,14 @@ set(LIBRARIES + glslang-default-resource-limits + $<$,$,9.0>>:stdc++fs>) +if(BUILD_SHARED_LIBS) + set(LIBRARIES ${LIBRARIES} ${SPIRV_TOOLS_SHARED_LIBRARIES}) @@ -189,7 +184,7 @@ diff -up glslang-sdk-1.3.275.0/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.275 if(WIN32) set(LIBRARIES ${LIBRARIES} psapi) elseif(UNIX) -@@ -70,8 +78,6 @@ elseif(UNIX) +@@ -71,8 +79,6 @@ elseif(UNIX) endif() target_link_libraries(glslang-standalone ${LIBRARIES}) @@ -198,3 +193,37 @@ diff -up glslang-sdk-1.3.275.0/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.275 if(ENABLE_SPIRV) if(ENABLE_SPVREMAPPER) +diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt +index eb1dc68e..9262bc8c 100644 +--- a/glslang/CMakeLists.txt ++++ b/glslang/CMakeLists.txt +@@ -254,6 +254,8 @@ if(GLSLANG_ENABLE_INSTALL) + if(NOT BUILD_SHARED_LIBS) + install(TARGETS MachineIndependent EXPORT glslang-targets) + install(TARGETS GenericCodeGen EXPORT glslang-targets) ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endif() + + set(PUBLIC_HEADERS +diff --git a/glslang/glslang.pc.cmake.in b/glslang/glslang.pc.cmake.in +new file mode 100644 +index 00000000..594db293 +--- /dev/null ++++ b/glslang/glslang.pc.cmake.in +@@ -0,0 +1,11 @@ ++ prefix=@CMAKE_INSTALL_PREFIX@ ++ exec_prefix=@CMAKE_INSTALL_PREFIX@ ++ libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ ++ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++ ++ Name: @PROJECT_NAME@ ++ Description: OpenGL and OpenGL ES shader front end and validator ++ Requires: ++ Version: @VERSION@ ++ Libs: -L${libdir} -lglslang -lOSDependent -lSPVRemapper ++ Cflags: -I${includedir} +\ No newline at end of file +-- +2.47.1 + diff --git a/glslang.spec b/glslang.spec index 2a9a110..fd47ed1 100644 --- a/glslang.spec +++ b/glslang.spec @@ -1,7 +1,7 @@ -%global sdkver 1.4.304.0 +%global sdkver 1.4.313.0 Name: glslang -Version: 15.1.0 +Version: 15.3.0 Release: 1%{?dist} Summary: OpenGL and OpenGL ES shader front end and validator diff --git a/sources b/sources index c291a46..c07116e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glslang-sdk-1.4.304.0.tar.gz) = dae98afbea27b518e6230ebae5207c67b4f1a695b8f65033159bcf0064ec6546c8db4f2d52bd028353c15e4d7d9409c1f7dffc589639bfd8ee07d98ea7c73b12 +SHA512 (glslang-sdk-1.4.313.0.tar.gz) = 2ebbe494e39080b713200a00ed1d1db09f712c0455cfc8293c687d197b9be4e1a83939ee3d16588d6f4691c810dbb894207f285c4441679b05677bf544e5f82e