From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id EBkxFJpglmFFFQEAgWs5BA (envelope-from ) for ; Thu, 18 Nov 2021 15:18:02 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id GNzOD5pglmE4SwAAbx9fmQ (envelope-from ) for ; Thu, 18 Nov 2021 14:18:02 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BEB17203BB for ; Thu, 18 Nov 2021 15:18:01 +0100 (CET) Received: from localhost ([::1]:50176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mniEi-00057S-Vi for larch@yhetil.org; Thu, 18 Nov 2021 09:18:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mniDs-0003Om-Ha for bug-guix@gnu.org; Thu, 18 Nov 2021 09:17:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51990) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mniDs-0001ya-96 for bug-guix@gnu.org; Thu, 18 Nov 2021 09:17:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mniDs-0000fv-45 for bug-guix@gnu.org; Thu, 18 Nov 2021 09:17:08 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#51900: [PATCH 11/11] gnu: mutter: Update to 41.0 and fix test (WIP). Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 18 Nov 2021 14:17:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51900 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 51900@debbugs.gnu.org Received: via spool by 51900-submit@debbugs.gnu.org id=B51900.16372450121758 (code B ref 51900); Thu, 18 Nov 2021 14:17:07 +0000 Received: (at 51900) by debbugs.gnu.org; 18 Nov 2021 14:16:52 +0000 Received: from localhost ([127.0.0.1]:35292 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mniDb-0000Rn-RP for submit@debbugs.gnu.org; Thu, 18 Nov 2021 09:16:52 -0500 Received: from mail-qk1-f170.google.com ([209.85.222.170]:38548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mniDW-0000KO-Q6 for 51900@debbugs.gnu.org; Thu, 18 Nov 2021 09:16:47 -0500 Received: by mail-qk1-f170.google.com with SMTP id q64so6454533qkd.5 for <51900@debbugs.gnu.org>; Thu, 18 Nov 2021 06:16:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kQ5uPwKl1IPtpTvou3aeZ4oiFK5QXvFJvxsyqmrcI4s=; b=OWv64jIG5SB89wqsje3BamaJuS+dVrGW5CxH+3UVlcmp/XMYJM9nhBLVDWntXeDuKw Nf9CfsEQ7m358eNjw3SlELj10/Pgs0x20bRikfWmdA1nybzj1G1R4s9Gi8QNVvk59nVT 8xUVkVCPv4n8KUqB51W9wrL4/gQ7aiRgEwZ/6i/gQlbaGWGFMWf3QgDAUCEOgDPlb6QX mNf+Quaxk6y/7V/rXzwKVHrGLyTCmseGRUHHU7j8DT7lMrqMyLLtw2u1DtiFtU6urWQh 4ks3r08roRqFkiRtT2ByOr2dKJ9Ft7ainNpY2vLT/2T/P9RqERJNqYOrJlzpXHG8aUXn tIKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kQ5uPwKl1IPtpTvou3aeZ4oiFK5QXvFJvxsyqmrcI4s=; b=OgssQWXb3rEKyksHViPubEeWl3Pt5mvxQcyJ5LS52z9VB9u7Kffzpkwx4UvmnxuQKa J55tKroaZbQhCt/PuHD9SM7lC0BHNojoBX5PZgr09GfskCHl/txX9jnXLGPy/LEMorPn 0uXJgM40WFYoYJSW3BheIlgva4XlUcayNIl4AT95oOHAE31/MWVn7VaESnFXkDgjyc1g nQkPyFjEKp8PlgjmjR51aOOdWtbL+JLC8kqwCpG7oi7VoS+INxMJYZ/WHgPoYZ/ZsodH H/CYQF3jMtu0GgnDd4SSgBnVuK+J9gCp2dFbcVOQ3U9HwbuavFzRup/YJcnNd1KoV28Y R4Ag== X-Gm-Message-State: AOAM532tYDbm83WBOvYB7Wr/e9Y9u2j0Aa1oT3PihvIeFmsxv5wxXmUV rUop92vBx5ESoPOPoniv6du1kc/wQvqolw== X-Google-Smtp-Source: ABdhPJy/otDWt/NQDQjnLjF1vPCS7LM78JbJsMNlWvO+NYrdcOcN6lnGDpVZwuvnIqiYGNht1WSMOw== X-Received: by 2002:a05:620a:404c:: with SMTP id i12mr21815755qko.298.1637245001119; Thu, 18 Nov 2021 06:16:41 -0800 (PST) Received: from localhost.localdomain (dsl-10-133-135.b2b2c.ca. [72.10.133.135]) by smtp.gmail.com with ESMTPSA id h22sm1655780qkk.14.2021.11.18.06.16.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Nov 2021 06:16:40 -0800 (PST) From: Maxim Cournoyer Date: Thu, 18 Nov 2021 09:16:16 -0500 Message-Id: <20211118141616.4252-11-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211118141616.4252-1-maxim.cournoyer@gmail.com> References: <20211118141616.4252-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxim Cournoyer Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1637245081; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=kQ5uPwKl1IPtpTvou3aeZ4oiFK5QXvFJvxsyqmrcI4s=; b=mpF/8TTMK8W9UZiGa55ywPofmdvZ8He2Qoqz5FP2UIDYwSIb76DONzjjRQK9igJLXa6g9L DqHnZWpJjQheclaEHLWRAI0uZH61oI/WFg24KcJhMp31SwcuhoLH1z92n6vOulUxodWTMD evdBcR4BSS1+wTDW3Vax+zww0PIkE3CTxeY7g2T73CbY0wQkMViflf/vV0/F50r9DOnjju 6QrXEJ+2xKjQPRA4xc7f7081BsoZ+NaWDbx/Lf4qqjHuRQxKe7NZ0S5u78NU/hhseSwi/0 THjIkfYgmEHdSxopvCt49+eEcskNqKRIT9lzv/drymU5wT8uBxMGYHISw+SM4Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1637245081; a=rsa-sha256; cv=none; b=Sw1WWEEEqRgt5Ysu6v7r31j+YhjCI5k0cd3U077hFpU0tZFeVpgC0XB/z7tiDfJucwQT1b EZzddWCnSHc3qgY2m5wOU0PylLyaCsA6t5XOpWNjw2SsiN3iSVoME9rQ05FxltOxPYXz0g VaxsTKuJY63IpaLHce5dq5Vq7mnB6hmN+aUImQyH3SRP+b1pz2pC2sGzB5SYpoPo1STsWt 6kySrpttZUI//EqSkOtopPHI7PvCYJQ2l6a9vqK8mEn2/lJkL2AfGlHh0c3E0ozqd7lpmP 5v5KqgjtDRcHyGn/NNhS/cBGWDKbtMdKQNbjuvxT8+o1UkKFcgs99NQ9PTi/Yw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=OWv64jIG; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Spam-Score: 3.24 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=OWv64jIG; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: BEB17203BB X-Spam-Score: 3.24 X-Migadu-Scanner: scn1.migadu.com X-TUID: g4ETCff4GRZP * gnu/packages/gnome.scm (mutter): Update to 41.0. TODO --- gnu/packages/gnome.scm | 95 +++++++++++++++++++++++++++++++++++------- 1 file changed, 79 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f07ff28701..c01da54da6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7478,7 +7478,7 @@ (define-public zenity (define-public mutter (package (name "mutter") - (version "40.5") + (version "41.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7486,54 +7486,114 @@ (define-public mutter 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 - #:glib-or-gtk? #t + '(#: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") - + (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")) + "/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" + ;; FIXME: There are three (3) test suites: 'clutter', 'cogl' and + ;; 'core', of which only 'core' is currently failing with errors + ;; like: + + ;; FIXME: The test suites takes way more time (from ~1m30 to 15m) + ;; in the build environment, due to python-dbusmock struggling to + ;; kill the dbus process with errors like "ERROR: timed out + ;; waiting for bus process to terminate" for unknown reasons + ;; (see: + ;; https://github.com/martinpitt/python-dbusmock/issues/47#issuecomment-972547988). + "--suite=clutter" + "--suite=cogl") #: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")))) + (replace 'check + (lambda* (#:key inputs 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")) + (apply invoke "dbus-run-session" "--" + "xvfb-run" "-a" "-s" (getenv "XVFB_SERVER_ARGS") + "meson" "test" "-t" "10" "--print-errorlogs" + test-options))))))) (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. + ("pipewire" ,pipewire-0.3) + ("python-dbus" ,python-dbus) + ("python-dbusmock" ,python-dbusmock))) (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: @@ -7545,6 +7605,7 @@ (define-public mutter ("libinput" ,libinput) ("libx11" ,libx11) ("libxcomposite" ,libxcomposite) + ("libxcvt" ,libxcvt) ("libxdamage" ,libxdamage) ("libxext" ,libxext) ("libxfixes" ,libxfixes) @@ -7556,7 +7617,8 @@ (define-public mutter ("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) @@ -7570,6 +7632,7 @@ (define-public mutter ("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) -- 2.33.1