amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: mutter: Update to 40.5.

Browse source 
* 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.
This commit is contained in:
Mathieu Othacehe 2021-09-26 06:16:03 +00:00
parent 087e3cbdde
commit fa8b43c8e3
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 14 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

33
gnu/packages/gnome.scm
View file

@ -7377,15 +7377,15 @@ to display dialog boxes from the commandline and shell scripts.")
(define-public mutter (define-public mutter
(package (package
(name "mutter") (name "mutter")
(version "3.34.2") (version "40.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/" (version-major version) "/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0b8bz5kvs7rlwvqsg87cf6jhrrj95vgd1l235mjx8rip35ipfvrd")))) "0bmd6p9qcwx0hv0y2bp33xjfaw4lyfkl55r0qn2cm04465riddny"))))
;; NOTE: Since version 3.21.x, mutter now bundles and exports forked ;; NOTE: Since version 3.21.x, mutter now bundles and exports forked
;; versions of cogl and clutter. As a result, many of the inputs, ;; versions of cogl and clutter. As a result, many of the inputs,
;; propagated-inputs, and configure flags used in cogl and clutter are ;; propagated-inputs, and configure flags used in cogl and clutter are
@ -7402,7 +7402,7 @@ to display dialog boxes from the commandline and shell scripts.")
;; Otherwise, the RUNPATH will lack the final path component. ;; Otherwise, the RUNPATH will lack the final path component.
(string-append "-Dc_link_args=-Wl,-rpath=" (string-append "-Dc_link_args=-Wl,-rpath="
(assoc-ref %outputs "out") "/lib:" (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 ;; The following flags are needed for the bundled clutter
(string-append "-Dxwayland_path=" (string-append "-Dxwayland_path="
@ -7413,20 +7413,13 @@ to display dialog boxes from the commandline and shell scripts.")
(string-append "-Dopengl_libname=" (string-append "-Dopengl_libname="
(assoc-ref %build-inputs "mesa") (assoc-ref %build-inputs "mesa")
"/lib/libGL.so")) "/lib/libGL.so"))
#:phases (modify-phases %standard-phases #:phases
(add-after 'unpack 'fix-build-with-mesa-20 (modify-phases %standard-phases
(lambda _ (add-before 'configure 'set-udev-dir
;; Mimic upstream commit a444a4c5f58ea516ad for (lambda* (#:key inputs outputs #:allow-other-keys)
;; compatibility with Mesa 20. Remove for 3.36. (setenv "PKG_CONFIG_UDEV_UDEVDIR"
(substitute* '("src/backends/meta-egl-ext.h" (string-append (assoc-ref outputs "out")
"src/backends/meta-egl.c" "/lib/udev")))))))
"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)))))
(native-inputs (native-inputs
`(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. ("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
@ -7455,6 +7448,7 @@ to display dialog boxes from the commandline and shell scripts.")
("libxext" ,libxext) ("libxext" ,libxext)
("libxfixes" ,libxfixes) ("libxfixes" ,libxfixes)
("libxkbcommon" ,libxkbcommon) ("libxkbcommon" ,libxkbcommon)
("libxml2" ,libxml2)
("libxrandr" ,libxrandr) ("libxrandr" ,libxrandr)
("mesa" ,mesa) ("mesa" ,mesa)
("pango" ,pango) ("pango" ,pango)
@ -7464,6 +7458,7 @@ to display dialog boxes from the commandline and shell scripts.")
`(("elogind" ,elogind) `(("elogind" ,elogind)
("gnome-desktop" ,gnome-desktop) ("gnome-desktop" ,gnome-desktop)
("gnome-settings-daemon" ,gnome-settings-daemon) ("gnome-settings-daemon" ,gnome-settings-daemon)
("graphene" ,graphene)
("libcanberra-gtk" ,libcanberra) ("libcanberra-gtk" ,libcanberra)
("libgudev" ,libgudev) ("libgudev" ,libgudev)
("libice" ,libice) ("libice" ,libice)
@ -7472,7 +7467,7 @@ to display dialog boxes from the commandline and shell scripts.")
("libxkbfile" ,libxkbfile) ("libxkbfile" ,libxkbfile)
("libxrandr" ,libxrandr) ("libxrandr" ,libxrandr)
("libxtst" ,libxtst) ("libxtst" ,libxtst)
("pipewire" ,pipewire) ("pipewire" ,pipewire-0.3)
("startup-notification" ,startup-notification) ("startup-notification" ,startup-notification)
("upower-glib" ,upower) ("upower-glib" ,upower)
("xkeyboard-config" ,xkeyboard-config) ("xkeyboard-config" ,xkeyboard-config)