Fabian Bornschein pushed to branch main at Arch Linux / Packaging / Packages / mutter
Commits: 8f5a47fb by Fabian Bornschein at 2024-04-21T16:08:58+02:00 upgpkg: 46.1-1 * New upstream release * Drops upstreamed cherry-pick 22689d722ab4e13ab272c3534f5d18a55c94084f * Drops upstreamed patch 0001-drm-buffer-gbm-Do-not-call-ensure_fb_id-from-lock_fr.patch * Closes https://gitlab.archlinux.org/archlinux/packaging/packages/mutter/-/issues/5 - - - - - 3 changed files: - .SRCINFO - − 0001-drm-buffer-gbm-Do-not-call-ensure_fb_id-from-lock_fr.patch - PKGBUILD Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = mutter pkgdesc = Window manager and compositor for GNOME - pkgver = 46.0 - pkgrel = 3 + pkgver = 46.1 + pkgrel = 1 url = https://gitlab.gnome.org/GNOME/mutter arch = x86_64 license = GPL-2.0-or-later @@ -74,10 +74,8 @@ pkgbase = mutter depends = systemd-libs depends = wayland depends = xorg-xwayland - source = git+https://gitlab.gnome.org/GNOME/mutter.git#tag=46.0 - source = 0001-drm-buffer-gbm-Do-not-call-ensure_fb_id-from-lock_fr.patch - b2sums = 04a14854c8ec2668a340b241102b7b2ebbc0387a9771a5bd2c2366419ee08e7ebb308f2288f4a64b9d08053e1897eb514a46802584d1590f8bcebde4a613afaa - b2sums = fed7d496b658a43b306e62a57c817c54990e8764103eae5479b8a96fbdf25da1ae6028126aa3cccda6239ff1f0c4e69bbe6f12e29804651c1a7b6ca40d6bf36c + source = git+https://gitlab.gnome.org/GNOME/mutter.git#tag=46.1 + b2sums = 4acd4a192455890b12b2fc9b6553ed65bd2176307cd6c6683fc2ab476b7fa88f4b5e507a1209b3e900c68d94768f3cf749b4f5d87d25300b33a112182c8a62a7 pkgname = mutter provides = libmutter-14.so ===================================== 0001-drm-buffer-gbm-Do-not-call-ensure_fb_id-from-lock_fr.patch deleted ===================================== @@ -1,48 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaen...@redhat.com> -Date: Wed, 27 Mar 2024 18:16:17 +0100 -Subject: [PATCH] drm-buffer-gbm: Do not call ensure_fb_id from lock_front - -When preparing a frame for scanout on a secondary GPU, calling -meta_drm_buffer_gbm_ensure_fb_id for the primary GPU device is -unnecessary and potentially harmful. ---- - src/backends/native/meta-drm-buffer-gbm.c | 2 +- - src/backends/native/meta-onscreen-native.c | 11 +++++++++++ - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/src/backends/native/meta-drm-buffer-gbm.c b/src/backends/native/meta-drm-buffer-gbm.c -index 161d43957d48..4ca8fb0f4625 100644 ---- a/src/backends/native/meta-drm-buffer-gbm.c -+++ b/src/backends/native/meta-drm-buffer-gbm.c -@@ -186,7 +186,7 @@ lock_front_buffer (MetaDrmBufferGbm *buffer_gbm, - return FALSE; - } - -- return meta_drm_buffer_gbm_ensure_fb_id (META_DRM_BUFFER (buffer_gbm), error); -+ return TRUE; - } - - MetaDrmBufferGbm * -diff --git a/src/backends/native/meta-onscreen-native.c b/src/backends/native/meta-onscreen-native.c -index e40b03f3eaf3..f2bae4f00d6d 100644 ---- a/src/backends/native/meta-onscreen-native.c -+++ b/src/backends/native/meta-onscreen-native.c -@@ -1373,6 +1373,17 @@ meta_onscreen_native_swap_buffers_with_damage (CoglOnscreen *onscreen, - #endif - } - -+ if (!meta_drm_buffer_ensure_fb_id (onscreen_native->gbm.next_fb, &error)) -+ { -+ g_warning ("Failed to ensure KMS FB ID on %s: %s", -+ meta_device_file_get_path (render_device_file), -+ error->message); -+ -+ frame_info->flags |= COGL_FRAME_INFO_FLAG_SYMBOLIC; -+ meta_onscreen_native_notify_frame_complete (onscreen); -+ return; -+ } -+ - /* - * If we changed EGL context, cogl will have the wrong idea about what is - * current, making it fail to set it when it needs to. Avoid that by making ===================================== PKGBUILD ===================================== @@ -8,8 +8,8 @@ pkgname=( mutter mutter-docs ) -pkgver=46.0 -pkgrel=3 +pkgver=46.1 +pkgrel=1 pkgdesc="Window manager and compositor for GNOME" url="https://gitlab.gnome.org/GNOME/mutter"; arch=(x86_64) @@ -92,22 +92,11 @@ checkdepends=( source=( # Mutter tags use SSH signatures which makepkg doesn't understand "git+https://gitlab.gnome.org/GNOME/mutter.git#tag=$pkgver"; - 0001-drm-buffer-gbm-Do-not-call-ensure_fb_id-from-lock_fr.patch ) -b2sums=('04a14854c8ec2668a340b241102b7b2ebbc0387a9771a5bd2c2366419ee08e7ebb308f2288f4a64b9d08053e1897eb514a46802584d1590f8bcebde4a613afaa' - 'fed7d496b658a43b306e62a57c817c54990e8764103eae5479b8a96fbdf25da1ae6028126aa3cccda6239ff1f0c4e69bbe6f12e29804651c1a7b6ca40d6bf36c') +b2sums=('4acd4a192455890b12b2fc9b6553ed65bd2176307cd6c6683fc2ab476b7fa88f4b5e507a1209b3e900c68d94768f3cf749b4f5d87d25300b33a112182c8a62a7') prepare() { cd mutter - - # https://gitlab.archlinux.org/archlinux/packaging/packages/mutter/-/issues/3 - # https://gitlab.gnome.org/GNOME/mutter/-/issues/3384 - # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3685 - git cherry-pick -n 22689d722ab4e13ab272c3534f5d18a55c94084f - - # https://gitlab.gnome.org/GNOME/mutter/-/issues/3389 - # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3674 - git apply -3 ../0001-drm-buffer-gbm-Do-not-call-ensure_fb_id-from-lock_fr.patch } build() { View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/mutter/-/commit/8f5a47fb9ae92a5cb1292bd76ce5ef76aa73d5d7 -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/mutter/-/commit/8f5a47fb9ae92a5cb1292bd76ce5ef76aa73d5d7 You're receiving this email because of your account on gitlab.archlinux.org.
