import CS shaderc-2024.0-1.el9

This commit is contained in:
eabdullin 2024-09-30 16:38:29 +00:00
parent 16de75dfd5
commit f63c247785
5 changed files with 14 additions and 11 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/shaderc-2023.7.tar.gz
SOURCES/shaderc-2024.0.tar.gz

View File

@ -1 +1 @@
800eb34b6e1e6ef70ace0c383fe4fe62f899d31c SOURCES/shaderc-2023.7.tar.gz
5c6d747e060e74f49e0a1f872dccefd87808cf77 SOURCES/shaderc-2024.0.tar.gz

View File

@ -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).")

View File

@ -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})

View File

@ -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 <jexposit@redhat.com> - 2024.0-1
- Update to 1.3.280.0 SDK
* Wed Jan 17 2024 José Expósito <jexposit@redhat.com> - 2023.7-1
- Update to 1.3.268.0 SDK