[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
48/72: gnu: mutter: Update to 40.5.
From: |
guix-commits |
Subject: |
48/72: gnu: mutter: Update to 40.5. |
Date: |
Sun, 26 Sep 2021 16:31:37 -0400 (EDT) |
mothacehe pushed a commit to branch wip-gnome40
in repository guix.
commit 0b1b2dceffb5ab9fdc3d3ca241c5db0e3e15276f
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Sun Sep 26 06:16:03 2021 +0000
gnu: mutter: Update to 40.5.
* gnu/packages/gnome.scm (mutter): Update to 40.5.
[source]: Fix the URI.
[arguments]<#:configure-flags>: Add mutter-8 directory to the runpath.
<#:phases>: Remove 'fix-build-with-mesa-20 phase and add a 'set-udev-dir
phase.
---
gnu/packages/gnome.scm | 33 ++++++++++++++-------------------
1 file changed, 14 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b58a9f0..6d198b9 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7370,15 +7370,15 @@ to display dialog boxes from the commandline and shell
scripts.")
(define-public mutter
(package
(name "mutter")
- (version "3.34.2")
+ (version "40.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
- (version-major+minor version) "/"
+ (version-major version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
- "0b8bz5kvs7rlwvqsg87cf6jhrrj95vgd1l235mjx8rip35ipfvrd"))))
+ "0bmd6p9qcwx0hv0y2bp33xjfaw4lyfkl55r0qn2cm04465riddny"))))
;; NOTE: Since version 3.21.x, mutter now bundles and exports forked
;; versions of cogl and clutter. As a result, many of the inputs,
;; propagated-inputs, and configure flags used in cogl and clutter are
@@ -7395,7 +7395,7 @@ to display dialog boxes from the commandline and shell
scripts.")
;; Otherwise, the RUNPATH will lack the final path component.
(string-append "-Dc_link_args=-Wl,-rpath="
(assoc-ref %outputs "out") "/lib:"
- (assoc-ref %outputs "out") "/lib/mutter-5")
+ (assoc-ref %outputs "out") "/lib/mutter-8")
;; The following flags are needed for the bundled clutter
(string-append "-Dxwayland_path="
@@ -7406,20 +7406,13 @@ to display dialog boxes from the commandline and shell
scripts.")
(string-append "-Dopengl_libname="
(assoc-ref %build-inputs "mesa")
"/lib/libGL.so"))
- #:phases (modify-phases %standard-phases
- (add-after 'unpack 'fix-build-with-mesa-20
- (lambda _
- ;; Mimic upstream commit a444a4c5f58ea516ad for
- ;; compatibility with Mesa 20. Remove for 3.36.
- (substitute* '("src/backends/meta-egl-ext.h"
- "src/backends/meta-egl.c"
- "src/backends/meta-egl.h")
- (("#include <EGL/eglext\\.h>" all)
- (string-append all "\n#include <EGL/eglmesaext.h>")))
- (substitute* "cogl/cogl/meson.build"
- (("#include <EGL/eglext\\.h>" all)
- (string-append all "\\n#include <EGL/eglmesaext.h>")))
- #t)))))
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'set-udev-dir
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (setenv "PKG_CONFIG_UDEV_UDEVDIR"
+ (string-append (assoc-ref outputs "out")
+ "/lib/udev")))))))
(native-inputs
`(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
@@ -7448,6 +7441,7 @@ to display dialog boxes from the commandline and shell
scripts.")
("libxext" ,libxext)
("libxfixes" ,libxfixes)
("libxkbcommon" ,libxkbcommon)
+ ("libxml2" ,libxml2)
("libxrandr" ,libxrandr)
("mesa" ,mesa)
("pango" ,pango)
@@ -7457,6 +7451,7 @@ to display dialog boxes from the commandline and shell
scripts.")
`(("elogind" ,elogind)
("gnome-desktop" ,gnome-desktop)
("gnome-settings-daemon" ,gnome-settings-daemon)
+ ("graphene" ,graphene)
("libcanberra-gtk" ,libcanberra)
("libgudev" ,libgudev)
("libice" ,libice)
@@ -7465,7 +7460,7 @@ to display dialog boxes from the commandline and shell
scripts.")
("libxkbfile" ,libxkbfile)
("libxrandr" ,libxrandr)
("libxtst" ,libxtst)
- ("pipewire" ,pipewire)
+ ("pipewire" ,pipewire-0.3)
("startup-notification" ,startup-notification)
("upower-glib" ,upower)
("xkeyboard-config" ,xkeyboard-config)
- 70/72: gnu: devhelp: Update to 40.1., (continued)
- 70/72: gnu: devhelp: Update to 40.1., guix-commits, 2021/09/26
- 72/72: gnu: gnome-tweaks: Update to 40.0., guix-commits, 2021/09/26
- 17/72: gnu: gnome-system-monitor: Update to 40.1., guix-commits, 2021/09/26
- 19/72: gnu: libgweather: Update to 40.0., guix-commits, 2021/09/26
- 25/72: gnu: gnome-latex: Update to 3.38.0., guix-commits, 2021/09/26
- 23/72: gnu: Add tepl-5., guix-commits, 2021/09/26
- 28/72: gnu: nautilus: Update to 40.2., guix-commits, 2021/09/26
- 45/72: gnu: gnome-contacts: Update to 40.0., guix-commits, 2021/09/26
- 46/72: gnu: eog-plugins: Update to 3.26.7., guix-commits, 2021/09/26
- 56/72: gnu: gnome-color-manager: Update to 3.36.0., guix-commits, 2021/09/26
- 48/72: gnu: mutter: Update to 40.5.,
guix-commits <=
- 61/72: gnu: gdm: Update to 40.1., guix-commits, 2021/09/26
- 62/72: gnu: gnome-music: Update to 40.1.1., guix-commits, 2021/09/26
- 60/72: gnu: accountsservice: Update to 0.6.55., guix-commits, 2021/09/26