Update to 1.4.304.0 SDK

0001-pkg-config-compatibility.patch

@@ -12,8 +12,8 @@ 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_SPIRV)
+     add_compile_definitions(ENABLE_SPIRV)
  endif()
 @@ -264,27 +271,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External)
      add_subdirectory(External)
@@ -95,23 +95,22 @@ diff -up glslang-sdk-1.3.275.0/glslang/glslang.pc.cmake.in.dma glslang-sdk-1.3.2
 +    Description: OpenGL and OpenGL ES shader front end and validator
 +    Requires:
 +    Version: @VERSION@
-+    Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper
++    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
-@@ -89,6 +89,10 @@ target_include_directories(SPIRV PUBLIC
+@@ -92,6 +92,9 @@ target_include_directories(SPIRV PUBLIC
+     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
+     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
  
- glslang_add_build_info_dependency(SPIRV)
- 
-+
 +set(SPIRV_NAME spirv)
 +set(SPIRV_VERSION 1.5.5)
 +
  if (ENABLE_SPVREMAPPER)
      add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS})
-     set_target_properties(SPVRemapper PROPERTIES
+     add_library(glslang::SPVRemapper ALIAS SPVRemapper)
 @@ -105,10 +109,17 @@ if(WIN32 AND BUILD_SHARED_LIBS)
      endif()
  endif()
@@ -126,12 +125,12 @@ diff -up glslang-sdk-1.3.275.0/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.275.0/SP
 +endif(BUILD_SHARED_LIBS)
 +
  if(ENABLE_OPT)
--    target_link_libraries(SPIRV PRIVATE MachineIndependent PUBLIC SPIRV-Tools-opt)
+-    target_link_libraries(SPIRV INTERFACE glslang PUBLIC SPIRV-Tools-opt)
 -    target_include_directories(SPIRV PUBLIC
 -        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>)
 +    target_link_libraries(SPIRV glslang)
  else()
-     target_link_libraries(SPIRV PRIVATE MachineIndependent)
+     target_link_libraries(SPIRV INTERFACE glslang)
  endif()
 @@ -125,5 +125,9 @@ if(GLSLANG_ENABLE_INSTALL)
  
@@ -168,14 +167,15 @@ diff -up glslang-sdk-1.3.275.0/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.275.0/SPIR
  #include "SpvTools.h"
 -#include "spirv-tools/optimizer.hpp"
 +#include <spirv-tools/optimizer.hpp>
+ #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
-@@ -63,6 +63,14 @@ set(LIBRARIES
-     SPIRV
+@@ -61,6 +61,14 @@ set(LIBRARIES
+     glslang
      glslang-default-resource-limits)
  
 +if(BUILD_SHARED_LIBS)
@@ -189,12 +189,12 @@ 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)
-@@ -72,8 +80,6 @@ elseif(UNIX)
+@@ -70,8 +78,6 @@ elseif(UNIX)
  endif()
  
  target_link_libraries(glslang-standalone ${LIBRARIES})
 -target_include_directories(glslang-standalone PUBLIC
 -    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>)
  
- if(ENABLE_SPVREMAPPER)
-     set(REMAPPER_SOURCES spirv-remap.cpp)
+ if(ENABLE_SPIRV)
+     if(ENABLE_SPVREMAPPER)

glslang.spec

@@ -1,7 +1,7 @@
-%global sdkver 1.3.283.0
+%global sdkver 1.4.304.0
 
 Name:           glslang
-Version:        14.2.0
+Version:        15.1.0
 Release:        %autorelease
 Summary:        OpenGL and OpenGL ES shader front end and validator
 

sources

@@ -1 +1 @@
-SHA512 (glslang-sdk-1.3.283.0.tar.gz) = 297fb9c91d17c80d0f6a9812a2c785179ad58ebff2d12d5c57f7d4d2c37bab96a31656f430b97914c39d0c23e21f96718fd13437233a40d80bd4e001579facda
+SHA512 (glslang-sdk-1.4.304.0.tar.gz) = dae98afbea27b518e6230ebae5207c67b4f1a695b8f65033159bcf0064ec6546c8db4f2d52bd028353c15e4d7d9409c1f7dffc589639bfd8ee07d98ea7c73b12