Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/, app-benchmarks/glmark2/files/
Date: Mon, 16 May 2022 16:29:11
Message-Id: 1652718530.080155ab1dcb60de7df0ef898689a0840ad304da.mattst88@gentoo
1 commit: 080155ab1dcb60de7df0ef898689a0840ad304da
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 16 16:28:50 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Mon May 16 16:28:50 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/x11.git/commit/?id=080155ab
7
8 app-benchmarks/glmark2: Add patch to fix build with gcc-12
9
10 Closes: https://github.com/gentoo/x11/issues/4
11 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
12
13 ....12-libmatrix-Add-missing-utility-include.patch | 27 ++++++++++++++++++++++
14 app-benchmarks/glmark2/glmark2-2021.12.ebuild | 4 ++++
15 2 files changed, 31 insertions(+)
16
17 diff --git a/app-benchmarks/glmark2/files/2021.12-libmatrix-Add-missing-utility-include.patch b/app-benchmarks/glmark2/files/2021.12-libmatrix-Add-missing-utility-include.patch
18 new file mode 100644
19 index 00000000..6d99d87c
20 --- /dev/null
21 +++ b/app-benchmarks/glmark2/files/2021.12-libmatrix-Add-missing-utility-include.patch
22 @@ -0,0 +1,27 @@
23 +From d1ca3f53c96dc8a4048b17dc16147a8fac782d4a Mon Sep 17 00:00:00 2001
24 +From: Alexandros Frantzis <alexandros.frantzis@×××××××××.com>
25 +Date: Mon, 14 Feb 2022 13:54:09 +0200
26 +Subject: [PATCH] libmatrix: Add missing <utility> include
27 +
28 +Fixes compilation with GCC 12.
29 +
30 +Fixes #169
31 +---
32 + src/libmatrix/program.h | 1 +
33 + 1 file changed, 1 insertion(+)
34 +
35 +diff --git a/src/libmatrix/program.h b/src/libmatrix/program.h
36 +index f95b470..1c9de08 100644
37 +--- a/src/libmatrix/program.h
38 ++++ b/src/libmatrix/program.h
39 +@@ -15,6 +15,7 @@
40 + #include <string>
41 + #include <vector>
42 + #include <map>
43 ++#include <utility>
44 + #include "mat.h"
45 +
46 + // Simple shader container. Abstracts all of the OpenGL bits, but leaves
47 +--
48 +2.35.1
49 +
50
51 diff --git a/app-benchmarks/glmark2/glmark2-2021.12.ebuild b/app-benchmarks/glmark2/glmark2-2021.12.ebuild
52 index 00290d61..28e00b55 100644
53 --- a/app-benchmarks/glmark2/glmark2-2021.12.ebuild
54 +++ b/app-benchmarks/glmark2/glmark2-2021.12.ebuild
55 @@ -39,6 +39,10 @@ BDEPEND="
56 REQUIRED_USE="|| ( opengl gles2 )
57 || ( drm wayland X )"
58
59 +PATCHES=(
60 + "${FILESDIR}"/${PV}-libmatrix-Add-missing-utility-include.patch
61 +)
62 +
63 src_configure() {
64 local flavors=()