unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Gabriel Wicki <gabriel@erlikon.ch>
To: 61331@debbugs.gnu.org
Subject: [bug#61331] [PATCH 3/6] gnu: Update wlroots to 0.16.1.
Date: Tue, 7 Feb 2023 00:26:17 +0100	[thread overview]
Message-ID: <20230206232617.yokszg43hrv2g5iw@blackbox> (raw)
In-Reply-To: <20230206231710.sh5pmgknkoulasvo@blackbox>

From 736f047384082f4eaa1ed1414ec3e0595ec19816 Mon Sep 17 00:00:00 2001
From: Gabriel Wicki <gabriel@erlikon.ch>
Date: Sun, 5 Feb 2023 00:27:20 +0100
Subject: [PATCH 3/6] gnu: Update wlroots to 0.16.1.

* gnu/packages/wm.scm (wlroots): Update to version 0.16.1.
---
 gnu/packages/wm.scm | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index a860ed1f93..8f812bc14b 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -101,6 +101,7 @@ (define-module (gnu packages wm)
   #:use-module (gnu packages build-tools)
   #:use-module (gnu packages calendar)
   #:use-module (gnu packages check)
+  #:use-module (gnu packages cmake)
   #:use-module (gnu packages datastructures)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
@@ -130,6 +131,7 @@ (define-module (gnu packages wm)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages mpd)
   #:use-module (gnu packages pcre)
+  #:use-module (gnu packages pciutils)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pretty-print)
@@ -146,6 +148,7 @@ (define-module (gnu packages wm)
   #:use-module (gnu packages textutils)
   #:use-module (gnu packages time)
   #:use-module (gnu packages video)
+  #:use-module (gnu packages vulkan)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xml)
@@ -1538,16 +1541,16 @@ (define-public polybar
 (define-public wlroots
   (package
     (name "wlroots")
-    (version "0.14.1")
+    (version "0.16.1")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/swaywm/wlroots")
+             (url "https://gitlab.freedesktop.org/wlroots/wlroots.git")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1sshp3lvlkl1i670kxhwsb4xzxl8raz6769kqvgmxzcb63ns9ay1"))))
+        (base32 "11kcica9waj1a1xgbi12gif9z5z0b4xzycbcgawbgdmj77pws8sk"))))
     (build-system meson-build-system)
     (arguments
      `(#:phases
@@ -1558,7 +1561,16 @@ (define-public wlroots
                (("Xwayland") (string-append (assoc-ref inputs
                                                        "xorg-server-xwayland")
                                             "/bin/Xwayland")))
+             #t))
+         (add-before 'configure 'fix-meson-file
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "backend/drm/meson.build"
+               (("/usr/share/hwdata/pnp.ids")
+                (string-append (assoc-ref inputs "hwdata")
+                               "/share/hwdata/pnp.ids")))
              #t)))))
+    (inputs (list cmake
+                  `(,hwdata "pnp")))
     (propagated-inputs
      (list ;; As required by wlroots.pc.
            eudev
@@ -1567,8 +1579,9 @@ (define-public wlroots
            mesa
            pixman
            libseat
+           vulkan-headers
            wayland
-           wayland-protocols
+           wayland-protocols-next
            xcb-util-errors
            xcb-util-wm
            xorg-server-xwayland))
-- 
2.38.1





  parent reply	other threads:[~2023-02-06 23:27 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-06 23:17 [bug#61331] [PATCH core-updates] Update wayland, libdrm, wlroots, wayland-protocols-next, libinput, sway Gabriel Wicki
2023-02-06 23:21 ` [bug#61331] [PATCH core-updates] Update wayland, ..., sway Gabriel Wicki
2023-02-06 23:22 ` [bug#61331] (no subject) Gabriel Wicki
2023-02-06 23:26 ` Gabriel Wicki [this message]
2023-02-06 23:26 ` [bug#61331] [PATCH 4/6] gnu: Update wayland-protocols-next to 1.31 Gabriel Wicki
2023-02-06 23:27 ` [bug#61331] [PATCH 5/6] gnu: Update libinput to 1.22.1 Gabriel Wicki
2023-02-06 23:29 ` [bug#61331] [PATCH 6/6] gnu: Update sway to 1.8 Gabriel Wicki
2023-02-07  5:16 ` [bug#61331] need update cagebreak too Feng Shu
2023-02-09  2:20 ` [bug#61331] Update " Feng Shu
2023-04-06  8:58 ` [bug#61331] [PATCH core-updates] Update wayland, libdrm, wlroots, wayland-protocols-next, libinput, sway Jonathan Brielmaier
2023-04-06  9:02 ` [bug#61331] [PATCH 1/4] gnu: Update libinput to 1.22.1 Jonathan Brielmaier
2023-04-06  9:02   ` [bug#61331] [PATCH 2/4] gnu: wlroots: Update to 0.16.1 Jonathan Brielmaier
2023-04-06  9:02   ` [bug#61331] [PATCH 3/4] gnu: sway: Update to 1.8 Jonathan Brielmaier
2023-04-06  9:02   ` [bug#61331] [PATCH 4/4] gnu: cagebreak: Update to 2.0.1 Jonathan Brielmaier
2023-04-06 11:19     ` tumashu
2023-04-07 12:25 ` bug#61331: [PATCH core-updates] Update wayland, libdrm, wlroots, wayland-protocols-next, libinput, sway Jonathan Brielmaier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230206232617.yokszg43hrv2g5iw@blackbox \
    --to=gabriel@erlikon.ch \
    --cc=61331@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).