rpms/shaderc
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 1.3.280.0 SDK

Browse Source 
Resolves: https://issues.redhat.com/browse/RHEL-46384
This commit is contained in:
José Expósito 2024-07-05 15:36:18 +02:00
parent 3f93034977
commit fefcbb6c99
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -16,3 +16,4 @@
/shaderc-8226ab8.tar.gz /shaderc-8226ab8.tar.gz
/shaderc-45b735d.tar.gz /shaderc-45b735d.tar.gz
/shaderc-2023.7.tar.gz /shaderc-2023.7.tar.gz
/shaderc-2024.0.tar.gz

2
0001-Drop-third-party-code-in-CMakeLists.txt.patch
View File

@ -15,7 +15,7 @@ diff -up shaderc-24275a11d81a6b33ef345878f8a4ef929c95a116/CMakeLists.txt.orig sh
-endif() -endif()
- -
-add_custom_target(build-version -add_custom_target(build-version
- ${PYTHON_EXECUTABLE} - ${Python_EXECUTABLE}
- ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py - ${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 - ${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).") - COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).")

10
glslang_linker_flags.patch
View File

@ -1,9 +1,9 @@
--- a/libshaderc_util/CMakeLists.txt --- a/libshaderc_util/CMakeLists.txt
+++ b/libshaderc_util/CMakeLists.txt +++ b/libshaderc_util/CMakeLists.txt
@@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@ add_definitions(-DENABLE_HLSL)
find_package(Threads) find_package(Threads)
target_link_libraries(shaderc_util PRIVATE target_link_libraries(shaderc_util PRIVATE
glslang OSDependent OGLCompiler HLSL glslang SPIRV glslang SPIRV
- SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) - SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
+ SPIRV-Tools-opt MachineIndependent GenericCodeGen ${CMAKE_THREAD_LIBS_INIT}) + SPIRV-Tools-opt MachineIndependent GenericCodeGen ${CMAKE_THREAD_LIBS_INIT})
@ -12,12 +12,12 @@
--- a/glslc/CMakeLists.txt --- a/glslc/CMakeLists.txt
+++ b/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) endif(SHADERC_ENABLE_WGSL_OUTPUT)
target_link_libraries(glslc PRIVATE target_link_libraries(glslc PRIVATE
- glslang OSDependent OGLCompiler HLSL glslang SPIRV # Glslang libraries - glslang SPIRV # Glslang libraries
+ glslang OSDependent OGLCompiler HLSL glslang SPIRV MachineIndependent GenericCodeGen # Glslang libraries + glslang SPIRV MachineIndependent GenericCodeGen # Glslang libraries
$<$<BOOL:${SHADERC_ENABLE_WGSL_OUTPUT}>:libtint> # Tint libraries, optional $<$<BOOL:${SHADERC_ENABLE_WGSL_OUTPUT}>:libtint> # Tint libraries, optional
shaderc_util shaderc # internal Shaderc libraries shaderc_util shaderc # internal Shaderc libraries
${CMAKE_THREAD_LIBS_INIT}) ${CMAKE_THREAD_LIBS_INIT})

9
shaderc.spec
View File

@ -1,8 +1,8 @@
# Glslang revision from packaged version # Glslang revision from packaged version
%global glslang_version 066853941a3f097b6196f452dde42c0cbf7f98f4 %global glslang_version 436237a4ab2be3225acedc66016ea2aa82946b37
Name: shaderc Name: shaderc
Version: 2023.7 Version: 2024.0
Release: 1%{?dist} Release: 1%{?dist}
Summary: A collection of tools, libraries, and tests for Vulkan shader compilation 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 \ %cmake3 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_SKIP_RPATH=True \ -DCMAKE_SKIP_RPATH=True \
-DSHADERC_SKIP_TESTS=True \ -DSHADERC_SKIP_TESTS=True \
-DPYTHON_EXE=%{__python3} \ -DPYTHON_EXECUTABLE=%{python3} \
-GNinja -GNinja
%cmake3_build %cmake3_build
@ -121,6 +121,9 @@ sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/sr
%{_libdir}/pkgconfig/shaderc_combined.pc %{_libdir}/pkgconfig/shaderc_combined.pc
%changelog %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 * Wed Jan 17 2024 José Expósito <jexposit@redhat.com> - 2023.7-1
- Update to 1.3.268.0 SDK - Update to 1.3.268.0 SDK

2
sources
View File

@ -1 +1 @@
SHA512 (shaderc-2023.7.tar.gz) = f3c1db574312e7e5ee22fb64f47f6609369754dd1648eb4e51c30b3c40aafd9994e54560e8334d01ac7d00011285a94d0543fa9ecd6977ec34c39a965fd72269 SHA512 (shaderc-2024.0.tar.gz) = ca80b22a80bf1a222e6deecbe63f99c6eed980c6c31b4f7981b6c8dc5637b7271c861543566e01aaf945df40da095b63a69f2e22f061a41faad2ecca5dc187ae