diff options
author | Mark Hatle <mark.hatle@amd.com> | 2024-01-25 12:58:37 -0700 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2024-01-30 17:48:07 -0700 |
commit | 0b4dd99525b504cec333ab157cbc40674148a8df (patch) | |
tree | 9c4d4ed5b18e86b0c65f89624cec537c40c0b0c5 | |
parent | 3bcd5607b3a5bbac85d49a815ca1d9f721104a62 (diff) | |
download | meta-xilinx-0b4dd99525b504cec333ab157cbc40674148a8df.tar.gz |
libvdu-omxil: Add workaround for latest gcc
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
3 files changed, 56 insertions, 0 deletions
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/files/0001-libvdu-omxil-Fix-missing-definitions.patch b/meta-xilinx-core/recipes-multimedia/vdu/files/0001-libvdu-omxil-Fix-missing-definitions.patch new file mode 100644 index 00000000..db23ed00 --- /dev/null +++ b/meta-xilinx-core/recipes-multimedia/vdu/files/0001-libvdu-omxil-Fix-missing-definitions.patch | |||
@@ -0,0 +1,54 @@ | |||
1 | From 7fc63cdd6642ea84b78db62fccafc460af0ff23e Mon Sep 17 00:00:00 2001 | ||
2 | From: Mark Hatle <mark.hatle@amd.com> | ||
3 | Date: Thu, 25 Jan 2024 12:50:18 -0700 | ||
4 | Subject: [PATCH] Fix missing definitions | ||
5 | |||
6 | Fix issues such as: | ||
7 | | module/module_structs.h:370:3: error: 'uint8_t' does not name a type | ||
8 | | 370 | uint8_t distributionMaxrgbPercentages[MAX_MAXRGB_PERCENTILES_ST2094_40]; | ||
9 | | | ^~~~~~~ | ||
10 | | module/module_structs.h:370:3: note: 'uint8_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'? | ||
11 | | module/module_structs.h:371:3: error: 'uint32_t' does not name a type | ||
12 | | 371 | uint32_t distributionMaxrgbPercentiles[MAX_MAXRGB_PERCENTILES_ST2094_40]; | ||
13 | | | ^~~~~~~~ | ||
14 | | module/module_structs.h:371:3: note: 'uint32_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'? | ||
15 | |||
16 | and | ||
17 | |||
18 | | ./utility/processor_fifo.h:80:15: error: field 'name_' has incomplete type 'std::string' {aka 'std::__cxx11::basic_string<char>'} | ||
19 | | 80 | std::string name_; | ||
20 | | | ^~~~~ | ||
21 | |||
22 | Signed-off-by: Mark Hatle <mark.hatle@amd.com> | ||
23 | --- | ||
24 | module/module_structs.h | 1 + | ||
25 | utility/processor_fifo.h | 1 + | ||
26 | 2 files changed, 2 insertions(+) | ||
27 | |||
28 | diff --git a/module/module_structs.h b/module/module_structs.h | ||
29 | index 75bdff6..594076f 100644 | ||
30 | --- a/module/module_structs.h | ||
31 | +++ b/module/module_structs.h | ||
32 | @@ -27,6 +27,7 @@ | ||
33 | #include "module_enums.h" | ||
34 | #include <string> | ||
35 | #include <vector> | ||
36 | +#include <cstdint> | ||
37 | |||
38 | template<typename T> | ||
39 | struct InputOutput | ||
40 | diff --git a/utility/processor_fifo.h b/utility/processor_fifo.h | ||
41 | index e0dd47c..f047267 100644 | ||
42 | --- a/utility/processor_fifo.h | ||
43 | +++ b/utility/processor_fifo.h | ||
44 | @@ -27,6 +27,7 @@ | ||
45 | #include <utility/locked_queue.h> | ||
46 | #include <thread> | ||
47 | #include <functional> | ||
48 | +#include <string> | ||
49 | |||
50 | #if defined __linux__ | ||
51 | #include <sys/prctl.h> | ||
52 | -- | ||
53 | 2.34.1 | ||
54 | |||
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.1.bb index b4fc482e..b3c02ca2 100644 --- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.1.bb +++ b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.1.bb | |||
@@ -13,6 +13,7 @@ SRCREV ?= "811eefac953fd5e098c69cada97a0dd35f5e9015" | |||
13 | 13 | ||
14 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" | 14 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" |
15 | SRC_URI = "${REPO};${BRANCHARG} \ | 15 | SRC_URI = "${REPO};${BRANCHARG} \ |
16 | file://0001-libvdu-omxil-Fix-missing-definitions.patch \ | ||
16 | " | 17 | " |
17 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
18 | 19 | ||
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.2.bb index f6f159d2..04860b79 100644 --- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.2.bb +++ b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.2.bb | |||
@@ -13,6 +13,7 @@ SRCREV ?= "811eefac953fd5e098c69cada97a0dd35f5e9015" | |||
13 | 13 | ||
14 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" | 14 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" |
15 | SRC_URI = "${REPO};${BRANCHARG} \ | 15 | SRC_URI = "${REPO};${BRANCHARG} \ |
16 | file://0001-libvdu-omxil-Fix-missing-definitions.patch \ | ||
16 | " | 17 | " |
17 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
18 | 19 | ||