From 785418ec20eeaffa2c6a57e97ec056d371e218cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Sat, 1 Mar 2025 18:22:14 +0100 Subject: [PATCH] Patch glslang for GCC 15 compatibility. --- ...uilder.h-add-missing-cstdint-include.patch | 30 +++++++++++++++++++ cmake/ports/glslang/portfile.cmake | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 cmake/ports/glslang/0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch diff --git a/cmake/ports/glslang/0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch b/cmake/ports/glslang/0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch new file mode 100644 index 0000000000..13602907bb --- /dev/null +++ b/cmake/ports/glslang/0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch @@ -0,0 +1,30 @@ +From e40c14a3e007fac0e4f2e4164fdf14d1712355bd Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Fri, 2 Aug 2024 22:44:21 +0100 +Subject: [PATCH] SPIRV/SpvBuilder.h: add missing include + +Without the change `glslang` build fails on upcoming `gcc-15` as: + + In file included from /build/source/SPIRV/GlslangToSpv.cpp:45: + SPIRV/SpvBuilder.h:248:30: error: 'uint32_t' has not been declared + 248 | Id makeDebugLexicalBlock(uint32_t line); + | ^~~~~~~~ +--- + SPIRV/SpvBuilder.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/SPIRV/SpvBuilder.h b/SPIRV/SpvBuilder.h +index f86dd81b..d688436a 100644 +--- a/SPIRV/SpvBuilder.h ++++ b/SPIRV/SpvBuilder.h +@@ -56,6 +56,7 @@ namespace spv { + } + + #include ++#include + #include + #include + #include +-- +2.47.2 + diff --git a/cmake/ports/glslang/portfile.cmake b/cmake/ports/glslang/portfile.cmake index 6f81676faf..0841e6090d 100644 --- a/cmake/ports/glslang/portfile.cmake +++ b/cmake/ports/glslang/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( REF 11.13.0 SHA512 20c2a6543b002648f459f26bd36b5c445afd6d8eae175e400dbe45632f11ca8de1f9e6f6e98fd6f910aa75d90063e174c095e7df26d9d4982192b84d08b0dc8b HEAD_REF master - PATCHES 0001-Include-cstdint-header-in-Common.h.patch + PATCHES 0001-Include-cstdint-header-in-Common.h.patch 0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch ) vcpkg_configure_cmake(