[ptxdist] [PATCH] glmark2: version bump 2021.12 -> 2023.01

[ptxdist] [PATCH] glmark2: version bump 2021.12 -> 2023.01

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 ...ibmatrix-Add-missing-utility-include.patch | 26 -------------------
 patches/glmark2-2021.12/series                |  4 ---
 rules/glmark2.make                            |  4 +--
 3 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 patches/glmark2-2021.12/0001-libmatrix-Add-missing-utility-include.patch
 delete 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
deleted file mode 100644
index ead4fb5f817c..000000000000
--- a/patches/glmark2-2021.12/0001-libmatrix-Add-missing-utility-include.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
deleted file mode 100644
index d9bbb4faacb3..000000000000
--- a/patches/glmark2-2021.12/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-libmatrix-Add-missing-utility-include.patch
-# ce7ebc58a400e5455959996697f9022b  - git-ptx-patches magic
diff --git a/rules/glmark2.make b/rules/glmark2.make
index 4d4df651cbb4..d0638ac59b10 100644
--- a/rules/glmark2.make
+++ b/rules/glmark2.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLMARK2) += glmark2
 #
 # Paths and names
 #
-GLMARK2_VERSION	:= 2021.12
-GLMARK2_MD5	:= da4ed86ff58955a1fb4a2972b00b8b09
+GLMARK2_VERSION	:= 2023.01
+GLMARK2_MD5	:= f6f20b4cb95aa40a446e8637115c7138
 GLMARK2		:= glmark2-$(GLMARK2_VERSION)
 GLMARK2_SUFFIX	:= tar.gz
 GLMARK2_URL	:= https://github.com/glmark2/glmark2/archive/$(GLMARK2_VERSION).$(GLMARK2_SUFFIX)
-- 
2.30.2

Re: [ptxdist] [APPLIED] glmark2: version bump 2021.12 -> 2023.01

[Michael Olbrich]

Thanks, applied as 65438b0d0e090cfca656046969f6c214f8749188.

Michael

[sent from post-receive hook]

On Wed, 08 Feb 2023 12:50:03 +0100, Lucas Stach <l.stach@pengutronix.de> wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20230126104158.380176-1-l.stach@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
> deleted file mode 100644
> index ead4fb5f817c..000000000000
> --- a/patches/glmark2-2021.12/0001-libmatrix-Add-missing-utility-include.patch
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -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
> deleted file mode 100644
> index d9bbb4faacb3..000000000000
> --- a/patches/glmark2-2021.12/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-libmatrix-Add-missing-utility-include.patch
> -# ce7ebc58a400e5455959996697f9022b  - git-ptx-patches magic
> diff --git a/rules/glmark2.make b/rules/glmark2.make
> index 4d4df651cbb4..d0638ac59b10 100644
> --- a/rules/glmark2.make
> +++ b/rules/glmark2.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLMARK2) += glmark2
>  #
>  # Paths and names
>  #
> -GLMARK2_VERSION	:= 2021.12
> -GLMARK2_MD5	:= da4ed86ff58955a1fb4a2972b00b8b09
> +GLMARK2_VERSION	:= 2023.01
> +GLMARK2_MD5	:= f6f20b4cb95aa40a446e8637115c7138
>  GLMARK2		:= glmark2-$(GLMARK2_VERSION)
>  GLMARK2_SUFFIX	:= tar.gz
>  GLMARK2_URL	:= https://github.com/glmark2/glmark2/archive/$(GLMARK2_VERSION).$(GLMARK2_SUFFIX)