snlavaise/pmaports-rtwo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

systemd/mutter: upgrade to 48.2

Browse Source 
Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6461
This commit is contained in:
Oliver Smith
2025-04-28 19:57:15 +02:00
parent ee887bdbfc
commit 962688a441
2 changed files with 3 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extra-repos/systemd/mutter/APKBUILD
+3 -5
View File
@@ -1,8 +1,8 @@
# Forked from Alpine to add systemd!
pkgname=mutter
pkgver=99948.0
_pkgver=48.0
pkgver=99948.2
_pkgver=48.2
pkgrel=0
pkgdesc="clutter-based window manager and compositor"
url="https://wiki.gnome.org/Projects/Mutter/"
@@ -73,7 +73,6 @@ subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-lang $pkgname-schem
source="https://download.gnome.org/sources/mutter/${_pkgver%.*}/mutter-$_pkgver.tar.xz
fixudev-req.patch
pcversion.patch
fix-freeze.patch
"
builddir="$srcdir/$pkgname-$_pkgver"
@@ -104,8 +103,7 @@ package() {
}
sha512sums="
48abd37a7b622835ccc9a5ca5aaa007744bd0a91764752ae64fc8385b0df700f58bdba11b7145d6bbc15649c84356c5f6107974c696c619cc272a939cb9743e3 mutter-48.0.tar.xz
f5ee612c83aded7586b2d2c784bf84428bd946b577e44aa02e8d35b042ad1ccbd6e3eb0bb65ecdfbc6294c01caeb895113c0f244269631f2228a9f877bf57382 mutter-48.2.tar.xz
60eb075a88ca301470130d17371c1410220be0c7d5a929f6b528ec838a1133ebccf46d29f448060043e94c2edf4615ae431927911bede1972ac37f04ff9f29b4 fixudev-req.patch
ec94fdecb7a3213903d013c1e6f48e02f8a1972ded16c3604627984cfce0936a0276d284c20e746eb91bf97249785bcf827f6fa55f1629e5290e19423d554e4d pcversion.patch
b7d0bea395c47558a089f75c2c30ac04da2ffc60d044364653098dcb30302aeeb839631fc51c5b5673d11f07fe85af645ea6fe9b2ebe107f8fc67541d5a8e3eb fix-freeze.patch
"
extra-repos/systemd/mutter/fix-freeze.patch
-99
View File
@@ -1,99 +0,0 @@
Patch-Source: https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4338
---
From d6005b539ca42905dfaf1c3854540a559332b78e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
Date: Mon, 17 Mar 2025 11:00:11 +0100
Subject: [PATCH 1/2] kms/impl-device: Always catch pending KMS update in
_schedule_process
Not only if the deadline timer is enabled. With the next commit, it'll
be semi-expected to happen even if the deadline timer is disabled.
Still leave the warning though, as a reminder that we'd rather prevent
this outside of the KMS thread.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4338>
---
src/backends/native/meta-kms-impl-device.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/backends/native/meta-kms-impl-device.c b/src/backends/native/meta-kms-impl-device.c
index 0135f22033..25cb1cbd5e 100644
--- a/src/backends/native/meta-kms-impl-device.c
+++ b/src/backends/native/meta-kms-impl-device.c
@@ -2081,17 +2081,8 @@ meta_kms_impl_device_schedule_process (MetaKmsImplDevice *impl_device,
if (ensure_deadline_timer_armed (impl_device, crtc_frame))
return;
-
- if (crtc_frame->pending_update)
- {
- meta_kms_impl_device_do_process_update (impl_device, crtc_frame,
- crtc_frame->crtc,
- crtc_frame->pending_update,
- META_KMS_UPDATE_FLAG_NONE);
- }
}
-
- if (crtc_frame->pending_update)
+ else if (crtc_frame->pending_update)
{
MetaKmsImplDevicePrivate *priv =
meta_kms_impl_device_get_instance_private (impl_device);
@@ -2100,6 +2091,14 @@ meta_kms_impl_device_schedule_process (MetaKmsImplDevice *impl_device,
crtc_frame->pending_update, priv->deadline_timer_state);
}
+ if (crtc_frame->pending_update)
+ {
+ meta_kms_impl_device_do_process_update (impl_device, crtc_frame,
+ crtc_frame->crtc,
+ crtc_frame->pending_update,
+ META_KMS_UPDATE_FLAG_NONE);
+ }
+
meta_kms_device_set_needs_flush (meta_kms_crtc_get_device (crtc), crtc);
}
--
GitLab
From a355f68d347830ab1dc8fba0bf409dd0aaf2804d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
Date: Mon, 17 Mar 2025 10:50:13 +0100
Subject: [PATCH 2/2] Revert "onscreen/native: Account for all posted frames"
This reverts commit 9fc5fdc953f96cd91ad54fce6c50964e7ce57815.
It caused freezes for some users.
Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/3974
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4338>
---
src/backends/native/meta-onscreen-native.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/backends/native/meta-onscreen-native.c b/src/backends/native/meta-onscreen-native.c
index bb7a2c4bd5..a8d7d7aa26 100644
--- a/src/backends/native/meta-onscreen-native.c
+++ b/src/backends/native/meta-onscreen-native.c
@@ -1672,7 +1672,6 @@ maybe_post_next_frame (CoglOnscreen *onscreen)
{
kms_update = meta_frame_native_steal_kms_update (frame_native);
post_nonprimary_plane_update (onscreen_native, frame, kms_update);
- onscreen_native->posted_frame = clutter_frame_ref (frame);
return;
}
@@ -2127,7 +2126,6 @@ meta_onscreen_native_finish_frame (CoglOnscreen *onscreen,
}
post_nonprimary_plane_update (onscreen_native, frame, kms_update);
- onscreen_native->posted_frame = clutter_frame_ref (frame);
clutter_frame_set_result (frame, CLUTTER_FRAME_RESULT_PENDING_PRESENTED);
}
--
GitLab