diff --git a/programming/library/shaderc/actions.py b/programming/library/shaderc/actions.py index 37d13eee26..3f3fb8e947 100644 --- a/programming/library/shaderc/actions.py +++ b/programming/library/shaderc/actions.py @@ -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 \ diff --git a/programming/library/shaderc/files/build-version.inc b/programming/library/shaderc/files/build-version.inc index 0e9d305fc3..bf4460e227 100644 --- a/programming/library/shaderc/files/build-version.inc +++ b/programming/library/shaderc/files/build-version.inc @@ -1,3 +1,3 @@ -"shaderc 2023.8\n" +"shaderc 2023.4\n" "spirv-tools 2023.6\n" "glslang 14.0.1\n" diff --git a/programming/library/shaderc/files/gentoo/shaderc-2020.4-fix-build.patch b/programming/library/shaderc/files/gentoo/shaderc-2020.4-fix-build.patch new file mode 100644 index 0000000000..93f8252831 --- /dev/null +++ b/programming/library/shaderc/files/gentoo/shaderc-2020.4-fix-build.patch @@ -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 + #include + +-#include "SPIRV/GlslangToSpv.h" ++#include "glslang/SPIRV/GlslangToSpv.h" + #include "libshaderc_util/format.h" + #include "libshaderc_util/io.h" + #include "libshaderc_util/message.h" diff --git a/programming/library/shaderc/files/glslang_linker_flags.patch b/programming/library/shaderc/files/glslang_linker_flags.patch new file mode 100644 index 0000000000..0bc540c4da --- /dev/null +++ b/programming/library/shaderc/files/glslang_linker_flags.patch @@ -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 + $<$:libtint> # Tint libraries, optional + shaderc_util shaderc # internal Shaderc libraries + ${CMAKE_THREAD_LIBS_INIT}) + diff --git a/programming/library/shaderc/files/shaderc-2020.4-system-glslang.patch b/programming/library/shaderc/files/shaderc-2020.4-system-glslang.patch new file mode 100644 index 0000000000..c123130c8b --- /dev/null +++ b/programming/library/shaderc/files/shaderc-2020.4-system-glslang.patch @@ -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 + $<$:libtint> # Tint libraries, optional + shaderc_util shaderc # internal Shaderc libraries + ${CMAKE_THREAD_LIBS_INIT}) diff --git a/programming/library/shaderc/files/shaderc-2022.1-cmakelists.patch b/programming/library/shaderc/files/shaderc-2022.1-cmakelists.patch new file mode 100644 index 0000000000..9ead140cdc --- /dev/null +++ b/programming/library/shaderc/files/shaderc-2022.1-cmakelists.patch @@ -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 diff --git a/programming/library/shaderc/pspec.xml b/programming/library/shaderc/pspec.xml index 7d9f8112d2..66c1a87bed 100644 --- a/programming/library/shaderc/pspec.xml +++ b/programming/library/shaderc/pspec.xml @@ -13,7 +13,7 @@ Collection of tools, libraries and tests for shader compilation shaderc Gölgelendirici derlemesi için araçlar, kütüphaneler ve testlerden oluşan koleksiyon - https://github.com/google/shaderc/archive/refs/tags/v2023.8.tar.gz + https://github.com/google/shaderc/archive/refs/tags/v2024.1.tar.gz build-version.inc @@ -58,6 +58,13 @@ + + 2024-05-05 + 2024.1 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2024-03-18 2023.8