| Message ID | acba611cbd31ab29f39f46e072d8b8ae@schwi.pl |
|---|---|
| State | New |
| Headers | show |
| Series | [bug#56041,v2] gnu: Add vkmark. | expand |
| Context | Check | Description |
|---|---|---|
| cbaines/applying patch | fail | View Laminar job |
| cbaines/issue | success | View issue |
LGTM except for:
On Sun Jun 19, 2022 at 12:01 AM BST, Tomasz Jeneralczyk wrote:
> + #:use-module (gnu packages cmake)
You probably don't need this anymore.
Tomasz Jeneralczyk schreef op za 18-06-2022 om 23:01 [+0000]:
> + (license license:lgpl2.1))))
Going by, e.g.,
<https://github.com/vkmark/vkmark/blob/master/src/benchmark.cpp>, it's
not lgpl2.1 but more general (lgpl2.1+).
Greetings,
Maxime.
Tomasz Jeneralczyk schreef op za 18-06-2022 om 23:01 [+0000]:
> + (latest-release "2017.08"))
This variable referred to from a single location, so no need for this
variable.
Greetings,
Maxime.
diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index b167c6de6e..79e1645eba 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Greg Hogan <code@greghogan.com> ;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2022 Tomasz Jeneralczyk <tj@schwi.pl> ;;; ;;; This file is part of GNU Guix.
* gnu/packages/benchmark.scm (vkmark): Add variable. --- gnu/packages/benchmark.scm | 47 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) ;;; @@ -36,15 +37,20 @@ (define-module (gnu packages benchmark) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python) + #:use-module (guix build-system meson) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages c) #:use-module (gnu packages check) + #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages databases) #:use-module (gnu packages docbook) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gl) + #:use-module (gnu packages graphics) #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages maths) @@ -57,6 +63,8 @@ (define-module (gnu packages benchmark) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) + #:use-module (gnu packages vulkan) + #:use-module (gnu packages xorg) #:use-module (gnu packages xml) #:use-module (ice-9 match)) @@ -584,3 +592,42 @@ (define-public sysbench @item @end itemize") (license license:gpl2+))) + +(define-public vkmark + ;; The latest "release" of vkmark is tagged "2017.08" and it's so old + ;; I couldn't even compile it. The current master branch's head + ;; seems to be working just fine. + (let ((commit "d872846e2e7c47010c11227eb713d00ccfdd35c6") + (revision "1") + (latest-release "2017.08")) + (package + (name "vkmark") + (version (git-version latest-release revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vkmark/vkmark") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0zlryz8i8jvl160bv30ig5nd9h4ahpjfw53ys839i41xi80jjg5d")))) + (build-system meson-build-system) + (native-inputs (list pkg-config)) + ;; The kms back-end, as it is, seems to have bitrot + ;; and would need maintenance to work with current Mesa: + ;; https://gitlab.freedesktop.org/mesa/mesa/-/commit/5e6db1916806 + (inputs (list vulkan-loader + vulkan-headers + glm + assimp + libxcb + xcb-util-wm + wayland-protocols + wayland)) + (synopsis "Benchmark for Vulkan") + (description + "vkmark is an extensible Vulkan benchmarking suite with targeted, configurable +scenes.") + (home-page "https://github.com/vkmark/vkmark") + (license license:lgpl2.1)))) base-commit: 319b8331b2357e12ec9edb9665513c32bef56622 -- 2.36.1