Hello community, here is the log from the commit of package mutter for openSUSE:Factory checked in at 2017-10-20 16:12:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mutter (Old) and /work/SRC/openSUSE:Factory/.mutter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mutter" Fri Oct 20 16:12:28 2017 rev:117 rq:533691 version:3.26.1 Changes: -------- --- /work/SRC/openSUSE:Factory/mutter/mutter.changes 2017-10-06 11:01:20.692447306 +0200 +++ /work/SRC/openSUSE:Factory/.mutter.new/mutter.changes 2017-10-20 16:12:38.504776444 +0200 @@ -1,0 +2,8 @@ +Tue Oct 10 13:03:00 UTC 2017 - [email protected] + +- Add mutter-wayland-dma-buf-modifiers-fix.patch: Don't send + modifiers to old clients (bgo#788558). +- Add mutter-x11-Protect-XChangeProperty-call.patch: Protect + XChangeProperty call with error traps (bgo#788666). + +------------------------------------------------------------------- New: ---- mutter-wayland-dma-buf-modifiers-fix.patch mutter-x11-Protect-XChangeProperty-call.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mutter.spec ++++++ --- /var/tmp/diff_new_pack.OV5bPl/_old 2017-10-20 16:12:39.100748603 +0200 +++ /var/tmp/diff_new_pack.OV5bPl/_new 2017-10-20 16:12:39.100748603 +0200 @@ -28,6 +28,10 @@ Patch0: mutter-fix-startup.patch # PATCH-FEATURE-UPSTREAM mutter-iconcache-Support-RGB16_565-format-for-16-bit-color-.patch FATE#323412 bgo#781704 bsc#1024748 [email protected] -- iconcache: Support RGB16_565 format for 16-bit sessions Patch1: mutter-iconcache-Support-RGB16_565-format-for-16-bit-color-.patch +# PATCH-FIX-UPSTREAM mutter-wayland-dma-buf-modifiers-fix.patch bgo#788558 [email protected] -- Don't send modifiers to old clients +Patch2: mutter-wayland-dma-buf-modifiers-fix.patch +# PATCH-FIX-UPSTREAM mutter-x11-Protect-XChangeProperty-call.patch bgo#788666 [email protected] -- Protect XChangeProperty call with error traps +Patch3: mutter-x11-Protect-XChangeProperty-call.patch # SLE only patches start at 1000 # PATCH-FEATURE-SLE mutter-SLE-bell.patch FATE#316042 bnc#889218 [email protected] -- make audible bell work out of the box. @@ -138,6 +142,8 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 # SLE only patches and translations. %if !0%{?is_opensuse} ++++++ mutter-wayland-dma-buf-modifiers-fix.patch ++++++ >From edfd15b32daca9fef707a25bf312441349506b05 Mon Sep 17 00:00:00 2001 From: Daniel Stone <[email protected]> Date: Mon, 2 Oct 2017 16:46:17 +0100 Subject: wayland-dma-buf: Don't send modifiers to old clients The modifier event was only added in v3 of the client; sending it to older clients (e.g. GStreamer waylandsink) causes them to disconnect immediately. Send the older 'format' event to all clients, and only send the newer 'modifier' event to resource versions 3 or above. https://bugzilla.gnome.org/show_bug.cgi?id=788558 --- src/wayland/meta-wayland-dma-buf.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/wayland/meta-wayland-dma-buf.c b/src/wayland/meta-wayland-dma-buf.c index e5d2f7c..76b8aa2 100644 --- a/src/wayland/meta-wayland-dma-buf.c +++ b/src/wayland/meta-wayland-dma-buf.c @@ -473,12 +473,19 @@ send_modifiers (struct wl_resource *resource, gboolean ret; int i; + zwp_linux_dmabuf_v1_send_format (resource, format); + + /* The modifier event was only added in v3; v1 and v2 only have the format + * event. */ + if (wl_resource_get_version (resource) < ZWP_LINUX_DMABUF_V1_MODIFIER_SINCE_VERSION) + return; + /* First query the number of available modifiers, then allocate an array, * then fill the array. */ ret = meta_egl_query_dma_buf_modifiers (egl, egl_display, format, 0, NULL, NULL, &num_modifiers, NULL); if (!ret || num_modifiers == 0) - return; + return; modifiers = g_new0 (uint64_t, num_modifiers); ret = meta_egl_query_dma_buf_modifiers (egl, egl_display, format, -- cgit v0.12 ++++++ mutter-x11-Protect-XChangeProperty-call.patch ++++++ >From 41f7a5fdf3bd95bd13e43e2151d29157d1dc5168 Mon Sep 17 00:00:00 2001 From: polygamma <[email protected]> Date: Mon, 9 Oct 2017 16:14:13 +0200 Subject: x11: Protect XChangeProperty call with error traps They may happen around the time a window is destroyed, thus could result on BadWindow X errors. https://bugzilla.gnome.org/show_bug.cgi?id=788666 --- src/x11/window-x11.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c index 36a5e70..4885f5f 100644 --- a/src/x11/window-x11.c +++ b/src/x11/window-x11.c @@ -920,11 +920,13 @@ update_gtk_edge_constraints (MetaWindow *window) meta_verbose ("Setting _GTK_EDGE_CONSTRAINTS to %lu\n", data[0]); + meta_error_trap_push (window->display); XChangeProperty (window->display->xdisplay, window->xwindow, window->display->atom__GTK_EDGE_CONSTRAINTS, XA_CARDINAL, 32, PropModeReplace, (guchar*) data, 1); + meta_error_trap_pop (window->display); } static gboolean -- cgit v0.12
