Merge lp:~mir-team/gtk/mir-release-0.14.0 into lp:~ubuntu-desktop/gtk/ubuntugtk3

[Andreas Pokorny]

mir release 0.14.0 changes

buffer swapping shall now be done through mir_buffer_stream instead of mir_surface.

mir release 0.14.0 changes

This change updates the mir patch for mir release 0.14.0 and lifts the restriction for little endian targets.

[Martin Pitt (pitti)]

This is blocked until we actually get mir 0.14 into wily.

[Iain Lane (laney)]

Also note that this backend is upstream, so we need to make sure that updates to the patch go there to. You can send them to Will Hua (attente).

[William Hua (attente)]

Hi, we already added something upstream to fix this (https://git.gnome.org/browse/gtk+/commit/?id=9800d83a721fd21b34df6dd36684d3e0e2a9fd7b) as well as backporting other commits (https://code.launchpad.net/~attente/gtk/refresh-mir/+merge/262776). Can we take that branch instead? I can update it with your changes to debian/control and debian/rules though.

[Andreas Pokorny (andreas-pokorny)]

@hua: ok even better.. will update the silo and switch to your MP

=== modified file 'debian/control'
--- debian/control	2015-06-19 18:07:33 +0000
+++ debian/control	2015-06-25 20:51:12 +0000
@@ -48,7 +48,7 @@
                gobject-introspection (>= 1.41.3),
                libgirepository1.0-dev (>= 1.39.0),
                xvfb,
-               libmirclient-dev (>= 0.11.0) [amd64 arm64 armhf i386],
+               libmirclient-dev (>= 0.14.0),
 Build-Depends-Indep: docbook-xml,
                      docbook-utils,
                      libglib2.0-doc,
@@ -167,7 +167,7 @@
          libegl1-mesa-dev [linux-any],
          libwayland-dev (>= 1.5.91) [linux-any],
          libxkbcommon-dev,
-         libmirclient-dev [amd64 arm64 armhf i386],
+         libmirclient-dev (>= 0.14.0),
 Suggests: libgtk-3-doc
 Description: development files for the GTK+ library
  GTK+ is a multi-platform toolkit for creating graphical user

=== modified file 'debian/patches/0002-Unstable-mir-patches-from-git-wip-mir-unstable.patch'
--- debian/patches/0002-Unstable-mir-patches-from-git-wip-mir-unstable.patch	2015-06-02 11:18:47 +0000
+++ debian/patches/0002-Unstable-mir-patches-from-git-wip-mir-unstable.patch	2015-06-25 20:51:12 +0000
@@ -10,11 +10,9 @@
  gdk/mir/gdkmirwindowimpl.c  | 319 ++++++++++++--------------------------------
  4 files changed, 116 insertions(+), 330 deletions(-)
 
-diff --git a/gdk/mir/gdkmir-debug.c b/gdk/mir/gdkmir-debug.c
-index 9bfdfe7..a135f1b 100644
 --- a/gdk/mir/gdkmir-debug.c
 +++ b/gdk/mir/gdkmir-debug.c
-@@ -184,8 +184,26 @@ _gdk_mir_print_close_event (const MirCloseSurfaceEvent *event)
+@@ -184,8 +184,26 @@
  void
  _gdk_mir_print_event (const MirEvent *event)
  {
@@ -41,11 +39,9 @@
      case mir_event_type_key:
        _gdk_mir_print_key_event (mir_event_get_input_event (event));
        break;
-diff --git a/gdk/mir/gdkmir-private.h b/gdk/mir/gdkmir-private.h
-index 847720b..2464434 100644
 --- a/gdk/mir/gdkmir-private.h
 +++ b/gdk/mir/gdkmir-private.h
-@@ -133,16 +133,4 @@ void _gdk_mir_print_resize_event (const MirResizeEvent *event);
+@@ -133,16 +133,4 @@
  
  void _gdk_mir_print_event (const MirEvent *event);
  
@@ -62,11 +58,9 @@
 -                                                 gpointer    user_data);
 -
  #endif /* __GDK_PRIVATE_MIR_H__ */
-diff --git a/gdk/mir/gdkmireventsource.c b/gdk/mir/gdkmireventsource.c
-index aed881c..41a4422 100644
 --- a/gdk/mir/gdkmireventsource.c
 +++ b/gdk/mir/gdkmireventsource.c
-@@ -148,6 +148,8 @@ generate_button_event (GdkWindow *window, GdkEventType type, gdouble x, gdouble
+@@ -148,6 +148,8 @@
  {
    GdkEvent *event;
  
@@ -75,7 +69,7 @@
    event = gdk_event_new (type);
    event->button.x = x;
    event->button.y = y;
-@@ -308,47 +310,6 @@ handle_key_event (GdkWindow *window, const MirInputEvent *event)
+@@ -308,47 +310,6 @@
      }
  }
  
@@ -123,7 +117,7 @@
  static guint
  mir_pointer_event_get_button_state (const MirPointerEvent *event)
  {
-@@ -388,49 +349,6 @@ handle_motion_event (GdkWindow *window, const MirInputEvent *event)
+@@ -388,49 +349,6 @@
    modifier_state = get_modifier_state (mir_pointer_event_modifiers (pointer_event), mir_pointer_event_get_button_state (pointer_event));
    event_time = NANO_TO_MILLI (mir_input_event_get_event_time (event));
  
@@ -173,7 +167,7 @@
    if (window)
      {
        gdouble new_x;
-@@ -444,6 +362,8 @@ handle_motion_event (GdkWindow *window, const MirInputEvent *event)
+@@ -444,6 +362,8 @@
          {
          case mir_pointer_action_button_up:
          case mir_pointer_action_button_down:
@@ -182,7 +176,7 @@
            event_type = mir_pointer_event_action (pointer_event) == mir_pointer_action_button_down ? GDK_BUTTON_PRESS : GDK_BUTTON_RELEASE;
            changed_button_state = button_state ^ mir_pointer_event_get_button_state (pointer_event);
            if (changed_button_state == 0 || (changed_button_state & mir_pointer_button_primary) != 0)
-@@ -463,7 +383,11 @@ handle_motion_event (GdkWindow *window, const MirInputEvent *event)
+@@ -463,7 +383,11 @@
            if (hscroll > 0.5 || vscroll > 0.5)
              generate_scroll_event (window, x, y, hscroll, vscroll, modifier_state, event_time);
            if (ABS (new_x - x) > 0.5 || ABS (new_y - y) > 0.5)
@@ -195,7 +189,7 @@
  
            break;
          case mir_pointer_action_leave:
-@@ -616,6 +540,7 @@ static void
+@@ -616,6 +540,7 @@
  gdk_mir_queued_event_free (GdkMirQueuedEvent *event)
  {
    _gdk_mir_window_reference_unref (event->window_ref);
@@ -203,7 +197,7 @@
    g_slice_free (GdkMirQueuedEvent, event);
  }
  
-@@ -800,7 +725,7 @@ _gdk_mir_event_source_queue (GdkMirWindowReference *window_ref,
+@@ -800,7 +725,7 @@
    queued_event = g_slice_new (GdkMirQueuedEvent);
    g_atomic_int_inc (&window_ref->ref_count);
    queued_event->window_ref = window_ref;
@@ -212,11 +206,9 @@
  
    g_mutex_lock (&source->mir_event_lock);
    g_queue_push_tail (&source->mir_events, queued_event);
-diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c
-index 9cafcc9..d150d3e 100644
 --- a/gdk/mir/gdkmirwindowimpl.c
 +++ b/gdk/mir/gdkmirwindowimpl.c
-@@ -46,11 +46,8 @@ struct _GdkMirWindowImpl
+@@ -46,11 +46,8 @@
    gint transient_x;
    gint transient_y;
  
@@ -229,7 +221,7 @@
    MirSurfaceState surface_state;
  
    /* Pattern for background */
-@@ -103,9 +100,9 @@ _gdk_mir_window_impl_set_surface_state (GdkMirWindowImpl *impl, MirSurfaceState
+@@ -103,9 +100,9 @@
  }
  
  void
@@ -241,7 +233,7 @@
  }
  
  void
-@@ -141,7 +138,7 @@ _gdk_mir_window_impl_get_cursor_state (GdkMirWindowImpl *impl,
+@@ -141,7 +138,7 @@
  static void
  gdk_mir_window_impl_init (GdkMirWindowImpl *impl)
  {
@@ -250,7 +242,7 @@
    impl->surface_state = mir_surface_state_unknown;
  }
  
-@@ -158,18 +155,6 @@ set_surface_state (GdkMirWindowImpl *impl,
+@@ -158,18 +155,6 @@
  }
  
  static void
@@ -269,7 +261,7 @@
  event_cb (MirSurface     *surface,
            const MirEvent *event,
            void           *context)
-@@ -179,18 +164,87 @@ event_cb (MirSurface     *surface,
+@@ -179,18 +164,87 @@
  
  static MirSurface *
  create_mir_surface (GdkDisplay *display,
@@ -358,7 +350,7 @@
    mir_surface_spec_set_name (spec, g_get_prgname ());
    mir_surface_spec_set_buffer_usage (spec, buffer_usage);
    surface = mir_surface_create_sync (spec);
-@@ -199,15 +253,6 @@ create_mir_surface (GdkDisplay *display,
+@@ -199,15 +253,6 @@
    return surface;
  }
  
@@ -374,7 +366,7 @@
  static void
  ensure_surface_full (GdkWindow *window,
                       MirBufferUsage buffer_usage)
-@@ -215,7 +260,7 @@ ensure_surface_full (GdkWindow *window,
+@@ -215,7 +260,7 @@
    GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
    GdkMirWindowReference *window_ref;
  
@@ -383,7 +375,7 @@
      return;
  
    /* no destroy notify -- we must leak for now
-@@ -223,8 +268,10 @@ ensure_surface_full (GdkWindow *window,
+@@ -223,8 +268,10 @@
     */
    window_ref = _gdk_mir_event_source_get_window_reference (window);
  
@@ -395,7 +387,7 @@
                                        buffer_usage);
  
    /* FIXME: can't make an initial resize event */
-@@ -242,8 +289,6 @@ ensure_surface_full (GdkWindow *window,
+@@ -242,8 +289,6 @@
    */
  
    mir_surface_set_event_handler (impl->surface, event_cb, window_ref); // FIXME: Ignore some events until shown
@@ -404,7 +396,7 @@
  }
  
  static void
-@@ -289,56 +334,10 @@ ensure_no_surface (GdkWindow *window)
+@@ -289,58 +334,14 @@
  }
  
  static void
@@ -459,9 +451,14 @@
 -    }
 -
    /* Send the completed buffer to Mir */
-   mir_surface_swap_buffers_sync (impl->surface);
+-  mir_surface_swap_buffers_sync (impl->surface);
++  mir_buffer_stream_swap_buffers_sync(
++      mir_surface_get_buffer_stream (impl->surface)
++      );
  
-@@ -363,7 +362,7 @@ gdk_mir_window_impl_ref_cairo_surface (GdkWindow *window)
+   /* The Cairo context is no longer valid */
+   g_clear_pointer (&impl->cairo_surface, cairo_surface_destroy);
+@@ -363,7 +364,7 @@
      }
  
    /* Transient windows get rendered into a buffer and copied onto their parent */
@@ -470,7 +467,17 @@
      {
        cairo_surface = cairo_image_surface_create (pixel_format, window->width, window->height);
      }
-@@ -409,13 +408,6 @@ static void
+@@ -371,7 +372,8 @@
+     {
+       ensure_surface (window);
+ 
+-      mir_surface_get_graphics_region (impl->surface, &region);
++      mir_buffer_stream_get_graphics_region (mir_surface_get_buffer_stream (impl->surface),
++                                             &region);
+       g_assert (region.pixel_format == mir_pixel_format_argb_8888);
+ 
+       cairo_surface = cairo_image_surface_create_for_data ((unsigned char *) region.vaddr,
+@@ -409,13 +411,6 @@
  gdk_mir_window_impl_finalize (GObject *object)
  {
    GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (object);
@@ -484,7 +491,7 @@
  
    if (impl->background)
      cairo_pattern_destroy (impl->background);
-@@ -423,7 +415,6 @@ gdk_mir_window_impl_finalize (GObject *object)
+@@ -423,7 +418,6 @@
      mir_surface_release_sync (impl->surface);
    if (impl->cairo_surface)
      cairo_surface_destroy (impl->cairo_surface);
@@ -492,27 +499,27 @@
  
    G_OBJECT_CLASS (gdk_mir_window_impl_parent_class)->finalize (object);
  }
-@@ -460,9 +451,6 @@ gdk_mir_window_impl_hide (GdkWindow *window)
-   impl->cursor_inside = FALSE;
-   impl->visible = FALSE;
-   ensure_no_surface (window);
--
--  if (should_render_in_parent (window))
--    redraw_transient (window);
- }
- 
- static void
-@@ -474,9 +462,6 @@ gdk_mir_window_impl_withdraw (GdkWindow *window)
-   impl->cursor_inside = FALSE;
-   impl->visible = FALSE;
-   ensure_no_surface (window);
--
--  if (should_render_in_parent (window))
--    redraw_transient (window);
- }
- 
- static void
-@@ -530,19 +515,10 @@ gdk_mir_window_impl_move_resize (GdkWindow *window,
+@@ -460,9 +454,6 @@
+   impl->cursor_inside = FALSE;
+   impl->visible = FALSE;
+   ensure_no_surface (window);
+-
+-  if (should_render_in_parent (window))
+-    redraw_transient (window);
+ }
+ 
+ static void
+@@ -474,9 +465,6 @@
+   impl->cursor_inside = FALSE;
+   impl->visible = FALSE;
+   ensure_no_surface (window);
+-
+-  if (should_render_in_parent (window))
+-    redraw_transient (window);
+ }
+ 
+ static void
+@@ -530,19 +518,10 @@
    GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
    gboolean recreate_surface = FALSE;
  
@@ -533,7 +540,7 @@
          {
            impl->transient_x = x;
            impl->transient_y = y;
-@@ -564,10 +540,6 @@ gdk_mir_window_impl_move_resize (GdkWindow *window,
+@@ -564,10 +543,6 @@
        ensure_no_surface (window);
        ensure_surface (window);
      }
@@ -544,7 +551,7 @@
  }
  
  static void
-@@ -742,16 +714,6 @@ gdk_mir_window_impl_destroy (GdkWindow *window,
+@@ -742,16 +717,6 @@
  
    impl->visible = FALSE;
    ensure_no_surface (window);
@@ -561,7 +568,7 @@
  }
  
  static void
-@@ -771,41 +733,13 @@ static void
+@@ -771,41 +736,13 @@
  gdk_mir_window_impl_set_type_hint (GdkWindow         *window,
                                     GdkWindowTypeHint  hint)
  {
@@ -607,7 +614,7 @@
  }
  
  static GdkWindowTypeHint
-@@ -813,29 +747,7 @@ gdk_mir_window_impl_get_type_hint (GdkWindow *window)
+@@ -813,29 +750,7 @@
  {
    GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
  
@@ -638,7 +645,7 @@
  }
  
  void
-@@ -911,64 +823,6 @@ gdk_mir_window_impl_set_transient_for (GdkWindow *window,
+@@ -911,64 +826,6 @@
  
    /* Link this window to the parent */
    impl->transient_for = parent;
@@ -703,7 +710,17 @@
  }
  
  static void
-@@ -1533,7 +1387,8 @@ _gdk_mir_window_get_dummy_egl_surface (GdkWindow *window,
+@@ -1509,7 +1366,8 @@
+       ensure_surface_full (window, mir_buffer_usage_hardware);
+ 
+       egl_display = _gdk_mir_display_get_egl_display (gdk_window_get_display (window));
+-      egl_window = (EGLNativeWindowType) mir_surface_get_egl_native_window (impl->surface);
++      egl_window = (EGLNativeWindowType) mir_buffer_stream_get_egl_native_window (
++          mir_surface_get_buffer_stream (impl->surface));
+ 
+       impl->egl_surface =
+         eglCreateWindowSurface (egl_display, config, egl_window, NULL);
+@@ -1533,11 +1391,13 @@
        EGLNativeWindowType egl_window;
  
        display = gdk_window_get_display (window);
@@ -713,6 +730,9 @@
                                                  mir_buffer_usage_hardware);
  
        egl_display = _gdk_mir_display_get_egl_display (display);
--- 
-2.1.4
-
+-      egl_window = (EGLNativeWindowType) mir_surface_get_egl_native_window (impl->surface);
++      egl_window = (EGLNativeWindowType) mir_buffer_stream_get_egl_native_window (
++          mir_surface_get_buffer_stream (impl->surface));
+ 
+       impl->dummy_egl_surface =
+         eglCreateWindowSurface (egl_display, config, egl_window, NULL);

=== modified file 'debian/rules'
--- debian/rules	2015-04-30 15:23:46 +0000
+++ debian/rules	2015-06-25 20:51:12 +0000
@@ -74,16 +74,13 @@
 DEB_CONFIGURE_FLAGS_shared = \
 			--enable-broadway-backend \
 			--enable-x11-backend \
+			--enable-mir-backend \
 			--enable-gtk-doc \
 			--enable-shared \
 			--enable-introspection \
 			--enable-cloudprint \
 			--disable-static
 
-ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armhf i386))
-	DEB_CONFIGURE_FLAGS_shared += --enable-mir-backend
-endif
-
 ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
 DEB_CONFIGURE_FLAGS_shared += --enable-colord
 else