From 944c0d55e2c0157cc7677ec25d9ccc01a0ccfda7 Mon Sep 17 00:00:00 2001
From: Mark Hatle <mark.hatle@amd.com>
Date: Thu, 28 Sep 2023 13:48:51 -0600
Subject: libvcu-xlnx: Add fixup for the latest gcc

Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
 ...t-updated-gcc-add-cstdint-where-necessary.patch | 52 ++++++++++++++++++++++
 .../recipes-multimedia/vcu/libvcu-xlnx_2023.1.bb   |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 meta-xilinx-core/recipes-multimedia/vcu/files/0001-Support-updated-gcc-add-cstdint-where-necessary.patch

(limited to 'meta-xilinx-core/recipes-multimedia')

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 @@
+From b58c0a7dd0eeb16b2251edfad3b4763ce5653ea2 Mon Sep 17 00:00:00 2001
+From: Mark Hatle <mark.hatle@amd.com>
+Date: Thu, 28 Sep 2023 12:04:34 -0600
+Subject: [PATCH] Support updated gcc, add cstdint where necessary
+
+With the latest gcc, cstdint is now needs to be explicitly included, otherwise
+errors similar to the following will occur:
+
+  include/lib_app/Parser.h:413:36: error: 'uint32_t' has not been declared
+    413 | static void resetFlag(T* bitfield, uint32_t uFlag)
+        |                                    ^~~~~~~~
+  include/lib_app/Parser.h: In function 'void resetFlag(T*, int)':
+  include/lib_app/Parser.h:415:20: error: 'uint32_t' was not declared in this scope
+    415 |   *bitfield = (T)((uint32_t)*bitfield & ~uFlag);
+        |                    ^~~~~~~~
+  include/lib_app/Parser.h:18:1: note: 'uint32_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
+     17 | #include <iomanip>
+    +++ |+#include <cstdint>
+     18 |
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+---
+ exe_encoder/EncCmdMngr.h | 1 +
+ include/lib_app/Parser.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/exe_encoder/EncCmdMngr.h b/exe_encoder/EncCmdMngr.h
+index 6dacd68..cd3d0a6 100644
+--- a/exe_encoder/EncCmdMngr.h
++++ b/exe_encoder/EncCmdMngr.h
+@@ -7,6 +7,7 @@
+ #include <iostream>
+ #include <string>
+ #include <vector>
++#include <cstdint>
+ 
+ #include "ICommandsSender.h"
+ 
+diff --git a/include/lib_app/Parser.h b/include/lib_app/Parser.h
+index efb7f94..66d5164 100644
+--- a/include/lib_app/Parser.h
++++ b/include/lib_app/Parser.h
+@@ -15,6 +15,7 @@
+ #include <sstream>
+ #include <vector>
+ #include <iomanip>
++#include <cstdint>
+ 
+ std::deque<Token> toReversePolish(std::deque<Token>& tokens);
+ std::string parseString(std::deque<Token>& tokens);
+-- 
+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"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
 
+SRC_URI += "file://0001-Support-updated-gcc-add-cstdint-where-necessary.patch"
+
 S  = "${WORKDIR}/git"
 
 inherit features_check
-- 
cgit v1.2.3-54-g00ecf