[arch-commits] Commit in mutter/repos/extra-x86_64 (5 files)
Jan Steffens
heftig at archlinux.org
Sun Jun 13 00:04:13 UTC 2021
Date: Sunday, June 13, 2021 @ 00:04:12
Author: heftig
Revision: 418101
archrelease: copy trunk to extra-x86_64
Added:
mutter/repos/extra-x86_64/0001-renderer-native-Clear-pending-update-list-before-rep.patch
(from rev 418100, mutter/trunk/0001-renderer-native-Clear-pending-update-list-before-rep.patch)
mutter/repos/extra-x86_64/PKGBUILD
(from rev 418100, mutter/trunk/PKGBUILD)
mutter/repos/extra-x86_64/mutter.install
(from rev 418100, mutter/trunk/mutter.install)
Deleted:
mutter/repos/extra-x86_64/PKGBUILD
mutter/repos/extra-x86_64/mutter.install
-----------------------------------------------------------------+
0001-renderer-native-Clear-pending-update-list-before-rep.patch | 33 ++
PKGBUILD | 143 +++++-----
mutter.install | 14
3 files changed, 114 insertions(+), 76 deletions(-)
Copied: mutter/repos/extra-x86_64/0001-renderer-native-Clear-pending-update-list-before-rep.patch (from rev 418100, mutter/trunk/0001-renderer-native-Clear-pending-update-list-before-rep.patch)
===================================================================
--- 0001-renderer-native-Clear-pending-update-list-before-rep.patch (rev 0)
+++ 0001-renderer-native-Clear-pending-update-list-before-rep.patch 2021-06-13 00:04:12 UTC (rev 418101)
@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl at gmail.com>
+Date: Sat, 12 Jun 2021 21:09:55 +0200
+Subject: [PATCH] renderer/native: Clear pending update list before
+ repopulating
+
+Before we did a simple copy, meaning the old list was overriden. Copy
+was too eager, as it meant views without modes to set was waited for,
+resulting in a dead lock. Instead only the relevant views were added to
+the list for view which had pending updates needed. What was missed was
+that the list was never cleared, meaning we just appended the new list
+on top of the old, causing issues.
+
+Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1846
+Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1843
+Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1844
+---
+ src/backends/native/meta-renderer-native.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c
+index a84f3025f..7e4af8fe0 100644
+--- a/src/backends/native/meta-renderer-native.c
++++ b/src/backends/native/meta-renderer-native.c
+@@ -831,7 +831,7 @@ meta_renderer_native_queue_modes_reset (MetaRendererNative *renderer_native)
+ MetaRenderer *renderer = META_RENDERER (renderer_native);
+ GList *l;
+
+- g_list_free (renderer_native->pending_mode_set_views);
++ g_clear_list (&renderer_native->pending_mode_set_views, NULL);
+ for (l = meta_renderer_get_views (renderer); l; l = l->next)
+ {
+ ClutterStageView *stage_view = l->data;
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-06-13 00:03:30 UTC (rev 418100)
+++ PKGBUILD 2021-06-13 00:04:12 UTC (rev 418101)
@@ -1,69 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
-
-pkgname=mutter
-pkgver=40.2
-pkgrel=1
-pkgdesc="A window manager for GNOME"
-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-xwayland graphene libxkbfile)
-makedepends=(gobject-introspection git egl-wayland meson xorg-server)
-checkdepends=(xorg-server-xvfb pipewire-media-session)
-provides=(libmutter-8.so)
-groups=(gnome)
-install=mutter.install
-_commit=d4269932528e28672a94cd965f8a5ee43481f127 # tags/40.2^0
-source=("git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- cd $pkgname
-}
-
-build() {
- CFLAGS="${CFLAGS/-O2/-O3} -fno-semantic-interposition"
- LDFLAGS+=" -Wl,-Bsymbolic-functions"
- arch-meson $pkgname build \
- -D egl_device=true \
- -D wayland_eglstream=true \
- -D installed_tests=false \
- -D profiler=false
- meson compile -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
-
- pipewire &
- _p1=$!
-
- pipewire-media-session &
- _p2=$!
-
- trap "kill $_p1 $_p2; wait" EXIT
-
- meson test -C build --print-errorlogs
-)
-
-check() {
- dbus-run-session xvfb-run \
- -s '-screen 0 1920x1080x24 -nolisten local +iglx -noreset' \
- bash -c "$(declare -f _check); _check"
-}
-
-package() {
- meson install -C build --destdir "$pkgdir"
-}
Copied: mutter/repos/extra-x86_64/PKGBUILD (from rev 418100, mutter/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-06-13 00:04:12 UTC (rev 418101)
@@ -0,0 +1,74 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
+
+pkgname=mutter
+pkgver=40.2
+pkgrel=2
+pkgdesc="A window manager for GNOME"
+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-xwayland graphene libxkbfile)
+makedepends=(gobject-introspection git egl-wayland meson xorg-server)
+checkdepends=(xorg-server-xvfb pipewire-media-session)
+provides=(libmutter-8.so)
+groups=(gnome)
+install=mutter.install
+_commit=d4269932528e28672a94cd965f8a5ee43481f127 # tags/40.2^0
+source=("git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit"
+ 0001-renderer-native-Clear-pending-update-list-before-rep.patch)
+sha256sums=('SKIP'
+ '8a861c2732e030fe2f19161539b0deb126ef0955a45d90fdf1fabd6390ca6f59')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+
+ # https://bugs.archlinux.org/task/71236
+ git apply -3 ../0001-renderer-native-Clear-pending-update-list-before-rep.patch
+}
+
+build() {
+ CFLAGS="${CFLAGS/-O2/-O3} -fno-semantic-interposition"
+ LDFLAGS+=" -Wl,-Bsymbolic-functions"
+ arch-meson $pkgname build \
+ -D egl_device=true \
+ -D wayland_eglstream=true \
+ -D installed_tests=false \
+ -D profiler=false
+ meson compile -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
+
+ pipewire &
+ _p1=$!
+
+ pipewire-media-session &
+ _p2=$!
+
+ trap "kill $_p1 $_p2; wait" EXIT
+
+ meson test -C build --print-errorlogs
+)
+
+check() {
+ dbus-run-session xvfb-run \
+ -s '-screen 0 1920x1080x24 -nolisten local +iglx -noreset' \
+ bash -c "$(declare -f _check); _check"
+}
+
+package() {
+ meson install -C build --destdir "$pkgdir"
+}
Deleted: mutter.install
===================================================================
--- mutter.install 2021-06-13 00:03:30 UTC (rev 418100)
+++ mutter.install 2021-06-13 00:04:12 UTC (rev 418101)
@@ -1,7 +0,0 @@
-post_install() {
- setcap cap_sys_nice+ep usr/bin/mutter
-}
-
-post_upgrade() {
- post_install
-}
Copied: mutter/repos/extra-x86_64/mutter.install (from rev 418100, mutter/trunk/mutter.install)
===================================================================
--- mutter.install (rev 0)
+++ mutter.install 2021-06-13 00:04:12 UTC (rev 418101)
@@ -0,0 +1,7 @@
+post_install() {
+ setcap cap_sys_nice+ep usr/bin/mutter
+}
+
+post_upgrade() {
+ post_install
+}
More information about the arch-commits
mailing list