pool/mutter
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 945640 from GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/945640
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutter?expand=0&rev=179
This commit is contained in:
Dominique Leuenberger 2022-01-12 23:22:08 +00:00 committed by Git OBS Bridge
commit 9f4e291952
12 changed files with 94 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_service
View File

@ -3,7 +3,7 @@
<service name="obs_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">https://gitlab.gnome.org/GNOME/mutter.git</param>
<param name="revision">refs/tags/41.2</param>
<param name="revision">refs/tags/41.3</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">(.*)\+0</param>
<param name="versionrewrite-replacement">\1</param>

4
_servicedata
View File

@ -1,4 +0,0 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://gitlab.gnome.org/GNOME/mutter.git</param>
<param name="changesrevision">62609d7a6a7e9cfc34d4eebf2e1a7a29151810ae</param></service></servicedata>

3
mutter-41.2.obscpio
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:122e8ffad1d68643104bdc915f3f3c7ee4883254b11981c550de83671bf4a74b
size 24791565

3
mutter-41.3.obscpio Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:993ed29a9c95637e3fb9793dad3f7ef0451e2570a7420f9a2f5bfe9e1aa8c4f5
size 24804365

8
mutter-Lower-HIDPI_LIMIT-to-144.patch
View File

@ -7,11 +7,11 @@ Subject: [PATCH] monitor: Lower HIDPI_LIMIT to 144
src/backends/meta-monitor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: mutter-40.2.1/src/backends/meta-monitor.c
Index: mutter-41.2/src/backends/meta-monitor.c
===================================================================
--- mutter-40.2.1.orig/src/backends/meta-monitor.c
+++ mutter-40.2.1/src/backends/meta-monitor.c
@@ -1644,7 +1644,7 @@ meta_monitor_calculate_crtc_pos (MetaMon
--- mutter-41.2.orig/src/backends/meta-monitor.c
+++ mutter-41.2/src/backends/meta-monitor.c
@@ -1658,7 +1658,7 @@ meta_monitor_calculate_crtc_pos (MetaMon
}
/* The minimum resolution at which we turn on a window-scale of 2 */

35
mutter-allow-disable-hardware-cursors.patch
View File

@ -1,35 +0,0 @@
From 62f1e7c12e87da4529df5441edf7a8303e8a6e9e Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri, 10 Dec 2021 10:57:29 +0100
Subject: [PATCH] cursor-renderer/native: Add a means to disable HW cursors
When dealing with a faulty hardware or bugs in the driver, it might be
interesting to force the use of software cursors for debugging purposes.
Add a debug environment variable MUTTER_DEBUG_DISABLE_HW_CURSORS to
disable hardware cursors and force using software cursors.
Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/2046
---
src/backends/native/meta-cursor-renderer-native.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/backends/native/meta-cursor-renderer-native.c b/src/backends/native/meta-cursor-renderer-native.c
index 8efdaf7775..8a1a6d6446 100644
--- a/src/backends/native/meta-cursor-renderer-native.c
+++ b/src/backends/native/meta-cursor-renderer-native.c
@@ -1874,7 +1874,10 @@ meta_cursor_renderer_native_new (MetaBackend *backend,
priv->backend = backend;
- init_hw_cursor_support (cursor_renderer_native);
+ if (g_strcmp0 (getenv ("MUTTER_DEBUG_DISABLE_HW_CURSORS"), "1"))
+ init_hw_cursor_support (cursor_renderer_native);
+ else
+ g_message ("Disabling hardware cursors because MUTTER_DEBUG_DISABLE_HW_CURSORS is set");
return cursor_renderer_native;
}
--
GitLab

14
mutter-disable-cvt-s390x.patch
View File

@ -1,8 +1,8 @@
Index: mutter-40.2.1/src/meson.build
Index: mutter-41.2/src/meson.build
===================================================================
--- mutter-40.2.1.orig/src/meson.build
+++ mutter-40.2.1/src/meson.build
@@ -824,6 +824,7 @@ if have_profiler
--- mutter-41.2.orig/src/meson.build
+++ mutter-41.2/src/meson.build
@@ -843,6 +843,7 @@ if have_profiler
endif
if have_native_backend
@ -10,7 +10,7 @@ Index: mutter-40.2.1/src/meson.build
cvt = find_program('cvt')
gen_default_modes = find_program('backends/native/gen-default-modes.py')
@@ -831,6 +832,9 @@ if have_native_backend
@@ -850,6 +851,9 @@ if have_native_backend
output: 'meta-default-modes.h',
command: [gen_default_modes, '@OUTPUT@']
)
@ -20,10 +20,10 @@ Index: mutter-40.2.1/src/meson.build
mutter_built_sources += default_modes_h
dbus_login1_built_sources = gnome.gdbus_codegen('meta-dbus-login1',
Index: mutter-40.2.1/src/backends/native/meta-default-modes.h
Index: mutter-41.2/src/backends/native/meta-default-modes.h
===================================================================
--- /dev/null
+++ mutter-40.2.1/src/backends/native/meta-default-modes.h
+++ mutter-41.2/src/backends/native/meta-default-modes.h
@@ -0,0 +1,57 @@
+/* Generated by gen-default-modes.py */
+

43
mutter-initialize-saved_rect_fullscreen.patch
View File

@ -1,43 +0,0 @@
From 157555cf0e7aaef32892c5576e81ba2154d14a0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Fri, 7 Jan 2022 16:30:19 +0100
Subject: [PATCH] window: Initialize saved_rect_fullscreen too
We save the window rect before going fullscreen to a dedicated variable,
so we can go back to the correct dimension. We also have a dedicated
variable for returning from other window states, e.g. maximized, and
this one we initialized when creating the MetaWindow. This meant that we
could always rely on this being up to date on X11 windows that were
mapped maximized or fullscreen.
What the commit that introduced the saved rect dedicated for going
unfullscreen missed was to initialize the new saved rectangle too when
creating the MetaWindow. This resulted in windows mapped as fullscreen
often ending up misbehaving when unfullscreening, as mutter would tell
them to unfullscreen to 0x0.
Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1786
Fixes: a51ad8f932cb55bdd8a62fc5d8d10af7fc62b0a0
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2210>
(cherry picked from commit 13f35ab0640631566f52c80583b09fe4e3dc3685)
---
src/core/window.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/core/window.c b/src/core/window.c
index 9b3f54df9e..6623951613 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -1054,6 +1054,7 @@ _meta_window_shared_new (MetaDisplay *display,
/* And this is our unmaximized size */
window->saved_rect = window->rect;
+ window->saved_rect_fullscreen = window->rect;
window->unconstrained_rect = window->rect;
window->depth = attrs->depth;
--
GitLab

32
mutter-window-actor-Special-case-shaped-Java-windows.patch Normal file
View File

@ -0,0 +1,32 @@
From 9efcc35102b4c41265e93461b35a1193b3d5822d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Fri, 12 May 2017 13:40:31 +0200
Subject: [PATCH] window-actor: Special-case shaped Java windows
OpenJDK wrongly assumes that shaping a window implies no shadows.
They got lucky until commit b975676c changed the fallback case,
but now their compliance tests are broken. Make them happy again
by special-casing shaped Java windows.
---
src/compositor/meta-window-actor-x11.c | 8 ++++++++
1 file changed, 8 insertions(+)
Index: mutter-41.2/src/compositor/meta-window-actor-x11.c
===================================================================
--- mutter-41.2.orig/src/compositor/meta-window-actor-x11.c
+++ mutter-41.2/src/compositor/meta-window-actor-x11.c
@@ -589,6 +589,14 @@ has_shadow (MetaWindowActorX11 *actor_x1
*/
if (window->has_custom_frame_extents)
return FALSE;
+
+ /*
+ * OpenJDK wrongly assumes that shaping a window implies no compositor
+ * shadows; make its compliance tests happy to give it what it wants ...
+ */
+ if (g_strcmp0 (window->res_name, "sun-awt-X11-XWindowPeer") == 0 &&
+ window->shape_region != NULL)
+ return FALSE;
/*
* Generate shadows for all other windows.

36
mutter.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Tue Jan 11 17:28:52 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 41.3:
+ Check keyboard serials for activation
+ Fix mixed up refresh rates in multi-monitor setups
+ Allow disabling HW cursors
+ Improve damage handling
+ Consider xrandr flags for advertised modes
+ Ensure constraints after client resize
+ window-group: Disable culling when rendinging clone to
offscreen buffer
+ Fix workspace switch animation in default plugin
+ Fix unfullscreening of window that were mapped fullscreen
+ Fix DMA-BUF screencasts with unredirected fullscreen windows
+ Fix orientation changes on devices with 90°
+ Fixed crashes
+ Plugged leaks
+ Misc. bug fixes and cleanups.
- Drop patches fixed upstream:
+ mutter-allow-disable-hardware-cursors.patch
+ mutter-initialize-saved_rect_fullscreen.patch
- Renumber patches yet again.
-------------------------------------------------------------------
Mon Jan 10 07:14:19 UTC 2022 - Alynx Zhou <alynx.zhou@suse.com>
@ -7,6 +31,18 @@ Mon Jan 10 07:14:19 UTC 2022 - Alynx Zhou <alynx.zhou@suse.com>
saved_rect_fullscreen which is used for unfullscreen, this patch
fixes it (glgo#GNOME/mutter!2210, bsc#1185444).
-------------------------------------------------------------------
Fri Dec 17 22:19:26 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
- Rebase patches with quilt and renumber them.
- Add mutter-window-actor-Special-case-shaped-Java-windows.patch:
window-actor: Special-case shaped Java windows.
OpenJDK wrongly assumes that shaping a window implies no shadows.
They got lucky until commit b975676c changed the fallback case,
but now their compliance tests are broken. Make them happy again
by special-casing shaped Java windows. Patch from fedora:
https://src.fedoraproject.org/rpms/mutter/raw/rawhide/f/0001-window-actor-Special-case-shaped-Java-windows.patch
-------------------------------------------------------------------
Fri Dec 17 09:00:44 UTC 2021 - Alynx Zhou <alynx.zhou@suse.com>

7
mutter.obsinfo
View File

@ -1,5 +1,4 @@
name: mutter
version: 41.2
mtime: 1639332937
commit: 664ac09eecfd365b5258f53d2c9e6c8410a37919
version: 41.3
mtime: 1641851077
commit: f51ad2911419ee2ab88b5548581227a57d0fd987

19
mutter.spec
View File

@ -23,7 +23,7 @@
%define api_minor 0
%define libmutter libmutter-%{api_major}-%{api_minor}
Name: mutter
Version: 41.2
Version: 41.3
Release: 0
Summary: Window and compositing manager based on Clutter
License: GPL-2.0-or-later
@ -34,13 +34,11 @@ URL: https://www.gnome.org
Source0: %{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE mutter-Lower-HIDPI_LIMIT-to-144.patch fate#326682, bsc#1125467 qkzhu@suse.com -- Lower HIDPI_LIMIT to 144
Patch3: mutter-Lower-HIDPI_LIMIT-to-144.patch
Patch0: mutter-Lower-HIDPI_LIMIT-to-144.patch
# PATCH-FIX-UPSTREAM mutter-disable-cvt-s390x.patch bsc#1158128 fcrozat@suse.com -- Do not search for cvt on s390x, it doesn't exist there
Patch4: mutter-disable-cvt-s390x.patch
# PATCH-FIX-UPSTREAM mutter-allow-disable-hardware-cursors.patch glgo#GNOME/mutter!2150 alynx.zhou@suse.com -- Add a debug environment variable to disable hardware cursors.
Patch5: mutter-allow-disable-hardware-cursors.patch
# PATCH-FIX-UPSTREAM mutter-initialize-saved_rect_fullscreen.patch glgo#GNOME/mutter!2210, bsc#1185444 alynx.zhou@suse.com -- Initialize saved_rect_fullscreen to fix fullscreen for some program like Stellarium.
Patch6: mutter-initialize-saved_rect_fullscreen.patch
Patch1: mutter-disable-cvt-s390x.patch
# PATCH-FIX-OPENSUSE mutter-window-actor-Special-case-shaped-Java-windows.patch -- window-actor: Special-case shaped Java windows
Patch2: mutter-window-actor-Special-case-shaped-Java-windows.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.
@ -145,10 +143,9 @@ applications that want to make use of the mutter library.
%prep
%setup -q
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch0 -p1
%patch1 -p1
%patch2 -p1
# SLE-only patches and translations.
%if 0%{?sle_version}