summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-04-12 11:44:04 -0700
committerKhem Raj <raj.khem@gmail.com>2022-04-13 19:21:41 -0700
commit4cde452b197b09272131bff98c0c98f49267b9cc (patch)
treeedef0d35d411c5030f966f2b9644624f3341716b
parentc03a543d93d955effe603257a7f3782970e95271 (diff)
downloadmeta-openembedded-4cde452b197b09272131bff98c0c98f49267b9cc.tar.gz
glmark2: Fix build with gcc12
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-benchmark/glmark2/files/0001-libmatrix-Include-missing-utility-header.patch24
-rw-r--r--meta-oe/recipes-benchmark/glmark2/glmark2_git.bb1
2 files changed, 25 insertions, 0 deletions
diff --git a/meta-oe/recipes-benchmark/glmark2/files/0001-libmatrix-Include-missing-utility-header.patch b/meta-oe/recipes-benchmark/glmark2/files/0001-libmatrix-Include-missing-utility-header.patch
new file mode 100644
index 0000000000..959a18e5eb
--- /dev/null
+++ b/meta-oe/recipes-benchmark/glmark2/files/0001-libmatrix-Include-missing-utility-header.patch
@@ -0,0 +1,24 @@
1From 45cb02332b38b2059e7e44369c3d8684492a7def Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 12 Apr 2022 11:41:41 -0700
4Subject: [PATCH] libmatrix: Include missing <utility> header
5
6Fixes build with gcc12
7| ../git/src/libmatrix/program.h:43:21: error: 'exchange' is not a member of 'std' | 43 | ready_(std::exchange(shader.ready_, false)), | | ^~~~~~~~
8
9Upstream-Status: Submitted [https://github.com/glmark2/glmark2/pull/174]
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 src/libmatrix/program.h | 1 +
13 1 file changed, 1 insertion(+)
14
15--- a/src/libmatrix/program.h
16+++ b/src/libmatrix/program.h
17@@ -13,6 +13,7 @@
18 #define PROGRAM_H_
19
20 #include <string>
21+#include <utility>
22 #include <vector>
23 #include <map>
24 #include "mat.h"
diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
index 47d927397c..1406f68b05 100644
--- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
+++ b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
@@ -17,6 +17,7 @@ SRC_URI = " \
17 git://github.com/glmark2/glmark2.git;protocol=https;branch=master \ 17 git://github.com/glmark2/glmark2.git;protocol=https;branch=master \
18 file://0001-fix-dispmanx-build.patch \ 18 file://0001-fix-dispmanx-build.patch \
19 file://0002-run-dispmanx-fullscreen.patch \ 19 file://0002-run-dispmanx-fullscreen.patch \
20 file://0001-libmatrix-Include-missing-utility-header.patch \
20 " 21 "
21SRCREV = "0858b450cd88c84a15b99dda9698d44e7f7e8c70" 22SRCREV = "0858b450cd88c84a15b99dda9698d44e7f7e8c70"
22 23