r51752 - in /desktop/unstable/clutter-1.0/debian: changelog control patches/Don-t-create-the-Cogl-GLib-source-multiple-times.patch patches/Rely-on-gdk-to-dispatch-wayland-events.patch patches/gdk-Ensure-surface-buffer-scale-is-set.patch patches/series

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Fri Nov 18 21:46:07 UTC 2016


Author: sjoerd
Date: Fri Nov 18 21:46:06 2016
New Revision: 51752

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=51752
Log:
* d/p/Don-t-create-the-Cogl-GLib-source-multiple-times.patch:
  - Added. Avoid clreating multiple glib sources (gbo#768243, upstream git)
* d/p/Rely-on-gdk-to-dispatch-wayland-events.patch
  - Added. Don't dispatch wayland events from cogl as gdk will already do
    that. Fixes clutter-gst hanging on wayland (bgo#774079)
* d/p/gdk-Ensure-surface-buffer-scale-is-set.patch
  - Added. Ensure buffer scale is always set on wayland surfaces. Fixes
    clutter applications not being properly scaled on HiDPI (bgo#769190)

Added:
    desktop/unstable/clutter-1.0/debian/patches/Don-t-create-the-Cogl-GLib-source-multiple-times.patch
    desktop/unstable/clutter-1.0/debian/patches/Rely-on-gdk-to-dispatch-wayland-events.patch
    desktop/unstable/clutter-1.0/debian/patches/gdk-Ensure-surface-buffer-scale-is-set.patch
Modified:
    desktop/unstable/clutter-1.0/debian/changelog
    desktop/unstable/clutter-1.0/debian/control
    desktop/unstable/clutter-1.0/debian/patches/series

Modified: desktop/unstable/clutter-1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-1.0/debian/changelog?rev=51752&op=diff
==============================================================================
--- desktop/unstable/clutter-1.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/clutter-1.0/debian/changelog	[utf-8] Fri Nov 18 21:46:06 2016
@@ -1,3 +1,16 @@
+clutter-1.0 (1.26.0+dfsg-2) unstable; urgency=medium
+
+  * d/p/Don-t-create-the-Cogl-GLib-source-multiple-times.patch:
+    - Added. Avoid clreating multiple glib sources (gbo#768243, upstream git)
+  * d/p/Rely-on-gdk-to-dispatch-wayland-events.patch
+    - Added. Don't dispatch wayland events from cogl as gdk will already do
+      that. Fixes clutter-gst hanging on wayland (bgo#774079)
+  * d/p/gdk-Ensure-surface-buffer-scale-is-set.patch
+    - Added. Ensure buffer scale is always set on wayland surfaces. Fixes
+      clutter applications not being properly scaled on HiDPI (bgo#769190)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri, 18 Nov 2016 22:23:04 +0100
+
 clutter-1.0 (1.26.0+dfsg-1) unstable; urgency=medium
 
   * Team upload.

Modified: desktop/unstable/clutter-1.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-1.0/debian/control?rev=51752&op=diff
==============================================================================
--- desktop/unstable/clutter-1.0/debian/control	[utf-8] (original)
+++ desktop/unstable/clutter-1.0/debian/control	[utf-8] Fri Nov 18 21:46:06 2016
@@ -6,7 +6,7 @@
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>, Rico Tzschichholz <ricotz at ubuntu.com>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>, Rico Tzschichholz <ricotz at ubuntu.com>
 Build-Depends: debhelper (>= 9),
                cdbs (>= 0.4.93~),
                dh-autoreconf,

Added: desktop/unstable/clutter-1.0/debian/patches/Don-t-create-the-Cogl-GLib-source-multiple-times.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-1.0/debian/patches/Don-t-create-the-Cogl-GLib-source-multiple-times.patch?rev=51752&op=file
==============================================================================
--- desktop/unstable/clutter-1.0/debian/patches/Don-t-create-the-Cogl-GLib-source-multiple-times.patch	(added)
+++ desktop/unstable/clutter-1.0/debian/patches/Don-t-create-the-Cogl-GLib-source-multiple-times.patch	[utf-8] Fri Nov 18 21:46:06 2016
@@ -0,0 +1,43 @@
+From 9285a8522fbe1a4651c729a52de97dfff73dcf9b Mon Sep 17 00:00:00 2001
+From: "Owen W. Taylor" <otaylor at fishsoup.net>
+Date: Wed, 29 Jun 2016 17:03:46 -0400
+Subject: [PATCH] Don't create the Cogl GLib source multiple times
+
+Since the check for backend->cogl_context was accidentally moved
+to clutter_backend_do_real_create_context, the Glib source that
+is created at the end of clutter_backend_do_create_context() is
+created and added each time create_context() is called, though
+create_context() is supposed to be idempotent.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=768243
+---
+ clutter/clutter-backend.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c
+index bce4e91..d150e7c 100644
+--- a/clutter/clutter-backend.c
++++ b/clutter/clutter-backend.c
+@@ -252,9 +252,6 @@ clutter_backend_do_real_create_context (ClutterBackend  *backend,
+   CoglSwapChain *swap_chain;
+   GError *internal_error;
+ 
+-  if (backend->cogl_context != NULL)
+-    return TRUE;
+-
+   klass = CLUTTER_BACKEND_GET_CLASS (backend);
+ 
+   swap_chain = NULL;
+@@ -383,6 +380,9 @@ clutter_backend_real_create_context (ClutterBackend  *backend,
+   gboolean allow_any;
+   int i;
+ 
++  if (backend->cogl_context != NULL)
++    return TRUE;
++
+   if (allowed_drivers == NULL)
+     allowed_drivers = CLUTTER_DRIVERS;
+ 
+-- 
+2.10.2
+

Added: desktop/unstable/clutter-1.0/debian/patches/Rely-on-gdk-to-dispatch-wayland-events.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-1.0/debian/patches/Rely-on-gdk-to-dispatch-wayland-events.patch?rev=51752&op=file
==============================================================================
--- desktop/unstable/clutter-1.0/debian/patches/Rely-on-gdk-to-dispatch-wayland-events.patch	(added)
+++ desktop/unstable/clutter-1.0/debian/patches/Rely-on-gdk-to-dispatch-wayland-events.patch	[utf-8] Fri Nov 18 21:46:06 2016
@@ -0,0 +1,30 @@
+From 27116fec9474d2e3c124b653cd35b15d53d54a37 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+Date: Thu, 25 Jun 2015 10:39:48 +0200
+Subject: [PATCH] Rely on gdk to dispatch wayland events
+
+Disable cogl dispatching wayland events as Gdk will already be
+dispatching them causing a deadlock when cogl tries again to dispatch
+wayland events.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=774079
+---
+ clutter/gdk/clutter-backend-gdk.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/clutter/gdk/clutter-backend-gdk.c b/clutter/gdk/clutter-backend-gdk.c
+index 25c687b..f81b85b 100644
+--- a/clutter/gdk/clutter-backend-gdk.c
++++ b/clutter/gdk/clutter-backend-gdk.c
+@@ -275,7 +275,7 @@ clutter_backend_gdk_get_renderer (ClutterBackend  *backend,
+       /* Force a Wayland winsys */
+       cogl_renderer_set_winsys_id (renderer, COGL_WINSYS_ID_EGL_WAYLAND);
+       cogl_wayland_renderer_set_foreign_display (renderer, display);
+-      cogl_wayland_renderer_set_event_dispatch_enabled (renderer, !disable_event_retrieval);
++      cogl_wayland_renderer_set_event_dispatch_enabled (renderer, FALSE);
+     }
+   else
+ #endif
+-- 
+2.10.2
+

Added: desktop/unstable/clutter-1.0/debian/patches/gdk-Ensure-surface-buffer-scale-is-set.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-1.0/debian/patches/gdk-Ensure-surface-buffer-scale-is-set.patch?rev=51752&op=file
==============================================================================
--- desktop/unstable/clutter-1.0/debian/patches/gdk-Ensure-surface-buffer-scale-is-set.patch	(added)
+++ desktop/unstable/clutter-1.0/debian/patches/gdk-Ensure-surface-buffer-scale-is-set.patch	[utf-8] Fri Nov 18 21:46:06 2016
@@ -0,0 +1,41 @@
+From 4bbfaee8265315fde8b4c2d524d50823c449e18f Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd at luon.net>
+Date: Mon, 7 Nov 2016 22:52:45 +0100
+Subject: [PATCH] gdk: Ensure surface buffer scale is set
+
+GDK will only set the buffer scale for the surfaces it creates when
+attaching an image or when using an egl window window. Neither will
+happen for native clutter applications, thus directly set the buffer
+scale from clutter in that case (so it's in sync with the rendering
+scale)
+
+Signed-off-by: Sjoerd Simons <sjoerd at luon.net>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=769190
+---
+ clutter/gdk/clutter-stage-gdk.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/clutter/gdk/clutter-stage-gdk.c b/clutter/gdk/clutter-stage-gdk.c
+index 742de58..b4cc4d4 100644
+--- a/clutter/gdk/clutter-stage-gdk.c
++++ b/clutter/gdk/clutter-stage-gdk.c
+@@ -227,7 +227,14 @@ clutter_stage_gdk_wayland_surface (ClutterStageGdk *stage_gdk)
+ 
+   if (!stage_gdk->foreign_window ||
+       gdk_window_get_window_type (stage_gdk->window) != GDK_WINDOW_CHILD)
+-    return gdk_wayland_window_get_wl_surface (stage_gdk->window);
++    {
++      struct wl_surface *surface;
++
++      surface = gdk_wayland_window_get_wl_surface (stage_gdk->window);
++      wl_surface_set_buffer_scale (surface,
++                                   gdk_window_get_scale_factor (stage_gdk->window));
++      return surface;
++    }
+ 
+   if (stage_gdk->clutter_surface)
+     return stage_gdk->clutter_surface;
+-- 
+2.10.2
+

Modified: desktop/unstable/clutter-1.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-1.0/debian/patches/series?rev=51752&op=diff
==============================================================================
--- desktop/unstable/clutter-1.0/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/clutter-1.0/debian/patches/series	[utf-8] Fri Nov 18 21:46:06 2016
@@ -1 +1,4 @@
 01_do-not-build-cookbook.patch
+Don-t-create-the-Cogl-GLib-source-multiple-times.patch
+Rely-on-gdk-to-dispatch-wayland-events.patch
+gdk-Ensure-surface-buffer-scale-is-set.patch




More information about the pkg-gnome-commits mailing list