From 6eaafe35587a2a4e73e6304b70d5eee8335d5ce4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= <jexposit@redhat.com>
Date: Fri, 5 Jul 2024 15:00:32 +0200
Subject: [PATCH] Update to 1.3.280.0 SDK

Resolves: https://issues.redhat.com/browse/RHEL-45225
---
 .gitignore                                         |  1 +
 0001-Drop-third-party-code-in-CMakeLists.txt.patch |  2 +-
 glslang_linker_flags.patch                         | 10 +++++-----
 shaderc.spec                                       |  6 +++---
 sources                                            |  2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 05d0b2c..e6c068b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /shaderc-d0b0222.tar.gz
 /shaderc-2023.3.tar.gz
 /shaderc-2023.7.tar.gz
+/shaderc-2024.0.tar.gz
diff --git a/0001-Drop-third-party-code-in-CMakeLists.txt.patch b/0001-Drop-third-party-code-in-CMakeLists.txt.patch
index b49b925..312864e 100644
--- a/0001-Drop-third-party-code-in-CMakeLists.txt.patch
+++ b/0001-Drop-third-party-code-in-CMakeLists.txt.patch
@@ -15,7 +15,7 @@ diff -up shaderc-24275a11d81a6b33ef345878f8a4ef929c95a116/CMakeLists.txt.orig sh
 -endif()
 -
 -add_custom_target(build-version
--  ${PYTHON_EXECUTABLE}
+-  ${Python_EXECUTABLE}
 -  ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py
 -  ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc
 -  COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).")
diff --git a/glslang_linker_flags.patch b/glslang_linker_flags.patch
index 9324f21..0bc540c 100644
--- a/glslang_linker_flags.patch
+++ b/glslang_linker_flags.patch
@@ -1,9 +1,9 @@
 --- a/libshaderc_util/CMakeLists.txt
 +++ b/libshaderc_util/CMakeLists.txt
-@@ -47,7 +47,7 @@
+@@ -47,7 +47,7 @@ add_definitions(-DENABLE_HLSL)
  find_package(Threads)
  target_link_libraries(shaderc_util PRIVATE
-   glslang OSDependent OGLCompiler HLSL glslang SPIRV
+   glslang SPIRV
 -  SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
 +  SPIRV-Tools-opt MachineIndependent GenericCodeGen ${CMAKE_THREAD_LIBS_INIT})
  
@@ -12,12 +12,12 @@
 
 --- a/glslc/CMakeLists.txt
 +++ b/glslc/CMakeLists.txt
-@@ -43,7 +43,7 @@
+@@ -43,7 +43,7 @@ if (SHADERC_ENABLE_WGSL_OUTPUT)
  endif(SHADERC_ENABLE_WGSL_OUTPUT)
  
  target_link_libraries(glslc PRIVATE
--  glslang OSDependent OGLCompiler HLSL glslang SPIRV    # Glslang libraries
-+  glslang OSDependent OGLCompiler HLSL glslang SPIRV MachineIndependent GenericCodeGen # Glslang libraries
+-  glslang SPIRV    # Glslang libraries
++  glslang SPIRV MachineIndependent GenericCodeGen       # Glslang libraries
    $<$<BOOL:${SHADERC_ENABLE_WGSL_OUTPUT}>:libtint>      # Tint libraries, optional
    shaderc_util shaderc                                  # internal Shaderc libraries
    ${CMAKE_THREAD_LIBS_INIT})
diff --git a/shaderc.spec b/shaderc.spec
index 5c0a949..395c951 100644
--- a/shaderc.spec
+++ b/shaderc.spec
@@ -1,8 +1,8 @@
 # Glslang revision from packaged version
-%global glslang_version 066853941a3f097b6196f452dde42c0cbf7f98f4
+%global glslang_version 436237a4ab2be3225acedc66016ea2aa82946b37
 
 Name:           shaderc
-Version:        2023.7
+Version:        2024.0
 Release:        %autorelease
 Summary:        Collection of tools, libraries, and tests for Vulkan shader compilation
 
@@ -88,7 +88,7 @@ sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/sr
 %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
        -DCMAKE_SKIP_RPATH=True \
        -DSHADERC_SKIP_TESTS=True \
-       -DPYTHON_EXE=%{python3} \
+       -DPYTHON_EXECUTABLE=%{python3} \
        -GNinja
 %cmake_build
 
diff --git a/sources b/sources
index f48ee18..4f13dfe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (shaderc-2023.7.tar.gz) = f3c1db574312e7e5ee22fb64f47f6609369754dd1648eb4e51c30b3c40aafd9994e54560e8334d01ac7d00011285a94d0543fa9ecd6977ec34c39a965fd72269
+SHA512 (shaderc-2024.0.tar.gz) = ca80b22a80bf1a222e6deecbe63f99c6eed980c6c31b4f7981b6c8dc5637b7271c861543566e01aaf945df40da095b63a69f2e22f061a41faad2ecca5dc187ae