Skip to content

Commit 6fe9e0e

Browse files
krajrpurdie
authored andcommitted
vulkan-samples: Fix build with GCC-15
Include cstdint for uint32_t definition Update to tip if trunk as it helps with GCC-15 fixes Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
1 parent 7cdb9ea commit 6fe9e0e

File tree

3 files changed

+59
-1
lines changed

3 files changed

+59
-1
lines changed
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
From e40c14a3e007fac0e4f2e4164fdf14d1712355bd Mon Sep 17 00:00:00 2001
2+
From: Sergei Trofimovich <slyich@gmail.com>
3+
Date: Fri, 2 Aug 2024 22:44:21 +0100
4+
Subject: [PATCH] SPIRV/SpvBuilder.h: add missing <cstdint> include
5+
6+
Without the change `glslang` build fails on upcoming `gcc-15` as:
7+
8+
In file included from /build/source/SPIRV/GlslangToSpv.cpp:45:
9+
SPIRV/SpvBuilder.h:248:30: error: 'uint32_t' has not been declared
10+
248 | Id makeDebugLexicalBlock(uint32_t line);
11+
| ^~~~~~~~
12+
13+
Upstream-Status: Backport [https://github.com/KhronosGroup/glslang/commit/e40c14a3e007fac0e4f2e4164fdf14d1712355bd]
14+
Signed-off-by: Khem Raj <raj.khem@gmail.com>
15+
---
16+
SPIRV/SpvBuilder.h | 1 +
17+
1 file changed, 1 insertion(+)
18+
19+
--- a/SPIRV/SpvBuilder.h
20+
+++ b/SPIRV/SpvBuilder.h
21+
@@ -56,6 +56,7 @@ namespace spv {
22+
}
23+
24+
#include <algorithm>
25+
+#include <cstdint>
26+
#include <map>
27+
#include <memory>
28+
#include <set>
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From 445fcfd7b9245881d769880a5942ce9faa893045 Mon Sep 17 00:00:00 2001
2+
From: Khem Raj <raj.khem@gmail.com>
3+
Date: Sun, 23 Mar 2025 20:09:35 -0700
4+
Subject: [PATCH] framework: Include stdint.h
5+
6+
Needed for uint32_t used in this header
7+
GCC 15 gets upset about it.
8+
9+
Upstream-Status: Submitted [https://github.com/KhronosGroup/Vulkan-Samples/pull/1314]
10+
Signed-off-by: Khem Raj <raj.khem@gmail.com>
11+
---
12+
framework/platform/configuration.h | 1 +
13+
1 file changed, 1 insertion(+)
14+
15+
diff --git a/framework/platform/configuration.h b/framework/platform/configuration.h
16+
index f6a9cae..c15f76f 100644
17+
--- a/framework/platform/configuration.h
18+
+++ b/framework/platform/configuration.h
19+
@@ -18,6 +18,7 @@
20+
#pragma once
21+
22+
#include <algorithm>
23+
+#include <cstdint>
24+
#include <map>
25+
#include <memory>
26+
#include <string>

meta/recipes-graphics/vulkan/vulkan-samples_git.bb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,20 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=48aa35cefb768436223a6e7f18dc2a2a"
77

88
SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=main;protocol=https;lfs=0 \
99
file://0001-vulkan-samples-Fix-reproducibility-issue.patch \
10+
file://0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch;patchdir=third_party/glslang \
11+
file://0001-framework-Include-stdint.h.patch \
1012
"
1113

1214
UPSTREAM_CHECK_COMMITS = "1"
13-
SRCREV = "4838e02a4b08236931bec0532fc26ee3871b466a"
15+
SRCREV = "8547ce1022a19870d3e49075b5b08ca2d11c8773"
1416

1517
UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for"
1618
S = "${WORKDIR}/git"
1719

1820
REQUIRED_DISTRO_FEATURES = 'vulkan'
1921

22+
# Avoid erroring on including <ciso646> instead of <version> in c++17
23+
CXXFLAGS += "-Wno-error=cpp"
2024
inherit cmake features_check
2125

2226
FILES:${PN} += "${datadir}"

0 commit comments

Comments
 (0)