diff options
author | Mark Hatle <mark.hatle@amd.com> | 2023-09-28 13:48:51 -0600 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2023-09-28 13:50:15 -0600 |
commit | 944c0d55e2c0157cc7677ec25d9ccc01a0ccfda7 (patch) | |
tree | 3af0f7e2c3c5ebc91e5d9aa6bd00c1c8d8472840 /meta-xilinx-core/recipes-multimedia | |
parent | 6b9f17f0c990645063efaf21fff3f76072c5300e (diff) | |
download | meta-xilinx-944c0d55e2c0157cc7677ec25d9ccc01a0ccfda7.tar.gz |
libvcu-xlnx: Add fixup for the latest gcc
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-core/recipes-multimedia')
-rw-r--r-- | meta-xilinx-core/recipes-multimedia/vcu/files/0001-Support-updated-gcc-add-cstdint-where-necessary.patch | 52 | ||||
-rw-r--r-- | meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.1.bb | 2 |
2 files changed, 54 insertions, 0 deletions
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/files/0001-Support-updated-gcc-add-cstdint-where-necessary.patch b/meta-xilinx-core/recipes-multimedia/vcu/files/0001-Support-updated-gcc-add-cstdint-where-necessary.patch new file mode 100644 index 00000000..788edd03 --- /dev/null +++ b/meta-xilinx-core/recipes-multimedia/vcu/files/0001-Support-updated-gcc-add-cstdint-where-necessary.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From b58c0a7dd0eeb16b2251edfad3b4763ce5653ea2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mark Hatle <mark.hatle@amd.com> | ||
3 | Date: Thu, 28 Sep 2023 12:04:34 -0600 | ||
4 | Subject: [PATCH] Support updated gcc, add cstdint where necessary | ||
5 | |||
6 | With the latest gcc, cstdint is now needs to be explicitly included, otherwise | ||
7 | errors similar to the following will occur: | ||
8 | |||
9 | include/lib_app/Parser.h:413:36: error: 'uint32_t' has not been declared | ||
10 | 413 | static void resetFlag(T* bitfield, uint32_t uFlag) | ||
11 | | ^~~~~~~~ | ||
12 | include/lib_app/Parser.h: In function 'void resetFlag(T*, int)': | ||
13 | include/lib_app/Parser.h:415:20: error: 'uint32_t' was not declared in this scope | ||
14 | 415 | *bitfield = (T)((uint32_t)*bitfield & ~uFlag); | ||
15 | | ^~~~~~~~ | ||
16 | include/lib_app/Parser.h:18:1: note: 'uint32_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'? | ||
17 | 17 | #include <iomanip> | ||
18 | +++ |+#include <cstdint> | ||
19 | 18 | | ||
20 | |||
21 | Signed-off-by: Mark Hatle <mark.hatle@amd.com> | ||
22 | --- | ||
23 | exe_encoder/EncCmdMngr.h | 1 + | ||
24 | include/lib_app/Parser.h | 1 + | ||
25 | 2 files changed, 2 insertions(+) | ||
26 | |||
27 | diff --git a/exe_encoder/EncCmdMngr.h b/exe_encoder/EncCmdMngr.h | ||
28 | index 6dacd68..cd3d0a6 100644 | ||
29 | --- a/exe_encoder/EncCmdMngr.h | ||
30 | +++ b/exe_encoder/EncCmdMngr.h | ||
31 | @@ -7,6 +7,7 @@ | ||
32 | #include <iostream> | ||
33 | #include <string> | ||
34 | #include <vector> | ||
35 | +#include <cstdint> | ||
36 | |||
37 | #include "ICommandsSender.h" | ||
38 | |||
39 | diff --git a/include/lib_app/Parser.h b/include/lib_app/Parser.h | ||
40 | index efb7f94..66d5164 100644 | ||
41 | --- a/include/lib_app/Parser.h | ||
42 | +++ b/include/lib_app/Parser.h | ||
43 | @@ -15,6 +15,7 @@ | ||
44 | #include <sstream> | ||
45 | #include <vector> | ||
46 | #include <iomanip> | ||
47 | +#include <cstdint> | ||
48 | |||
49 | std::deque<Token> toReversePolish(std::deque<Token>& tokens); | ||
50 | std::string parseString(std::deque<Token>& tokens); | ||
51 | -- | ||
52 | 2.34.1 | ||
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.1.bb index 7dc97d72..53a03f45 100644 --- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.1.bb | |||
@@ -13,6 +13,8 @@ SRCREV = "83aabb84c26667f7d6aee632654c63e504838061" | |||
13 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" | 13 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" |
14 | SRC_URI = "${REPO};${BRANCHARG}" | 14 | SRC_URI = "${REPO};${BRANCHARG}" |
15 | 15 | ||
16 | SRC_URI += "file://0001-Support-updated-gcc-add-cstdint-where-necessary.patch" | ||
17 | |||
16 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
17 | 19 | ||
18 | inherit features_check | 20 | inherit features_check |