rpms
/
mutter
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 40.8 

Resolves: #2040043
This commit is contained in:
Florian Müllner 2022-01-13 12:57:59 +01:00
parent da75cd39c1
commit 36c70f9f85
4 changed files with 58 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -189,3 +189,4 @@ mutter-2.31.5.tar.bz2
/mutter-40.4.tar.xz
/mutter-40.6.tar.xz
/mutter-40.7.tar.xz
/mutter-40.8.tar.xz

6
mutter.spec
View File

@ -9,7 +9,7 @@
%global tarball_version %%(echo %{version} | tr '~' '.')
Name: mutter
Version: 40.7
Version: 40.8
Release: 1%{?dist}
Summary: Window and compositing manager based on Clutter
@ -204,6 +204,10 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
%{_datadir}/mutter-%{mutter_api_version}/tests
%changelog
* Thu Jan 13 2022 Florian Müllner <fmuellner@redhat.com> - 40.8-1
- Update to 40.8
Resolves: #2040043
* Mon Dec 13 2021 Florian Müllner <fmuellner@redhat.com> - 40.7-1
- Update to 40.7
Resolves: #2031662

2
sources
View File

@ -1 +1 @@
SHA512 (mutter-40.7.tar.xz) = 35856f733c146d6eaa1a77816688a970ba3def76309b26c0d973f20ccecb70aaa12ea15fb305b94dadc20d7fceb6318929530ec2271150364e5c63e430753be7
SHA512 (mutter-40.8.tar.xz) = c2535158b60a6646cfbb61b97fbb986fd27aac53b2244137dcccdd0054ae4ede06ce620cdc9f1d7401e6dbedbf1568b8721237aca1d0e482842e1e48d6363c89

102
x11-monitor-configuration-patches.patch
View File

