diff options
| author | Joakim Soderlund | 2022-02-17 21:14:35 +0100 |
|---|---|---|
| committer | Joakim Soderlund | 2022-02-17 21:44:44 +0100 |
| commit | 30f9019b0338972f82d42fdb8bf3b2d9b28ea986 (patch) | |
| tree | 6a53682520c9b2e9ffad7aab3ec5f539f9dd030e | |
| parent | a76dfea8c0c77418382279f3a27f8db652a453e2 (diff) | |
| download | aur-30f9019b0338972f82d42fdb8bf3b2d9b28ea986.tar.gz | |
Upgrade Mutter to version 41.4
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | backports.patch | 9 |
3 files changed, 11 insertions, 17 deletions
@@ -1,7 +1,7 @@ pkgbase = mutter-dynamic-buffering pkgdesc = A window manager for GNOME (with dynamic triple/double buffering) - pkgver = 41.3 - pkgrel = 2 + pkgver = 41.4 + pkgrel = 1 url = https://gitlab.gnome.org/GNOME/mutter arch = x86_64 groups = gnome @@ -37,11 +37,11 @@ pkgbase = mutter-dynamic-buffering provides = mutter provides = libmutter-9.so conflicts = mutter - source = mutter-dynamic-buffering::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=f51ad2911419ee2ab88b5548581227a57d0fd987 + source = mutter-dynamic-buffering::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=83a34957046c5b6bca609fda4b68c8c5d1276d14 source = backports.patch source = mr1441.patch sha256sums = SKIP - sha256sums = 650e2d88bad9226be7cde62974b3a39a99d63156d0fe61df6bc54887481a1b51 + sha256sums = 4bfebf11fd10d2829977cb3c77491bcb9eaa7779f9fc72cdbf10cb0f56adc813 sha256sums = cf99896763558258f489ff0e9a1e8001f716d63b06366f740e044cc72a71d3e7 pkgname = mutter-dynamic-buffering @@ -4,8 +4,8 @@ # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> pkgname=mutter-dynamic-buffering -pkgver=41.3 -pkgrel=2 +pkgver=41.4 +pkgrel=1 pkgdesc="A window manager for GNOME (with dynamic triple/double buffering)" url="https://gitlab.gnome.org/GNOME/mutter" arch=(x86_64) @@ -20,13 +20,13 @@ checkdepends=(xorg-server-xvfb pipewire-media-session python-dbusmock) provides=(mutter libmutter-9.so) conflicts=(mutter) groups=(gnome) -_commit=f51ad2911419ee2ab88b5548581227a57d0fd987 # tags/41.3^0 +_commit=83a34957046c5b6bca609fda4b68c8c5d1276d14 # tags/41.4^0 source=("$pkgname::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit" 'backports.patch' 'mr1441.patch') sha256sums=('SKIP' - '650e2d88bad9226be7cde62974b3a39a99d63156d0fe61df6bc54887481a1b51' + '4bfebf11fd10d2829977cb3c77491bcb9eaa7779f9fc72cdbf10cb0f56adc813' 'cf99896763558258f489ff0e9a1e8001f716d63b06366f740e044cc72a71d3e7') pkgver() { @@ -38,6 +38,9 @@ prepare() { cd "$srcdir/$pkgname" patch -p1 < "$srcdir/mr1441.patch" patch -p1 < "$srcdir/backports.patch" + + # Make tests run + sed -i '/catchsegv/d' meson.build } build() { diff --git a/backports.patch b/backports.patch index ae12ad29274a..5852ba662557 100644 --- a/backports.patch +++ b/backports.patch @@ -8,15 +8,6 @@ diff --git a/src/backends/native/meta-onscreen-native.c b/src/backends/native/me index eb1e7412a..eacfd2cc1 100644 --- a/src/backends/native/meta-onscreen-native.c +++ b/src/backends/native/meta-onscreen-native.c -@@ -188,6 +188,8 @@ notify_view_crtc_presented (MetaRendererView *view, - - frame_info = cogl_onscreen_peek_head_frame_info (onscreen); - -+ g_return_if_fail (frame_info != NULL); -+ - crtc = META_CRTC (meta_crtc_kms_from_kms_crtc (kms_crtc)); - maybe_update_frame_info (crtc, frame_info, time_us, flags, sequence); - @@ -404,7 +406,7 @@ meta_onscreen_native_flip_crtc (CoglOnscreen *onscreen, kms = meta_kms_device_get_kms (kms_device); kms_update = meta_kms_ensure_pending_update (kms, kms_device); |