From 3cb23ccb0bc911129ba3ac487d562dbc5cfccaad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 29 Aug 2018 19:36:28 +0200 Subject: [PATCH] Update to 3.29.92 --- .gitignore | 1 + 175.patch | 88 ----------------------------------------------------- mutter.spec | 8 ++--- sources | 2 +- 4 files changed, 6 insertions(+), 93 deletions(-) delete mode 100644 175.patch diff --git a/.gitignore b/.gitignore index d59141e..0428ad6 100644 --- a/.gitignore +++ b/.gitignore @@ -142,3 +142,4 @@ mutter-2.31.5.tar.bz2 /mutter-3.29.4.tar.xz /mutter-3.29.90.tar.xz /mutter-3.29.91.tar.xz +/mutter-3.29.92.tar.xz diff --git a/175.patch b/175.patch deleted file mode 100644 index 2658f2c..0000000 --- a/175.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 91c5c94434b22895f97b3ae47a889ccb902b86aa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jonas=20=C3=85dahl?= -Date: Mon, 23 Jul 2018 21:36:57 +0200 -Subject: [PATCH] renderer/native: Check calculated transform when creating - view - -The "backends: Move MetaOutput::crtc field into private struct" -accidentally changed the view transform calculation code to assume that -"MetaCrtc::transform" corresponds to the transform of the CRTC; so is -not the case yet; one must calculate the transform from the logical -monitor, and check whether it is supported by the CRTC using -meta_monitor_manager_is_transform_handled(). This commit restores the -old behaviour that doesn't use MetaCrtc::transform when calculating the -view transform. - -Fixes: https://gitlab.gnome.org/GNOME/mutter/issues/216 ---- - src/backends/native/meta-renderer-native.c | 9 +++++++-- - src/backends/x11/nested/meta-renderer-x11-nested.c | 8 ++++++-- - 2 files changed, 13 insertions(+), 4 deletions(-) - -diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c -index fc6b22302..8dc0da710 100644 ---- a/src/backends/native/meta-renderer-native.c -+++ b/src/backends/native/meta-renderer-native.c -@@ -2720,9 +2720,14 @@ calculate_view_transform (MetaMonitorManager *monitor_manager, - MetaMonitor *main_monitor; - MetaOutput *main_output; - MetaCrtc *crtc; -+ MetaMonitorTransform crtc_transform; -+ - main_monitor = meta_logical_monitor_get_monitors (logical_monitor)->data; - main_output = meta_monitor_get_main_output (main_monitor); - crtc = meta_output_get_assigned_crtc (main_output); -+ crtc_transform = -+ meta_monitor_logical_to_crtc_transform (main_monitor, -+ logical_monitor->transform); - - /* - * Pick any monitor and output and check; all CRTCs of a logical monitor will -@@ -2731,10 +2736,10 @@ calculate_view_transform (MetaMonitorManager *monitor_manager, - - if (meta_monitor_manager_is_transform_handled (monitor_manager, - crtc, -- crtc->transform)) -+ crtc_transform)) - return META_MONITOR_TRANSFORM_NORMAL; - else -- return crtc->transform; -+ return crtc_transform; - } - - static MetaRendererView * -diff --git a/src/backends/x11/nested/meta-renderer-x11-nested.c b/src/backends/x11/nested/meta-renderer-x11-nested.c -index 8fdf46b0b..b29b9c69e 100644 ---- a/src/backends/x11/nested/meta-renderer-x11-nested.c -+++ b/src/backends/x11/nested/meta-renderer-x11-nested.c -@@ -51,10 +51,14 @@ calculate_view_transform (MetaMonitorManager *monitor_manager, - MetaMonitor *main_monitor; - MetaOutput *main_output; - MetaCrtc *crtc; -+ MetaMonitorTransform crtc_transform; - - main_monitor = meta_logical_monitor_get_monitors (logical_monitor)->data; - main_output = meta_monitor_get_main_output (main_monitor); - crtc = meta_output_get_assigned_crtc (main_output); -+ crtc_transform = -+ meta_monitor_logical_to_crtc_transform (main_monitor, -+ logical_monitor->transform); - /* - * Pick any monitor and output and check; all CRTCs of a logical monitor will - * always have the same transform assigned to them. -@@ -62,10 +66,10 @@ calculate_view_transform (MetaMonitorManager *monitor_manager, - - if (meta_monitor_manager_is_transform_handled (monitor_manager, - crtc, -- crtc->transform)) -+ crtc_transform)) - return META_MONITOR_TRANSFORM_NORMAL; - else -- return crtc->transform; -+ return crtc_transform; - } - - static MetaRendererView * --- -2.17.1 - diff --git a/mutter.spec b/mutter.spec index 2e555a2..692c0d9 100644 --- a/mutter.spec +++ b/mutter.spec @@ -6,7 +6,7 @@ %global pipewire_version 0.2.2 Name: mutter -Version: 3.29.91 +Version: 3.29.92 Release: 1%{?dist} Summary: Window and compositing manager based on Clutter @@ -16,9 +16,6 @@ URL: http://www.gnome.org Source0: http://download.gnome.org/sources/%{name}/3.29/%{name}-%{version}.tar.xz Patch0: startup-notification.patch -# Backport https://gitlab.gnome.org/GNOME/mutter/merge_requests/175 -# fix 90/270 degree screen rotation -Patch1: 175.patch BuildRequires: chrpath BuildRequires: pango-devel @@ -183,6 +180,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_datadir}/mutter/tests %changelog +* Wed Aug 29 2018 Florian Müllner - 3.29.92-1 +- Update to 3.29.92 + * Mon Aug 20 2018 Florian Müllner - 3.29.91-1 - Update to 3.29.91 diff --git a/sources b/sources index 6d09b70..29ed388 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mutter-3.29.91.tar.xz) = 9c5a8eff6c48da6638df79f3adf4779a36c5d8775502d309b7a2f081d49406f0c9b79f91c2006771cb6212a1973140de3b29fdd627a742b657c474da7683e5c4 +SHA512 (mutter-3.29.92.tar.xz) = 725f58912c82613ab4663880c97db66a5f150db4628f8cb8a1b3022eaa343364cf6767ccaafc44ac6650d9582d3bf28240d34ee04a612dd547633ad44f79eac3