Accepting request 630956 from GNOME:Factory
- Add mutter-left-right-rotation-fix.patch to fix blank screen when rotating it left/right (boo#1105268, glgo#gnome/mutter#216); patch taken from upstream bug report. OBS-URL: https://build.opensuse.org/request/show/630956 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutter?expand=0&rev=131
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
f75be30f30
89
mutter-left-right-rotation-fix.patch
Normal file
89
mutter-left-right-rotation-fix.patch
Normal file
@ -0,0 +1,89 @@
|
||||
From 91c5c94434b22895f97b3ae47a889ccb902b86aa Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
|
||||
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
|
||||
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Aug 18 01:27:04 UTC 2018 - badshah400@gmail.com
|
||||
|
||||
- Add mutter-left-right-rotation-fix.patch to fix blank screen
|
||||
when rotating it left/right (boo#1105268,
|
||||
glgo#gnome/mutter#216); patch taken from upstream bug report.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 23 18:36:08 UTC 2018 - bjorn.lie@gmail.com
|
||||
|
||||
|
||||
@ -33,6 +33,8 @@ Patch0: mutter-fix-startup.patch
|
||||
Patch1: mutter-iconcache-Support-RGB16_565-format-for-16-bit-color-.patch
|
||||
# PATCH-FIX-OPENSUSE mutter-xwayland-create-xauthority.patch bsc#1084737 hpj@suse.com -- Create and pass an Xauthority file to Xwayland and session
|
||||
Patch2: mutter-xwayland-create-xauthority.patch
|
||||
# PATCH-FIX-UPSTREAM mutter-left-right-rotation-fix.patch boo#1105268 glgo#gnome/mutter#216 badshah400@opensuse.org -- Fix blank screen when rotating it left/right; patch taken from upstream bug report
|
||||
Patch3: mutter-left-right-rotation-fix.patch
|
||||
# SLE-only patches start at 1000
|
||||
# PATCH-FEATURE-SLE mutter-SLE-bell.patch FATE#316042 bnc#889218 idonmez@suse.com -- make audible bell work out of the box.
|
||||
Patch1000: mutter-SLE-bell.patch
|
||||
@ -144,6 +146,7 @@ applications that want to make use of the mutter library.
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
# SLE-only patches and translations.
|
||||
translation-update-upstream
|
||||
|
||||
Loading…
Reference in New Issue
Block a user