* [bug#41248] [PATCH] gnu: Add glmark2.
@ 2020-05-13 23:20 Kei Kebreau
2020-12-07 11:42 ` Ludovic Courtès
0 siblings, 1 reply; 3+ messages in thread
From: Kei Kebreau @ 2020-05-13 23:20 UTC (permalink / raw)
To: 41248; +Cc: Kei Kebreau
* 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 <mail@ambrevar.xyz>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2020 Kei Kebreau <kkebreau@posteo.net>
;;;
;;; 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+)))
--
2.26.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#41248] [PATCH] gnu: Add glmark2.
2020-05-13 23:20 [bug#41248] [PATCH] gnu: Add glmark2 Kei Kebreau
@ 2020-12-07 11:42 ` Ludovic Courtès
2020-12-07 21:27 ` bug#41248: " Kei Kebreau
0 siblings, 1 reply; 3+ messages in thread
From: Ludovic Courtès @ 2020-12-07 11:42 UTC (permalink / raw)
To: Kei Kebreau; +Cc: 41248
Hi Kei,
Kei Kebreau <kkebreau@posteo.net> skribis:
> * gnu/packages/gl.scm (glmark2): New variable.
Just found this in the backlog; it LGTM!
BTW, under the “simple new package” rule, you could push this patch
without further ado:
https://guix.gnu.org/manual/devel/en/html_node/Commit-Access.html
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#41248: [PATCH] gnu: Add glmark2.
2020-12-07 11:42 ` Ludovic Courtès
@ 2020-12-07 21:27 ` Kei Kebreau
0 siblings, 0 replies; 3+ messages in thread
From: Kei Kebreau @ 2020-12-07 21:27 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 41248-done
Hi Ludovic,
On Mon, 07 Dec 2020 12:42:23 +0100
Ludovic Courtès <ludo@gnu.org> wrote:
> Hi Kei,
>
> Kei Kebreau <kkebreau@posteo.net> skribis:
>
> > * gnu/packages/gl.scm (glmark2): New variable.
>
> Just found this in the backlog; it LGTM!
>
> BTW, under the “simple new package” rule, you could push this patch
> without further ado:
>
> https://guix.gnu.org/manual/devel/en/html_node/Commit-Access.html
>
> Thanks,
> Ludo’.
Great! Somehow I'd overlooked that specific paragraph. I've pushed
this commit to master.
Thanks for reviewing,
Kei
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-07 21:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-13 23:20 [bug#41248] [PATCH] gnu: Add glmark2 Kei Kebreau
2020-12-07 11:42 ` Ludovic Courtès
2020-12-07 21:27 ` bug#41248: " Kei Kebreau
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.