Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14292 from Rmys/master

Browse Source 
shaderc ver. bump
This commit is contained in:
Rmys
2024-05-31 14:51:53 +03:00
committed by GitHub
parent 4e2b5cc821 acbd2a8651
commit 1d89aea62c
7 changed files with 111 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programming/library/shaderc/actions.py
+2
View File
@@ -15,6 +15,8 @@ def setup():
shelltools.system("sed '/build-version/d' -i glslc/CMakeLists.txt")
# shelltools.system("cat <<- EOF > glslc/src/build-version.inc")
cmaketools.configure("-B build \
-GNinja \
programming/library/shaderc/files/build-version.inc
+1 -1
View File
@@ -1,3 +1,3 @@
"shaderc 2023.8\n"
"shaderc 2023.4\n"
"spirv-tools 2023.6\n"
"glslang 14.0.1\n"
programming/library/shaderc/files/gentoo/shaderc-2020.4-fix-build.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc
index c5ce37e..4703634 100644
--- a/libshaderc_util/src/compiler.cc
+++ b/libshaderc_util/src/compiler.cc
@@ -20,7 +20,7 @@
#include <thread>
#include <tuple>
-#include "SPIRV/GlslangToSpv.h"
+#include "glslang/SPIRV/GlslangToSpv.h"
#include "libshaderc_util/format.h"
#include "libshaderc_util/io.h"
#include "libshaderc_util/message.h"
programming/library/shaderc/files/glslang_linker_flags.patch
+24
View File
@@ -0,0 +1,24 @@
--- a/libshaderc_util/CMakeLists.txt
+++ b/libshaderc_util/CMakeLists.txt
@@ -47,7 +47,7 @@ add_definitions(-DENABLE_HLSL)
find_package(Threads)
target_link_libraries(shaderc_util PRIVATE
glslang SPIRV
- SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
+ SPIRV-Tools-opt MachineIndependent GenericCodeGen ${CMAKE_THREAD_LIBS_INIT})
shaderc_add_tests(
TEST_PREFIX shaderc_util
--- a/glslc/CMakeLists.txt
+++ b/glslc/CMakeLists.txt
@@ -43,7 +43,7 @@ if (SHADERC_ENABLE_WGSL_OUTPUT)
endif(SHADERC_ENABLE_WGSL_OUTPUT)
target_link_libraries(glslc PRIVATE
- 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})
programming/library/shaderc/files/shaderc-2020.4-system-glslang.patch
+39
View File
@@ -0,0 +1,39 @@
Index: shaderc-2020.4/libshaderc_util/CMakeLists.txt
===================================================================
--- shaderc-2020.4/libshaderc_util/CMakeLists.txt
+++ shaderc-2020.4/libshaderc_util/CMakeLists.txt 2020-12-17 16:37:40.662060059 +0100
@@ -46,7 +46,7 @@
find_package(Threads)
target_link_libraries(shaderc_util PRIVATE
- glslang OSDependent OGLCompiler HLSL glslang SPIRV
+ glslang HLSL SPIRV
SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
shaderc_add_tests(
Index: shaderc-2020.4/libshaderc/CMakeLists.txt
===================================================================
--- shaderc-2020.4/libshaderc/CMakeLists.txt
+++ shaderc-2020.4/libshaderc/CMakeLists.txt 2020-12-17 16:37:27.847177220 +0100
@@ -62,7 +62,7 @@
find_package(Threads)
set(SHADERC_LIBS
- glslang OSDependent OGLCompiler glslang ${CMAKE_THREAD_LIBS_INIT}
+ glslang ${CMAKE_THREAD_LIBS_INIT}
shaderc_util
SPIRV # from glslang
SPIRV-Tools
Index: shaderc-2020.4/glslc/CMakeLists.txt
===================================================================
--- shaderc-2020.4/glslc/CMakeLists.txt
+++ shaderc-2020.4/glslc/CMakeLists.txt 2020-12-17 16:37:17.558271289 +0100
@@ -43,7 +43,7 @@
endif(SHADERC_ENABLE_WGSL_OUTPUT)
target_link_libraries(glslc PRIVATE
- glslang OSDependent OGLCompiler HLSL glslang SPIRV # Glslang libraries
+ glslang HLSL SPIRV # Glslang libraries
$<$<BOOL:${SHADERC_ENABLE_WGSL_OUTPUT}>:libtint> # Tint libraries, optional
shaderc_util shaderc # internal Shaderc libraries
${CMAKE_THREAD_LIBS_INIT})
programming/library/shaderc/files/shaderc-2022.1-cmakelists.patch
+24
View File
@@ -0,0 +1,24 @@
Index: shaderc-2022.1/CMakeLists.txt
===================================================================
--- shaderc-2022.1/CMakeLists.txt
+++ shaderc-2022.1/CMakeLists.txt 2022-03-08 10:53:40.587725107 +0100
@@ -124,7 +124,6 @@
# Configure subdirectories.
# We depend on these for later projects, so they should come first.
-add_subdirectory(third_party)
add_subdirectory(libshaderc_util)
add_subdirectory(libshaderc)
Index: shaderc-2022.1/glslc/CMakeLists.txt
===================================================================
--- shaderc-2022.1/glslc/CMakeLists.txt
+++ shaderc-2022.1/glslc/CMakeLists.txt 2022-03-08 10:53:48.232728595 +0100
@@ -53,7 +53,6 @@
target_include_directories(glslc_exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/.. ${spirv-tools_SOURCE_DIR}/include)
set_target_properties(glslc_exe PROPERTIES OUTPUT_NAME glslc)
target_link_libraries(glslc_exe PRIVATE glslc shaderc_util shaderc)
-add_dependencies(glslc_exe build-version)
shaderc_add_tests(
TEST_PREFIX glslc
programming/library/shaderc/pspec.xml
+8 -1
View File
@@ -13,7 +13,7 @@
<Summary>Collection of tools, libraries and tests for shader compilation</Summary>
<Icon>shaderc</Icon>
<Description>Gölgelendirici derlemesi için araçlar, kütüphaneler ve testlerden oluşan koleksiyon</Description>
<Archive sha1sum="1b5229f5aebcd7afa49d3a399d0162f15821e7b8" type="targz">https://github.com/google/shaderc/archive/refs/tags/v2023.8.tar.gz</Archive>
<Archive sha1sum="7b012f90d5f4b4f37c9645c0f8eff357ffe68e3a" type="targz">https://github.com/google/shaderc/archive/refs/tags/v2024.1.tar.gz</Archive>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="glslc/src/build-version.inc">build-version.inc</AdditionalFile>
</AdditionalFiles>
@@ -58,6 +58,13 @@
</Package>
<History>
<Update release="2">
<Date>2024-05-05</Date>
<Version>2024.1</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="1">
<Date>2024-03-18</Date>
<Version>2023.8</Version>