From patchwork Thu Jan 22 15:43:33 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 79423 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 945EED3EE92 for ; Thu, 22 Jan 2026 15:44:00 +0000 (UTC) Received: from mailout10.t-online.de (mailout10.t-online.de [194.25.134.21]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.40495.1769096637286855155 for ; Thu, 22 Jan 2026 07:43:57 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: t-online.de, ip: 194.25.134.21, mailfrom: f_l_k@t-online.de) Received: from fwd76.aul.t-online.de (fwd76.aul.t-online.de [10.223.144.102]) by mailout10.t-online.de (Postfix) with SMTP id C36C73884B for ; Thu, 22 Jan 2026 16:43:54 +0100 (CET) Received: from intel-corei7-64.fritz.box ([84.154.161.253]) by fwd76.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1viwqc-1auNgY0; Thu, 22 Jan 2026 16:43:50 +0100 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [meta-gnome][PATCH 10/11] mutter: fix build without x11 in DISTRO_FEATURES Date: Thu, 22 Jan 2026 16:43:33 +0100 Message-ID: <20260122154334.1872038-10-f_l_k@t-online.de> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260122154334.1872038-1-f_l_k@t-online.de> References: <20260122154334.1872038-1-f_l_k@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1769096630-097F9925-9CAC5E13/0/0 CLEAN NORMAL X-TOI-MSGID: 6dd04674-e315-40ec-9301-4387f06f19f1 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 22 Jan 2026 15:44:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/123745 Signed-off-by: Markus Volk --- .../recipes-gnome/mutter/mutter_48.7.bb | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/meta-gnome/recipes-gnome/mutter/mutter_48.7.bb b/meta-gnome/recipes-gnome/mutter/mutter_48.7.bb index 0dbdb4b31a..7409b6908d 100644 --- a/meta-gnome/recipes-gnome/mutter/mutter_48.7.bb +++ b/meta-gnome/recipes-gnome/mutter/mutter_48.7.bb @@ -3,8 +3,6 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = " \ - wayland-native \ - virtual/libx11 \ colord \ graphene \ gtk4 \ @@ -15,14 +13,15 @@ DEPENDS = " \ json-glib \ libdisplay-info \ libei \ - libxcvt-native \ - libxtst \ - libxkbfile \ python3-argcomplete-native \ python3-docutils-native \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xinerama', '', d)} \ - xwayland \ -" + virtual/egl \ + virtual/libgles2 \ + wayland \ + wayland-native \ + wayland-protocols \ + libxcvt-native \ + " inherit gnomebase gsettings gobject-introspection gettext features_check @@ -30,8 +29,8 @@ inherit gnomebase gsettings gobject-introspection gettext features_check SRC_URI += "file://0001-Dont-use-system-sysprof-dbus-folder.patch" SRC_URI[archive.sha256sum] = "ec102aa3cbb0e39001206627aca3055314555f70609de5e6c2b7efcd1fa90f20" -# x11 is still manadatory - see meson.build -REQUIRED_DISTRO_FEATURES = "wayland x11 polkit" +REQUIRED_DISTRO_FEATURES = "wayland polkit" +ANY_OF_DISTRO_FEATURES = "opengl vulkan" # systemd can be replaced by libelogind (not available atow - make systemd # mandatory distro feature) @@ -41,27 +40,33 @@ REQUIRED_DISTRO_FEATURES += "systemd" # profiler requires sysprof 3.34 which is not willing to build atow PACKAGECONFIG ??= " \ native-backend \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'opengl glx', '', d)} \ - startup-notification \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 opengl glx sm xwayland startup-notification', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'logind udev', '', d)} \ gnome-desktop \ + egl \ " EXTRA_OEMESON += " \ -Dtests=disabled \ - -Dxwayland_path=${bindir}/Xwayland \ " # combi-config - see meson_options.txt for more details PACKAGECONFIG[native-backend] = "-Dnative_backend=true -Dudev=true, -Dnative_backend=false -Dudev=false, libdrm virtual/libgbm libinput ${LOGIND} virtual/egl virtual/libgles2 udev" -PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false, virtual/libgl" PACKAGECONFIG[glx] = "-Dglx=true, -Dglx=false" +PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false,virtual/libgl" +PACKAGECONFIG[egl] = "-Degl=true,-Degl=false,virtual/egl" PACKAGECONFIG[libwacom] = "-Dlibwacom=true, -Dlibwacom=false, libwacom" # Remove depending on pipewire-0.2 when mutter is upgraded to 3.36+ PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, pipewire" PACKAGECONFIG[gnome-desktop] = "-Dlibgnome_desktop=true, -Dlibgnome_desktop=false, gnome-desktop gnome-settings-daemon" +PACKAGECONFIG[sm] = "-Dsm=true, -Dsm=false, libsm" +PACKAGECONFIG[udev] = "-Dudev=true, -Dudev=false" +PACKAGECONFIG[logind] = "-Dlogind=true, -Dlogind=false, systemd" PACKAGECONFIG[sound-player] = "-Dsound_player=true, -Dsound_player=false, libcanberra" PACKAGECONFIG[profiler] = "-Dprofiler=true,-Dprofiler=false,sysprof" PACKAGECONFIG[startup-notification] = "-Dstartup_notification=true, -Dstartup_notification=false, startup-notification, startup-notification" +PACKAGECONFIG[x11] = "-Dx11=true, -Dx11=false, virtual/libx11" +PACKAGECONFIG[xwayland] = "-Dxwayland=true, -Dxwayland=false, libxcb xi xcomposite xcursor xdamage xext libxfixes xkeyboard-config virtual/libx11 xinerama xau" MUTTER_API_NAME = "mutter-16"