From 4c23b73630c1697a0176b2e15afe15ed01a08165 Mon Sep 17 00:00:00 2001 From: Liu Yiding Date: Tue, 22 Jul 2025 11:12:11 +0800 Subject: mutter: upgrade 48.0 -> 48.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changelog: =========== 48.4 ==== * Unlink outputs from unused connectors in update_outputs [Michel; !4474] * Add speed limit to Visual alerts [Sergio; !4487] * Fix behavior of windows that get activated before mapped [Alessandro; !4462] * Fix incorrect cursor over Xwayland clients [Carlos; !4433] * Fix hi-res scroll events getting converted to flip-flopping discrete events [Peter; !4459] * Fixed crash [Daniel; !4303] * Misc. bug fixes and cleanups [Alessandro, Jonas, Jordan, Alessandro, Corentin, Daniel, Lukáš, Rémi, Michel; !4481, !4482, !4485, !4492, !4496, !4495, !4444, !4447, !4442, !4452] 48.3.1 ====== * Fix Xwayland windows becoming unresponsive to events [Jonas; !4475] * Fix drag and drop of tabs into tiled/maximized state [Carlos; !4468] 48.3 ==== * Use opaque dma-buf formats substitutes for scanout [Robert; !4320] * Restore tiled/maximized windows to the correct monitor [Nick; !4411] * Do not leak session manager file to launched processes [Sebastian K.; !4405] * Use frame-sync candidate that likely matches scanout candidate [Robert; !4412] * Propagate all touchpad gesture events to apps [Carlos; !4417] * Update window decorations on override-redirect attribute [Rémi; !4287] * Load initial _NET_WM_FULLSCREEN_MONITORS value [Zhiyi; !4389] * Fix race when registering implicit grab [Alessandro; !4399] * Skip multiple refresh intervals if necessary [Michel; !4406] * box-layout: Update actor-request-mode on orientation changes [Jonas D.; !4339] * Do not take control of logind session on Xorg [Madhu; !4391] * Fixed crashes [Sebastian W., Jonas Å.; !4423, !4431] * Plugged leaks [Michel; !4432] * Misc. bug fixes and cleanups [Chris, Maxim, Michel, Carlos, Florian, Rémi; 48.2 ==== * Fix animated cursors [Michel; !4382] * Announce workspace changes to screen reader [Florian; !4385] * Fix popups showing in some situations [Carlos; !4354] * Fix wrong cursor after window animations [Carlos; !4392] * Fixed crashes [Michel; !4362] * Misc. bug fixes and cleanups [Florian, Robert, Sebastian, Jonas; !4349, !4383, !4393, !4386, !4269] 48.1 ==== * Fixed occasional screen freezes [Michel, Jonas; !4338, !4334, !4375] * Fix tablet tool cursor sizes when set via the cursor shape protocol [Jan; !4345] * Fix hiding the cursor when using the cursor shape protocl [Sebastian; !4358] * Fall back to the default color mode when a HDR monitor looses HDR capabilities [Sebastian, Jonas; !4357, !4364] * Disable HDR support with non-atomic (legacy) KMS drivers [Sebastian; !4357] * Fix the cursor shape protocol when being used with tablets [Carlos; !4367] * Immediately update cursors on theme and size changes [Sebastian; !4359] * Avoid cursor stuttering when cursor set via the cursor shape protocol [Michel; !4371] * Handle DnD cursor feedback in compositor [Carlos; !4368] * Fixed crashes [Orko, Michel, Jonas, Daniel; !4351, !4372, !4374, !4370, !4378] * Misc. bug fixes and cleanups [Daniel, Florian, Carlos, Michel; !4340, !4343, !4352, !4353, !4361, !4369, !4377] Signed-off-by: Liu Yiding Signed-off-by: Khem Raj --- .../0001-Dont-use-system-sysprof-dbus-folder.patch | 8 +- meta-gnome/recipes-gnome/mutter/mutter_48.0.bb | 113 --------------------- meta-gnome/recipes-gnome/mutter/mutter_48.4.bb | 113 +++++++++++++++++++++ 3 files changed, 117 insertions(+), 117 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/mutter/mutter_48.0.bb create mode 100644 meta-gnome/recipes-gnome/mutter/mutter_48.4.bb diff --git a/meta-gnome/recipes-gnome/mutter/files/0001-Dont-use-system-sysprof-dbus-folder.patch b/meta-gnome/recipes-gnome/mutter/files/0001-Dont-use-system-sysprof-dbus-folder.patch index 2f09c32997..8e4048bac6 100644 --- a/meta-gnome/recipes-gnome/mutter/files/0001-Dont-use-system-sysprof-dbus-folder.patch +++ b/meta-gnome/recipes-gnome/mutter/files/0001-Dont-use-system-sysprof-dbus-folder.patch @@ -1,4 +1,4 @@ -From 790177e2a89aa0710b570d595223bdb511241c56 Mon Sep 17 00:00:00 2001 +From 342358225ad886726d68239be8e9eb5e78eacb64 Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Tue, 11 Feb 2025 13:39:54 +0100 Subject: [PATCH] Don't use system sysprof dbus folder @@ -10,7 +10,7 @@ system ($datadir/dbus-1/interfaces) instead of searching for it in the $RECIPE_SYSROOT. To ensure that it looks for this file in the correct folder, prefix -the search path with the value of the sys_root property, which is set +the search path with the value of the sys_root property, which is set in the meson.cross file (by meson.bbclass). Signed-off-by: Gyorgy Sarvari @@ -21,10 +21,10 @@ Upstream-Status: Inappropriate [oe-specific: only related to cross-compiling] 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 551cb23..5199be6 100644 +index 8513f14..0f87e4a 100644 --- a/meson.build +++ b/meson.build -@@ -446,7 +446,7 @@ if have_profiler +@@ -469,7 +469,7 @@ if have_profiler if libsysprof_capture_dep.type_name() == 'pkgconfig' sysprof_dep = dependency('sysprof-6', 'sysprof-4') diff --git a/meta-gnome/recipes-gnome/mutter/mutter_48.0.bb b/meta-gnome/recipes-gnome/mutter/mutter_48.0.bb deleted file mode 100644 index 6f799ad57a..0000000000 --- a/meta-gnome/recipes-gnome/mutter/mutter_48.0.bb +++ /dev/null @@ -1,113 +0,0 @@ -SUMMARY = "Window and compositing manager based on Clutter" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = " \ - wayland-native \ - virtual/libx11 \ - colord \ - graphene \ - gtk4 \ - gdk-pixbuf \ - cairo \ - pango \ - gsettings-desktop-schemas \ - json-glib \ - libdisplay-info \ - libei \ - libxcvt-native \ - libxtst \ - libxkbfile \ - python3-argcomplete-native \ - python3-docutils-native \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xinerama', '', d)} \ - xwayland \ -" - - -inherit gnomebase gsettings gobject-introspection gettext features_check - -SRC_URI[archive.sha256sum] = "9ca177fd5851a4077f17f6a888c45447b7d1163c9879580597a1fd837f47e57d" - -SRC_URI += "file://0001-Dont-use-system-sysprof-dbus-folder.patch" - -# x11 is still manadatory - see meson.build -REQUIRED_DISTRO_FEATURES = "wayland x11 polkit" - -# systemd can be replaced by libelogind (not available atow - make systemd -# mandatory distro feature) -LOGIND ?= "systemd" -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)} \ - sm \ - startup-notification \ - gnome-desktop \ -" - -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[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[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" - -MUTTER_API_NAME = "mutter-16" - -do_install:prepend() { - sed -i -e 's|${B}/||g' ${B}/cogl/cogl/cogl-enum-types.c - sed -i -e 's|${B}/||g' ${B}/clutter/clutter/clutter-enum-types.c - sed -i -e 's|${B}/||g' ${B}/src/meta-private-enum-types.c - sed -i -e 's|${B}/||g' ${B}/src/meta/meta-enum-types.c -} - -do_install:append() { - # Add gir links in standard paths. That makes dependents life much easier - # to find them - install -d ${D}${datadir}/gir-1.0 - for gir_full in `find ${D}${libdir}/${MUTTER_API_NAME} -name '*.gir'`; do - gir=`basename "$gir_full"` - ln -sr "${D}${libdir}/${MUTTER_API_NAME}/$gir" "${D}${datadir}/gir-1.0/$gir" - done -} - -GSETTINGS_PACKAGE = "${PN}-gsettings" - -PACKAGES =+ "${PN}-tests ${PN}-gsettings" - -FILES:${PN} += " \ - ${datadir}/bash-completion \ - ${datadir}/gnome-control-center \ - ${datadir}/gir-1.0 \ - ${libdir}/${MUTTER_API_NAME}/lib*${SOLIBS} \ - ${libdir}/${MUTTER_API_NAME}/*.typelib \ - ${libdir}/${MUTTER_API_NAME}/plugins \ -" - -FILES:${PN}-tests += " \ - ${datadir}/installed-tests \ - ${datadir}/${MUTTER_API_NAME}/tests \ - ${libexecdir}/installed-tests/${MUTTER_API_NAME} \ -" - -FILES:${PN}-dev += " \ - ${libdir}/${MUTTER_API_NAME}/*.gir \ - ${libdir}/${MUTTER_API_NAME}/lib*.so \ -" - -RDEPENDS:${PN} += "${PN}-gsettings gsettings-desktop-schemas" - diff --git a/meta-gnome/recipes-gnome/mutter/mutter_48.4.bb b/meta-gnome/recipes-gnome/mutter/mutter_48.4.bb new file mode 100644 index 0000000000..d563e8a912 --- /dev/null +++ b/meta-gnome/recipes-gnome/mutter/mutter_48.4.bb @@ -0,0 +1,113 @@ +SUMMARY = "Window and compositing manager based on Clutter" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = " \ + wayland-native \ + virtual/libx11 \ + colord \ + graphene \ + gtk4 \ + gdk-pixbuf \ + cairo \ + pango \ + gsettings-desktop-schemas \ + json-glib \ + libdisplay-info \ + libei \ + libxcvt-native \ + libxtst \ + libxkbfile \ + python3-argcomplete-native \ + python3-docutils-native \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xinerama', '', d)} \ + xwayland \ +" + + +inherit gnomebase gsettings gobject-introspection gettext features_check + +SRC_URI[archive.sha256sum] = "1189cf7e63cc87cfdd1f3a86e8f14d97c33d6a9da254f23e81655549b6c50d93" + +SRC_URI += "file://0001-Dont-use-system-sysprof-dbus-folder.patch" + +# x11 is still manadatory - see meson.build +REQUIRED_DISTRO_FEATURES = "wayland x11 polkit" + +# systemd can be replaced by libelogind (not available atow - make systemd +# mandatory distro feature) +LOGIND ?= "systemd" +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)} \ + sm \ + startup-notification \ + gnome-desktop \ +" + +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[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[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" + +MUTTER_API_NAME = "mutter-16" + +do_install:prepend() { + sed -i -e 's|${B}/||g' ${B}/cogl/cogl/cogl-enum-types.c + sed -i -e 's|${B}/||g' ${B}/clutter/clutter/clutter-enum-types.c + sed -i -e 's|${B}/||g' ${B}/src/meta-private-enum-types.c + sed -i -e 's|${B}/||g' ${B}/src/meta/meta-enum-types.c +} + +do_install:append() { + # Add gir links in standard paths. That makes dependents life much easier + # to find them + install -d ${D}${datadir}/gir-1.0 + for gir_full in `find ${D}${libdir}/${MUTTER_API_NAME} -name '*.gir'`; do + gir=`basename "$gir_full"` + ln -sr "${D}${libdir}/${MUTTER_API_NAME}/$gir" "${D}${datadir}/gir-1.0/$gir" + done +} + +GSETTINGS_PACKAGE = "${PN}-gsettings" + +PACKAGES =+ "${PN}-tests ${PN}-gsettings" + +FILES:${PN} += " \ + ${datadir}/bash-completion \ + ${datadir}/gnome-control-center \ + ${datadir}/gir-1.0 \ + ${libdir}/${MUTTER_API_NAME}/lib*${SOLIBS} \ + ${libdir}/${MUTTER_API_NAME}/*.typelib \ + ${libdir}/${MUTTER_API_NAME}/plugins \ +" + +FILES:${PN}-tests += " \ + ${datadir}/installed-tests \ + ${datadir}/${MUTTER_API_NAME}/tests \ + ${libexecdir}/installed-tests/${MUTTER_API_NAME} \ +" + +FILES:${PN}-dev += " \ + ${libdir}/${MUTTER_API_NAME}/*.gir \ + ${libdir}/${MUTTER_API_NAME}/lib*.so \ +" + +RDEPENDS:${PN} += "${PN}-gsettings gsettings-desktop-schemas" + -- cgit v1.2.3-54-g00ecf