me/guix
Archived
1
0
Fork 0
Code Activity

gnu: mutter: Update to 42.4, use gexps and remove input labels.

Browse source 
* gnu/packages/gnome.scm (mutter): Update to 42.4.
[arguments]: Use gexps.
[configure-flags]: Use search-input-file.
[phases]{patch-docbook-xml}: Likewise.
{adjust-runpath-linker-directives}: New phase.
{check}: Set HOME.  Set XDG_RUNTIME_DIR to an absolute path, and chmod 700 its
directory.
[native-inputs, propagated-inputs, inputs]: Remove labels.
[native-inputs]: Add wayland-protocols-next.
[propagated-inputs]: Replace gsettings-desktop-schemas with
gsettings-desktop-schemas-next.
This commit is contained in:
Maxim Cournoyer 2022-08-22 16:34:15 -04:00
parent 815e7d21ef
commit 106667ce45
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 50 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
gnu/packages/gnome.scm
View file

@ -7519,7 +7519,7 @@ to display dialog boxes from the commandline and shell scripts.")
(define-public mutter (define-public mutter
(package (package
(name "mutter") (name "mutter")
(version "41.0") (version "42.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -7527,7 +7527,7 @@ to display dialog boxes from the commandline and shell scripts.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"17pqrm48kddqrc3fl96n5knhaxyn0crg0zv7zpmqhk848jks307s")))) "0h1ak3201mdc2qbf67fhcn801ddp33hm0f0c52zis1l7s6ipyb62"))))
;; 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
@ -7546,28 +7546,37 @@ to display dialog boxes from the commandline and shell scripts.")
#~(list #~(list
;; 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="
#$output "/lib:" #$output "/lib/mutter-9") #$output "/lib:"
#$output "/lib/mutter-9")
;; Disable systemd support. ;; Disable systemd support.
"-Dsystemd=false" "-Dsystemd=false"
;; 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="
(search-input-file %build-inputs "/bin/Xwayland")) (search-input-file %build-inputs "bin/Xwayland"))
;; the remaining flags are needed for the bundled cogl ;; the remaining flags are needed for the bundled cogl
(string-append "-Dopengl_libname=" (string-append "-Dopengl_libname="
(search-input-file %build-inputs "/lib/libGL.so")) (search-input-file %build-inputs "lib/libGL.so"))
(string-append "-Dgles2_libname=" (string-append "-Dgles2_libname="
(search-input-file %build-inputs "/lib/libGLESv2.so")) (search-input-file %build-inputs "lib/libGLESv2.so"))
"-Degl_device=true" ;false by default "-Degl_device=true" ;false by default
"-Dwayland_eglstream=true") ;false by default "-Dwayland_eglstream=true") ;false by default
#:test-options ''("--verbose") #:test-options '(list "--verbose")
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'adjust-runpath-linker-directives
(lambda _
;; By default Mutter uses RPATH instead of RUNPATH, which our
;; customized linker script makes use of. Some libraries are
;; also installed under lib/mutter-10 and need to be added to
;; the RUNPATH.
(substitute* "meson.build"
(("'-Wl,--disable-new-dtags'")
(string-append "'-Wl,-rpath=" #$output "/lib/mutter-10'")))))
(add-after 'unpack 'patch-dlopen-calls (add-after 'unpack 'patch-dlopen-calls
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/wayland/meta-wayland-egl-stream.c" (substitute* "src/wayland/meta-wayland-egl-stream.c"
(("libnvidia-egl-wayland.so.1") (("libnvidia-egl-wayland.so.1")
(search-input-file inputs (search-input-file inputs "lib/libnvidia-egl-wayland.so.1")))))
"/lib/libnvidia-egl-wayland.so.1")))))
(add-before 'configure 'set-udev-dir (add-before 'configure 'set-udev-dir
(lambda _ (lambda _
(setenv "PKG_CONFIG_UDEV_UDEVDIR" (setenv "PKG_CONFIG_UDEV_UDEVDIR"
@ -7592,7 +7601,12 @@ to display dialog boxes from the commandline and shell scripts.")
(when tests? (when tests?
;; Setup (see the 'test-mutter' CI target at ;; Setup (see the 'test-mutter' CI target at
;; https://gitlab.gnome.org/GNOME/mutter/-/raw/main/.gitlab-ci.yml). ;; https://gitlab.gnome.org/GNOME/mutter/-/raw/main/.gitlab-ci.yml).
(setenv "XDG_RUNTIME_DIR" "runtime-dir") (setenv "HOME" "/tmp")
(setenv "XDG_RUNTIME_DIR" (string-append (getcwd)
"/runtime-dir"))
(mkdir (getenv "XDG_RUNTIME_DIR"))
(chmod (getenv "XDG_RUNTIME_DIR") #o700)
(setenv "GSETTINGS_SCHEMA_DIR" "data") (setenv "GSETTINGS_SCHEMA_DIR" "data")
(setenv "MUTTER_DEBUG_DUMMY_MODE_SPECS" "800x600@10.0") (setenv "MUTTER_DEBUG_DUMMY_MODE_SPECS" "800x600@10.0")
(setenv "PIPEWIRE_DEBUG" "2") (setenv "PIPEWIRE_DEBUG" "2")
@ -7635,16 +7649,17 @@ to display dialog boxes from the commandline and shell scripts.")
(error "`meson test' exited with status" (error "`meson test' exited with status"
status)))))))))))) status))))))))))))
(native-inputs (native-inputs
(list desktop-file-utils ; for update-desktop-database (list desktop-file-utils ;for update-desktop-database
gettext-minimal `(,glib "bin") ;for glib-compile-schemas, etc.
`(,glib "bin") ; for glib-compile-schemas, etc.
gobject-introspection gobject-introspection
intltool
pkg-config pkg-config
xvfb-run xvfb-run
;; For git build ;; For git build
autoconf autoconf
automake automake
libtool libtool
wayland-protocols-next
;; For tests. ;; For tests.
;; Warnings are configured to be fatal during the tests; add an icon ;; Warnings are configured to be fatal during the tests; add an icon
;; theme to please libxcursor. ;; theme to please libxcursor.
@ -7656,29 +7671,28 @@ to display dialog boxes from the commandline and shell scripts.")
python-dbusmock python-dbusmock
tini)) ;acting as init (zombie reaper) tini)) ;acting as init (zombie reaper)
(propagated-inputs (propagated-inputs
(list ;; libmutter.pc refers to these: (list gsettings-desktop-schemas-next ;required by libmutter.pc
gsettings-desktop-schemas gtk+ ;required by libmutter.pc
gtk+ ;; mutter-clutter-1.0.pc and mutter-cogl-1.0.pc refer to these:
;; mutter-clutter-1.0.pc and mutter-cogl-1.0.pc refer to these: atk
atk cairo
cairo eudev
gdk-pixbuf gdk-pixbuf
glib glib
json-glib json-glib
libinput libinput
libx11 libx11
libxcomposite libxcomposite
libxcvt libxcvt
libxdamage libxdamage
libxext libxext
libxfixes libxfixes
libxkbcommon libxkbcommon
libxml2 libxml2
libxrandr libxrandr
mesa mesa
pango pango
eudev xinput))
xinput))
(inputs (inputs
(list egl-wayland ;for wayland-eglstream-protocols (list egl-wayland ;for wayland-eglstream-protocols
elogind elogind