public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/mutter] f44: Update to 50.4
@ 2026-08-05 8:15 Jan Grulich
0 siblings, 0 replies; only message in thread
From: Jan Grulich @ 2026-08-05 8:15 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/mutter
Branch : f44
Commit : 2f38d934eaf2c2ab5771567de30a8f36cc0f5532
Author : Jan Grulich <jgrulich@redhat.com>
Date : 2026-08-05T10:15:23+02:00
Stats : +2/-239 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/mutter/c/2f38d934eaf2c2ab5771567de30a8f36cc0f5532?branch=f44
Log:
Update to 50.4
---
diff --git a/0001-kms_impl-device__Handle-NULL-crtc_frames-in-_discard_pending_page_flips.patch b/0001-kms_impl-device__Handle-NULL-crtc_frames-in-_discard_pending_page_flips.patch
deleted file mode 100644
index 1d8e29e..0000000
--- a/0001-kms_impl-device__Handle-NULL-crtc_frames-in-_discard_pending_page_flips.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5d187100e2e146511cc19269d2f1c650cc3125ab Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
-Date: Mon, 6 Jul 2026 16:44:29 +0200
-Subject: [PATCH] kms/impl-device: Handle NULL crtc_frames in
- _discard_pending_page_flips
-
-Closes: https://gitlab.gnome.org/GNOME/mutter/-/work_items/4848
-Fixes: 14b3d57b7d92 ("kms-impl-device: Discard pending update when discarding pending flips")
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/5163>
----
- src/backends/native/meta-kms-impl-device.c | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/src/backends/native/meta-kms-impl-device.c b/src/backends/native/meta-kms-impl-device.c
-index 835bbc25e46..3f28fd4d3ae 100644
---- a/src/backends/native/meta-kms-impl-device.c
-+++ b/src/backends/native/meta-kms-impl-device.c
-@@ -2457,12 +2457,16 @@ meta_kms_impl_device_discard_pending_page_flips (MetaKmsImplDevice *impl_device)
- MetaKmsImplDeviceClass *klass = META_KMS_IMPL_DEVICE_GET_CLASS (impl_device);
- MetaKmsImplDevicePrivate *priv =
- meta_kms_impl_device_get_instance_private (impl_device);
-- GHashTableIter iter;
-- CrtcFrame *crtc_frame;
-
-- g_hash_table_iter_init (&iter, priv->crtc_frames);
-- while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &crtc_frame))
-- discard_update (impl_device, &crtc_frame->pending_update);
-+ if (priv->crtc_frames)
-+ {
-+ GHashTableIter iter;
-+ CrtcFrame *crtc_frame;
-+
-+ g_hash_table_iter_init (&iter, priv->crtc_frames);
-+ while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &crtc_frame))
-+ discard_update (impl_device, &crtc_frame->pending_update);
-+ }
-
- klass->discard_pending_page_flips (impl_device);
- }
---
-GitLab
-
diff --git a/0001-screen-cast-stream-source-Handle-NULL-cursor-rendere.patch b/0001-screen-cast-stream-source-Handle-NULL-cursor-rendere.patch
deleted file mode 100644
index 3bffd95..0000000
--- a/0001-screen-cast-stream-source-Handle-NULL-cursor-rendere.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-From 32c0b43605b37c32a89b29758f9a2a4d2bd7dce7 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
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-meta_backend_get_cursor_renderer may return NULL now.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/5169>
-
-(cherry picked from commit 547f1db2838dc09a189c645d6d679191562092e5)
----
- .../meta-screen-cast-area-stream-src.c | 18 ++++++++++++++----
- .../meta-screen-cast-monitor-stream-src.c | 18 ++++++++++++++----
- .../meta-screen-cast-virtual-stream-src.c | 6 ++++--
- .../meta-screen-cast-window-stream-src.c | 18 ++++++++++++++----
- 4 files changed, 46 insertions(+), 14 deletions(-)
-
-diff --git a/src/backends/meta-screen-cast-area-stream-src.c b/src/backends/meta-screen-cast-area-stream-src.c
-index 5502251c2c..ca6ceebcdb 100644
---- a/src/backends/meta-screen-cast-area-stream-src.c
-+++ b/src/backends/meta-screen-cast-area-stream-src.c
-@@ -121,12 +121,14 @@ is_cursor_in_stream (MetaScreenCastAreaStreamSrc *area_src)
- meta_backend_get_cursor_renderer (backend);
- MtkRectangle *area;
- graphene_rect_t area_rect;
-- ClutterCursor *cursor;
-+ ClutterCursor *cursor = NULL;
-
- area = meta_screen_cast_area_stream_get_area (area_stream);
- 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;
-@@ -650,11 +652,19 @@ meta_screen_cast_area_stream_src_set_cursor_metadata (MetaScreenCastStreamSrc *s
- MetaScreenCastStream *stream = meta_screen_cast_stream_src_get_stream (src);
- MetaScreenCastAreaStream *area_stream = META_SCREEN_CAST_AREA_STREAM (stream);
- MetaBackend *backend = get_backend (area_src);
-- 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)
-+ {
-+ area_src->last_cursor_matadata.set = FALSE;
-+ meta_screen_cast_stream_src_unset_cursor_metadata (src,
-+ spa_meta_cursor);
-+ return;
-+ }
-+
- cursor = meta_cursor_renderer_get_cursor (cursor_renderer);
-
- if (!should_cursor_metadata_be_set (area_src))
-diff --git a/src/backends/meta-screen-cast-monitor-stream-src.c b/src/backends/meta-screen-cast-monitor-stream-src.c
-index eea0fd1ecb..a92a3003b6 100644
---- a/src/backends/meta-screen-cast-monitor-stream-src.c
-+++ b/src/backends/meta-screen-cast-monitor-stream-src.c
-@@ -259,7 +259,7 @@ is_cursor_in_stream (MetaScreenCastMonitorStreamSrc *monitor_src)
- MetaLogicalMonitor *logical_monitor;
- MtkRectangle logical_monitor_layout;
- graphene_rect_t logical_monitor_rect;
-- ClutterCursor *cursor;
-+ ClutterCursor *cursor = NULL;
-
- monitor = get_monitor (monitor_src);
- logical_monitor = meta_monitor_get_logical_monitor (monitor);
-@@ -267,7 +267,9 @@ is_cursor_in_stream (MetaScreenCastMonitorStreamSrc *monitor_src)
- 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;
-@@ -987,11 +989,19 @@ meta_screen_cast_monitor_stream_src_set_cursor_metadata (MetaScreenCastStreamSrc
- MetaScreenCastMonitorStreamSrc *monitor_src =
- META_SCREEN_CAST_MONITOR_STREAM_SRC (src);
- MetaBackend *backend = get_backend (monitor_src);
-- 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)
-+ {
-+ monitor_src->last_cursor_matadata.set = FALSE;
-+ meta_screen_cast_stream_src_unset_cursor_metadata (src,
-+ spa_meta_cursor);
-+ return;
-+ }
-+
- cursor = meta_cursor_renderer_get_cursor (cursor_renderer);
-
- if (!should_cursor_metadata_be_set (monitor_src))
-diff --git a/src/backends/meta-screen-cast-virtual-stream-src.c b/src/backends/meta-screen-cast-virtual-stream-src.c
-index d5821919d8..24757eb63a 100644
---- a/src/backends/meta-screen-cast-virtual-stream-src.c
-+++ b/src/backends/meta-screen-cast-virtual-stream-src.c
-@@ -513,12 +513,14 @@ is_cursor_in_stream (MetaScreenCastVirtualStreamSrc *virtual_src)
- ClutterStageView *stage_view = view_from_src (src);
- 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-screen-cast-window-stream-src.c b/src/backends/meta-screen-cast-window-stream-src.c
-index ff5aee97e5..e5b46208bc 100644
---- a/src/backends/meta-screen-cast-window-stream-src.c
-+++ b/src/backends/meta-screen-cast-window-stream-src.c
-@@ -144,6 +144,9 @@ maybe_draw_cursor_sprite (MetaScreenCastWindowStreamSrc *window_src,
- int hotspot_x, hotspot_y;
- cairo_t *cr;
-
-+ if (!cursor_renderer)
-+ return;
-+
- cursor = meta_cursor_renderer_get_cursor (cursor_renderer);
- if (!cursor)
- return;
-@@ -267,6 +270,9 @@ maybe_blit_cursor_sprite (MetaScreenCastWindowStreamSrc *window_src,
- int hotspot_x, hotspot_y;
- float x, y;
-
-+ if (!cursor_renderer)
-+ return;
-+
- cursor = meta_cursor_renderer_get_cursor (cursor_renderer);
- if (!cursor)
- return;
-@@ -707,11 +713,13 @@ meta_screen_cast_window_stream_src_is_cursor_metadata_valid (MetaScreenCastStrea
- 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) &&
-@@ -753,13 +761,15 @@ meta_screen_cast_window_stream_src_set_cursor_metadata (MetaScreenCastStreamSrc
- MetaCursorTracker *cursor_tracker =
- meta_backend_get_cursor_tracker (backend);
- MetaScreenCastWindow *screen_cast_window = window_src->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) ||
---
-2.55.0
-
diff --git a/mutter.spec b/mutter.spec
index 387eda3..302d160 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -18,7 +18,7 @@
%global tarball_version %%(echo %{version} | tr '~' '.')
Name: mutter
-Version: 50.3
+Version: 50.4
Release: %autorelease
Summary: Window and compositing manager based on Clutter
@@ -27,10 +27,6 @@ License: GPL-2.0-or-later
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/%{name}/%{major_version}/%{name}-%{tarball_version}.tar.xz
-Patch: 0001-kms_impl-device__Handle-NULL-crtc_frames-in-_discard_pending_page_flips.patch
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=2501681
-Patch: 0001-screen-cast-stream-source-Handle-NULL-cursor-rendere.patch
BuildRequires: cvt
BuildRequires: desktop-file-utils
diff --git a/sources b/sources
index 00eae5a..9b19a47 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mutter-50.3.tar.xz) = 2f72de466a21437b3b7d6823503746623072b569c7f2ef31121c4ee73621ccb628d562dba91f79553b88ff7663d28c13ede7595b9f40c5ca4241028df2ee240b
+SHA512 (mutter-50.4.tar.xz) = 88c9e5c2e87ca837819f980ededd2834c130dd0a2f31e46dd1561d04138dcafdd63ba72b409e609f7eba80a56b863edbef5647755934ca9deb87670f4a736430
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-05 8:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-05 8:15 [rpms/mutter] f44: Update to 50.4 Jan Grulich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox