blob: e7dc2aa6fb44ab179b07225a96a009a24ab801f5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
|
# Maintainer: Saren Arterius <saren@wtako.net>
# Maintainer: Térence Clastres <t.clastres@gmail.com>
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
### MERGE REQUESTS SELECTION
# available MR: ('!429' '!493' '!575' '!579' !719 '!724' '!762')
# _merge_requests_to_use=('!493' '!575' '!579' !719 '!724' '!762')
_merge_requests_to_use=('!575' '!724' '!909')
### IMPORTANT: Do no edit below this line unless you know what you're doing
pkgname=mutter-performance
pkgver=3.34.1+52+g403d8fcc6
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"
arch=(x86_64)
license=(GPL)
depends=(dconf gobject-introspection-runtime gsettings-desktop-schemas libcanberra
startup-notification zenity libsm gnome-desktop upower libxkbcommon-x11
gnome-settings-daemon libgudev libinput pipewire xorg-server-xwayland)
makedepends=(gobject-introspection git egl-wayland meson xorg-server "sysprof>=3.34")
checkdepends=(xorg-server-xvfb)
provides=(mutter mutter-781835-workaround)
conflicts=(mutter)
replaces=(mutter-781835-workaround)
groups=(gnome)
_commit=403d8fcc6624f5d027dd599c934411e71d248754 # gnome-3-34
source=("$pkgname::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit"
918.patch
fix-build.patch)
sha256sums=('SKIP'
'775fbcd209a170b6ca13326367ef62b8d35acff16019553c40eb24f0684c3495'
'28aa24daed161f2566ca2b159beb43285184c533956b851a7eb318de741da935')
pkgver() {
cd $pkgname
git describe --tags | sed 's/-/+/g'
}
hash_of() {
git log --oneline --all | grep "$1" | tail -n 1 | awk '{print $1}'
}
git_cp_by_msg() {
# Comment: Saren found a way to fetch hash based on commit name. It's controversial but might be interesting to create a function to call for each MR to not have to update the hash at each rebase.
h_first=$(hash_of "$2")
if [[ -n "$3" ]]; then
h_last=$(hash_of "$3")
echo "Found $h_first^$h_last for $1"
git cherry-pick -n -Xtheirs $h_first^..$h_last
else
echo "Found $h_first for $1"
git cherry-pick -n -Xtheirs $h_first
fi
}
pick_mr() {
for mr in "${_merge_requests_to_use[@]}"; do
if [ "$1" = "$mr" ]; then
if [ "$3" = "merge" ]; then
echo "Merging $1..."
git cherry-pick -n $2
elif [ "$3" = "revert" ]; then
echo "Reverting $1..."
git revert "$2" --no-commit
else
echo "Merging latest commits for $1..."
git_cp_by_msg "$1" "$2" "$3"
fi
break
fi
done
}
prepare() {
cd $pkgname
### Adding and fetching remotes providing the selected merge-requests
git reset --hard
git cherry-pick --abort || true
git remote add vanvugt https://gitlab.gnome.org/vanvugt/mutter.git || true
# git remote add verdre https://gitlab.gnome.org/verdre/mutter.git || true # !429
git remote add 3v1no https://gitlab.gnome.org/3v1n0/mutter.git || true
git fetch vanvugt
# git fetch verdre
git fetch 3v1no
### Merge Requests
# Merge Request Prototype
# Title:
# URL:
# Type:
# Status:
# Comment:
# git cherry-pick -n first_commit^..last_commit
#
# Possible Status:
# 1. Needs rebase: Conflicts with master branch.
# 2. Needs review: Mutter maintainers needs to review the new/updated MR and provide feedback.
# 3. Needs changes: MR needs to be adjusted based on maintainers feedback.
# 4. Merged: MR approved and it changes commited to master.
#
# Generally, a MR status oscillate between 2 and 3 and then becomes 4.
#
# Possible Type:
# 1. Improvement: Makes an already existing feature behave better, more efficiently/reliably.
# 2. Feature: Adds a new functionality.
# 3. Fix: Regression/bug fix only available in master (not backported).
# 4. Cleanup: Code styling improvement, function deprecation, rearrangement...
# Title: Resource scale computation optimizations
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/493
# Type: 1
# Status: 3
# Comment: Not picked by default because breaks the overview on Wayland. https://gitlab.gnome.org/GNOME/mutter/merge_requests/493#note_549833
pick_mr '!493' 3aa449af^..1017ce44 'merge'
# Title: Honour `CLUTTER_ACTOR_NO_LAYOUT` more efficiently
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/575
# Type: 1
# Status: 2
pick_mr '!575' 'clutter/stage: Add an API for shallow relayouts' 'clutter/actor: Use the new shallow relayout API'
# Title: clutter/stage: Update input devices right after doing a relayout
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/429
# Type: 1
# Status: 1
pick_mr '!429' 'clutter/stage-cogl: Add method to check if ongoing repaint is clipped' 'clutter/stage: Use a device-manager method to update input devices'
# Title: Sync timelines to hardware vsync
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/724
# Type: 1
# Status: 2
# Comment:
pick_mr '!724' 'clutter/stage: Add API to get_next_presentation_time' 'clutter/master-clock-default: Sync timelines to hardware vsync'
# Title: backends: Do not reload keymap on new keyboard notifications
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/579
# Type: 1
# Status: 4
# Comment: Was reverted: https://gitlab.gnome.org/GNOME/mutter/merge_requests/833
# If you use stenography software or play hardcore rhythm games like Lunatic Rave 2/osumania, use it.
pick_mr '!579' ce86f90efbaa51522ba14c5b4cad933c2106de42 'revert'
# Title: https://gitlab.gnome.org/GNOME/mutter/merge_requests/719
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/719
# Type: 1
# Status: 4
# Comment: Was reverted: https://gitlab.gnome.org/GNOME/mutter/commit/97140ab6346bd29208e99c9c9aab892c2eec0e52
# Use together with !762 to fix one of its issues.
pick_mr '!719' 97140ab6346bd29208e99c9c9aab892c2eec0e52 'revert'
pick_mr '!762' e9ba9dc2 'merge'
# https://gitlab.gnome.org/GNOME/mutter/merge_requests/918
git apply -3 ../918.patch
patch -Np1 < ../fix-build.patch
}
build() {
arch-meson $pkgname build \
-D egl_device=true \
-D wayland_eglstream=true \
-D installed_tests=false
ninja -C build
}
check() (
mkdir -p -m 700 "${XDG_RUNTIME_DIR:=$PWD/runtime-dir}"
glib-compile-schemas "${GSETTINGS_SCHEMA_DIR:=$PWD/build/data}"
export XDG_RUNTIME_DIR GSETTINGS_SCHEMA_DIR
# Unexpected passes in conform test
# Stacking test flaky
dbus-run-session xvfb-run -s '+iglx -noreset' meson test -C build --print-errorlogs || :
)
package() {
DESTDIR="$pkgdir" meson install -C build
}
|