blob: e978e218c38345b71badda2ac63bf901d926fcae (
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
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
|
# 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>
pkgname=mutter-performance
pkgver=3.32.2+43+gb7f158811
pkgrel=15
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 gnome-shell)
makedepends=(gobject-introspection git egl-wayland meson xorg-server)
checkdepends=(xorg-server-xvfb)
options=(debug !strip)
provides=(mutter mutter-781835-workaround)
conflicts=(mutter)
replaces=(mutter-781835-workaround)
groups=(gnome)
_commit=b7f158811934d8e4d9dd0be28ad8e1746ceac46c # tags/3.32.2^43
source=("$pkgname::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit"
429.diff)
sha256sums=('SKIP'
'c22bc32ab8a29e3da986f386d14a8376f1985c051328ca6786571b4b67ec9e48')
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
}
prepare() {
cd $pkgname
### Adding and fetching remotes providing the selected merge-requests
git cherry-pick --abort || true
git remote add vanvugt https://gitlab.gnome.org/vanvugt/mutter.git || true
git fetch vanvugt
### 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: Various Clutter cleanups
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/666
# Type: 4
# Status: 4
# Comment: Needed so !189 doesn't conflict
git cherry-pick -n 5bd85ef7^..b0b1ff36
# Title: Minor clutter stage cleanup
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/616
# Type: 4
# Status: 4
# Comment: Needed so !661 doesn't conflict
git cherry-pick -n 4064d9a7^..3073acc3
# Title: Geometric (OpenGL-less) picking
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/189
# Type: 1
# Status: 2
# Comment:
git cherry-pick -n a2507cd5^..b9170a69
# Title: clutter/stage-cogl: Don't skip over the next frame
# URL : https://gitlab.gnome.org/GNOME/mutter/merge_requests/520
# Type: 1
# Status: 4
# Comment:
git cherry-pick -n 45244852
# Title: Consolidate all frame throttling into clutter-stage-cogl
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/363
# Type: 1
# Status: 4
# Comment:
git cherry-pick -n 912a9ecf^..1dbf25af
# Title: clutter/stage-cogl: Reschedule update on present
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/281
# Type: 1
# Status: 4
# Comment:
git cherry-pick -n 4faeb127
# Title: clutter/stage: Only queue compressible events
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/711
# Type: 1
# Status: 2
# Comment: Replaces !168
git_cp_by_msg '!711' 'clutter/device-manager-evdev: Update device modifiers before queuing' 'clutter/stage: Only queue compressible events'
# Title: Resource scale computation optimizations
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/493
# Type: 1
# Status: 3
# Comment: Disabled because breaks the overview on Wayland. https://gitlab.gnome.org/GNOME/mutter/merge_requests/493#note_549833
if [ -f "$HOME/.i_dont_use_wayland_on_gnome" ]; then
echo "OK, you dont use wayland on gnome"
git cherry-pick -n 3aa449af^..1017ce44
fi
# Title: clutter: Defer actor allocations till shown
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/677
# Type: 1
# Status: 4
# Comment:
git cherry-pick -n 0eab73dc
# Title: Honour `CLUTTER_ACTOR_NO_LAYOUT` more efficiently
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/575
# Type: 1
# Status: 2
git_cp_by_msg '!575' 'clutter/stage: Add an API for shallow relayouts' 'clutter/actor: Use the new shallow relayout API'
# Title: cogl: Remove GLX "threaded swap wait" used on Nvidia
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/602
# Type: 1
# Status: 2
# Comment:
git_cp_by_msg '!602' 'cogl: Remove GLX "threaded swap wait" used on Nvidia'
# git cherry-pick -n -Xtheirs df38ad3c
# Title: compositor: Don't emit size-changed when only position changes
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/568
# Type: 1
# Status: 4
# Comment:
git cherry-pick -n 01e20a6b
# Title: cogl: Enable EGL_IMG_context_priority
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/454
# Type: 1
# Status: 4
# Comment:
git cherry-pick -n 3f29b478^..7df86fb2
# Title: Add experimental key for RT scheduling
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/460
# Type: 1
# Status: 4
# Comment: Only works in Wayland
git cherry-pick -n dae2c1d4
# 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: Disabled by default because it has issues when using multiple layouts
if [ -f "$HOME/.i_dont_use_multiple_keyboard_layouts" ]; then
echo "OK, you dont use multiple keyboard layouts"
git cherry-pick -n b01edc22
fi
# Title: Fix background texture corruption when resuming from suspend on Nvidia
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/600
# Type: 2
# Status: 4
# Comment:
git cherry-pick -n a5265365
# Title: WIP: renderer-native: Accept frames without ever blocking
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/73
# Type: 1
# Status: 1
# Comment: Might be replaced: https://gitlab.gnome.org/GNOME/mutter/merge_requests/73#note_544784
# git cherry-pick -n 35ec0eaf^..202530c9
# Title: clutter: Force an allocation on clone source if necessary
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/693
# Type: 3
# Status: 4
# Comment: Sometimes produces artefacts in the application grid: https://gitlab.gnome.org/GNOME/mutter/merge_requests/693#note_566491
#git cherry-pick -n 08a3cbfc
# Title: core: Only trigger MetaWorkspace::window-* on toplevel window types
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/701
# Type: 1
# Status: 2
# Comment:
git cherry-pick -n d7f799bf
# Title: Make MetaCullable implementations more thorough wrt painted areas
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/698
# Type: 1
# Status: 4
# Comment:
git cherry-pick -n 2812338b^..f501fdcc
#Title: window-actor: Fix rectangle coordinates in culling
#URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/707
#Type: 3
#Status: 4
#Comment: Fix for !698
git cherry-pick -n aae9f3a3
# Title: clutter-stage-cogl: Use regions
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/692
# Type: 1
# Status: 1
# Comment:
#git cherry-pick -n f2694e72^..d0edf91c
# Title: clutter/stage: Update input devices right after doing a relayout
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/429
# Type: 1
# Status: 2
# Comment: Can't be cleanly applied on 3.32 without lot of cherry-pick unrelated commits...
patch -Np1 < ../429.diff
git add clutter/clutter/*.{c,h}
# Title: Implement clipboard manager
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/320
# Type: 2
# Status: 4
# Comment:
git cherry-pick -n 156980ef^..02c99524
# Title: renderer-native: Reference count front buffers.
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/119
# Type: 2
# Status: 4
# Comment: Needed for !719 to behave well
git cherry-pick -n fecc57dd
# Title: Remove pending_swaps counter
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/719
# Type: 1
# Status: 2
# Comment:
git_cp_by_msg '!719' 'clutter/stage-cogl: Remove pending_swaps counter'
# Title: clutter: Use va_marshallers for actor signals
# URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/700
# Type: 1
# Status: 4
# Comment:
git cherry-pick -n c4a9117e^..9d65eab5 -Xours
}
build() {
arch-meson $pkgname build \
-D egl_device=true \
-D wayland_eglstream=true \
-D installed_tests=false
ninja -C build
}
package() {
DESTDIR="$pkgdir" meson install -C build
}
|