5 changed files with 91 additions and 104 deletions
--- a/0001-pkg-config-compatibility.patch
+++ b/0001-pkg-config-compatibility.patch
@ -1,9 +1,9 @@
-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()
- 
- option(ENABLE_PCH "Enables Precompiled header" ON)
+diff -up glslang-sdk-1.3.250.0/CMakeLists.txt.dma glslang-sdk-1.3.250.0/CMakeLists.txt
+--- glslang-sdk-1.3.250.0/CMakeLists.txt.dma	2023-05-18 06:47:56.000000000 +1000
+++ glslang-sdk-1.3.250.0/CMakeLists.txt	2023-06-20 14:19:40.290695726 +1000
+@@ -104,6 +104,13 @@ else()
+ endif()
+ option(ENABLE_CTEST "Enables testing" ON)
 
 +# using pkg-config to configure include paths and link libraries
 +include(FindPkgConfig)
@ -12,31 +12,15 @@ diff -up glslang-sdk-1.3.275.0/CMakeLists.txt.dma glslang-sdk-1.3.275.0/CMakeLis
 +    pkg_check_modules(SPIRV_TOOLS_SHARED REQUIRED SPIRV-Tools-shared>=2019.2.1)
 +endif(BUILD_SHARED_LIBS)
 +
- if(ENABLE_HLSL)
-     add_compile_definitions(ENABLE_HLSL)
+ if(ENABLE_CTEST)
+     include(CTest)
 endif()
-@@ -264,27 +271,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External)
+@@ -282,11 +289,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA
     add_subdirectory(External)
 endif()
 
-option(ALLOW_EXTERNAL_SPIRV_TOOLS "Allows to build against installed SPIRV-Tools-opt. This is unsupported if the commit isn't the one in known_good.json")
 -if(NOT TARGET SPIRV-Tools-opt)
-    if(ALLOW_EXTERNAL_SPIRV_TOOLS)
-        # Look for external SPIR-V Tools build, if not building in-tree
-        message(STATUS "Trying to find local SPIR-V tools")
-        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.")
-            endif()
-            set(ENABLE_OPT OFF)
-        endif()
-    else()
-        if(ENABLE_OPT)
-            message(SEND_ERROR "ENABLE_OPT set but SPIR-V tools not found. Please run update_glslang_sources.py, "
-                "set the ALLOW_EXTERNAL_SPIRV_TOOLS option to use a local install of SPIRV-Tools, or set ENABLE_OPT=0.")
-        endif()
-    endif()
+-    set(ENABLE_OPT OFF)
 -endif()
 -
 -if(ENABLE_OPT)
@ -44,47 +28,35 @@ diff -up glslang-sdk-1.3.275.0/CMakeLists.txt.dma glslang-sdk-1.3.275.0/CMakeLis
     message(STATUS "optimizer enabled")
     add_definitions(-DENABLE_OPT=1)
 else()
-@@ -349,9 +336,6 @@ if (GLSLANG_ENABLE_INSTALL)
-     file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake.in" [=[
-         @PACKAGE_INIT@
-         include(CMakeFindDependencyMacro)
-        if(@ENABLE_OPT@)
-            find_dependency(SPIRV-Tools-opt)
-        endif()
-         @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
-@@ -68,10 +68,4 @@ if(GLSLANG_TESTS)
+diff -up glslang-sdk-1.3.250.0/External/CMakeLists.txt.dma glslang-sdk-1.3.250.0/External/CMakeLists.txt
+--- glslang-sdk-1.3.250.0/External/CMakeLists.txt.dma	2023-05-18 06:47:56.000000000 +1000
+++ glslang-sdk-1.3.250.0/External/CMakeLists.txt	2023-06-20 14:19:40.290695726 +1000
+@@ -68,10 +68,3 @@ if(BUILD_TESTING)
     endif()
 endif()
 
 -if(ENABLE_OPT AND NOT TARGET SPIRV-Tools-opt)
 -    if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools)
 -        set(SPIRV_SKIP_TESTS ON CACHE BOOL "Skip building SPIRV-Tools tests")
