[ptxdist] [PATCH] glmark2: backport GCC 12 build fix

[ptxdist] [PATCH] glmark2: backport GCC 12 build fix

[Philipp Zabel]

Upstream commit d1ca3f53c96d ("libmatrix: Add missing <utility>
include") fixes building with GCC 12.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 ...ibmatrix-Add-missing-utility-include.patch | 26 +++++++++++++++++++
 patches/glmark2-2021.12/series                |  4 +++
 2 files changed, 30 insertions(+)
 create mode 100644 patches/glmark2-2021.12/0001-libmatrix-Add-missing-utility-include.patch
 create mode 100644 patches/glmark2-2021.12/series

diff --git a/patches/glmark2-2021.12/0001-libmatrix-Add-missing-utility-include.patch b/patches/glmark2-2021.12/0001-libmatrix-Add-missing-utility-include.patch
new file mode 100644
index 000000000000..ead4fb5f817c
--- /dev/null
+++ b/patches/glmark2-2021.12/0001-libmatrix-Add-missing-utility-include.patch
@@ -0,0 +1,26 @@
+From: Alexandros Frantzis <alexandros.frantzis@collabora.com>
+Date: Mon, 14 Feb 2022 13:54:09 +0200
+Subject: [PATCH] libmatrix: Add missing <utility> include
+
+Fixes compilation with GCC 12.
+
+Fixes #169
+
+[p.zabel@pengutronix.de: Back-ported to 2021.12]
+Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
+---
+ src/libmatrix/program.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libmatrix/program.h b/src/libmatrix/program.h
+index f95b470cfae0..1c9de08b749a 100644
+--- a/src/libmatrix/program.h
++++ b/src/libmatrix/program.h
+@@ -15,6 +15,7 @@
+ #include <string>
+ #include <vector>
+ #include <map>
++#include <utility>
+ #include "mat.h"
+ 
+ // Simple shader container.  Abstracts all of the OpenGL bits, but leaves
diff --git a/patches/glmark2-2021.12/series b/patches/glmark2-2021.12/series
new file mode 100644
index 000000000000..d9bbb4faacb3
--- /dev/null
+++ b/patches/glmark2-2021.12/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-libmatrix-Add-missing-utility-include.patch
+# ce7ebc58a400e5455959996697f9022b  - git-ptx-patches magic
-- 
2.30.2

Re: [ptxdist] [APPLIED] glmark2: backport GCC 12 build fix

[Michael Olbrich]

Thanks, applied as d0a6370b0425ca607c9f4df28a981541a6ad82ef.

Michael

[sent from post-receive hook]

On Wed, 19 Oct 2022 07:41:03 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Upstream commit d1ca3f53c96d ("libmatrix: Add missing <utility>
> include") fixes building with GCC 12.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20220930093829.3758764-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/glmark2-2021.12/0001-libmatrix-Add-missing-utility-include.patch b/patches/glmark2-2021.12/0001-libmatrix-Add-missing-utility-include.patch
> new file mode 100644
> index 000000000000..ead4fb5f817c
> --- /dev/null
> +++ b/patches/glmark2-2021.12/0001-libmatrix-Add-missing-utility-include.patch
> @@ -0,0 +1,26 @@
> +From: Alexandros Frantzis <alexandros.frantzis@collabora.com>
> +Date: Mon, 14 Feb 2022 13:54:09 +0200
> +Subject: [PATCH] libmatrix: Add missing <utility> include
> +
> +Fixes compilation with GCC 12.
> +
> +Fixes #169
> +
> +[p.zabel@pengutronix.de: Back-ported to 2021.12]
> +Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> +---
> + src/libmatrix/program.h | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/src/libmatrix/program.h b/src/libmatrix/program.h
> +index f95b470cfae0..1c9de08b749a 100644
> +--- a/src/libmatrix/program.h
> ++++ b/src/libmatrix/program.h
> +@@ -15,6 +15,7 @@
> + #include <string>
> + #include <vector>
> + #include <map>
> ++#include <utility>
> + #include "mat.h"
> + 
> + // Simple shader container.  Abstracts all of the OpenGL bits, but leaves
> diff --git a/patches/glmark2-2021.12/series b/patches/glmark2-2021.12/series
> new file mode 100644
> index 000000000000..d9bbb4faacb3
> --- /dev/null
> +++ b/patches/glmark2-2021.12/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-libmatrix-Add-missing-utility-include.patch
> +# ce7ebc58a400e5455959996697f9022b  - git-ptx-patches magic