From patchwork Wed May 13 23:20:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kei Kebreau X-Patchwork-Id: 22065 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 76D9127BBE3; Thu, 14 May 2020 00:22:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED,URIBL_SBL,URIBL_SBL_A autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id DC40227BBE1 for ; Thu, 14 May 2020 00:22:08 +0100 (BST) Received: from localhost ([::1]:33474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZ0hU-0005oM-Bj for patchwork@mira.cbaines.net; Wed, 13 May 2020 19:22:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48386) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZ0hO-0005nk-OC for guix-patches@gnu.org; Wed, 13 May 2020 19:22:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48287) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jZ0hO-0004Ls-F8 for guix-patches@gnu.org; Wed, 13 May 2020 19:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jZ0hO-00059E-CE for guix-patches@gnu.org; Wed, 13 May 2020 19:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41248] [PATCH] gnu: Add glmark2. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 May 2020 23:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41248 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41248@debbugs.gnu.org Cc: Kei Kebreau X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158941208219735 (code B ref -1); Wed, 13 May 2020 23:22:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 May 2020 23:21:22 +0000 Received: from localhost ([127.0.0.1]:59833 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZ0gc-000588-MP for submit@debbugs.gnu.org; Wed, 13 May 2020 19:21:21 -0400 Received: from lists.gnu.org ([209.51.188.17]:60766) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZ0gX-00057w-4A for submit@debbugs.gnu.org; Wed, 13 May 2020 19:21:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48288) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZ0gW-0005fy-Uk for guix-patches@gnu.org; Wed, 13 May 2020 19:21:08 -0400 Received: from mout01.posteo.de ([185.67.36.65]:52144) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZ0gU-0004IC-Oj for guix-patches@gnu.org; Wed, 13 May 2020 19:21:08 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 6277816005C for ; Thu, 14 May 2020 01:21:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1589412064; bh=O9lW3a7b+VFuAiaTpb7QhMhWh9xjbBEaGt6D75dTVVc=; h=From:To:Cc:Subject:Date:From; b=JJJT//d5Xef0hC+Rgl7BzB1AuLIQJjW3PyFGrX1MuaSwwvGrbCBtMnX+P3YKw0msp 6gfKm061aLTEi/p419XIUvdW8wy7GSS0GEcoE2ieV6O+Is912k9W/szKtI4Bwh2mQy x4zqD68rqCtBCYCDiXKv7yiJl6Kh6mOSz3ellKHOsLfk0GXS32u4WSXDAmstVU52nq KJoD/0cNNlWT6gnpH/NNhnTvbqfsqteFLYK9d9hP2BrZR5Ad1pb/CO7YQEVdyG9ZID 0YNtv10ygaJhJeblP5TreI0rZQ0fQr86K5qmxI9SbqlFRqEa0F+cXsbsEWjoBFOrdr xp3/mOYkG91cA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 49MrJb1MBMz9rxK; Thu, 14 May 2020 01:21:02 +0200 (CEST) From: Kei Kebreau Date: Wed, 13 May 2020 19:20:56 -0400 Message-Id: <20200513232056.19602-1-kkebreau@posteo.net> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.65; envelope-from=kkebreau@posteo.net; helo=mout01.posteo.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/13 19:21:04 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 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, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001, URIBL_SBL=1.623, URIBL_SBL_A=0.1 autolearn=_AUTOLEARN 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gl.scm (glmark2): New variable. --- gnu/packages/gl.scm | 61 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index e024dd2756..f032982664 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Giacomo Leidi +;;; Copyright © 2020 Kei Kebreau ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,6 +61,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix build-system meson) + #:use-module (guix build-system waf) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) @@ -955,3 +957,62 @@ the glProgramViewportFlip before it was replaced with glProgramViewportInfo.") The C# wrapper was written to be used for FNA's platform support. However, this is written in a way that can be used for any general C# application.") (license license:zlib)))) + +(define-public glmark2 + (package + (name "glmark2") + (version "2020.04") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/glmark2/glmark2.git") + (commit version))) + (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) + (arguments + '(#:tests? #f ; no check target + #:configure-flags + (list (string-append "--with-flavors=" + (string-join '("x11-gl" "x11-glesv2" + "drm-gl" "drm-glesv2" + "wayland-gl" "wayland-glesv2") + ","))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((mesa (assoc-ref inputs "mesa"))) + (substitute* (find-files "src" "gl-state-.*\\.cpp$") + (("libGL.so") (string-append mesa "/lib/libGL.so")) + (("libEGL.so") (string-append mesa "/lib/libEGL.so")) + (("libGLESv2.so") (string-append mesa "/lib/libGLESv2.so"))) + #t)))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("eudev" ,eudev) + ("libdrm" ,libdrm) + ("libjpeg-turbo" ,libjpeg-turbo) + ("libpng" ,libpng) + ("libx11" ,libx11) + ("libxcb" ,libxcb) + ("mesa" ,mesa) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols))) + (home-page "https://github.com/glmark2/glmark2") + (synopsis "OpenGL 2.0 and OpenGL ES 2.0 benchmark") + (description + "glmark2 is an OpenGL 2.0 and OpenGL ES 2.0 benchmark based on the +original glmark benchmark by Ben Smith.") + (license license:gpl3+)))