me
/
guix
Archived
1
0
Fork 0
Code

gnu: mutter: Update to 41.0 and enable tests. 

* gnu/packages/gnome.scm (mutter): Update to 41.0.
[imported-modules, modules]: New arguments.
[configure-flags]: Specify the gles2_libname, egl_device and wayland_eglstream
options.  Enable the profiler by removing the option.
[phases]{patch-dlopen-calls}: New phase.
{disable-problematic-tests}: Likewise.
{check}: Override phase.
[native-inputs]{xorg-server-for-tests}: Replace with...
{xvfb-run}: ... this.
{adwaita-icon-theme, libxcursor, pipewire-0.3}
{python-dbus, python-dbusmock, tini}: New native inputs.
[propagated-inputs]: Add libxcvt.
[inputs]: Add egl-wayland and sysprof.
master
Maxim Cournoyer 2021-11-14 00:40:27 -05:00
parent 7063ee6d9d
commit d1c2fe248a
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 112 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
gnu/packages/gnome.scm
View File

@ -110,6 +110,7 @@
#:use-module (gnu packages djvu)
#:use-module (gnu packages dns)
#:use-module (gnu packages docbook)
#:use-module (gnu packages docker)
#:use-module (gnu packages documentation)
#:use-module (gnu packages enchant)
#:use-module (gnu packages flex)
@ -7498,7 +7499,7 @@ to display dialog boxes from the commandline and shell scripts.")
(define-public mutter
(package
(name "mutter")
(version "40.5")
(version "41.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@ -7506,54 +7507,135 @@ to display dialog boxes from the commandline and shell scripts.")
name "-" version ".tar.xz"))
(sha256
(base32
"0bmd6p9qcwx0hv0y2bp33xjfaw4lyfkl55r0qn2cm04465riddny"))))
"17pqrm48kddqrc3fl96n5knhaxyn0crg0zv7zpmqhk848jks307s"))))
;; 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
;; needed here as well.
(build-system meson-build-system)
(arguments
'(;; XXX: All mutter tests fail with the following error:
;; Settings schema 'org.gnome.mutter' is not installed
#:tests? #f
`(#:imported-modules (,@%meson-build-system-modules
(guix build syscalls))
#:modules ((guix build meson-build-system)
(guix build syscalls)
(guix build utils)
(ice-9 match))
#:glib-or-gtk? #t
#:configure-flags
;; TODO: Enable profiler when Sysprof is packaged.
(list "-Dprofiler=false"
;; 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-8")
;; The following flags are needed for the bundled clutter
(string-append "-Dxwayland_path="
(assoc-ref %build-inputs "xorg-server-xwayland")
"/bin/Xwayland")
;; the remaining flags are needed for the bundled cogl
(string-append "-Dopengl_libname="
(assoc-ref %build-inputs "mesa")
"/lib/libGL.so"))
(list
;; 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-9")
;; Disable systemd support.
"-Dsystemd=false"
;; The following flags are needed for the bundled clutter
(string-append "-Dxwayland_path="
(assoc-ref %build-inputs "xorg-server-xwayland")
"/bin/Xwayland")
;; the remaining flags are needed for the bundled cogl
(string-append "-Dopengl_libname="
(assoc-ref %build-inputs "mesa")
"/lib/libGL.so")
(string-append "-Dgles2_libname="
(assoc-ref %build-inputs "mesa")
"/lib/libGLESv2.so")
"-Degl_device=true" ;false by default
"-Dwayland_eglstream=true") ;false by default
#:test-options
(list "--verbose")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-dlopen-calls
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/wayland/meta-wayland-egl-stream.c"
(("libnvidia-egl-wayland.so.1")
(string-append (assoc-ref inputs "egl-wayland")
"/lib/libnvidia-egl-wayland.so.1")))))
(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")))))))
"/lib/udev"))))
(add-after 'unpack 'disable-problematic-tests
(lambda _
;; The native-headless test hangs due to attempting to use audio,
;; unavailable in the container.
;; Note: the following sed expression deletes the whole test(...)
;; expression paragraph. For an explanation, see: info '(sed)
;; Multiline techniques'.
(invoke "sed" "/./{H;$!d} ; x ; s/^.*native-headless.*$//"
"-i" "src/tests/meson.build")))
(replace 'check
(lambda* (#:key tests? test-options parallel-tests?
#:allow-other-keys)
(when tests?
;; Setup (see the 'test-mutter' CI target at
;; https://gitlab.gnome.org/GNOME/mutter/-/raw/main/.gitlab-ci.yml).
(setenv "XDG_RUNTIME_DIR" "runtime-dir")
(setenv "GSETTINGS_SCHEMA_DIR" "data")
(setenv "MUTTER_DEBUG_DUMMY_MODE_SPECS" "800x600@10.0")
(setenv "PIPEWIRE_DEBUG" "2")
(setenv "PIPEWIRE_LOG" "meson-logs/pipewire.log")
(setenv "XVFB_SERVER_ARGS" "+iglx -noreset")
(setenv "G_SLICE" "always-malloc")
(setenv "MALLOC_CHECK" "3")
(setenv "NO_AT_BRIDGE" "1")
;; This is needed, otherwise the "mutter:core+mutter/unit /
;; anonymous-file" test would fail (see:
;; https://gitlab.gnome.org/GNOME/mutter/-/issues/2017).
(setenv "CI_JOB_ID" "1")
(invoke "glib-compile-schemas" (getenv "GSETTINGS_SCHEMA_DIR"))
(mkdir-p (getenv "XDG_RUNTIME_DIR"))
(chmod (getenv "XDG_RUNTIME_DIR") #o755)
(invoke "pipewire" "--version") ;check for pipewire
(system "pipewire &") ;always returns 0 due to forking
(setenv "MESON_TESTTHREADS"
(if parallel-tests?
(number->string (parallel-job-count))
"1"))
(match (primitive-fork)
(0 ;child process
(set-child-subreaper!)
;; Use tini so that signals are properly handled and
;; doubly-forked processes get reaped; otherwise,
;; python-dbusmock would waste time polling for the dbus
;; processes it spawns to be reaped, in vain.
(apply execlp "tini" "--"
"dbus-run-session" "--"
"xvfb-run" "-a" "-s" (getenv "XVFB_SERVER_ARGS")
"meson" "test" "-t" "0" "--print-errorlogs"
test-options))
(pid
(match (waitpid pid)
((_ . status)
(unless (zero? status)
(error "`meson test' exited with status"
status))))))))))))
(native-inputs
`(("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.
("gobject-introspection" ,gobject-introspection)
("intltool" ,intltool)
("pkg-config" ,pkg-config)
("xorg-server" ,xorg-server-for-tests)
("xvfb-run" ,xvfb-run)
;; For git build
("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)))
("libtool" ,libtool)
;; For tests.
;; Warnings are configured to be fatal during the tests; add an icon
;; theme to please libxcursor.
("adwaita-icon-theme" ,adwaita-icon-theme)
("libxcursor" ,libxcursor) ;for XCURSOR_PATH
("pipewire" ,pipewire-0.3)
("python-dbus" ,python-dbus)
("python-dbusmock" ,python-dbusmock)
("tini" ,tini))) ;acting as init (zombie reaper)
(propagated-inputs
`(;; libmutter.pc refers to these:
`( ;; libmutter.pc refers to these:
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("gtk+" ,gtk+)
;; mutter-clutter-1.0.pc and mutter-cogl-1.0.pc refer to these:
@ -7565,6 +7647,7 @@ to display dialog boxes from the commandline and shell scripts.")
("libinput" ,libinput)
("libx11" ,libx11)
("libxcomposite" ,libxcomposite)
("libxcvt" ,libxcvt)
("libxdamage" ,libxdamage)
("libxext" ,libxext)
("libxfixes" ,libxfixes)
@ -7576,7 +7659,8 @@ to display dialog boxes from the commandline and shell scripts.")
("udev" ,eudev)
("xinput" ,xinput)))
(inputs
`(("elogind" ,elogind)
`(("egl-wayland" ,egl-wayland) ;for wayland-eglstream-protocols
("elogind" ,elogind)
("gnome-desktop" ,gnome-desktop)
("gnome-settings-daemon" ,gnome-settings-daemon)
("graphene" ,graphene)
@ -7590,6 +7674,7 @@ to display dialog boxes from the commandline and shell scripts.")
("libxtst" ,libxtst)
("pipewire" ,pipewire-0.3)
("startup-notification" ,startup-notification)
("sysprof" ,sysprof)
("upower-glib" ,upower)
("xkeyboard-config" ,xkeyboard-config)
("xorg-server-xwayland" ,xorg-server-xwayland)