@ -1,4 +1,4 @@
From 9c7c46384ec5e64fbfad84366c93ece52aabd26a Mon Sep 17 00:00:00 2001
From 22c48221a3117a7a8ac5b983767d8de5ec5fd599 Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Tue, 6 Oct 2015 21:16:18 +0200
Subject: [PATCH 1/9] monitor-manager-xrandr: Work around spurious hotplugs on
@ -14,7 +14,7 @@ hotplug.
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/src/backends/x11/meta-monitor-manager-xrandr.c b/src/backends/x11/meta-monitor-manager-xrandr.c
index 489a9b4241..1ddc2a7870 100644
index 489a9b424..1ddc2a787 100644
--- a/src/backends/x11/meta-monitor-manager-xrandr.c
+++ b/src/backends/x11/meta-monitor-manager-xrandr.c
@@ -1100,6 +1100,20 @@ meta_monitor_manager_xrandr_class_init (MetaMonitorManagerXrandrClass *klass)
@ -60,10 +60,10 @@ index 489a9b4241..1ddc2a7870 100644
manager_xrandr->last_xrandr_set_timestamp);
if (is_hotplug)
--
2.31.1
2.33.1
From 17d9494cc08e833a6e896daa4f85a15b81df1554 Mon Sep 17 00:00:00 2001
From 1092dfec7b096e6ad3208dba362623faf26c564c Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Mon, 4 Jun 2018 16:35:04 -0400
Subject: [PATCH 2/9] monitor-manager-xrandr: Force an update when resuming
@ -80,7 +80,7 @@ laptop on a dock, meaning that we'd miss newly attached outputs.
4 files changed, 125 insertions(+), 10 deletions(-)
diff --git a/src/backends/meta-gpu.c b/src/backends/meta-gpu.c
index ce4353bf01..6b3086e747 100644
index ce4353bf0..6b3086e74 100644
--- a/src/backends/meta-gpu.c
+++ b/src/backends/meta-gpu.c
@@ -66,6 +66,13 @@ meta_gpu_has_hotplug_mode_update (MetaGpu *gpu)
@ -98,7 +98,7 @@ index ce4353bf01..6b3086e747 100644
meta_gpu_read_current (MetaGpu *gpu,
GError **error)
diff --git a/src/backends/meta-gpu.h b/src/backends/meta-gpu.h
index 9d12f95a72..37b76bd0fa 100644
index 9d12f95a7..37b76bd0f 100644
--- a/src/backends/meta-gpu.h
+++ b/src/backends/meta-gpu.h
@@ -36,8 +36,12 @@ struct _MetaGpuClass
@ -115,7 +115,7 @@ index 9d12f95a72..37b76bd0fa 100644
gboolean meta_gpu_read_current (MetaGpu *gpu,
GError **error);
diff --git a/src/backends/x11/meta-gpu-xrandr.c b/src/backends/x11/meta-gpu-xrandr.c
index bc3292d368..6a96e53979 100644
index 6c84be6ce..573df7a90 100644
--- a/src/backends/x11/meta-gpu-xrandr.c
+++ b/src/backends/x11/meta-gpu-xrandr.c
@@ -46,6 +46,8 @@ struct _MetaGpuXrandr
@ -127,8 +127,8 @@ index bc3292d368..6a96e53979 100644
};
G_DEFINE_TYPE (MetaGpuXrandr, meta_gpu_xrandr, META_TYPE_GPU)
@@ -86,6 +88,14 @@ get_xmode_name (XRRModeInfo *xmode)
return g_strdup_printf ("%dx%d", width, height);
@@ -104,6 +106,14 @@ calculate_xrandr_refresh_rate (XRRModeInfo *xmode)
return xmode->dotClock / (h_total * v_total);
}
+static void
@ -142,7 +142,7 @@ index bc3292d368..6a96e53979 100644
static gboolean
meta_gpu_xrandr_read_current (MetaGpu *gpu,
GError **error)
@@ -123,8 +133,18 @@ meta_gpu_xrandr_read_current (MetaGpu *gpu,
@@ -141,8 +151,18 @@ meta_gpu_xrandr_read_current (MetaGpu *gpu,
monitor_manager->screen_width = WidthOfScreen (screen);
monitor_manager->screen_height = HeightOfScreen (screen);
@ -163,7 +163,7 @@ index bc3292d368..6a96e53979 100644
if (!resources)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
@@ -263,6 +283,7 @@ meta_gpu_xrandr_finalize (GObject *object)
@@ -280,6 +300,7 @@ meta_gpu_xrandr_finalize (GObject *object)
static void
meta_gpu_xrandr_init (MetaGpuXrandr *gpu_xrandr)
{
@ -171,14 +171,14 @@ index bc3292d368..6a96e53979 100644
}
static void
@@ -274,4 +295,5 @@ meta_gpu_xrandr_class_init (MetaGpuXrandrClass *klass)
@@ -291,4 +312,5 @@ meta_gpu_xrandr_class_init (MetaGpuXrandrClass *klass)
object_class->finalize = meta_gpu_xrandr_finalize;
gpu_class->read_current = meta_gpu_xrandr_read_current;
+ gpu_class->poll_hardware = meta_gpu_xrandr_poll_hardware;
}
diff --git a/src/backends/x11/meta-monitor-manager-xrandr.c b/src/backends/x11/meta-monitor-manager-xrandr.c
index 1ddc2a7870..61e13f459d 100644
index 1ddc2a787..61e13f459 100644
--- a/src/backends/x11/meta-monitor-manager-xrandr.c
+++ b/src/backends/x11/meta-monitor-manager-xrandr.c
@@ -72,6 +72,10 @@ struct _MetaMonitorManagerXrandr
@ -335,10 +335,10 @@ index 1ddc2a7870..61e13f459d 100644
return TRUE;
}
--
2.31.1
2.33.1
From 7a04949b978ebe96cd088d7bd255fd3f52c7c355 Mon Sep 17 00:00:00 2001
From a4e09fe21fc77188c99fb41650eb18c171e39f36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Mon, 24 Feb 2020 16:09:59 +0100
Subject: [PATCH 3/9] Revert "MetaMonitorManager: ignore hotplug_mode_update at
@ -350,7 +350,7 @@ This reverts commit 183f4b0c13f3dc9565bf5f693f2e5d61ca0199c9.
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
index a75da9329e..c291ddb5d3 100644
index a75da9329..c291ddb5d 100644
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
@@ -609,8 +609,7 @@ meta_monitor_manager_has_hotplug_mode_update (MetaMonitorManager *manager)
@ -364,10 +364,10 @@ index a75da9329e..c291ddb5d3 100644
MetaMonitorsConfig *
--
2.31.1
2.33.1
From babcf2a6d09136bcf1bf2dc958046aaa0334b85e Mon Sep 17 00:00:00 2001
From 2dbf32b591c004fc996ff16d0b6622659185f2b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Thu, 28 Jan 2016 15:26:33 +0100
Subject: [PATCH 4/9] monitor-manager: Consider external layout before default
@ -386,7 +386,7 @@ back to the default linear config.
3 files changed, 107 insertions(+)
diff --git a/src/backends/meta-monitor-config-manager.c b/src/backends/meta-monitor-config-manager.c
index 0253e072ff..2f6cc3856f 100644
index 0253e072f..2f6cc3856 100644
--- a/src/backends/meta-monitor-config-manager.c
+++ b/src/backends/meta-monitor-config-manager.c
@@ -739,6 +739,92 @@ create_preferred_logical_monitor_config (MetaMonitorManager *monitor_ma
@ -483,7 +483,7 @@ index 0253e072ff..2f6cc3856f 100644
meta_monitor_config_manager_create_linear (MetaMonitorConfigManager *config_manager)
{
diff --git a/src/backends/meta-monitor-config-manager.h b/src/backends/meta-monitor-config-manager.h
index 86756a7e33..961d604bd5 100644
index 86756a7e3..961d604bd 100644
--- a/src/backends/meta-monitor-config-manager.h
+++ b/src/backends/meta-monitor-config-manager.h
@@ -94,6 +94,8 @@ gboolean meta_monitor_config_manager_assign (MetaMonitorManager *manager,
@ -496,7 +496,7 @@ index 86756a7e33..961d604bd5 100644
MetaMonitorsConfig * meta_monitor_config_manager_create_linear (MetaMonitorConfigManager *config_manager);
diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
index c291ddb5d3..96f0d6b84a 100644
index c291ddb5d..96f0d6b84 100644
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
@@ -695,6 +695,25 @@ meta_monitor_manager_ensure_configured (MetaMonitorManager *manager)
@ -526,10 +526,10 @@ index c291ddb5d3..96f0d6b84a 100644
if (config)
{
--
2.31.1
2.33.1
From ada8c9b1346fe261a8fa04f68149c79d95c969ac Mon Sep 17 00:00:00 2001
From 7a55398c0d108921af8d4fecdf9034ca94ef783c Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Tue, 11 Sep 2018 10:19:44 -0400
Subject: [PATCH 5/9] monitor-manager: only reuse initial-config if monitor
@ -553,7 +553,7 @@ the start up topology.
3 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/src/backends/meta-monitor-config-manager.c b/src/backends/meta-monitor-config-manager.c
index 2f6cc3856f..46249755bc 100644
index 2f6cc3856..46249755b 100644
--- a/src/backends/meta-monitor-config-manager.c
+++ b/src/backends/meta-monitor-config-manager.c
@@ -42,6 +42,7 @@ struct _MetaMonitorConfigManager
@ -614,7 +614,7 @@ index 2f6cc3856f..46249755bc 100644
G_OBJECT_CLASS (meta_monitor_config_manager_parent_class)->dispose (object);
diff --git a/src/backends/meta-monitor-config-manager.h b/src/backends/meta-monitor-config-manager.h
index 961d604bd5..dc273c961b 100644
index 961d604bd..dc273c961 100644
--- a/src/backends/meta-monitor-config-manager.h
+++ b/src/backends/meta-monitor-config-manager.h
@@ -95,7 +95,7 @@ META_EXPORT_TEST
@ -627,7 +627,7 @@ index 961d604bd5..dc273c961b 100644
MetaMonitorsConfig * meta_monitor_config_manager_create_linear (MetaMonitorConfigManager *config_manager);
diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
index 96f0d6b84a..baf5bf2f9f 100644
index 96f0d6b84..baf5bf2f9 100644
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
@@ -615,9 +615,11 @@ should_use_stored_config (MetaMonitorManager *manager)
@ -671,10 +671,10 @@ index 96f0d6b84a..baf5bf2f9f 100644
{
if (!meta_monitor_manager_apply_monitors_config (manager,
--
2.31.1
2.33.1
From baa22f3ac77f549bd36c2a0ea45ba4caee434ddc Mon Sep 17 00:00:00 2001
From 26ef9d3b2f407ec87388789b04f553d13289e6e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Mon, 18 Mar 2019 17:08:11 +0100
Subject: [PATCH 6/9] monitor-config-manager: Use current mode when deriving
@ -688,7 +688,7 @@ position of the monitor in the screen coordinate space.
1 file changed, 46 insertions(+), 34 deletions(-)
diff --git a/src/backends/meta-monitor-config-manager.c b/src/backends/meta-monitor-config-manager.c
index 46249755bc..f355879c3e 100644
index 46249755b..f355879c3 100644
--- a/src/backends/meta-monitor-config-manager.c
+++ b/src/backends/meta-monitor-config-manager.c
@@ -678,21 +678,20 @@ get_monitor_transform (MetaMonitorManager *monitor_manager,
@ -810,10 +810,10 @@ index 46249755bc..f355879c3e 100644
continue;
--
2.31.1
2.33.1
From 52622c80f747a03738823471be9d275c7a2fd8c0 Mon Sep 17 00:00:00 2001
From e64a5c73f06c14371304c978e10584a211f704f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Mon, 18 Mar 2019 17:10:37 +0100
Subject: [PATCH 7/9] monitor-manager: Don't try to derive current config on
@ -844,7 +844,7 @@ the following changes:
5 files changed, 49 insertions(+), 34 deletions(-)
diff --git a/src/backends/meta-monitor-config-manager.c b/src/backends/meta-monitor-config-manager.c
index f355879c3e..4b37657d34 100644
index f355879c3..4b37657d3 100644
--- a/src/backends/meta-monitor-config-manager.c
+++ b/src/backends/meta-monitor-config-manager.c
@@ -42,7 +42,7 @@ struct _MetaMonitorConfigManager
@ -926,7 +926,7 @@ index f355879c3e..4b37657d34 100644
G_OBJECT_CLASS (meta_monitor_config_manager_parent_class)->dispose (object);
diff --git a/src/backends/meta-monitor-config-manager.h b/src/backends/meta-monitor-config-manager.h
index dc273c961b..641ed1bc1a 100644
index dc273c961..641ed1bc1 100644
--- a/src/backends/meta-monitor-config-manager.h
+++ b/src/backends/meta-monitor-config-manager.h
@@ -96,6 +96,11 @@ MetaMonitorsConfig * meta_monitor_config_manager_get_stored (MetaMonitorConfigMa
@ -942,7 +942,7 @@ index dc273c961b..641ed1bc1a 100644
MetaMonitorsConfig * meta_monitor_config_manager_create_linear (MetaMonitorConfigManager *config_manager);
diff --git a/src/backends/meta-monitor-manager-private.h b/src/backends/meta-monitor-manager-private.h
index 60c1e90821..571b9000dc 100644
index 60c1e9082..571b9000d 100644
--- a/src/backends/meta-monitor-manager-private.h
+++ b/src/backends/meta-monitor-manager-private.h
@@ -44,7 +44,8 @@ typedef enum _MetaMonitorManagerCapability
@ -964,7 +964,7 @@ index 60c1e90821..571b9000dc 100644
GnomePnpIds *pnp_ids;
diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
index baf5bf2f9f..9e57db94cd 100644
index baf5bf2f9..9e57db94c 100644
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
@@ -612,14 +612,21 @@ should_use_stored_config (MetaMonitorManager *manager)
@ -1028,7 +1028,7 @@ index baf5bf2f9f..9e57db94cd 100644
config,
method,
diff --git a/src/backends/x11/meta-monitor-manager-xrandr.c b/src/backends/x11/meta-monitor-manager-xrandr.c
index 61e13f459d..90ccb74053 100644
index 61e13f459..90ccb7405 100644
--- a/src/backends/x11/meta-monitor-manager-xrandr.c
+++ b/src/backends/x11/meta-monitor-manager-xrandr.c
@@ -984,7 +984,8 @@ meta_monitor_manager_xrandr_calculate_supported_scales (MetaMonitorManager
@ -1042,10 +1042,10 @@ index 61e13f459d..90ccb74053 100644
static gboolean
--
2.31.1
2.33.1
From e15c812ef8525d6dd6db730c1c6a1f8ad839bb09 Mon Sep 17 00:00:00 2001
From c4038b08d265f9de55087fe629a43382649656a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Wed, 27 Nov 2019 19:03:50 +0100
Subject: [PATCH 8/9] monitor-manager-xrandr: Move dpms state and screen size
@ -1058,10 +1058,10 @@ To be used by no-Xrandr fallback path.
2 files changed, 40 insertions(+), 17 deletions(-)
diff --git a/src/backends/x11/meta-gpu-xrandr.c b/src/backends/x11/meta-gpu-xrandr.c
index 6a96e53979..e8361c77bc 100644
index 573df7a90..368ac9402 100644
--- a/src/backends/x11/meta-gpu-xrandr.c
+++ b/src/backends/x11/meta-gpu-xrandr.c
@@ -96,6 +96,32 @@ meta_gpu_xrandr_poll_hardware (MetaGpu *gpu)
@@ -114,6 +114,32 @@ meta_gpu_xrandr_poll_hardware (MetaGpu *gpu)
gpu_xrandr->need_hardware_poll = TRUE;
}
@ -1094,7 +1094,7 @@ index 6a96e53979..e8361c77bc 100644
static gboolean
meta_gpu_xrandr_read_current (MetaGpu *gpu,
GError **error)
@@ -112,8 +138,6 @@ meta_gpu_xrandr_read_current (MetaGpu *gpu,
@@ -130,8 +156,6 @@ meta_gpu_xrandr_read_current (MetaGpu *gpu,
RROutput primary_output;
unsigned int i, j;
GList *l;
@ -1103,7 +1103,7 @@ index 6a96e53979..e8361c77bc 100644
GList *outputs = NULL;
GList *modes = NULL;
GList *crtcs = NULL;
@@ -122,16 +146,7 @@ meta_gpu_xrandr_read_current (MetaGpu *gpu,
@@ -140,16 +164,7 @@ meta_gpu_xrandr_read_current (MetaGpu *gpu,
XRRFreeScreenResources (gpu_xrandr->resources);
gpu_xrandr->resources = NULL;
@ -1122,7 +1122,7 @@ index 6a96e53979..e8361c77bc 100644
if (gpu_xrandr->need_hardware_poll)
{
diff --git a/src/backends/x11/meta-monitor-manager-xrandr.c b/src/backends/x11/meta-monitor-manager-xrandr.c
index 90ccb74053..1b35545a09 100644
index 90ccb7405..1b35545a0 100644
--- a/src/backends/x11/meta-monitor-manager-xrandr.c
+++ b/src/backends/x11/meta-monitor-manager-xrandr.c
@@ -140,12 +140,9 @@ x11_dpms_state_to_power_save (CARD16 dpms_state)
@ -1159,10 +1159,10 @@ index 90ccb74053..1b35545a09 100644
parent_class->read_current_state (manager);
}
--
2.31.1
2.33.1
From 49307c3171b086ba5cdebe633f97a217042c8903 Mon Sep 17 00:00:00 2001
From 5553d415b2b826764e24f53398ee78fa1b169ba4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Wed, 3 Oct 2018 10:50:47 +0200
Subject: [PATCH 9/9] monitor-manager/xrandr: Create dummy screen sized monitor
@ -1180,10 +1180,10 @@ monitor with a single output, crtc and mode.
3 files changed, 111 insertions(+), 1 deletion(-)
diff --git a/src/backends/x11/meta-gpu-xrandr.c b/src/backends/x11/meta-gpu-xrandr.c
index e8361c77bc..3ecb80bb2c 100644
index 368ac9402..48c729b5d 100644
--- a/src/backends/x11/meta-gpu-xrandr.c
+++ b/src/backends/x11/meta-gpu-xrandr.c
@@ -122,6 +122,89 @@ update_screen_size (MetaGpuXrandr *gpu_xrandr)
@@ -140,6 +140,89 @@ update_screen_size (MetaGpuXrandr *gpu_xrandr)
monitor_manager->screen_height = HeightOfScreen (screen);
}
@ -1273,7 +1273,7 @@ index e8361c77bc..3ecb80bb2c 100644
static gboolean
meta_gpu_xrandr_read_current (MetaGpu *gpu,
GError **error)
@@ -142,6 +225,9 @@ meta_gpu_xrandr_read_current (MetaGpu *gpu,
@@ -160,6 +243,9 @@ meta_gpu_xrandr_read_current (MetaGpu *gpu,
GList *modes = NULL;
GList *crtcs = NULL;
@ -1284,7 +1284,7 @@ index e8361c77bc..3ecb80bb2c 100644
XRRFreeScreenResources (gpu_xrandr->resources);
gpu_xrandr->resources = NULL;
diff --git a/src/backends/x11/meta-monitor-manager-xrandr.c b/src/backends/x11/meta-monitor-manager-xrandr.c
index 1b35545a09..98eb080b6b 100644
index 1b35545a0..98eb080b6 100644
--- a/src/backends/x11/meta-monitor-manager-xrandr.c
+++ b/src/backends/x11/meta-monitor-manager-xrandr.c
@@ -76,6 +76,7 @@ struct _MetaMonitorManagerXrandr
@ -1353,7 +1353,7 @@ index 1b35545a09..98eb080b6b 100644
and we don't want to step on its toes */
XRRSelectInput (manager_xrandr->xdisplay,
diff --git a/src/backends/x11/meta-monitor-manager-xrandr.h b/src/backends/x11/meta-monitor-manager-xrandr.h
index d55b3d2b88..dc75134a56 100644
index d55b3d2b8..dc75134a5 100644
--- a/src/backends/x11/meta-monitor-manager-xrandr.h
+++ b/src/backends/x11/meta-monitor-manager-xrandr.h
@@ -33,9 +33,13 @@ G_DECLARE_FINAL_TYPE (MetaMonitorManagerXrandr, meta_monitor_manager_xrandr,
@ -1371,5 +1371,5 @@ index d55b3d2b88..dc75134a56 100644
+
#endif /* META_MONITOR_MANAGER_XRANDR_H */
--
2.31.1
2.33.1