Upgrade to 47.4

Resolves: RHEL-74562

.gitignore

@@ -225,3 +225,4 @@ mutter-2.31.5.tar.bz2
 /mutter-47.beta.tar.xz
 /mutter-47.rc.tar.xz
 /mutter-47.0.tar.xz
+/mutter-47.4.tar.xz

0001-cogl-egl-Choose-config-only-if-needed.patch

@@ -1,89 +0,0 @@
-From 3a858da28e0517a862e40ea992f8bb0f2988dc33 Mon Sep 17 00:00:00 2001
-From: Jocelyn Falempe <jfalempe@redhat.com>
-Date: Fri, 18 Oct 2024 17:19:14 +0200
-Subject: [PATCH 1/2] cogl/egl: Choose config only if needed
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In try_create_context(), if COGL_EGL_WINSYS_FEATURE_NO_CONFIG_CONTEXT
-is set, don't try to choose an egl config.
-
-Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
-Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4088>
-(cherry picked from commit 18085b0e402ba5a7fe9c6a06a8cbb0bfcaabebf7)
----
- cogl/cogl/winsys/cogl-winsys-egl-private.h |  2 ++
- cogl/cogl/winsys/cogl-winsys-egl-x11.c     |  1 +
- cogl/cogl/winsys/cogl-winsys-egl.c         | 27 +++++++++++++---------
- 3 files changed, 19 insertions(+), 11 deletions(-)
-
-diff --git a/cogl/cogl/winsys/cogl-winsys-egl-private.h b/cogl/cogl/winsys/cogl-winsys-egl-private.h
-index 6a31d1ab2d..30821cc22f 100644
---- a/cogl/cogl/winsys/cogl-winsys-egl-private.h
-+++ b/cogl/cogl/winsys/cogl-winsys-egl-private.h
-@@ -120,6 +120,8 @@ typedef struct _CoglRendererEGL
-   /* vtable for platform specific parts */
-   const CoglWinsysEGLVtable *platform_vtable;
- 
-+  gboolean needs_config;
-+
-   /* Sync for latest submitted work */
-   EGLSyncKHR sync;
- 
-diff --git a/cogl/cogl/winsys/cogl-winsys-egl-x11.c b/cogl/cogl/winsys/cogl-winsys-egl-x11.c
-index 7393f79f6a..d61e82f4de 100644
---- a/cogl/cogl/winsys/cogl-winsys-egl-x11.c
-+++ b/cogl/cogl/winsys/cogl-winsys-egl-x11.c
-@@ -244,6 +244,7 @@ _cogl_winsys_renderer_connect (CoglRenderer *renderer,
- 
-   egl_renderer->platform_vtable = &_cogl_winsys_egl_vtable;
-   egl_renderer->sync = EGL_NO_SYNC_KHR;
-+  egl_renderer->needs_config = TRUE;
- 
-   if (!_cogl_xlib_renderer_connect (renderer, error))
-     goto error;
-diff --git a/cogl/cogl/winsys/cogl-winsys-egl.c b/cogl/cogl/winsys/cogl-winsys-egl.c
-index b37ba15316..54a402aee2 100644
---- a/cogl/cogl/winsys/cogl-winsys-egl.c
-+++ b/cogl/cogl/winsys/cogl-winsys-egl.c
-@@ -329,19 +329,24 @@ try_create_context (CoglDisplay *display,
- 
-   edpy = egl_renderer->edpy;
- 
--  if (!egl_renderer->platform_vtable->choose_config (display,
--                                                     cfg_attribs,
--                                                     &config,
--                                                     &config_error))
-+  if (!(egl_renderer->private_features &
-+        COGL_EGL_WINSYS_FEATURE_NO_CONFIG_CONTEXT) ||
-+      egl_renderer->needs_config)
-     {
--      g_set_error (error, COGL_WINSYS_ERROR,
--                   COGL_WINSYS_ERROR_CREATE_CONTEXT,
--                   "Couldn't choose config: %s", config_error->message);
--      g_error_free (config_error);
--      goto err;
--    }
-+      if (!egl_renderer->platform_vtable->choose_config (display,
-+                                                         cfg_attribs,
-+                                                         &config,
-+                                                         &config_error))
-+        {
-+          g_set_error (error, COGL_WINSYS_ERROR,
-+                       COGL_WINSYS_ERROR_CREATE_CONTEXT,
-+                       "Couldn't choose config: %s", config_error->message);
-+          g_error_free (config_error);
-+          goto err;
-+        }
- 
--  egl_display->egl_config = config;
-+      egl_display->egl_config = config;
-+    }
- 
-   if (display->renderer->driver == COGL_DRIVER_GL3)
-     {
--- 
-2.44.0.501.g19981daefd.dirty
-

0002-renderer-native-Add-BGRX8888-format-to-the-default-l.patch

@@ -1,37 +0,0 @@
-From e5c80f620e11e401efc8deddc09b86e4b227320e Mon Sep 17 00:00:00 2001
-From: Jocelyn Falempe <jfalempe@redhat.com>
-Date: Tue, 15 Oct 2024 14:38:55 +0200
-Subject: [PATCH 2/2] renderer/native: Add BGRX8888 format to the default list
-
-On big endian machine, the native 32bits format is
-DRM_FORMAT_BGRX8888, so add this format to the list.
-
-Tested on a s390x VM, using virtio-gpu driver.
-
-Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4088>
-(cherry picked from commit e44620c86e76f7150d756609341b97617af50258)
----
- src/backends/native/meta-onscreen-native.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/backends/native/meta-onscreen-native.c b/src/backends/native/meta-onscreen-native.c
-index 8a25fca8cc..18c18f7225 100644
---- a/src/backends/native/meta-onscreen-native.c
-+++ b/src/backends/native/meta-onscreen-native.c
-@@ -2088,6 +2088,12 @@ choose_onscreen_egl_config (CoglOnscreen  *onscreen,
-     GBM_FORMAT_ABGR2101010,
-     GBM_FORMAT_RGBA1010102,
-     GBM_FORMAT_BGRA1010102,
-+    GBM_FORMAT_XBGR8888,
-+    GBM_FORMAT_ABGR8888,
-+    GBM_FORMAT_RGBX8888,
-+    GBM_FORMAT_RGBA8888,
-+    GBM_FORMAT_BGRX8888,
-+    GBM_FORMAT_BGRA8888,
-     GBM_FORMAT_XRGB8888,
-     GBM_FORMAT_ARGB8888,
-   };
--- 
-2.44.0.501.g19981daefd.dirty
-

mutter.spec

@@ -12,7 +12,7 @@
 %global tarball_version %%(echo %{version} | tr '~' '.')
 
 Name:          mutter
-Version:       47.0
+Version:       47.4
 Release:       %autorelease
 Summary:       Window and compositing manager based on Clutter
 
@@ -40,10 +40,6 @@ Patch:         0003-Revert-x11-window-Use-correct-bounding-rect-to-deter.patch
 # Revert deprecation fix to avoid newer glib requirement
 Patch:         0001-Revert-Replace-deprecated-g_qsort_with_data-with-g_s.patch
 
-# RHEL-45898
-Patch:         0001-cogl-egl-Choose-config-only-if-needed.patch
-Patch:         0002-renderer-native-Add-BGRX8888-format-to-the-default-l.patch
-
 BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.41.0
 BuildRequires: pkgconfig(sm)
 BuildRequires: pkgconfig(libwacom)

sources

@@ -1 +1 @@
-SHA512 (mutter-47.0.tar.xz) = 4e9690f2ead28d3fdf5eacd52750190286ab46dbb0b37b771afa01b65da14b15582bd8a1acd32acaa3b3b03135ff2ff51ec015ed30637a37f3df7879453bcf26
+SHA512 (mutter-47.4.tar.xz) = f1d3c16830a5fd8225f62d37f583931d582ed1d09631b1d44321a162c14b4d99b2487f322a4c95954b154cdc205b0d20d5d12663f89675baff211e49067ef1ee