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

Accepting request 641194 from GNOME:Factory

Browse Source 
(forwarded request 640831 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/641194
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutter?expand=0&rev=132
This commit is contained in:
Dominique Leuenberger 2018-10-17 06:22:44 +00:00 committed by Git OBS Bridge
commit 0d27c6285f
10 changed files with 218 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
_service
View File

@ -1,14 +0,0 @@
<services>
<service mode="disabled" name="tar_scm">
<param name="url">https://gitlab.gnome.org/GNOME/mutter.git</param>
<param name="scm">git</param>
<param name="revision">gnome-3-28</param>
<param name="versionformat">3.28.3+%cd.%h</param>
<param name="changesgenerate">enable</param>
</service>
<service mode="disabled" name="recompress">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service mode="disabled" name="set_version" />
</services>

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">62660bbd1526c6135d149df397b2470c6e71969d</param></service></servicedata>

3
mutter-3.28.3+20180719.62660bbd1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:43d4161c994e6e015960337ce439faf528931601e8be95eca84ce2d30581c784
size 2872576

3
mutter-3.30.1.tar.xz Normal file
View File

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

13
mutter-fix-startup.patch
View File

@ -15,11 +15,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=768531
src/wayland/meta-wayland-gtk-shell.c | 10 ++++++++++ src/wayland/meta-wayland-gtk-shell.c | 10 ++++++++++
1 file changed, 10 insertions(+) 1 file changed, 10 insertions(+)
diff --git a/src/wayland/meta-wayland-gtk-shell.c b/src/wayland/meta-wayland-gtk-shell.c Index: mutter-3.29.2/src/wayland/meta-wayland-gtk-shell.c
index d6e249f..9d1a19e 100644 ===================================================================
--- a/src/wayland/meta-wayland-gtk-shell.c --- mutter-3.29.2.orig/src/wayland/meta-wayland-gtk-shell.c 2017-12-21 16:44:13.000000000 +0100
+++ b/src/wayland/meta-wayland-gtk-shell.c +++ mutter-3.29.2/src/wayland/meta-wayland-gtk-shell.c 2018-07-24 21:26:48.888683780 +0200
@@ -219,11 +219,21 @@ gtk_shell_set_startup_id (struct wl_client *client, @@ -312,11 +312,21 @@ gtk_shell_set_startup_id (struct wl_clie
struct wl_resource *resource, struct wl_resource *resource,
const char *startup_id) const char *startup_id)
{ {
@ -41,6 +41,3 @@ index d6e249f..9d1a19e 100644
} }
static void static void
--
2.9.3

6
mutter-iconcache-Support-RGB16_565-format-for-16-bit-color-.patch
View File

@ -12,10 +12,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=781704
src/x11/iconcache.c | 35 ++++++++++++++++++++++++++++++++++- src/x11/iconcache.c | 35 ++++++++++++++++++++++++++++++++++-
1 file changed, 34 insertions(+), 1 deletion(-) 1 file changed, 34 insertions(+), 1 deletion(-)
Index: mutter-3.26.0/src/x11/iconcache.c Index: mutter-3.29.2/src/x11/iconcache.c
=================================================================== ===================================================================
--- mutter-3.26.0.orig/src/x11/iconcache.c --- mutter-3.29.2.orig/src/x11/iconcache.c 2017-03-09 19:39:07.000000000 +0100
+++ mutter-3.26.0/src/x11/iconcache.c +++ mutter-3.29.2/src/x11/iconcache.c 2018-07-24 21:26:48.904683928 +0200
@@ -304,10 +304,43 @@ standard_pict_format_for_depth (int dept @@ -304,10 +304,43 @@ standard_pict_format_for_depth (int dept
} }
} }

89
mutter-left-right-rotation-fix.patch
View File

@ -1,89 +0,0 @@
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

63
mutter-xwayland-create-xauthority.patch
View File

