Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging
/ Packages / weston
Commits:
fe8d83a9 by Jan Alexander Steffens (heftig) at 2024-09-14T06:41:13+02:00
14.0.0-2: Fix a crash in headless mode (e.g. gtk4 tests)
- - - - -
3 changed files:
- .SRCINFO
- + 0001-libweston-noop-renderer-Check-shm_buffer-for-NULL.patch
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = weston
pkgdesc = Reference implementation of a Wayland compositor
pkgver = 14.0.0
- pkgrel = 1
+ pkgrel = 2
url = https://wayland.freedesktop.org/
arch = x86_64
license = MIT
@@ -53,11 +53,13 @@ pkgbase = weston
options = !lto
source =
https://gitlab.freedesktop.org/wayland/weston/-/releases/14.0.0/downloads/weston-14.0.0.tar.xz
source =
https://gitlab.freedesktop.org/wayland/weston/-/releases/14.0.0/downloads/weston-14.0.0.tar.xz.sig
+ source = 0001-libweston-noop-renderer-Check-shm_buffer-for-NULL.patch
validpgpkeys = 7032877A3EB1EAE3E4DC9DFBF63412E60947D6EF
validpgpkeys = 34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48
validpgpkeys = C7223EBE4EF66513B892598911A30156E0E67611
validpgpkeys = C0066D7DB8E9AC6844D728715E54498E697F11D7
sha256sums =
47fd0325b0b948e9b003a38fdf4eb3a8581f3fdc740b8932b35ae8793bf4e4a5
sha256sums = SKIP
+ sha256sums =
1fb79ddf37a917b1787399e9f20b419af99c59d42966ced899ef238ec2b6999a
pkgname = weston
=====================================
0001-libweston-noop-renderer-Check-shm_buffer-for-NULL.patch
=====================================
@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <[email protected]>
+Date: Sat, 14 Sep 2024 06:35:09 +0200
+Subject: [PATCH] libweston/noop-renderer: Check shm_buffer for NULL
+
+Copy the check from the pixman renderer.
+
+Fixes: https://gitlab.freedesktop.org/wayland/weston/-/issues/953
+---
+ libweston/noop-renderer.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/libweston/noop-renderer.c b/libweston/noop-renderer.c
+index 06b4aebc1f36..58d0b66819e9 100644
+--- a/libweston/noop-renderer.c
++++ b/libweston/noop-renderer.c
+@@ -94,6 +94,12 @@ noop_renderer_attach(struct weston_paint_node *pnode)
+ }
+
+ shm_buffer = buffer->shm_buffer;
++ /* This can happen if a SHM wl_buffer gets destroyed before we attach,
++ * because wayland-server just nukes the wl_shm_buffer from underneath
++ * us. */
++ if (!shm_buffer)
++ return;
++
+ data = wl_shm_buffer_get_data(shm_buffer);
+ stride = buffer->stride;
+ height = buffer->height;
=====================================
PKGBUILD
=====================================
@@ -3,7 +3,7 @@
pkgname=weston
pkgver=14.0.0
-pkgrel=1
+pkgrel=2
pkgdesc='Reference implementation of a Wayland compositor'
arch=('x86_64')
url='https://wayland.freedesktop.org/'
@@ -25,9 +25,12 @@ validpgpkeys=('7032877A3EB1EAE3E4DC9DFBF63412E60947D6EF' #
Marius Vlad <marius.v
'34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48' # emersion
<[email protected]>
'C7223EBE4EF66513B892598911A30156E0E67611' # Bryce Harrington
'C0066D7DB8E9AC6844D728715E54498E697F11D7') # Derek Foreman
-source=("https://gitlab.freedesktop.org/wayland/weston/-/releases/$pkgver/downloads/weston-$pkgver.tar.xz"{,.sig})
+source=("https://gitlab.freedesktop.org/wayland/weston/-/releases/$pkgver/downloads/weston-$pkgver.tar.xz"{,.sig}
+ # https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/1614
+ 0001-libweston-noop-renderer-Check-shm_buffer-for-NULL.patch)
sha256sums=('47fd0325b0b948e9b003a38fdf4eb3a8581f3fdc740b8932b35ae8793bf4e4a5'
- 'SKIP')
+ 'SKIP'
+ '1fb79ddf37a917b1787399e9f20b419af99c59d42966ced899ef238ec2b6999a')
prepare() {
cd $pkgname-$pkgver
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/weston/-/commit/fe8d83a9ce149b39496f1227fd56922158464add
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/weston/-/commit/fe8d83a9ce149b39496f1227fd56922158464add
You're receiving this email because of your account on gitlab.archlinux.org.
