1
0
Fork 0

Sync to gnome-45 & rm mr3327.patch

Signed-off-by: Mingi Sung <dawdleming@gmail.com>
This commit is contained in:
Mingi Sung 2024-03-21 21:23:14 +09:00
parent 20ba6cf419
commit cca7a2bbf3
Signed by: sungmg
GPG key ID: 8914E37E2BA317DD
3 changed files with 6 additions and 48 deletions

View file

@ -1,6 +1,6 @@
pkgbase = mutter-performance
pkgdesc = A window manager for GNOME | Attempts to improve performances with non-upstreamed merge-requests and frequent stable branch resync
pkgver = 45.4
pkgver = 45.5
pkgrel = 1
epoch = 1
url = https://gitlab.gnome.org/GNOME/mutter
@ -37,15 +37,13 @@ pkgbase = mutter-performance
depends = pipewire
depends = startup-notification
depends = xorg-xwayland
source = mutter-performance::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=919e71b113cc03c0fe1de7777393a19947f7b9f9
source = mutter-performance::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=4e8ccf5f9c177595aac11895ed50a4e35d5087e4
source = mr1441.patch
source = mr3304.patch
source = mr3327.patch
source = mr3373.patch
sha256sums = SKIP
sha256sums = 8d082a002e3506f67cf40c9ea03119e9e24f6c02238e633265a51992501e9799
sha256sums = 1339a8235b54a218c109a1d5e0992b3dca0f7610beb98fab0c27f0d68e026e16
sha256sums = 2bf8e12fe60a35469352510cc14a76603722441c1cb47ae9548a79712a01a762
sha256sums = 3e1f07b696ad37b1c639a524c092cd9259444bc6156542901ccaec936bea240f
pkgname = mutter-performance

View file

@ -11,8 +11,8 @@
### PACKAGE OPTIONS
## MERGE REQUESTS SELECTION
# Merge Requests List: ('579' '1441' '3304' '3327' '3373')
_merge_requests_to_use=('1441' '3304' '3327' '3373')
# Merge Requests List: ('579' '1441' '3304' '3373')
_merge_requests_to_use=('1441' '3304' '3373')
## Disable building the DOCS package (Enabled if not set)
# Remember to unset this variable when producing .SRCINFO
@ -31,7 +31,7 @@ else
pkgname=(mutter-performance mutter-performance-docs)
fi
epoch=1
pkgver=45.4
pkgver=45.5
pkgrel=1
pkgdesc="A window manager for GNOME | Attempts to improve performances with non-upstreamed merge-requests and frequent stable branch resync"
url="https://gitlab.gnome.org/GNOME/mutter"
@ -74,16 +74,14 @@ makedepends=(
if [ -n "$_enable_check" ]; then
checkdepends=(gnome-session xorg-server-xvfb pipewire-session-manager python-dbusmock zenity)
fi
_commit=919e71b113cc03c0fe1de7777393a19947f7b9f9 # tags/45.4^0
_commit=4e8ccf5f9c177595aac11895ed50a4e35d5087e4 # tags/45.5^0
source=("$pkgname::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit"
'mr1441.patch'
'mr3304.patch'
'mr3327.patch'
'mr3373.patch')
sha256sums=('SKIP'
'8d082a002e3506f67cf40c9ea03119e9e24f6c02238e633265a51992501e9799'
'1339a8235b54a218c109a1d5e0992b3dca0f7610beb98fab0c27f0d68e026e16'
'2bf8e12fe60a35469352510cc14a76603722441c1cb47ae9548a79712a01a762'
'3e1f07b696ad37b1c639a524c092cd9259444bc6156542901ccaec936bea240f')
pkgver() {
@ -175,15 +173,6 @@ prepare() {
# Comment: This fixes three issues that were preventing GPU copies on the Nvidia proprietary driver.
pick_mr '3304' 'mr3304.patch' 'patch'
# Title: backends/native: Fix the issue where KMS thread fails to acquire realtime on boot
# Author: Agustín Dall'Alba <gnome@dallalba.com.ar>
# URL: https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3327
# Type: 3
# Status: 2
# Comment: Remove G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START to fix the issue where KMS thread
# fails to acquire realtime priority on boot when the shell starts before the rtkit daemon.
pick_mr '3327' 'mr3327.patch' 'patch'
# Title: kms/crtc: Increase default deadline evasion to 1000 microseconds
# Author: Daniel van Vugt <daniel.van.vugt@canonical.com>
# URL: https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3373

View file

@ -1,29 +0,0 @@
From b0713028790d7831381d9e9d6d6b49f240d79b8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agust=C3=ADn=20Dall=27Alba?= <gnome@dallalba.com.ar>
Date: Sat, 14 Oct 2023 00:05:26 +0000
Subject: [PATCH] backends/native: Remove DO_NOT_AUTO_START flag from rtkit
dbus proxy
With this flag, the KMS Thread isn't made realtime at boot when the shell
starts before the rtkit daemon
---
src/backends/native/meta-thread.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/backends/native/meta-thread.c b/src/backends/native/meta-thread.c
index 1ed30441de3..48a524a198d 100644
--- a/src/backends/native/meta-thread.c
+++ b/src/backends/native/meta-thread.c
@@ -218,8 +218,7 @@ ensure_realtime_kit_proxy (MetaThread *thread,
rtkit_proxy =
meta_dbus_realtime_kit1_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
- G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS |
- G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
+ G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
"org.freedesktop.RealtimeKit1",
"/org/freedesktop/RealtimeKit1",
NULL,
--
GitLab