From patchwork Thu May 12 10:29:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 39228 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 53F5B27BBEB; Thu, 12 May 2022 11:37:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D430927BBEA for ; Thu, 12 May 2022 11:37:12 +0100 (BST) Received: from localhost ([::1]:41858 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1np6C0-0006lh-0E for patchwork@mira.cbaines.net; Thu, 12 May 2022 06:37:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1np656-0001RU-PV for guix-patches@gnu.org; Thu, 12 May 2022 06:30:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45850) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1np655-0000u6-RT for guix-patches@gnu.org; Thu, 12 May 2022 06:30:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1np655-0001lh-Je for guix-patches@gnu.org; Thu, 12 May 2022 06:30:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55384] [PATCH] gnu: glmark2: Update to 2021.12. Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 12 May 2022 10:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55384 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55384@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.16523513646704 (code B ref -1); Thu, 12 May 2022 10:30:03 +0000 Received: (at submit) by debbugs.gnu.org; 12 May 2022 10:29:24 +0000 Received: from localhost ([127.0.0.1]:39747 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1np64S-0001k4-Gl for submit@debbugs.gnu.org; Thu, 12 May 2022 06:29:24 -0400 Received: from lists.gnu.org ([209.51.188.17]:43508) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1np64Q-0001ju-8K for submit@debbugs.gnu.org; Thu, 12 May 2022 06:29:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53572) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1np64M-00017H-Ao for guix-patches@gnu.org; Thu, 12 May 2022 06:29:20 -0400 Received: from mail-0201.mail-europe.com ([51.77.79.158]:44945) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1np64J-0000lM-5W for guix-patches@gnu.org; Thu, 12 May 2022 06:29:17 -0400 Date: Thu, 12 May 2022 10:29:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail2; t=1652351349; bh=DUmAFi9ZgBuontj4qnltGdP6xMN14NZkycNNUru9igo=; h=Date:To:From:Reply-To:Subject:Message-ID:Feedback-ID:From:To:Cc: Date:Subject:Reply-To:Feedback-ID:Message-ID; b=gNEwaUyCloEnGXRrQD4fgPbprgdc5h/45rSp49UtP3HJ470kzOlBeCV8zOpa1e0z8 0ElctVzoucwY9Ous/09ItR0z5YRSmxtwM//DlVREfClhJTkHnVsTlterrZH7vPZFR2 ZxKxuiNzivLpbeJmMgOLY/+SVJaNK7dp6rAD6X6o4uJzprBosIE55gZQzX2Ly242Rx nUDYVs4DISCIe8Ihk/TZ/9jXx1+dvhZQVoH0ewIUu9/r0RqIcPJJQTdegvqHjOpqlm 8qOpFEQBmOvaKvZhpQVSJ+gAN/RVzM4hOSPne9gEMMxoFyDUM2e3WtflRhTTbLe+1I z8uVSQNF7H+LA== Message-ID: Feedback-ID: 14143818:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=51.77.79.158; envelope-from=phodina@protonmail.com; helo=mail-0201.mail-europe.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina X-getmail-retrieved-from-mailbox: Patches Hi, here's an update of glmark2 with switch to meson build system. --- Petr From e6fe8544720ec8ed257f9c0f94daa84de20cb6a3 Mon Sep 17 00:00:00 2001 From: Petr Hodina 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 ;;; Copyright © 2021 Ivan Gankevich ;;; Copyright © 2021 John Kehayias +;;; Copyright © 2022 Petr Hodina ;;; ;;; 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