diff --git a/0001-Revert-build-Do-not-provide-built-sources-as-libmutt.patch b/0001-Revert-build-Do-not-provide-built-sources-as-libmutt.patch new file mode 100644 index 0000000000000000000000000000000000000000..bd18e8a1d189f0570effef518d27a2c741717984 --- /dev/null +++ b/0001-Revert-build-Do-not-provide-built-sources-as-libmutt.patch @@ -0,0 +1,26 @@ +From 3899a01cd6cb00ca686946d3065d58f59f5c2099 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jonas=20=C3=85dahl?= +Date: Tue, 17 Nov 2020 14:00:02 +0100 +Subject: [PATCH] Revert "build: Do not provide built sources as libmutter_dep + sources" + +This reverts commit 4e9a2e479969973bf3063c740ceff149036b3af4. +--- + src/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/meson.build b/src/meson.build +index e7c99caee..8fe484ec2 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -955,6 +955,7 @@ libmutter = shared_library(libmutter_name, + libmutter_dep = declare_dependency( + link_with: libmutter, + include_directories: mutter_includes, ++ sources: mutter_built_sources, + dependencies: [ + libmutter_cogl_dep, + libmutter_clutter_dep, +-- +2.28.0 + diff --git a/mutter-42.2.tar.xz b/mutter-42.2.tar.xz deleted file mode 100644 index 7f5b8a95474d6a97be7017936a64c07b5a2f1deb..0000000000000000000000000000000000000000 Binary files a/mutter-42.2.tar.xz and /dev/null differ diff --git a/mutter-42.alpha-disable-tegra.patch b/mutter-42.alpha-disable-tegra.patch index f341984724a0c9408247c2283206a4305da56b3b..8428db9685e8e69885bad71a1e7da110dd73b846 100644 --- a/mutter-42.alpha-disable-tegra.patch +++ b/mutter-42.alpha-disable-tegra.patch @@ -12,10 +12,10 @@ diff --git a/src/backends/native/meta-kms-impl-device-atomic.c b/src/backends/na index bcb41e8ad..bafbc7b8f 100644 --- a/src/backends/native/meta-kms-impl-device-atomic.c +++ b/src/backends/native/meta-kms-impl-device-atomic.c -@@ -1159,6 +1159,7 @@ is_atomic_allowed (const char *driver_name) +@@ -1216,6 +1216,7 @@ is_atomic_allowed (const char *driver_name) "vboxvideo", - "nvidia-drm", "virtio_gpu", + "xlnx", + "tegra", NULL, }; diff --git a/mutter-43.2.tar.xz b/mutter-43.2.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..86238be8eb4fe3f3b55cdeebb1eadbb091d13e84 Binary files /dev/null and b/mutter-43.2.tar.xz differ diff --git a/mutter.spec b/mutter.spec index d685dccd395e2ca6a3e17eea6eacc736eb8400c6..604bb671513817c6bc83270ae715a0c129878607 100644 --- a/mutter.spec +++ b/mutter.spec @@ -1,21 +1,25 @@ +%global glib_version 2.69.0 %global gtk3_version 3.19.8 -%global glib_version 2.53.2 -%global gsettings_desktop_schemas_version 40~alpha +%global gsettings_desktop_schemas_version 40 %global json_glib_version 0.12.0 -%global libinput_version 1.4 +%global libinput_version 1.19.0 %global pipewire_version 0.3.33 -%global mutter_api_version 10 +%global lcms2_version 2.6 +%global colord_version 1.4.5 +%global mutter_api_version 11 Name: mutter -Version: 42.2 -Release: 3 +Version: 43.2 +Release: 1 Summary: Window and compositing manager based on Clutter License: GPLv2+ URL: https://www.gnome.org -Source0: http://download.gnome.org/sources/%{name}/42/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/%{name}/43/%{name}-%{version}.tar.xz Patch0: 0001-window-actor-Special-case-shaped-Java-windows.patch -Patch1: mutter-42.alpha-disable-tegra.patch +Patch1: 0001-Revert-build-Do-not-provide-built-sources-as-libmutt.patch +Patch2: mutter-42.alpha-disable-tegra.patch +#Patch3: post-43.1-fixes.patch BuildRequires: meson pam-devel zenity sysprof-devel gtk-doc gettext-devel git-core BuildRequires: xorg-x11-server-Xorg xorg-x11-server-Xvfb desktop-file-utils @@ -24,6 +28,8 @@ BuildRequires: pkgconfig(libpipewire-0.3) >= %{pipewire_version} BuildRequires: pkgconfig(json-glib-1.0) >= %{json_glib_version} BuildRequires: pkgconfig(libinput) >= %{libinput_version} BuildRequires: pkgconfig(gsettings-desktop-schemas) >= %{gsettings_desktop_schemas_version} +BuildRequires: pkgconfig(lcms2) >= %{lcms2_version} +BuildRequires: pkgconfig(colord) >= %{colord_version} BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.41.0 BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(libwacom) @@ -94,7 +100,8 @@ developing applications that use %{name}. %autosetup -n %{name}-%{version} -p1 %build -%meson -Degl_device=true -Dwayland_eglstream=true -Dxwayland_initfd=disabled +%meson -Degl_device=true -Dwayland_eglstream=true +#-Dxwayland_initfd=disabled %meson_build %install @@ -107,10 +114,11 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop mkdir -p %{buildroot}/etc/ld.so.conf.d %ifarch sw_64 -echo "/usr/lib/mutter-10" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf +echo "/usr/lib/mutter-11" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf %else -echo "/usr/lib64/mutter-10" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf +echo "/usr/lib64/mutter-11" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf %endif + %ldconfig_scriptlets %files -f %{name}.lang @@ -137,10 +145,13 @@ echo "/usr/lib64/mutter-10" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.con %files help %defattr(-,root,root) -%doc NEWS +%doc NEWS %{_mandir}/man1/*.1.gz %changelog +* Mon Jan 02 2023 lin zhang - 43.2-1 +- Update to 43.2 + * Wed Dec 14 2022 wuzx - 42.2-3 - Add sw64 architecture diff --git a/post-43.1-fixes.patch b/post-43.1-fixes.patch new file mode 100644 index 0000000000000000000000000000000000000000..2e5a2d67549b691568bcb2c17dd66ab382b15413 --- /dev/null +++ b/post-43.1-fixes.patch @@ -0,0 +1,111 @@ +From 926567d5533a56ec4b609d814c0bbaf234901ba3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jonas=20=C3=85dahl?= +Date: Thu, 17 Nov 2022 10:13:45 +0100 +Subject: [PATCH 1/2] Revert "clutter/actor: Avoid some stage view updates" + +This reverts commit 7e7a639cc5132cf3355e861235f325540fe56548. +--- + clutter/clutter/clutter-actor.c | 30 +++++++++++++++++++++++++++++- + 1 file changed, 29 insertions(+), 1 deletion(-) + +diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c +index 009488a069..4d1856ef77 100644 +--- a/clutter/clutter/clutter-actor.c ++++ b/clutter/clutter/clutter-actor.c +@@ -1484,6 +1484,22 @@ clutter_actor_update_map_state (ClutterActor *self, + #endif + } + ++static void ++queue_update_stage_views (ClutterActor *actor) ++{ ++ while (actor && !actor->priv->needs_update_stage_views) ++ { ++ actor->priv->needs_update_stage_views = TRUE; ++ ++ /* We don't really need to update the stage-views of the actors up the ++ * hierarchy, we set the flag anyway though so we can avoid traversing ++ * the whole scenegraph when looking for actors which need an update ++ * in clutter_actor_finish_layout(). ++ */ ++ actor = actor->priv->parent; ++ } ++} ++ + static void queue_update_paint_volume (ClutterActor *actor); + + static void +@@ -1528,6 +1544,18 @@ clutter_actor_real_map (ClutterActor *self) + + if (priv->unmapped_paint_branch_counter == 0) + { ++ /* We skip unmapped actors when updating the stage-views list, so if ++ * an actors list got invalidated while it was unmapped make sure to ++ * set priv->needs_update_stage_views to TRUE for all actors up the ++ * hierarchy now. ++ */ ++ if (priv->needs_update_stage_views) ++ { ++ /* Avoid the early return in queue_update_stage_views() */ ++ priv->needs_update_stage_views = FALSE; ++ queue_update_stage_views (self); ++ } ++ + /* Avoid the early return in clutter_actor_queue_relayout() */ + priv->needs_width_request = FALSE; + priv->needs_height_request = FALSE; +@@ -2479,7 +2507,7 @@ clutter_actor_notify_if_geometry_changed (ClutterActor *self, + static void + absolute_geometry_changed (ClutterActor *actor) + { +- actor->priv->needs_update_stage_views = TRUE; ++ queue_update_stage_views (actor); + } + + static ClutterActorTraverseVisitFlags +-- +2.38.1 + + +From c0f8a20fbd25d4efa1aae85505eb46ab987f9975 Mon Sep 17 00:00:00 2001 +From: John Wudrick +Date: Fri, 4 Nov 2022 02:35:12 +0000 +Subject: [PATCH 2/2] window: Update ongoing edge resistance flags with input + +Fix a recent regression where edge resistance flags where no +longer updated during the move/resize operation. + +Fixes: bd6b14a843 (window: Throttle window move grab updates) + +Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/2492 +Part-of: + + +(cherry picked from commit d889aad7cf76f786208c446ce195d4e26f9c0a8d) +--- + src/core/window.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/core/window.c b/src/core/window.c +index d376017166..3b35ee021e 100644 +--- a/src/core/window.c ++++ b/src/core/window.c +@@ -6021,6 +6021,7 @@ queue_update_move (MetaWindow *window, + MetaCompositor *compositor; + MetaLaters *laters; + ++ window->display->grab_last_edge_resistance_flags = flags; + window->display->grab_latest_motion_x = x; + window->display->grab_latest_motion_y = y; + +@@ -6166,6 +6167,7 @@ queue_update_resize (MetaWindow *window, + MetaCompositor *compositor; + MetaLaters *laters; + ++ window->display->grab_last_edge_resistance_flags = flags; + window->display->grab_latest_motion_x = x; + window->display->grab_latest_motion_y = y; + +-- +2.38.1 +