[PATCH] gnu: Add monado

  • Done
  • quality assurance status badge
Details
2 participants
  • Andy Tai
  • Leo Famulari
Owner
unassigned
Submitted by
Andy Tai
Severity
normal

Debbugs page

Andy Tai wrote 4 years ago
(address . guix-patches@gnu.org)
CAJsg1E_Sjf4rfP-Sc_pw+SNau1WC2jhnfdqgOrygrADg-_8JbQ@mail.gmail.com
* gnu/packages/graphics.scm (monado): New variable
---
gnu/packages/graphics.scm | 46 +++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)

Toggle diff (80 lines)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 7cb4aecec2..5b8621c390 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -24,6 +24,7 @@
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com>
;;; Copyright © 2021 Antoine Côté <antoine.cote@posteo.net>
+;;; Copyright © 2021 Andy Tai <atai@atai.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -74,6 +75,7 @@
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages jemalloc)
#:use-module (gnu packages kde-frameworks)
+ #:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
#:use-module (gnu packages lua)
#:use-module (gnu packages maths)
@@ -97,6 +99,7 @@
#:use-module (gnu packages tbb)
#:use-module (gnu packages upnp)
#:use-module (gnu packages video)
+ #:use-module (gnu packages vulkan)
#:use-module (gnu packages xiph)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
@@ -1914,3 +1917,46 @@ Some feature highlights:
@item Automatic port forwarding with UPnP
@end itemize\n")
(license license:gpl3+))))
+
+
+(define-public monado
+ (package
+ (name "monado")
+ (version "21.0.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://gitlab.freedesktop.org/" name "/"
+ name "/-/archive/v" version "/"
+ name "-v" version ".tar.bz2"))
+ (sha256
+ (base32
+ "0n04k7a8b0i8ga0kbzh7qxmvni1ijawgk98s83519vxg4d0yyjbq"))))
+ (build-system meson-build-system)
+ (inputs
+ `(("ffmpeg" ,ffmpeg)
+ ("glslang" ,glslang)
+ ("libudev" ,eudev)
+ ("libusb" ,libusb)
+ ("libxcb" ,libxcb)
+ ("libxrandr" ,libxrandr)
+ ("opengl" ,mesa)
+ ("v4l" ,v4l-utils)
+ ("vulkan-loader" ,vulkan-loader)
+ ))
+ (native-inputs
+ `(("eigen" ,eigen)
+ ("pkg-config" ,pkg-config)
+ ("vulkan-headers" ,vulkan-headers)
+ ))
+
+ (home-page "https://monado.freedesktop.org/")
+ (synopsis "The open source OpenXR runtime")
+ (description
+ "Monado is an open source XR runtime delivering immersive
experiences such as VR
+and AR on mobile, PC/desktop, and any other device(because gosh darn peoplecome
+up with a lot of weird hardware). Monado aims to be a complete and conforming
+implementation of the OpenXR API made by Khronos. The project
currently is being
+developed for GNU/Linux and aims to support other operating systems in the near
+future.")
+ (license (license:x11-style
"https://gitlab.freedesktop.org/monado/monado/-/blob/master/LICENSE"))))
+
--
2.30.0
Leo Famulari wrote 4 years ago
(name . Andy Tai)(address . atai@atai.org)(address . 46500@debbugs.gnu.org)
YDGgrfpqzUmiWZ+H@jasmine.lan
On Sat, Feb 13, 2021 at 06:12:01PM -0800, Andy Tai wrote:
Toggle quote (2 lines)
> * gnu/packages/graphics.scm (monado): New variable

Thanks for the patch!

You had asked in #46666 about how to make the review process go more
quickly. We definitely aim for it to be fast and efficient for
contributors, but there are a lot of patches (good!) and reviewers can
get tired. When that happens to me, I start to focus my reviewing energy
on patches that I think will be easy, which means ready-to-push, or on
patches for things I find interesting. I think that's human nature. It
would be better if patches were reviewed more systematically.

My goal when reviewing is to push contributions to guix.git and close
patch tickets.

The linter found a couple issues:

------
$ guix environment guix -- ./pre-inst-env guix lint monado
gnu/packages/graphics.scm:1953:5: monado@21.0.0: sentences in description should be followed by two spaces; possible infractions at 191, 285
gnu/packages/graphics.scm:1943:0: monado@21.0.0: parentheses feel lonely, move to the previous or next line
gnu/packages/graphics.scm:1948:0: monado@21.0.0: parentheses feel lonely, move to the previous or next line
gnu/packages/graphics.scm:1924:16: monado@21.0.0: source not archived on Software Heritage
------

