[ptxdist] [PATCH] glmark2: version bump 2019-03-27-geaa70888 -> 2020.04

[ptxdist] [PATCH] glmark2: version bump 2019-03-27-geaa70888 -> 2020.04

[Philipp Zabel]

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/glmark2.make | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/rules/glmark2.make b/rules/glmark2.make
index 5f495886deb3..d6b35a3bfca4 100644
--- a/rules/glmark2.make
+++ b/rules/glmark2.make
@@ -14,12 +14,11 @@ PACKAGES-$(PTXCONF_GLMARK2) += glmark2
 #
 # Paths and names
 #
-# No tags: use a fake descriptive commit-ish to include the date
-GLMARK2_VERSION	:= 2019-03-27-geaa70888
-GLMARK2_MD5	:= ee3ae64489fbcb942490ae758362e737
+GLMARK2_VERSION	:= 2020.04
+GLMARK2_MD5	:= a90713700a740180fef3576f7ee3c9db
 GLMARK2		:= glmark2-$(GLMARK2_VERSION)
-GLMARK2_SUFFIX	:= tar.xz
-GLMARK2_URL	:= https://github.com/glmark2/glmark2.git;tag=$(GLMARK2_VERSION)
+GLMARK2_SUFFIX	:= tar.gz
+GLMARK2_URL	:= https://github.com/glmark2/glmark2/archive/$(GLMARK2_VERSION).$(GLMARK2_SUFFIX)
 GLMARK2_SOURCE	:= $(SRCDIR)/$(GLMARK2).$(GLMARK2_SUFFIX)
 GLMARK2_DIR	:= $(BUILDDIR)/$(GLMARK2)
 GLMARK2_LICENSE	:= GPL-3.0-only AND SGIv1
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH] glmark2: version bump 2019-03-27-geaa70888 -> 2020.04

[Michael Olbrich]

On Thu, Jul 02, 2020 at 03:40:44PM +0200, Philipp Zabel wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>

Fails to build here:

Waf: The wscript in '.../build-target/glmark2-2020.04' is unreadable
Traceback (most recent call last):
  File ".../build-target/glmark2-2020.04/waflib/Scripting.py", line 104, in waf_entry_point
    set_main_module(os.path.normpath(os.path.join(Context.run_dir,Context.WSCRIPT_FILE)))
  File ".../build-target/glmark2-2020.04/waflib/Scripting.py", line 135, in set_main_module
    Context.g_module=Context.load_module(file_path)
  File ".../build-target/glmark2-2020.04/waflib/Context.py", line 349, in load_module
    exec(compile(code,path,'exec'),module.__dict__)
  File ".../build-target/glmark2-2020.04/wscript", line 23, in <module>
    FLAVORS_STR = ", ".join(sorted(FLAVORS.keys() + ['all-linux', 'all-win32']))
TypeError: unsupported operand type(s) for +: 'dict_keys' and 'list'

Michael

> ---
>  rules/glmark2.make | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/rules/glmark2.make b/rules/glmark2.make
> index 5f495886deb3..d6b35a3bfca4 100644
> --- a/rules/glmark2.make
> +++ b/rules/glmark2.make
> @@ -14,12 +14,11 @@ PACKAGES-$(PTXCONF_GLMARK2) += glmark2
>  #
>  # Paths and names
>  #
> -# No tags: use a fake descriptive commit-ish to include the date
> -GLMARK2_VERSION	:= 2019-03-27-geaa70888
> -GLMARK2_MD5	:= ee3ae64489fbcb942490ae758362e737
> +GLMARK2_VERSION	:= 2020.04
> +GLMARK2_MD5	:= a90713700a740180fef3576f7ee3c9db
>  GLMARK2		:= glmark2-$(GLMARK2_VERSION)
> -GLMARK2_SUFFIX	:= tar.xz
> -GLMARK2_URL	:= https://github.com/glmark2/glmark2.git;tag=$(GLMARK2_VERSION)
> +GLMARK2_SUFFIX	:= tar.gz
> +GLMARK2_URL	:= https://github.com/glmark2/glmark2/archive/$(GLMARK2_VERSION).$(GLMARK2_SUFFIX)
>  GLMARK2_SOURCE	:= $(SRCDIR)/$(GLMARK2).$(GLMARK2_SUFFIX)
>  GLMARK2_DIR	:= $(BUILDDIR)/$(GLMARK2)
>  GLMARK2_LICENSE	:= GPL-3.0-only AND SGIv1
> -- 
> 2.20.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de