-        add_subdirectory(spirv-tools)
+-        add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools spirv-tools)
 -    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)
+-
+diff -up glslang-sdk-1.3.250.0/glslang/CMakeLists.txt.dma glslang-sdk-1.3.250.0/glslang/CMakeLists.txt
+--- glslang-sdk-1.3.250.0/glslang/CMakeLists.txt.dma	2023-06-20 14:19:23.329383926 +1000
+++ glslang-sdk-1.3.250.0/glslang/CMakeLists.txt	2023-06-20 14:19:40.291695745 +1000
+@@ -245,6 +245,8 @@ if(ENABLE_GLSLANG_INSTALL)
+                 add_library(GenericCodeGen ALIAS glslang::GenericCodeGen)
+             endif()
+         ")
 +        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)
+         install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
     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
+diff -up glslang-sdk-1.3.250.0/glslang/glslang.pc.cmake.in.dma glslang-sdk-1.3.250.0/glslang/glslang.pc.cmake.in
+--- glslang-sdk-1.3.250.0/glslang/glslang.pc.cmake.in.dma	2023-06-20 14:19:40.292695763 +1000
+++ glslang-sdk-1.3.250.0/glslang/glslang.pc.cmake.in	2023-06-20 14:19:40.291695745 +1000
@@ -0,0 +1,11 @@
 +    prefix=@CMAKE_INSTALL_PREFIX@
 +    exec_prefix=@CMAKE_INSTALL_PREFIX@
@ -98,21 +70,21 @@ diff -up glslang-sdk-1.3.275.0/glslang/glslang.pc.cmake.in.dma glslang-sdk-1.3.2
 +    Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -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
-@@ -89,6 +89,10 @@ target_include_directories(SPIRV PUBLIC
+diff -up glslang-sdk-1.3.250.0/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.250.0/SPIRV/CMakeLists.txt
+--- glslang-sdk-1.3.250.0/SPIRV/CMakeLists.txt.dma	2023-05-18 06:47:56.000000000 +1000
+++ glslang-sdk-1.3.250.0/SPIRV/CMakeLists.txt	2023-06-20 14:19:40.292695763 +1000
+@@ -80,6 +80,10 @@ target_include_directories(SPIRV PUBLIC
 
 glslang_add_build_info_dependency(SPIRV)
 
 +
 +set(SPIRV_NAME spirv)
-+set(SPIRV_VERSION 1.5.5)
+set(SPIRV_VERSION 1.3)
 +
 if (ENABLE_SPVREMAPPER)
     add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS})
-     set_target_properties(SPVRemapper PROPERTIES
-@@ -105,10 +109,17 @@ if(WIN32 AND BUILD_SHARED_LIBS)
+     set_target_properties(SPVRemapper PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}")
+@@ -94,15 +98,21 @@ if(WIN32 AND BUILD_SHARED_LIBS)
     endif()
 endif()
 
@ -124,28 +96,34 @@ diff -up glslang-sdk-1.3.275.0/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.275.0/SP
 +    target_compile_options(SPIRV PUBLIC ${SPIRV_TOOLS_SHARED_CFLAGS_OTHER})
 +    target_link_libraries(SPIRV ${SPIRV_TOOLS_SHARED_LIBRARIES})
 +endif(BUILD_SHARED_LIBS)
-+
+ 
 if(ENABLE_OPT)
-    target_link_libraries(SPIRV PRIVATE MachineIndependent PUBLIC SPIRV-Tools-opt)
+     target_include_directories(SPIRV
+         PRIVATE ${spirv-tools_SOURCE_DIR}/include
+         PRIVATE ${spirv-tools_SOURCE_DIR}/source
+     )
+-    target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt)
 -    target_include_directories(SPIRV PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>)
+-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
+-        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
 +    target_link_libraries(SPIRV glslang)
 else()
     target_link_libraries(SPIRV PRIVATE MachineIndependent)
 endif()