@ -4,11 +4,11 @@ Date: Wed Mar 14 19:06:42 2018 +0100
Patch 3: mutter-xwayland-use-gdm-auth-file.patch Patch 3: mutter-xwayland-use-gdm-auth-file.patch
Index: mutter-3.28.0/src/wayland/meta-wayland.c Index: mutter-3.29.2/src/wayland/meta-wayland.c
=================================================================== ===================================================================
--- mutter-3.28.0.orig/src/wayland/meta-wayland.c --- mutter-3.29.2.orig/src/wayland/meta-wayland.c 2018-05-10 12:43:15.000000000 +0200
+++ mutter-3.28.0/src/wayland/meta-wayland.c +++ mutter-3.29.2/src/wayland/meta-wayland.c 2018-07-24 21:26:48.916684038 +0200
@@ -353,6 +353,7 @@ meta_wayland_init (void) @@ -359,6 +359,7 @@ meta_wayland_init (void)
{ {
MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default (); MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default ();
GSource *wayland_event_source; GSource *wayland_event_source;
@ -16,31 +16,30 @@ Index: mutter-3.28.0/src/wayland/meta-wayland.c
wayland_event_source = wayland_event_source_new (compositor->wayland_display); wayland_event_source = wayland_event_source_new (compositor->wayland_display);
@@ -394,7 +395,8 @@ meta_wayland_init (void) @@ -404,7 +405,8 @@ meta_wayland_init (void)
meta_xwayland_global_filter,
compositor);
- if (!meta_xwayland_start (&compositor->xwayland_manager, compositor->wayland_display)) if (meta_should_autostart_x11_display ())
+ if (!meta_xwayland_start (&compositor->xwayland_manager, compositor->wayland_display, {
+ &xauthority_path)) - if (!meta_xwayland_start (&compositor->xwayland_manager, compositor->wayland_display))
g_error ("Failed to start X Wayland"); + if (!meta_xwayland_start (&compositor->xwayland_manager, compositor->wayland_display,
+ &xauthority_path))
if (_display_name_override) g_error ("Failed to start X Wayland");
@@ -417,7 +419,10 @@ meta_wayland_init (void)
} }
set_gnome_env ("DISPLAY", meta_wayland_get_xwayland_display_name (compositor)); @@ -429,6 +431,9 @@ meta_wayland_init (void)
+ set_gnome_env ("XAUTHORITY", xauthority_path);
set_gnome_env ("WAYLAND_DISPLAY", meta_wayland_get_wayland_display_name (compositor));
+
+ g_free (xauthority_path);
}
const char * if (meta_should_autostart_x11_display ())
Index: mutter-3.28.0/src/wayland/meta-xwayland-private.h set_gnome_env ("DISPLAY", meta_wayland_get_xwayland_display_name (compositor));
+ set_gnome_env ("XAUTHORITY", xauthority_path);
+
+ g_free (xauthority_path);
set_gnome_env ("WAYLAND_DISPLAY", meta_wayland_get_wayland_display_name (compositor));
}
Index: mutter-3.29.2/src/wayland/meta-xwayland-private.h
=================================================================== ===================================================================
--- mutter-3.28.0.orig/src/wayland/meta-xwayland-private.h --- mutter-3.29.2.orig/src/wayland/meta-xwayland-private.h 2017-03-09 19:39:07.000000000 +0100
+++ mutter-3.28.0/src/wayland/meta-xwayland-private.h +++ mutter-3.29.2/src/wayland/meta-xwayland-private.h 2018-07-24 21:26:48.916684038 +0200
@@ -26,7 +26,8 @@ @@ -26,7 +26,8 @@
gboolean gboolean
@ -50,12 +49,12 @@ Index: mutter-3.28.0/src/wayland/meta-xwayland-private.h
+ gchar **xauthority_path_out); + gchar **xauthority_path_out);
void void
meta_xwayland_complete_init (void); meta_xwayland_complete_init (MetaDisplay *display);
Index: mutter-3.28.0/src/wayland/meta-xwayland.c Index: mutter-3.29.2/src/wayland/meta-xwayland.c
=================================================================== ===================================================================
--- mutter-3.28.0.orig/src/wayland/meta-xwayland.c --- mutter-3.29.2.orig/src/wayland/meta-xwayland.c 2018-05-10 12:43:15.000000000 +0200
+++ mutter-3.28.0/src/wayland/meta-xwayland.c +++ mutter-3.29.2/src/wayland/meta-xwayland.c 2018-07-24 21:26:48.916684038 +0200
@@ -32,6 +32,13 @@ @@ -34,6 +34,13 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/un.h> #include <sys/un.h>
@ -69,7 +68,7 @@ Index: mutter-3.28.0/src/wayland/meta-xwayland.c
#include "compositor/meta-surface-actor-wayland.h" #include "compositor/meta-surface-actor-wayland.h"
#include "wayland/meta-wayland-actor-surface.h" #include "wayland/meta-wayland-actor-surface.h"
@@ -508,20 +515,231 @@ on_displayfd_ready (int fd, @@ -459,20 +466,231 @@ on_displayfd_ready (int fd,
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
@ -302,7 +301,7 @@ Index: mutter-3.28.0/src/wayland/meta-xwayland.c
/* We want xwayland to be a wayland client so we make a socketpair to setup a /* We want xwayland to be a wayland client so we make a socketpair to setup a
* wayland protocol connection. */ * wayland protocol connection. */
if (socketpair (AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, xwayland_client_fd) < 0) if (socketpair (AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, xwayland_client_fd) < 0)
@@ -566,6 +784,7 @@ meta_xwayland_start (MetaXWaylandManager @@ -517,6 +735,7 @@ meta_xwayland_start (MetaXWaylandManager
"-terminate", "-terminate",
"-accessx", "-accessx",
"-core", "-core",
@ -310,7 +309,7 @@ Index: mutter-3.28.0/src/wayland/meta-xwayland.c
"-listen", "4", "-listen", "4",
"-listen", "5", "-listen", "5",
"-displayfd", "6", "-displayfd", "6",
@@ -588,6 +807,11 @@ meta_xwayland_start (MetaXWaylandManager @@ -539,6 +758,11 @@ meta_xwayland_start (MetaXWaylandManager
manager->init_loop = g_main_loop_new (NULL, FALSE); manager->init_loop = g_main_loop_new (NULL, FALSE);
g_main_loop_run (manager->init_loop); g_main_loop_run (manager->init_loop);

132
mutter.changes
View File

@ -1,3 +1,59 @@
-------------------------------------------------------------------
Tue Oct 9 09:59:19 UTC 2018 - bjorn.lie@gmail.com
- Update to version 3.30.1:
+ Improve trackball detection (glgo#GNOME/mutter#258).
+ Fix clipping of scaled surfaces (glgo#GNOME/mutter#300).
+ Improve tracking of monitor switch configuration
(glgo#GNOME/mutter!213).
+ Fix parent-relative positioning of constrained windows
(glgo#GNOME/mutter#332).
+ Add clutter_input_method_forward_key() method
(glgo#GNOME/gnome-shell#531).
+ Various crash fixes (glgo#GNOME/mutter#194,
glgo#GNOME/mutter#336).
+ Misc. bug fixes: glgo#GNOME/gnome-shell#540,
glgo#GNOME/mutter#294, glgo#GNOME/mutter#221,
glgo#GNOME/mutter!229, glgo#GNOME/mutter#30 and
glgo#GNOME/mutter#331.
+ Updated translations.
-------------------------------------------------------------------
Thu Sep 6 01:49:53 UTC 2018 - luc14n0@linuxmail.org
- Update to version 3.30.0:
+ Updated translations.
-------------------------------------------------------------------
Sat Sep 1 23:53:35 UTC 2018 - luc14n0@linuxmail.org
- Update to version 3.29.92:
+ Avoid crash when a cursor is not found (glgo#GNOME/mutter#254).
+ Fix screen rotation regression (glgo#GNOME/mutter#216).
+ Handle requests to unmanaged windows gracefully
(glgo#GNOME/mutter#240).
+ Move popups together with their parent (glgo#GNOME/mutter#274).
+ Fix non-lowercase letters on virtual key devices
(glgo#GNOME/gnome-shell#135).
+ Misc. bug fixes: glgo#GNOME/mutter#223, glgo#GNOME/mutter#192,
glgo#GNOME/mutter#279.
+ Updated translations.
- Drop mutter-left-right-rotation-fix.patch: fixed upstream.
-------------------------------------------------------------------
Tue Aug 21 12:25:12 UTC 2018 - dimstar@opensuse.org
- Update to version 3.29.91:
+ Various crash fixes (glgo#GNOME/mutter#255,
glgo#GNOME/mutter#223).
+ Fix lock up with some DRI drivers (glgo#GNOME/mutter#127).
+ Send correct button codes from virtual evdev devices.
+ Improve grab-device clock updates on X11.
+ Fix popups closing immediately on key down.
+ Prevent clients from modifying the shared keymap (bgo#784206).
+ Updated translations.
- Drop mutter-pipewire-fix.patch: fixed upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Aug 18 01:27:04 UTC 2018 - badshah400@gmail.com Sat Aug 18 01:27:04 UTC 2018 - badshah400@gmail.com
@ -5,6 +61,47 @@ Sat Aug 18 01:27:04 UTC 2018 - badshah400@gmail.com
when rotating it left/right (boo#1105268, when rotating it left/right (boo#1105268,
glgo#gnome/mutter#216); patch taken from upstream bug report. glgo#gnome/mutter#216); patch taken from upstream bug report.
-------------------------------------------------------------------
Fri Aug 3 20:10:10 UTC 2018 - bjorn.lie@gmail.com
- Update to version 3.29.90:
+ Don't expose resolutions that are below the minimum
(bgo#793223).
+ Remove support for preference overrides (bgo#786496).
+ Various crash fixes: glgo#GNOME/mutter#189,
glgo#GNOME/mutter#70, glgo#GNOME/mutter#194,
glgo#GNOME/mutter#15, glgo#GNOME/mutter#130.
+ Misc. bug fixes and cleanups: glgo#GNOME/mutter#131,
glgo#GNOME/mutter#245, glgo#GNOME/mutter!176.
+ Updated translations.
- Add mutter-pipewire-fix.patch, replace pkgconfig(libpipewire-0.1)
with pkgconfig(libpipewire-0.2) BuildRequires. Also add libtool
BuildRequires and pass autoreconf call.
-------------------------------------------------------------------
Wed Jul 25 03:50:39 UTC 2018 - luc14n0@linuxmail.org
- Update to version 3.29.4:
+ Fix crash with parent-less modal dialogs
(glgo#GNOME/mutter#174).
+ Preserve paint volumes where possible to optimize CPU usage
(bgo#782344).
+ Updated translations.
- Changes from version 3.29.3:
+ Fix Korean Hangul support on wayland (glgo#GNOME/mutter#152).
+ Improve support for proprietary Nvidia driver (bgo#790316).
+ Only upload HW cursor sprite to the GPU that will display them
(glgo#GNOME/mutter#77).
+ Improve EGLstream support (glgo#GNOME/mutter#2, bgo#782575).
+ Misc. bug fixes: glgo#GNOME/mutter#160, bgo#786929, bgo#788834.
+ Updated translations.
- Rebase mutter-xwayland-create-xauthority.patch.
-------------------------------------------------------------------
Tue Jul 24 19:27:49 UTC 2018 - bjorn.lie@gmail.com
- Refresh openSUSE patches with quilt.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 23 18:36:08 UTC 2018 - bjorn.lie@gmail.com Mon Jul 23 18:36:08 UTC 2018 - bjorn.lie@gmail.com
@ -33,6 +130,34 @@ Fri Jul 6 11:38:13 UTC 2018 - bjorn.lie@gmail.com
enable-remote-desktop to configure, build remote-desktop support, enable-remote-desktop to configure, build remote-desktop support,
now that pipewire is available. now that pipewire is available.
-------------------------------------------------------------------
Fri Jun 22 02:32:53 UTC 2018 - luc14n0@linuxmail.org
- Update to version 3.29.2:
+ Fix size change animations on wayland (bgo#780292).
+ Handle touch events on server-side titlebars (bgo#770185).
+ Misc. bug fixes: glgo#GNOME/mutter#134, glgo#GNOME/mutter#124,
glgo#GNOME/mutter#138, glgo#GNOME/mutter#781471,
glgo#GNOME/mutter#150.
-------------------------------------------------------------------
Sun Jun 3 02:40:36 UTC 2018 - luc14n0@linuxmail.org
- Update to version 3.29.1:
+ Fix various input-method regressions glgo#GNOME/mutter#65,
glgo#GNOME/mutter#74, glgo#GNOME/mutter#66,
glgo#GNOME/mutter#112).
+ Take inhibitors into account for monitoring idle (bgo#705942).
+ Misc. bug fixes: glgo#GNOME/mutter#83, glgo#GNOME/mutter#104,
glgo#GNOME/mutter#157, glgo#GNOME/mutter#130,
glgo#GNOME/mutter#21.
+ Updated translations.
- Drop:
+ libtool BuildRequires, autogen execution and source service,
and use upstream tarball once more: the situation has been
normalized.
+ intltool BuildRequires to follow upstream migration to Gettext.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 28 17:34:20 UTC 2018 - bjorn.lie@gmail.com Mon May 28 17:34:20 UTC 2018 - bjorn.lie@gmail.com
@ -48,6 +173,13 @@ Mon May 28 17:34:20 UTC 2018 - bjorn.lie@gmail.com
+ clutter/evdev: ignore injected events from IM. + clutter/evdev: ignore injected events from IM.
+ wayland: Use cursor position in logical monitor. + wayland: Use cursor position in logical monitor.
-------------------------------------------------------------------
Thu May 17 15:18:48 UTC 2018 - hpj@suse.com
- Enable remote desktop support:
+ Add pkgconfig(libpipewire-1.0) BuildRequires.
+ Pass --enable-remote-desktop to configure.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 09 16:00:40 UTC 2018 - bjorn.lie@gmail.com Wed May 09 16:00:40 UTC 2018 - bjorn.lie@gmail.com

92
mutter.spec
View File

@ -12,30 +12,28 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
%define mutter_major 2 %define api_major 3
%define mutter_minor 0 %define api_minor 0
%define libmutter libmutter-%{api_major}-%{api_minor}
Name: mutter Name: mutter
Version: 3.28.3+20180719.62660bbd1 Version: 3.30.1
Release: 0 Release: 0
Summary: Window and compositing manager based on Clutter Summary: Window and compositing manager based on Clutter
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: System/GUI/GNOME Group: System/GUI/GNOME
URL: https://www.gnome.org URL: https://www.gnome.org
#Source0: http://download.gnome.org/sources/mutter/3.28/%%{name}-%%{version}.tar.xz Source0: https://download.gnome.org/sources/mutter/3.30/%{name}-%{version}.tar.xz
Source: %{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM mutter-fix-startup.patch bgo#768531 -- Fix slow startup notification on wayland
# PATCH-FIX-UPSTREAM mutter-fix-startup.patch bgo#768531 zaitor@opensuse.org -- Fix slow startup notification on wayland
Patch0: mutter-fix-startup.patch Patch0: mutter-fix-startup.patch
# PATCH-FEATURE-UPSTREAM mutter-iconcache-Support-RGB16_565-format-for-16-bit-color-.patch FATE#323412 bgo#781704 bsc#1024748 vliaskovitis@suse.com -- iconcache: Support RGB16_565 format for 16-bit sessions # PATCH-FEATURE-UPSTREAM mutter-iconcache-Support-RGB16_565-format-for-16-bit-color-.patch FATE#323412 bgo#781704 bsc#1024748 vliaskovitis@suse.com -- iconcache: Support RGB16_565 format for 16-bit sessions
Patch1: mutter-iconcache-Support-RGB16_565-format-for-16-bit-color-.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 # 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 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 ## SLE-only patches start at 1000
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. # 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 Patch1000: mutter-SLE-bell.patch
# PATCH-FIX-SLE mutter-SLE-relax-some-constraints-on-CSD-windows.patch bnc#883491 cxiong@suse.com -- Relax some constraints on window positioning for CSD windows s.t. they can be placed at the very top of the monitor. # PATCH-FIX-SLE mutter-SLE-relax-some-constraints-on-CSD-windows.patch bnc#883491 cxiong@suse.com -- Relax some constraints on window positioning for CSD windows s.t. they can be placed at the very top of the monitor.
@ -44,7 +42,6 @@ Patch1001: mutter-SLE-relax-some-constraints-on-CSD-windows.patch
Patch1002: mutter-SLE-bsc984738-grab-display.patch Patch1002: mutter-SLE-bsc984738-grab-display.patch
BuildRequires: Mesa-libGLESv3-devel BuildRequires: Mesa-libGLESv3-devel
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: intltool
BuildRequires: libtool BuildRequires: libtool
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: translation-update-upstream BuildRequires: translation-update-upstream
@ -63,7 +60,7 @@ BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libdrm) >= 2.4.83 BuildRequires: pkgconfig(libdrm) >= 2.4.83
BuildRequires: pkgconfig(libinput) BuildRequires: pkgconfig(libinput)
BuildRequires: pkgconfig(libpipewire-0.1) BuildRequires: pkgconfig(libpipewire-0.2)
BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(libstartup-notification-1.0)
BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(libudev) >= 136 BuildRequires: pkgconfig(libudev) >= 136
@ -100,7 +97,7 @@ Obsoletes: typelib-1_0-Meta-3_0
Mutter is a window and compositing manager based on Clutter, forked Mutter is a window and compositing manager based on Clutter, forked
from Metacity. from Metacity.
%package -n libmutter-%{mutter_major}-%{mutter_minor} %package -n %{libmutter}
Summary: Window and compositing manager based on Clutter Summary: Window and compositing manager based on Clutter
# we need the gsettings schema; hopefully, they'll stay backwards compatible # we need the gsettings schema; hopefully, they'll stay backwards compatible
# (since we can't require = version, to not break SLPP) # (since we can't require = version, to not break SLPP)
@ -112,7 +109,7 @@ Requires: %{name}-data >= %{version}
Obsoletes: libmutter-1-0 Obsoletes: libmutter-1-0
Obsoletes: libmutter0 Obsoletes: libmutter0
%description -n libmutter-%{mutter_major}-%{mutter_minor} %description -n %{libmutter}
Mutter is a window and compositing manager based on Clutter, forked Mutter is a window and compositing manager based on Clutter, forked
from Metacity. from Metacity.
@ -132,8 +129,8 @@ This package contains data files needed by mutter and its library.
%package devel %package devel
Summary: Development files for mutter, a window and compositing manager Summary: Development files for mutter, a window and compositing manager
Group: Development/Libraries/GNOME Group: Development/Libraries/GNOME
Requires: %{libmutter} = %{version}
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: libmutter-%{mutter_major}-%{mutter_minor} = %{version}
%description devel %description devel
This subpackage contains libraries and header files for developing This subpackage contains libraries and header files for developing
@ -146,7 +143,6 @@ applications that want to make use of the mutter library.
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
# SLE-only patches and translations. # SLE-only patches and translations.
translation-update-upstream translation-update-upstream
@ -157,7 +153,7 @@ translation-update-upstream
%endif %endif
%build %build
NOCONFIGURE=1 ./autogen.sh autoreconf -fiv
%configure \ %configure \
--enable-wayland \ --enable-wayland \
--enable-native-backend \ --enable-native-backend \
@ -175,8 +171,8 @@ find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print
%find_lang %{name} %{?no_lang_C} %find_lang %{name} %{?no_lang_C}
%fdupes %{buildroot}%{_prefix} %fdupes %{buildroot}%{_prefix}
%post -n libmutter-%{mutter_major}-%{mutter_minor} -p /sbin/ldconfig %post -n %{libmutter} -p /sbin/ldconfig
%postun -n libmutter-%{mutter_major}-%{mutter_minor} -p /sbin/ldconfig %postun -n %{libmutter} -p /sbin/ldconfig
%files %files
%license COPYING %license COPYING
@ -187,23 +183,23 @@ find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print
%{_datadir}/applications/mutter.desktop %{_datadir}/applications/mutter.desktop
# These so files are not split out since they are private to mutter # These so files are not split out since they are private to mutter
%{_libdir}/mutter/libmutter-clutter-%{mutter_major}.so %{_libdir}/mutter/libmutter-clutter-%{api_major}.so
%{_libdir}/mutter/libmutter-cogl-gles2-%{mutter_major}.so %{_libdir}/mutter/libmutter-cogl-gles2-%{api_major}.so
%{_libdir}/mutter/libmutter-cogl-pango-%{mutter_major}.so %{_libdir}/mutter/libmutter-cogl-pango-%{api_major}.so
%{_libdir}/mutter/libmutter-cogl-path-%{mutter_major}.so %{_libdir}/mutter/libmutter-cogl-path-%{api_major}.so
%{_libdir}/mutter/libmutter-cogl-%{mutter_major}.so %{_libdir}/mutter/libmutter-cogl-%{api_major}.so
%{_libdir}/mutter/plugins/default.so %{_libdir}/mutter/plugins/default.so
# These typelibs are not split out since they are private to mutter # These typelibs are not split out since they are private to mutter
%{_libdir}/mutter/Cally-%{mutter_major}.typelib %{_libdir}/mutter/Cally-%{api_major}.typelib
%{_libdir}/mutter/Clutter-%{mutter_major}.typelib %{_libdir}/mutter/Clutter-%{api_major}.typelib
%{_libdir}/mutter/ClutterX11-%{mutter_major}.typelib %{_libdir}/mutter/ClutterX11-%{api_major}.typelib
%{_libdir}/mutter/Cogl-%{mutter_major}.typelib %{_libdir}/mutter/Cogl-%{api_major}.typelib
%{_libdir}/mutter/CoglPango-%{mutter_major}.typelib %{_libdir}/mutter/CoglPango-%{api_major}.typelib
%{_libdir}/mutter/Meta-%{mutter_major}.typelib %{_libdir}/mutter/Meta-%{api_major}.typelib
%files -n libmutter-%{mutter_major}-%{mutter_minor} %files -n %{libmutter}
%{_libdir}/libmutter-%{mutter_major}.so.* %{_libdir}/libmutter-%{api_major}.so.*
%dir %{_libdir}/mutter/ %dir %{_libdir}/mutter/
# users of libmutter need this directory # users of libmutter need this directory
%dir %{_libdir}/mutter/plugins/ %dir %{_libdir}/mutter/plugins/
@ -220,23 +216,23 @@ find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print
%{_datadir}/glib-2.0/schemas/org.gnome.mutter.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.mutter.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.mutter.wayland.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.mutter.wayland.gschema.xml
%files lang -f %{name}.lang
%files devel %files devel
%{_includedir}/mutter/ %{_includedir}/mutter/
%{_libdir}/libmutter-%{mutter_major}.so %{_libdir}/libmutter-%{api_major}.so
%{_libdir}/mutter/Meta-%{mutter_major}.gir %{_libdir}/mutter/Meta-%{api_major}.gir
%{_libdir}/mutter/Cally-%{mutter_major}.gir %{_libdir}/mutter/Cally-%{api_major}.gir
%{_libdir}/mutter/Clutter-%{mutter_major}.gir %{_libdir}/mutter/Clutter-%{api_major}.gir
%{_libdir}/mutter/ClutterX11-%{mutter_major}.gir %{_libdir}/mutter/ClutterX11-%{api_major}.gir
%{_libdir}/mutter/Cogl-%{mutter_major}.gir %{_libdir}/mutter/Cogl-%{api_major}.gir
%{_libdir}/mutter/CoglPango-%{mutter_major}.gir %{_libdir}/mutter/CoglPango-%{api_major}.gir
%{_libdir}/pkgconfig/libmutter-%{mutter_major}.pc %{_libdir}/pkgconfig/libmutter-%{api_major}.pc
%{_libdir}/pkgconfig/mutter-clutter-%{mutter_major}.pc %{_libdir}/pkgconfig/mutter-clutter-%{api_major}.pc
%{_libdir}/pkgconfig/mutter-clutter-x11-%{mutter_major}.pc %{_libdir}/pkgconfig/mutter-clutter-x11-%{api_major}.pc
%{_libdir}/pkgconfig/mutter-cogl-%{mutter_major}.pc %{_libdir}/pkgconfig/mutter-cogl-%{api_major}.pc
%{_libdir}/pkgconfig/mutter-cogl-gles2-%{mutter_major}.pc %{_libdir}/pkgconfig/mutter-cogl-gles2-%{api_major}.pc
%{_libdir}/pkgconfig/mutter-cogl-pango-%{mutter_major}.pc %{_libdir}/pkgconfig/mutter-cogl-pango-%{api_major}.pc
%{_libdir}/pkgconfig/mutter-cogl-path-%{mutter_major}.pc %{_libdir}/pkgconfig/mutter-cogl-path-%{api_major}.pc
%files lang -f %{name}.lang
%changelog %changelog