diff mbox series

[bug#55384] gnu: glmark2: Update to 2021.12.

Message ID GV79WJ6PjTBn3rWXe2OQSZOQOJLGp4HZzmkzpaQLTZBZFhB7MCoqewNvMYe1SohiWvwdpm2L9B99nFIxkIcxKUVtmsT17hNJE7uHnLIW80o=@protonmail.com
State Accepted
Headers show
Series [bug#55384] gnu: glmark2: Update to 2021.12. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

phodina May 12, 2022, 10:29 a.m. UTC 
Hi,

here's an update of glmark2 with switch to meson build system.

---
Petr

Comments

Ludovic Courtès May 20, 2022, 6:07 p.m. UTC | #1 
Hi,

phodina <phodina@protonmail.com> skribis:

> From e6fe8544720ec8ed257f9c0f94daa84de20cb6a3 Mon Sep 17 00:00:00 2001
> From: Petr Hodina <phodina@protonmail.com>
> Date: Thu, 12 May 2022 12:26:16 +0200
> Subject: [PATCH] gnu: glmark2: Update to 2021.12.
>
> * gnu/packages/gl.scm (glmark2): Update to 2021.12.
>   [build-system]: Switch to meson build system.
>   [arguments]: Adjust arguments to meson build system.

Applied, thanks!

Ludo’.
diff mbox series

Patch

From e6fe8544720ec8ed257f9c0f94daa84de20cb6a3 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Thu, 12 May 2022 12:26:16 +0200
Subject: [PATCH] gnu: glmark2: Update to 2021.12.

* gnu/packages/gl.scm (glmark2): Update to 2021.12.
  [build-system]: Switch to meson build system.
  [arguments]: Adjust arguments to meson build system.

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 0ff39dc24d..f4313b4151 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -16,6 +16,7 @@ 
 ;;; Copyright © 2020 Kei Kebreau <kkebreau@posteo.net>
 ;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru>
 ;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
+;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1091,7 +1092,7 @@  (define-public mojoshader-cs
 (define-public glmark2
   (package
     (name "glmark2")
-    (version "2020.04")
+    (version "2021.12")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1100,20 +1101,12 @@  (define-public glmark2
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0ywpzp0imi3f8iyp7d1739576zx2nsr3db5hp2as4yhflfyq1as2"))
-              (modules '((guix build utils)))
-              ;; Fix Python 3 incompatibility.
-              (snippet
-               '(begin
-                  (substitute* "wscript"
-                    (("(sorted\\()FLAVORS\\.keys\\(\\)(.*)" _ beginning end)
-                     (string-append beginning "list(FLAVORS)" end)))
-                  #t))))
-    (build-system waf-build-system)
+                "1aydqbrg9i74s19rrdrsscx94m885yvc43v3sdqlgyh675ms98jb"))))
+    (build-system meson-build-system)
     (arguments
      '(#:tests? #f                      ; no check target
        #:configure-flags
-       (list (string-append "--with-flavors="
+       (list (string-append "-Dflavors="
                             (string-join '("x11-gl" "x11-glesv2"
                                            "drm-gl" "drm-glesv2"
                                            "wayland-gl" "wayland-glesv2")
-- 
2.34.0