-@@ -125,5 +125,9 @@ if(GLSLANG_ENABLE_INSTALL)
- 
-     install(TARGETS SPIRV EXPORT glslang-targets)
- 
+@@ -143,6 +153,9 @@ if(ENABLE_GLSLANG_INSTALL)
+         add_library(SPIRV ALIAS glslang::SPIRV)
+     ")
+     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/SPIRVTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+-
 +    # spirv.pc Configuration
 +    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/spirv.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc @ONLY)
 +    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-+
-     install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
+    
+     install(FILES ${HEADERS} ${SPVREMAP_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 -up glslang-sdk-1.3.250.0/SPIRV/spirv.pc.cmake.in.dma glslang-sdk-1.3.250.0/SPIRV/spirv.pc.cmake.in
+--- glslang-sdk-1.3.250.0/SPIRV/spirv.pc.cmake.in.dma	2023-06-20 14:19:40.293695781 +1000
+++ glslang-sdk-1.3.250.0/SPIRV/spirv.pc.cmake.in	2023-06-20 14:19:40.293695781 +1000
@@ -0,0 +1,11 @@
 +    prefix=@CMAKE_INSTALL_PREFIX@
 +    exec_prefix=@CMAKE_INSTALL_PREFIX@
@ -159,9 +137,9 @@ 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
+diff -up glslang-sdk-1.3.250.0/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.250.0/SPIRV/SpvTools.cpp
+--- glslang-sdk-1.3.250.0/SPIRV/SpvTools.cpp.dma	2023-05-18 06:47:56.000000000 +1000
+++ glslang-sdk-1.3.250.0/SPIRV/SpvTools.cpp	2023-06-20 14:19:40.293695781 +1000
@@ -43,7 +43,7 @@
 #include <iostream>
 
@ -171,30 +149,31 @@ diff -up glslang-sdk-1.3.275.0/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.275.0/SPIR
 
 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
-@@ -63,6 +63,14 @@ set(LIBRARIES
-     SPIRV
-     glslang-default-resource-limits)
+diff -up glslang-sdk-1.3.250.0/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.250.0/StandAlone/CMakeLists.txt
+--- glslang-sdk-1.3.250.0/StandAlone/CMakeLists.txt.dma	2023-05-18 06:47:56.000000000 +1000
+++ glslang-sdk-1.3.250.0/StandAlone/CMakeLists.txt	2023-06-20 14:19:40.294695800 +1000
+@@ -62,6 +62,14 @@ if(ENABLE_SPVREMAPPER)
+     set(LIBRARIES ${LIBRARIES} SPVRemapper)
+ endif()
 
 +if(BUILD_SHARED_LIBS)
 +    set(LIBRARIES ${LIBRARIES} ${SPIRV_TOOLS_SHARED_LIBRARIES})
-+    target_include_directories(glslang-standalone PUBLIC ${SPIRV_TOOLS_SHARED_INCLUDE_DIRS})
+    target_include_directories(glslangValidator PUBLIC ${SPIRV_TOOLS_SHARED_INCLUDE_DIRS})
 +else()
 +    set(LIBRARIES ${LIBRARIES} ${SPIRV_TOOLS_LIBRARIES})
-+    target_include_directories(glslang-standalone PUBLIC ${SPIRV_TOOLS_INCLUDE_DIRS})
+    target_include_directories(glslangValidator PUBLIC ${SPIRV_TOOLS_INCLUDE_DIRS})
 +endif(BUILD_SHARED_LIBS)
 +
 if(WIN32)
     set(LIBRARIES ${LIBRARIES} psapi)
 elseif(UNIX)
-@@ -72,8 +80,6 @@ elseif(UNIX)
+@@ -71,9 +79,6 @@ elseif(UNIX)
 endif()
 
- target_link_libraries(glslang-standalone ${LIBRARIES})
-target_include_directories(glslang-standalone PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>)
+ target_link_libraries(glslangValidator ${LIBRARIES})
+-target_include_directories(glslangValidator PUBLIC
+-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
+-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
 
- if(ENABLE_SPVREMAPPER)
-     set(REMAPPER_SOURCES spirv-remap.cpp)
+ if(ENABLE_OPT)
+     target_include_directories(glslangValidator
--- a/gating.yaml
+++ b/gating.yaml
@ -1,6 +0,0 @@
--- !Policy
-product_versions:
-  - rhel-10
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
--- a/glslang-default-resource-limits_staticlib.patch
+++ b/glslang-default-resource-limits_staticlib.patch
@ -0,0 +1,12 @@
+diff -up glslang-sdk-1.3.243.0/glslang/CMakeLists.txt.dma glslang-sdk-1.3.243.0/glslang/CMakeLists.txt
+--- glslang-sdk-1.3.243.0/glslang/CMakeLists.txt.dma	2023-04-20 17:33:10.410926416 +1000
+++ glslang-sdk-1.3.243.0/glslang/CMakeLists.txt	2023-03-22 08:20:54.000000000 +1000
+@@ -196,7 +196,7 @@ set(RESOURCELIMITS_HEADERS
+   Public/resource_limits_c.h
+ )
+ 
+-add_library(glslang-default-resource-limits ${RESOURCELIMITS_SOURCES} ${RESOURCELIMITS_HEADERS})
+add_library(glslang-default-resource-limits STATIC ${RESOURCELIMITS_SOURCES} ${RESOURCELIMITS_HEADERS})
+ set_target_properties(glslang-default-resource-limits PROPERTIES
+     VERSION "${GLSLANG_VERSION}"
+     SOVERSION "${GLSLANG_VERSION_MAJOR}"
--- a/glslang.spec
+++ b/glslang.spec
@ -1,13 +1,14 @@
-%global sdkver 1.3.283.0
+%global sdkver 1.3.250.0

 Name:           glslang
-Version:        14.2.0
+Version:        11.9.0
 Release:        %autorelease
 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
+License:        BSD and GPLv3+ and Apache-2.0
 URL:            https://github.com/KhronosGroup/%{name}
-Source0:        %url/archive/vulkan-sdk-%{sdkver}.tar.gz#/%{name}-sdk-%{sdkver}.tar.gz
+Source0:        %url/archive/sdk-%{sdkver}.tar.gz#/%{name}-sdk-%{sdkver}.tar.gz
+Patch1:         glslang-default-resource-limits_staticlib.patch
 # Patch to build against system spirv-tools (rebased locally)
 #Patch3:         https://patch-diff.githubusercontent.com/raw/KhronosGroup/glslang/pull/1722.patch#/0001-pkg-config-compatibility.patch
 Patch3:         0001-pkg-config-compatibility.patch
@ -32,7 +33,7 @@ ES and OpenGL shading languages. It implements a strict
 interpretation of the specifications for these languages.

 %prep
-%autosetup -p1 -n %{name}-vulkan-sdk-%{sdkver}
+%autosetup -p1 -n %{name}-sdk-%{sdkver}
 # Fix rpmlint warning on debuginfo
 find . -name '*.h' -or -name '*.cpp' -or -name '*.hpp'| xargs chmod a-x

@ -55,12 +56,13 @@ popd

 %files
 %doc README.md README-spirv-remap.txt
-%{_bindir}/glslang
 %{_bindir}/glslangValidator
 %{_bindir}/spirv-remap

 %files devel
 %{_includedir}/glslang/
+%{_libdir}/libHLSL.a
+%{_libdir}/libOGLCompiler.a
 %{_libdir}/libOSDependent.a
 %{_libdir}/libSPIRV.a
 %{_libdir}/libSPVRemapper.a
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (glslang-sdk-1.3.283.0.tar.gz) = 297fb9c91d17c80d0f6a9812a2c785179ad58ebff2d12d5c57f7d4d2c37bab96a31656f430b97914c39d0c23e21f96718fd13437233a40d80bd4e001579facda
+SHA512 (glslang-sdk-1.3.250.0.tar.gz) = deacf79bd036ee472235ae138028c8e7d39527feda387d4ac648edf2c6e93d958b983ba85cdbb5136ff336942e220dddedf44bdc890ed731bdc942cdf1fa045c