I noticed the parentheses thing before linting, and some extra blank
lines before and after the new package, too. These problems are
effectively cosmetic but, when I see them, I guess that there might be
some other problems that can't be caught with a simple linter, and I get
discouraged from putting more effort into it. So, definitely run the
linter. Don't hesitate to ask for help if you don't understand how to
use it or what it says.

I applied the patch on the current master branch and built it. It fails
in the install phase like this:

------
starting phase `install'
[1/14] Generating u_git_tag.c with a custom command.
[2/6] Generating driver_resources_copy with a custom command.
DIRECTORY ../monado-v21.0.0/src/xrt/targets/steamvr_drv/resources /tmp/guix-build-monado-21.0.0.drv-0/build/steamvr-monado/resources
Copying asset ../monado-v21.0.0/src/xrt/targets/steamvr_drv/resources to /tmp/guix-build-monado-21.0.0.drv-0/build/steamvr-monado/resources
[3/6] Generating driver_manifest_copy with a custom command.
FILE ../monado-v21.0.0/src/xrt/targets/steamvr_drv/driver.vrdrivermanifest /tmp/guix-build-monado-21.0.0.drv-0/build/steamvr-monado/driver.vrdrivermanifest
Copying asset ../monado-v21.0.0/src/xrt/targets/steamvr_drv/driver.vrdrivermanifest to /tmp/guix-build-monado-21.0.0.drv-0/build/steamvr-monado/driver.vrdrivermanifest
[4/6] Generating driver_input_profiles_generate with a custom command.
[5/6] Generating plugin_copy with a custom command.
Copying plugin src/xrt/targets/steamvr_drv/driver_monado.so to /tmp/guix-build-monado-21.0.0.drv-0/build/steamvr-monado/bin/linux64/driver_monado.so
[5/6] Installing files.
+ sysconfdir=/etc
+ manifest=/gnu/store/9598lvcgad60xfid8qxpm0w4p8g9ldr6-monado-21.0.0/share/openxr/1/openxr_monado.json
+ xrversion=1
+ runtime_path=/etc/xdg/openxr/1/active_runtime.json
+ mkdir -p /etc/xdg/openxr/1
mkdir: cannot create directory ‘/etc/xdg’: Permission denied
[...]
------

Can you look into that?

Toggle quote (11 lines)
> + (synopsis "The open source OpenXR runtime")
> + (description
> + "Monado is an open source XR runtime delivering immersive
> experiences such as VR
> +and AR on mobile, PC/desktop, and any other device(because gosh darn peoplecome
> +up with a lot of weird hardware). Monado aims to be a complete and conforming
> +implementation of the OpenXR API made by Khronos. The project
> currently is being
> +developed for GNU/Linux and aims to support other operating systems in the near
> +future.")

Guix only includes free software so we usually don't describe packages
as "open source" or "free software". I appreciate the colloquial
language in the parentheses but I would remove it.

We actually have a style guide in the manual:


Toggle quote (3 lines)
> + (license (license:x11-style
> "https://gitlab.freedesktop.org/monado/monado/-/blob/master/LICENSE"))))

This looks like the "Boost Software License".
Andy Tai wrote 4 years ago
(name . Leo Famulari)(address . leo@famulari.name)(address . 46500@debbugs.gnu.org)
CAJsg1E-ETsSm88Bb2b8xYdOVa8Q+4CmccyXg0b35mm=j92DrsQ@mail.gmail.com
review comments addressed;
lint passed cleanly (except the one for Software Heritage)

install fixed and no error now
From 99878cebc1e046369100cdae54d69dde3ade7448 Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Sat, 20 Feb 2021 21:42:24 -0800
Subject: [PATCH] gnu: Add monado

* gnu/packages/graphics.scm (monado): New variable
---
gnu/packages/graphics.scm | 42 +++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)

Toggle diff (73 lines)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 7cb4aecec2..0b1c33401e 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -24,6 +24,7 @@
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com>
;;; Copyright © 2021 Antoine Côté <antoine.cote@posteo.net>
+;;; Copyright © 2021 Andy Tai <atai@atai.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -74,6 +75,7 @@
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages jemalloc)
#:use-module (gnu packages kde-frameworks)
+ #:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
#:use-module (gnu packages lua)
#:use-module (gnu packages maths)
@@ -97,6 +99,7 @@
#:use-module (gnu packages tbb)
#:use-module (gnu packages upnp)
#:use-module (gnu packages video)
+ #:use-module (gnu packages vulkan)
#:use-module (gnu packages xiph)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
@@ -1914,3 +1917,42 @@ Some feature highlights:
@item Automatic port forwarding with UPnP
@end itemize\n")
(license license:gpl3+))))
+
+
+(define-public monado
+ (package
+ (name "monado")
+ (version "21.0.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://gitlab.freedesktop.org/" name "/"
+ name "/-/archive/v" version "/"
+ name "-v" version ".tar.bz2"))
+ (sha256
+ (base32
+ "0n04k7a8b0i8ga0kbzh7qxmvni1ijawgk98s83519vxg4d0yyjbq"))))
+ (build-system meson-build-system)
+ (inputs
+ `(("ffmpeg" ,ffmpeg)
+ ("glslang" ,glslang)
+ ("libudev" ,eudev)
+ ("libusb" ,libusb)
+ ("libxcb" ,libxcb)
+ ("libxrandr" ,libxrandr)
+ ("opengl" ,mesa)
+ ("v4l" ,v4l-utils)
+ ("vulkan-loader" ,vulkan-loader)))
+ (native-inputs
+ `(("eigen" ,eigen)
+ ("pkg-config" ,pkg-config)
+ ("vulkan-headers" ,vulkan-headers)))
+ (arguments
+ `(#:configure-flags
+ (list "-Dinstall-active-runtime=false")))
+ (home-page "https://monado.freedesktop.org/")
+ (synopsis "OpenXR runtime")
+ (description "Monado is an OpenXR runtime delivering immersive experiences
+such as VR and AR on mobile, PC/desktop, and any other device. Monado aims to be
+a complete and conforming implementation of the OpenXR API made by Khronos.")
+ (license license:boost1.0)))
+
--
2.30.0
Leo Famulari wrote 4 years ago
(name . Andy Tai)(address . atai@atai.org)(address . 46500-done@debbugs.gnu.org)
YDaCDr+Dwj4hAiFh@jasmine.lan
On Sat, Feb 20, 2021 at 09:47:18PM -0800, Andy Tai wrote:
Toggle quote (12 lines)
> review comments addressed;
> lint passed cleanly (except the one for Software Heritage)
>
> install fixed and no error now

