diff --git a/mutter-40.2.1.tar.xz b/mutter-40.2.1.tar.xz deleted file mode 100644 index c4d429d..0000000 --- a/mutter-40.2.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d10630edb6ae80b876deada8e725eaa2b1f00324a4243027d17b85d19457fcd -size 2681780 diff --git a/mutter-40.3.tar.xz b/mutter-40.3.tar.xz new file mode 100644 index 0000000..867c951 --- /dev/null +++ b/mutter-40.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b15cf8f41da281424bb381ddcd0defc2e17b944b552f77df2fac5e2b34cb005 +size 2682460 diff --git a/mutter-Lower-HIDPI_LIMIT-to-144.patch b/mutter-Lower-HIDPI_LIMIT-to-144.patch index 1077fbd..1b89eb4 100644 --- a/mutter-Lower-HIDPI_LIMIT-to-144.patch +++ b/mutter-Lower-HIDPI_LIMIT-to-144.patch @@ -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(-) -diff --git a/src/backends/meta-monitor.c b/src/backends/meta-monitor.c -index 60f3674..e0db546 100644 ---- a/src/backends/meta-monitor.c -+++ b/src/backends/meta-monitor.c -@@ -1476,7 +1476,7 @@ meta_monitor_calculate_crtc_pos (MetaMonitor *monitor, +Index: mutter-40.2.1/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 } /* The minimum resolution at which we turn on a window-scale of 2 */ @@ -20,6 +20,3 @@ index 60f3674..e0db546 100644 /* * The minimum screen height at which we turn on a window-scale of 2; --- -2.16.4 - diff --git a/mutter-disable-cvt-s390x.patch b/mutter-disable-cvt-s390x.patch index f9ebaf0..1b4dbfa 100644 --- a/mutter-disable-cvt-s390x.patch +++ b/mutter-disable-cvt-s390x.patch @@ -1,8 +1,8 @@ -Index: mutter-3.34.1+27/src/meson.build +Index: mutter-40.2.1/src/meson.build =================================================================== ---- mutter-3.34.1+27.orig/src/meson.build 2019-10-21 15:03:25.000000000 +0200 -+++ mutter-3.34.1+27/src/meson.build 2019-12-02 13:30:20.320685900 +0100 -@@ -722,6 +722,7 @@ +--- mutter-40.2.1.orig/src/meson.build ++++ mutter-40.2.1/src/meson.build +@@ -824,6 +824,7 @@ if have_profiler endif if have_native_backend @@ -10,7 +10,7 @@ Index: mutter-3.34.1+27/src/meson.build cvt = find_program('cvt') gen_default_modes = find_program('backends/native/gen-default-modes.py') -@@ -729,6 +730,9 @@ +@@ -831,6 +832,9 @@ if have_native_backend output: 'meta-default-modes.h', command: [gen_default_modes, '@OUTPUT@'] ) @@ -19,11 +19,11 @@ Index: mutter-3.34.1+27/src/meson.build + endif mutter_built_sources += default_modes_h - gdbus_codegen = find_program('gdbus-codegen') -Index: mutter-3.34.1+27/src/backends/native/meta-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 =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ mutter-3.34.1+27/src/backends/native/meta-default-modes.h 2019-12-02 13:09:44.832632052 +0100 +--- /dev/null ++++ mutter-40.2.1/src/backends/native/meta-default-modes.h @@ -0,0 +1,57 @@ +/* Generated by gen-default-modes.py */ + diff --git a/mutter.changes b/mutter.changes index 897ca7a..e928783 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Tue Jul 13 10:48:16 UTC 2021 - Bjørn Lie + +- Update to version 40.3: + + Fix area screencasts when window is unredirected. + + Fix mapping tablet to monitor. + + Fixed crash. + + Misc. bug fixes. + + Updated translations. +- Drop mutter-Gracefully-handle-page-flipping.patch: Fixed + upstream. + +------------------------------------------------------------------- +Tue Jul 6 16:51:47 UTC 2021 - Bjørn Lie + +- Build wayland eglstream support: Pass wayland_eglstream=true to + meson and add pkgconfig(wayland-eglstream) BuildRequires. + Gnome-shell Wayland session with nvidia binary driver is now + possible when enabled manually, users must first comment out the + disabling of Wayland when using the proprietary nvidia driver in + /usr/lib/udev/rules.d/61-gdm.rules, then boot with passing + nvidia-drm.modeset=1 to the kernel. We do NOT recommend that + users try this, as it buggy and unstable at the moment. +- Add mutter-Gracefully-handle-page-flipping.patch kms: Gracefully + handle page flipping direct scanouts failing. Fix a crash. + +------------------------------------------------------------------- +Thu Jun 17 12:55:03 UTC 2021 - Bjørn Lie + +- Rebase mutter-disable-cvt-s390x.patch and + mutter-Lower-HIDPI_LIMIT-to-144.patch, and enable + mutter-disable-cvt-s390x.patch again now that it is rebased. + ------------------------------------------------------------------- Wed Jun 16 12:31:32 UTC 2021 - Bjørn Lie diff --git a/mutter.spec b/mutter.spec index f155f2e..0b34512 100644 --- a/mutter.spec +++ b/mutter.spec @@ -23,7 +23,7 @@ %define api_minor 0 %define libmutter libmutter-%{api_major}-%{api_minor} Name: mutter -Version: 40.2.1 +Version: 40.3 Release: 0 Summary: Window and compositing manager based on Clutter License: GPL-2.0-or-later @@ -33,7 +33,7 @@ Source: https://download.gnome.org/sources/mutter/40/%{name}-%{version}. # 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 -# PATCH-NEEDS-REBASE mutter-disable-cvt-s390x.patch bsc#1158128 fcrozat@suse.com -- Do not search for cvt on s390x, it doesn't exist there WAS PATCH-FIX-UPSTREAM +# 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 ## SLE-only patches start at 1000 @@ -83,6 +83,7 @@ BuildRequires: pkgconfig(sysprof-capture-4) >= 3.37.3 %endif BuildRequires: pkgconfig(udev) BuildRequires: pkgconfig(upower-glib) >= 0.99.0 +BuildRequires: pkgconfig(wayland-eglstream) BuildRequires: pkgconfig(wayland-protocols) >= 1.18 BuildRequires: pkgconfig(wayland-server) >= 1.13.0 BuildRequires: pkgconfig(x11) @@ -135,7 +136,7 @@ applications that want to make use of the mutter library. %prep %setup -q %patch3 -p1 -#patch4 -p1 +%patch4 -p1 # SLE-only patches and translations. translation-update-upstream po mutter @@ -148,6 +149,7 @@ translation-update-upstream po mutter %build %meson \ -Degl_device=true \ + -Dwayland_eglstream=true \ -Dcogl_tests=false \ -Dclutter_tests=false \ -Dtests=false \