[bug#67893] [PATCH] gnu: Add libdisplay-info.

[bug#67893] [PATCH] gnu: Add libdisplay-info.

[Jaeme Sifat via Guix-patches via]

libdisplay-info is a new dependency for the wlroots@0.17.0 update. As
seen here:

- https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.17.0

The 'fix-meson-file phase was ripped right out of the wlroots@0.16.2
package. There was a surprise build dependency for Python in
generating the database.

* gnu/packages/wm.scm (libdisplay-info): New variable.

Change-Id: If6a466b902f4babdfb5bc9b3935c2d14f42ae662
---
 gnu/packages/wm.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 82ef67a2e4..c9a9b728b7 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2968,6 +2968,45 @@ (define-public cagebreak
 @command{ratpoison}.")
     (license license:expat)))

+(define-public libdisplay-info
+  (let ((commit "ebee35935dad01478ae1ae5ead298c4cd8018ac2")
+        (revision "0"))
+    (package
+      (name "libdisplay-info")
+      (version (git-version "0.2.0-dev" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://gitlab.freedesktop.org/emersion/libdisplay-info")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1ly8acdjxn8l55y0wc07n7pb6rzh9dpr1vbsakdib2zrl0i5yh3a"))))
+      (build-system meson-build-system)
+      (arguments
+       (list
+        #:phases #~(modify-phases %standard-phases
+                     (add-before 'configure 'fix-meson-file
+                       (lambda* (#:key native-inputs inputs #:allow-other-keys)
+                         (substitute* "meson.build"
+                           (("/usr/share/hwdata/pnp.ids")
+                            (string-append (assoc-ref (or native-inputs inputs)
+                                                      "hwdata")
+                                           "/share/hwdata/pnp.ids"))))))))
+      (native-inputs (list `(,hwdata "pnp") python))
+      (home-page "https://gitlab.freedesktop.org/emersion/libdisplay-info")
+      (synopsis "EDID and DisplayID library")
+      (description
+       "A EDID and DisplayID library with the following goals:
+@enumerate
+@item    Provide a set of high-level, easy-to-use, opinionated functions
+         as well as low-level functions to access detailed information.
+@item    Simplicity and correctness over performance and resource usage.
+@item    Well-tested and fuzzed.
+@end enumerate")
+      (license license:expat))))
+
 (define-public libucl
   (package
     (name "libucl")

base-commit: 6454788a5cf79a217bda86d49a6e403cc803747f
--
2.41.0

bug#67893: [PATCH] gnu: Add libdisplay-info.

[Ludovic Courtès]

[-- Attachment #1: Type: text/plain, Size: 563 bytes --]

Hi,

Jaeme Sifat <jaeme@runbox.com> skribis:

> libdisplay-info is a new dependency for the wlroots@0.17.0 update. As
> seen here:
>
> - https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.17.0
>
> The 'fix-meson-file phase was ripped right out of the wlroots@0.16.2
> package. There was a surprise build dependency for Python in
> generating the database.
>
> * gnu/packages/wm.scm (libdisplay-info): New variable.
>
> Change-Id: If6a466b902f4babdfb5bc9b3935c2d14f42ae662

Applied with the cosmetic changes below, thanks!

Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1994 bytes --]

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 4c7f19d3ef..9abf505caf 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2982,12 +2982,11 @@ (define-public libdisplay-info
     (package
       (name "libdisplay-info")
       (version (git-version "0.2.0-dev" revision commit))
+      (home-page "https://gitlab.freedesktop.org/emersion/libdisplay-info")
       (source
        (origin
          (method git-fetch)
-         (uri (git-reference
-               (url "https://gitlab.freedesktop.org/emersion/libdisplay-info")
-               (commit commit)))
+         (uri (git-reference (url home-page) (commit commit)))
          (file-name (git-file-name name version))
          (sha256
           (base32 "1ly8acdjxn8l55y0wc07n7pb6rzh9dpr1vbsakdib2zrl0i5yh3a"))))
@@ -3003,15 +3002,20 @@ (define-public libdisplay-info
                                                       "hwdata")
                                            "/share/hwdata/pnp.ids"))))))))
       (native-inputs (list `(,hwdata "pnp") python))
-      (home-page "https://gitlab.freedesktop.org/emersion/libdisplay-info")
       (synopsis "EDID and DisplayID library")
       (description
-       "A EDID and DisplayID library with the following goals:
+       "This package provides a library to read @acronym{EDID, Extended
+Display Identification Data} and DisplayID metadata from display devices.  It
+has the following goals:
+
 @enumerate
-@item    Provide a set of high-level, easy-to-use, opinionated functions
-         as well as low-level functions to access detailed information.
-@item    Simplicity and correctness over performance and resource usage.
-@item    Well-tested and fuzzed.
+@item
+Provide a set of high-level, easy-to-use, opinionated functions
+as well as low-level functions to access detailed information.
+@item
+Simplicity and correctness over performance and resource usage.
+@item
+Well-tested and fuzzed.
 @end enumerate")
       (license license:expat))))