> From 99878cebc1e046369100cdae54d69dde3ade7448 Mon Sep 17 00:00:00 2001
> From: Andy Tai <atai@atai.org>
> Date: Sat, 20 Feb 2021 21:42:24 -0800
> Subject: [PATCH] gnu: Add monado
>
> * gnu/packages/graphics.scm (monado): New variable

Thanks! I made the cosmetic changes shown below and pushed as
2fdc8ca7fdf6617835c48276585df6d5ace7c46e

Toggle diff (57 lines)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 0b1c33401e..a76417a508 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1918,30 +1918,29 @@ Some feature highlights:
@end itemize\n")
(license license:gpl3+))))
-
(define-public monado
(package
(name "monado")
(version "21.0.0")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://gitlab.freedesktop.org/" name "/"
- name "/-/archive/v" version "/"
- name "-v" version ".tar.bz2"))
- (sha256
- (base32
- "0n04k7a8b0i8ga0kbzh7qxmvni1ijawgk98s83519vxg4d0yyjbq"))))
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://gitlab.freedesktop.org/" name "/"
+ name "/-/archive/v" version "/"
+ name "-v" version ".tar.bz2"))
+ (sha256
+ (base32
+ "0n04k7a8b0i8ga0kbzh7qxmvni1ijawgk98s83519vxg4d0yyjbq"))))
(build-system meson-build-system)
(inputs
- `(("ffmpeg" ,ffmpeg)
- ("glslang" ,glslang)
- ("libudev" ,eudev)
- ("libusb" ,libusb)
- ("libxcb" ,libxcb)
- ("libxrandr" ,libxrandr)
- ("opengl" ,mesa)
- ("v4l" ,v4l-utils)
- ("vulkan-loader" ,vulkan-loader)))
+ `(("ffmpeg" ,ffmpeg)
+ ("glslang" ,glslang)
+ ("libudev" ,eudev)
+ ("libusb" ,libusb)
+ ("libxcb" ,libxcb)
+ ("libxrandr" ,libxrandr)
+ ("opengl" ,mesa)
+ ("v4l" ,v4l-utils)
+ ("vulkan-loader" ,vulkan-loader)))
(native-inputs
`(("eigen" ,eigen)
("pkg-config" ,pkg-config)
@@ -1955,4 +1954,3 @@ Some feature highlights:
such as VR and AR on mobile, PC/desktop, and any other device. Monado aims to be
a complete and conforming implementation of the OpenXR API made by Khronos.")
(license license:boost1.0)))
-
Closed
Andy Tai wrote 4 years ago
(name . Leo Famulari)(address . leo@famulari.name)(address . 46500-done@debbugs.gnu.org)
CAJsg1E_YMPLfVPkaN68yLNhjy_KygAa+cDrQPi6DeDHHqekwsw@mail.gmail.com
Awesome, thanks!

On Wed, Feb 24, 2021 at 8:42 AM Leo Famulari <leo@famulari.name> wrote:
Toggle quote (77 lines)
>
> On Sat, Feb 20, 2021 at 09:47:18PM -0800, Andy Tai wrote:
> > review comments addressed;
> > lint passed cleanly (except the one for Software Heritage)
> >
> > install fixed and no error now
>
> > From 99878cebc1e046369100cdae54d69dde3ade7448 Mon Sep 17 00:00:00 2001
> > From: Andy Tai <atai@atai.org>
> > Date: Sat, 20 Feb 2021 21:42:24 -0800
> > Subject: [PATCH] gnu: Add monado
> >
> > * gnu/packages/graphics.scm (monado): New variable
>
> Thanks! I made the cosmetic changes shown below and pushed as
> 2fdc8ca7fdf6617835c48276585df6d5ace7c46e
>
> diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
> index 0b1c33401e..a76417a508 100644
> --- a/gnu/packages/graphics.scm
> +++ b/gnu/packages/graphics.scm
> @@ -1918,30 +1918,29 @@ Some feature highlights:
> @end itemize\n")
> (license license:gpl3+))))
>
> -
> (define-public monado
> (package
> (name "monado")
> (version "21.0.0")
> - (source (origin
> - (method url-fetch)
> - (uri (string-append "https://gitlab.freedesktop.org/" name "/"
> - name "/-/archive/v" version "/"
> - name "-v" version ".tar.bz2"))
> - (sha256
> - (base32
> - "0n04k7a8b0i8ga0kbzh7qxmvni1ijawgk98s83519vxg4d0yyjbq"))))
> + (source (origin
> + (method url-fetch)
> + (uri (string-append "https://gitlab.freedesktop.org/" name "/"
> + name "/-/archive/v" version "/"
> + name "-v" version ".tar.bz2"))
> + (sha256
> + (base32
> + "0n04k7a8b0i8ga0kbzh7qxmvni1ijawgk98s83519vxg4d0yyjbq"))))
> (build-system meson-build-system)
> (inputs
> - `(("ffmpeg" ,ffmpeg)
> - ("glslang" ,glslang)
> - ("libudev" ,eudev)
> - ("libusb" ,libusb)
> - ("libxcb" ,libxcb)
> - ("libxrandr" ,libxrandr)
> - ("opengl" ,mesa)
> - ("v4l" ,v4l-utils)
> - ("vulkan-loader" ,vulkan-loader)))
> + `(("ffmpeg" ,ffmpeg)
> + ("glslang" ,glslang)
> + ("libudev" ,eudev)
> + ("libusb" ,libusb)
> + ("libxcb" ,libxcb)
> + ("libxrandr" ,libxrandr)
> + ("opengl" ,mesa)
> + ("v4l" ,v4l-utils)
> + ("vulkan-loader" ,vulkan-loader)))
> (native-inputs
> `(("eigen" ,eigen)
> ("pkg-config" ,pkg-config)
> @@ -1955,4 +1954,3 @@ Some feature highlights:
> such as VR and AR on mobile, PC/desktop, and any other device. Monado aims to be
> a complete and conforming implementation of the OpenXR API made by Khronos.")
> (license license:boost1.0)))
> -



--
Andy Tai, atai@atai.org, Skype: licheng.tai, Line: andy_tai, WeChat: andytai1010
Year 2021 民國110年
自動的精神力是信仰與覺悟
自動的行為力是勞動與技能
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 46500@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 46500
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch
You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags
mumi command -t +confirmed -t +easy
Or, remove the moreinfo tag and set the help tag
mumi command -t -moreinfo -t +help