public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/mutter] rawhide: Update to 51.beta
@ 2026-08-03 8:53 Jan Grulich
0 siblings, 0 replies; only message in thread
From: Jan Grulich @ 2026-08-03 8:53 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/mutter
Branch : rawhide
Commit : 6e5e58c285d6b6cbec3fbd25d5f86eef8fe99a88
Author : Jan Grulich <jgrulich@redhat.com>
Date : 2026-08-03T10:21:03+02:00
Stats : +3/-289 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/mutter/c/6e5e58c285d6b6cbec3fbd25d5f86eef8fe99a88?branch=rawhide
Log:
Update to 51.beta
---
diff --git a/5143.patch b/5143.patch
deleted file mode 100644
index e20c547..0000000
--- a/5143.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 8abdae0b00b035cca8fb47d6ff9e3f411c2f0f20 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
-Date: Mon, 29 Jun 2026 15:59:14 +0200
-Subject: [PATCH] stream-source/virtual: Don't assume there is a cursor
- renderer
-
-There might not be one, depending on various circumstances, so add a
-check.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/5143>
----
- src/backends/meta-stream-source-virtual.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/src/backends/meta-stream-source-virtual.c b/src/backends/meta-stream-source-virtual.c
-index 9245561e563..a54f84269b3 100644
---- a/src/backends/meta-stream-source-virtual.c
-+++ b/src/backends/meta-stream-source-virtual.c
-@@ -577,11 +577,18 @@ meta_stream_source_virtual_set_cursor_metadata (MetaStreamSource *source,
- MetaStreamSourceVirtual *source_virtual =
- META_STREAM_SOURCE_VIRTUAL (source);
- MetaBackend *backend = backend_from_source (source);
-- MetaCursorRenderer *cursor_renderer =
-- meta_backend_get_cursor_renderer (backend);
-+ MetaCursorRenderer *cursor_renderer;
- ClutterCursor *cursor;
- int x, y;
-
-+ cursor_renderer = meta_backend_get_cursor_renderer (backend);
-+ if (!cursor_renderer)
-+ {
-+ source_virtual->last_cursor_matadata.set = FALSE;
-+ meta_stream_source_unset_cursor_metadata (source, spa_meta_cursor);
-+ return;
-+ }
-+
- cursor = meta_cursor_renderer_get_cursor (cursor_renderer);
-
- if (!should_cursor_metadata_be_set (source_virtual))
---
-GitLab
-
diff --git a/5153.patch b/5153.patch
deleted file mode 100644
index d08bedf..0000000
--- a/5153.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From def264ecf556784035ddc48c1ba67b2c327f8a79 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Wed, 1 Jul 2026 10:32:51 +0200
-Subject: [PATCH] backends/native: Ensure GPU data when asking for gbm_device
-
-If the native cursor renderer is created at a time that a MetaGpuKms got
-its MetaRendererNative's GPU data collected by free_unused_gpu_datas(), it
-will be asking for a gbm_device in order to figure out whether using the
-cursor plane is an option, but triggering a crash since the missing GPU data
-would cause a NULL pointer dereference.
-
-Since the cursor renderer is asking for a gbm_device, it makes sense to
-make the MetaRendererNative get out of its way to get one. Ensure to create
-GPU data for it, or sanely bail out if it could not be created on the spot.
-
-Closes: https://gitlab.gnome.org/GNOME/mutter/-/work_items/4890
-Fixes: de5ee29e94 ("backends/native: Initialize HW cursor support right away")
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/5153>
----
- src/backends/native/meta-renderer-native.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c
-index f11ae8bdb4b..6b5c8deefed 100644
---- a/src/backends/native/meta-renderer-native.c
-+++ b/src/backends/native/meta-renderer-native.c
-@@ -174,9 +174,18 @@ meta_gbm_device_from_gpu (MetaGpuKms *gpu_kms)
- MetaRendererNativeGpuData *renderer_gpu_data;
- MetaRenderDevice *render_device;
- MetaRenderDeviceGbm *render_device_gbm;
-+ g_autoptr (GError) error = NULL;
-+
-+ if (!meta_renderer_native_ensure_gpu_data (renderer_native, gpu_kms, &error))
-+ {
-+ g_warning ("meta_gbm_device_from_gpu: could not create gpu_data for gpu %s: %s",
-+ meta_gpu_kms_get_file_path (gpu_kms), error->message);
-+ return NULL;
-+ }
-
- renderer_gpu_data = meta_renderer_native_get_gpu_data (renderer_native,
- gpu_kms);
-+ g_assert (renderer_gpu_data);
- render_device = renderer_gpu_data->render_device;
-
- if (!META_IS_RENDER_DEVICE_GBM (render_device))
---
-GitLab
-
diff --git a/5169.patch b/5169.patch
deleted file mode 100644
index 828cc76..0000000
--- a/5169.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-From 547f1db2838dc09a189c645d6d679191562092e5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
-Date: Wed, 8 Jul 2026 15:01:36 +0200
-Subject: [PATCH] screen-cast-stream-source: Handle NULL cursor renderer
-
-meta_backend_get_cursor_renderer may return NULL now.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/5169>
----
- src/backends/meta-stream-source-area.c | 17 +++++++++++++----
- src/backends/meta-stream-source-monitor.c | 17 +++++++++++++----
- src/backends/meta-stream-source-virtual.c | 6 ++++--
- src/backends/meta-stream-source-window.c | 18 ++++++++++++++----
- 4 files changed, 44 insertions(+), 14 deletions(-)
-
-diff --git a/src/backends/meta-stream-source-area.c b/src/backends/meta-stream-source-area.c
-index f1bfc247712..79f06c84c85 100644
---- a/src/backends/meta-stream-source-area.c
-+++ b/src/backends/meta-stream-source-area.c
-@@ -109,12 +109,14 @@ is_cursor_in_stream (MetaStreamSourceArea *source_area)
- meta_backend_get_cursor_renderer (backend);
- MtkRectangle area;
- graphene_rect_t area_rect;
-- ClutterCursor *cursor;
-+ ClutterCursor *cursor = NULL;
-
- meta_stream_area_get_area (area_stream, &area);
- area_rect = mtk_rectangle_to_graphene_rect (&area);
-
-- cursor = meta_cursor_renderer_get_cursor (cursor_renderer);
-+ if (cursor_renderer)
-+ cursor = meta_cursor_renderer_get_cursor (cursor_renderer);
-+
- if (cursor)
- {
- graphene_rect_t cursor_rect;
-@@ -627,11 +629,18 @@ meta_stream_source_area_set_cursor_metadata (MetaStreamSource *source,
- MetaStream *stream = meta_stream_source_get_stream (source);
- MetaStreamArea *area_stream = META_STREAM_AREA (stream);
- MetaBackend *backend = get_backend (source_area);
-- MetaCursorRenderer *cursor_renderer =
-- meta_backend_get_cursor_renderer (backend);
-+ MetaCursorRenderer *cursor_renderer;
- ClutterCursor *cursor;
- int x, y;
-
-+ cursor_renderer = meta_backend_get_cursor_renderer (backend);
-+ if (!cursor_renderer)
-+ {
-+ source_area->last_cursor_matadata.set = FALSE;
-+ meta_stream_source_unset_cursor_metadata (source, spa_meta_cursor);
-+ return;
-+ }
-+
- cursor = meta_cursor_renderer_get_cursor (cursor_renderer);
-
- if (!should_cursor_metadata_be_set (source_area))
-diff --git a/src/backends/meta-stream-source-monitor.c b/src/backends/meta-stream-source-monitor.c
-index 0110932c884..5520a5efe77 100644
---- a/src/backends/meta-stream-source-monitor.c
-+++ b/src/backends/meta-stream-source-monitor.c
-@@ -241,7 +241,7 @@ is_cursor_in_stream (MetaStreamSourceMonitor *source_monitor)
- MetaLogicalMonitor *logical_monitor;
- MtkRectangle logical_monitor_layout;
- graphene_rect_t logical_monitor_rect;
-- ClutterCursor *cursor;
-+ ClutterCursor *cursor = NULL;
-
- monitor = get_monitor (source_monitor);
- logical_monitor = meta_monitor_get_logical_monitor (monitor);
-@@ -249,7 +249,9 @@ is_cursor_in_stream (MetaStreamSourceMonitor *source_monitor)
- logical_monitor_rect =
- mtk_rectangle_to_graphene_rect (&logical_monitor_layout);
-
-- cursor = meta_cursor_renderer_get_cursor (cursor_renderer);
-+ if (cursor_renderer)
-+ cursor = meta_cursor_renderer_get_cursor (cursor_renderer);
-+
- if (cursor)
- {
- graphene_rect_t cursor_rect;
-@@ -973,11 +975,18 @@ meta_stream_source_monitor_set_cursor_metadata (MetaStreamSource *source,
- {
- MetaStreamSourceMonitor *source_monitor = META_STREAM_SOURCE_MONITOR (source);
- MetaBackend *backend = get_backend (source_monitor);
-- MetaCursorRenderer *cursor_renderer =
-- meta_backend_get_cursor_renderer (backend);
-+ MetaCursorRenderer *cursor_renderer;
- ClutterCursor *cursor;
- int x, y;
-
-+ cursor_renderer = meta_backend_get_cursor_renderer (backend);
-+ if (!cursor_renderer)
-+ {
-+ source_monitor->last_cursor_matadata.set = FALSE;
-+ meta_stream_source_unset_cursor_metadata (source, spa_meta_cursor);
-+ return;
-+ }
-+
- cursor = meta_cursor_renderer_get_cursor (cursor_renderer);
-
- if (!should_cursor_metadata_be_set (source_monitor))
-diff --git a/src/backends/meta-stream-source-virtual.c b/src/backends/meta-stream-source-virtual.c
-index a54f84269b3..c6beb9c6d36 100644
---- a/src/backends/meta-stream-source-virtual.c
-+++ b/src/backends/meta-stream-source-virtual.c
-@@ -475,12 +475,14 @@ is_cursor_in_stream (MetaStreamSourceVirtual *source_virtual)
- ClutterStageView *stage_view = view_from_source (source);
- MtkRectangle view_layout;
- graphene_rect_t view_rect;
-- ClutterCursor *cursor;
-+ ClutterCursor *cursor = NULL;
-
- clutter_stage_view_get_layout (stage_view, &view_layout);
- view_rect = mtk_rectangle_to_graphene_rect (&view_layout);
-
-- cursor = meta_cursor_renderer_get_cursor (cursor_renderer);
-+ if (cursor_renderer)
-+ cursor = meta_cursor_renderer_get_cursor (cursor_renderer);
-+
- if (cursor)
- {
- graphene_rect_t cursor_rect;
-diff --git a/src/backends/meta-stream-source-window.c b/src/backends/meta-stream-source-window.c
-index 0d92f88d3f7..a223afecfc1 100644
---- a/src/backends/meta-stream-source-window.c
-+++ b/src/backends/meta-stream-source-window.c
-@@ -139,6 +139,9 @@ maybe_draw_cursor_sprite (MetaStreamSourceWindow *source_window,
- int hotspot_x, hotspot_y;
- cairo_t *cr;
-
-+ if (!cursor_renderer)
-+ return;
-+
- cursor = meta_cursor_renderer_get_cursor (cursor_renderer);
- if (!cursor)
- return;
-@@ -261,6 +264,9 @@ maybe_blit_cursor_sprite (MetaStreamSourceWindow *source_window,
- int hotspot_x, hotspot_y;
- float x, y;
-
-+ if (!cursor_renderer)
-+ return;
-+
- cursor = meta_cursor_renderer_get_cursor (cursor_renderer);
- if (!cursor)
- return;
-@@ -702,11 +708,13 @@ meta_stream_source_window_is_cursor_metadata_valid (MetaStreamSource *source)
- meta_backend_get_cursor_renderer (backend);
- MetaCursorTracker *cursor_tracker =
- meta_backend_get_cursor_tracker (backend);
-- ClutterCursor *cursor;
-+ ClutterCursor *cursor = NULL;
- graphene_point_t cursor_position;
- graphene_point_t relative_cursor_position;
-
-- cursor = meta_cursor_renderer_get_cursor (cursor_renderer);
-+ if (cursor_renderer)
-+ cursor = meta_cursor_renderer_get_cursor (cursor_renderer);
-+
- meta_cursor_tracker_get_pointer (cursor_tracker, &cursor_position, NULL);
-
- if (meta_cursor_tracker_get_pointer_visible (cursor_tracker) &&
-@@ -748,13 +756,15 @@ meta_stream_source_window_set_cursor_metadata (MetaStreamSource *source,
- MetaCursorTracker *cursor_tracker =
- meta_backend_get_cursor_tracker (backend);
- MetaScreenCastWindow *screen_cast_window = source_window->screen_cast_window;
-- ClutterCursor *cursor;
-+ ClutterCursor *cursor = NULL;
- graphene_point_t cursor_position;
- float view_scale;
- graphene_point_t relative_cursor_position;
- int x, y;
-
-- cursor = meta_cursor_renderer_get_cursor (cursor_renderer);
-+ if (cursor_renderer)
-+ cursor = meta_cursor_renderer_get_cursor (cursor_renderer);
-+
- meta_cursor_tracker_get_pointer (cursor_tracker, &cursor_position, NULL);
-
- if (!meta_cursor_tracker_get_pointer_visible (cursor_tracker) ||
---
-GitLab
-
diff --git a/mutter.spec b/mutter.spec
index 8bb233c..98b28a4 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -16,7 +16,7 @@
%global mutter_api_version 51
Name: mutter
-Version: 51~alpha
+Version: 51~beta
Release: %autorelease
Summary: Window and compositing manager based on Clutter
@@ -25,19 +25,6 @@ License: GPL-2.0-or-later
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/%{name}/%{gnome_major_version}/%{name}-%{gnome_tarball_version}.tar.xz
-# Fix crashes in gnome-remote-desktop
-# https://gitlab.gnome.org/GNOME/mutter/-/work_items/4907
-# Two separate fixes are needed
-# https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/5143
-Patch: 5143.patch
-# Fix crashes on hybrid graphics systems
-# https://bugzilla.redhat.com/show_bug.cgi?id=2498847
-# https://gitlab.gnome.org/GNOME/mutter/-/issues/4890
-# https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/5153
-Patch: 5153.patch
-# https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/5169
-Patch: 5169.patch
-
%gnome_check_version
BuildRequires: cvt
@@ -201,6 +188,7 @@ Viewer for nested mutter instances.
%files common
%{_datadir}/GConf/gsettings/mutter-schemas.convert
%{_datadir}/glib-2.0/schemas/org.gnome.mutter.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.mutter.experimental.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.mutter.wayland.gschema.xml
%{_datadir}/gnome-control-center/keybindings/50-mutter-*.xml
%{_udevrulesdir}/61-mutter.rules
diff --git a/sources b/sources
index 46e2c29..c5c031a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mutter-51.alpha.tar.xz) = b0438a08b47778fd45dcfbcd160cdf18efa06e7853c0f7e7a2fdcc80c1021cd9f182389c0fc065bb2aa013d43b57a100469dd0d76c335a32a3ee0a0a9021299d
+SHA512 (mutter-51.beta.tar.xz) = dea4ad2de6ae83f7488f5330281c26c4e4cd2439f34700546b3ca44729a8762275b94260b6cc72e02990231b9b1afb00d58df5def9734426a01cd33aed4bde8a
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-03 8:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-03 8:53 [rpms/mutter] rawhide: Update to 51.beta Jan Grulich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox