From f63c2477859608d26c21f5d1588081524bfa3b9e Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 30 Sep 2024 16:38:29 +0000 Subject: [PATCH] import CS shaderc-2024.0-1.el9 --- .gitignore | 2 +- .shaderc.metadata | 2 +- .../0001-Drop-third-party-code-in-CMakeLists.txt.patch | 2 +- SOURCES/glslang_linker_flags.patch | 10 +++++----- SPECS/shaderc.spec | 9 ++++++--- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index b82a809..ac73806 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/shaderc-2023.7.tar.gz +SOURCES/shaderc-2024.0.tar.gz diff --git a/.shaderc.metadata b/.shaderc.metadata index b998602..93dbd87 100644 --- a/.shaderc.metadata +++ b/.shaderc.metadata @@ -1 +1 @@ -800eb34b6e1e6ef70ace0c383fe4fe62f899d31c SOURCES/shaderc-2023.7.tar.gz +5c6d747e060e74f49e0a1f872dccefd87808cf77 SOURCES/shaderc-2024.0.tar.gz diff --git a/SOURCES/0001-Drop-third-party-code-in-CMakeLists.txt.patch b/SOURCES/0001-Drop-third-party-code-in-CMakeLists.txt.patch index b49b925..312864e 100644 --- a/SOURCES/0001-Drop-third-party-code-in-CMakeLists.txt.patch +++ b/SOURCES/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/SOURCES/glslang_linker_flags.patch b/SOURCES/glslang_linker_flags.patch index 9324f21..0bc540c 100644 --- a/SOURCES/glslang_linker_flags.patch +++ b/SOURCES/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 $<$:libtint> # Tint libraries, optional shaderc_util shaderc # internal Shaderc libraries ${CMAKE_THREAD_LIBS_INIT}) diff --git a/SPECS/shaderc.spec b/SPECS/shaderc.spec index 82b1684..3630cdf 100644 --- a/SPECS/shaderc.spec +++ b/SPECS/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: 1%{?dist} Summary: A 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 %cmake3 -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_SKIP_RPATH=True \ -DSHADERC_SKIP_TESTS=True \ - -DPYTHON_EXE=%{__python3} \ + -DPYTHON_EXECUTABLE=%{python3} \ -GNinja %cmake3_build @@ -121,6 +121,9 @@ sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/sr %{_libdir}/pkgconfig/shaderc_combined.pc %changelog +* Fri Jul 05 2024 José Expósito - 2024.0-1 +- Update to 1.3.280.0 SDK + * Wed Jan 17 2024 José Expósito - 2023.7-1 - Update to 1.3.268.0 SDK