Merge lp:~albaguirre/mir/deprecate-more-things into lp:mir

[Alberto Aguirre]

Deprecate more apis related to functionality replaced by the introduction of MirRenderSurface

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:4154
https://mir-jenkins.ubuntu.com/job/mir-ci/3361/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4542
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4662
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4651
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/4651
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4651
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4651
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4574
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4574/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4574
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4574/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4574
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4574/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4574
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4574/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4574
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4574/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4574
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4574/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3361/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

lgtm just a lot of push/pop. This approve is with the understanding that theres a branch soon to replace all the src/* push/pop with replacements :)

review: Approve

=== modified file 'benchmarks/frame-uniformity/touch_measuring_client.cpp'
--- benchmarks/frame-uniformity/touch_measuring_client.cpp	2017-01-18 02:29:37 +0000
+++ benchmarks/frame-uniformity/touch_measuring_client.cpp	2017-04-11 18:27:10 +0000
@@ -29,6 +29,8 @@
 namespace
 {
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 MirWindow *create_window(MirConnection *connection)
 {
     MirPixelFormat pixel_format;
@@ -73,6 +75,7 @@
         results->record_frame_time(std::chrono::high_resolution_clock::now());
     }
 }
+#pragma GCC diagnostic pop
 
 }
 

=== modified file 'examples/basic.c'
--- examples/basic.c	2017-01-24 19:53:45 +0000
+++ examples/basic.c	2017-04-11 18:27:10 +0000
@@ -61,6 +61,8 @@
 } MirDemoState;
 ///\internal [MirDemoState_tag]
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 int demo_client(const char* server, int buffer_swap_count)
 {
     MirDemoState mcd;
@@ -142,6 +144,7 @@
             ///\internal [get_current_buffer_tag]
             MirNativeBuffer* buffer_package = NULL;
             mir_buffer_stream_get_current_buffer(bs, &buffer_package);
+#pragma GCC diagnostic pop
             assert(buffer_package != NULL);
             MirGraphicsRegion graphics_region;
             mir_buffer_stream_get_graphics_region(bs, &graphics_region);

=== modified file 'examples/camera.c'
--- examples/camera.c	2017-01-18 02:29:37 +0000
+++ examples/camera.c	2017-04-11 18:27:10 +0000
@@ -387,7 +387,10 @@
     if (ultrafast)
     {
         pref = camera_pref_speed;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         MirBufferStream* bs = mir_window_get_buffer_stream(mir_eglapp_native_window());
+#pragma GCC diagnostic pop
         mir_buffer_stream_set_swapinterval(bs, 0);
     }
     Camera *cam = open_camera(dev_video, pref, 1);

=== modified file 'examples/client_helpers.cpp'
--- examples/client_helpers.cpp	2017-01-18 02:29:37 +0000
+++ examples/client_helpers.cpp	2017-04-11 18:27:10 +0000
@@ -51,6 +51,8 @@
     return connection;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 me::BufferStream::BufferStream(
     Connection& connection,
     unsigned int width,
@@ -172,6 +174,7 @@
     make_current();
     eglSwapInterval(display.disp, swap_interval);
 }
+#pragma GCC diagnostic pop
 
 void me::Context::make_current()
 {

=== modified file 'examples/client_helpers.h'
--- examples/client_helpers.h	2017-01-18 02:29:37 +0000
+++ examples/client_helpers.h	2017-04-11 18:27:10 +0000
@@ -60,8 +60,10 @@
         bool prefer_alpha,
         bool hardware);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     std::unique_ptr<MirBufferStream, decltype(&mir_buffer_stream_release_sync)> const stream;
-
+#pragma GCC diagnostic pop
     BufferStream(BufferStream const&) = delete;
     BufferStream& operator=(BufferStream const&) = delete;
 };

=== modified file 'examples/fingerpaint.c'
--- examples/fingerpaint.c	2017-01-18 13:59:18 +0000
+++ examples/fingerpaint.c	2017-04-11 18:27:10 +0000
@@ -340,6 +340,8 @@
     return NULL;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 int main(int argc, char *argv[])
 {
     static const Color background = {180, 180, 150, 255};
@@ -514,3 +516,4 @@
 
     return 0;
 }
+#pragma GCC diagnostic pop

=== modified file 'examples/flicker.c'
--- examples/flicker.c	2017-01-18 02:29:37 +0000
+++ examples/flicker.c	2017-04-11 18:27:10 +0000
@@ -101,7 +101,8 @@
     }
 }
 
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 int main(int argc, char* argv[])
 {
     MirConnection *connection = 0;
@@ -196,3 +197,4 @@
 
     return 0;
 }
+#pragma GCC diagnostic pop

=== modified file 'examples/multi_stream.cpp'
--- examples/multi_stream.cpp	2017-01-18 02:29:37 +0000
+++ examples/multi_stream.cpp	2017-04-11 18:27:10 +0000
@@ -206,7 +206,10 @@
     me::Connection connection{socket, "Multiple MirBufferStream example"};
 
     me::NormalWindow window{connection, 200, 200, true, false};
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirBufferStream* surface_stream = mir_window_get_buffer_stream(window);
+#pragma GCC diagnostic pop
     int topSize = 100, dTopSize = 2;
     auto top = std::make_unique<me::BufferStream>(connection, topSize, topSize, true, false);
     me::BufferStream bottom(connection, 50, 50, true, false);
@@ -275,8 +278,10 @@
         fill_stream_with(surface_stream, baseColour, 0, 0, 128);
         fill_stream_with(bottom, 0, 0, bottomColour, 128);
         fill_stream_with(*top, 0, topColour, 0, 128);
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_window_spec_set_streams(spec, arrangement.data(), arrangement.size());
+#pragma GCC diagnostic pop
         mir_buffer_stream_swap_buffers_sync(surface_stream);
         mir_buffer_stream_swap_buffers_sync(bottom);
         mir_buffer_stream_swap_buffers_sync(*top);

=== modified file 'examples/multiwin.c'
--- examples/multiwin.c	2017-01-18 02:29:37 +0000
+++ examples/multiwin.c	2017-04-11 18:27:10 +0000
@@ -164,8 +164,10 @@
 static void draw_window(Window *win)
 {
     MirGraphicsRegion region;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirBufferStream *bs = mir_window_get_buffer_stream(win->window);
-
+#pragma GCC diagnostic pop
     mir_buffer_stream_get_graphics_region(bs, &region);
     clear_region(&region, &win->fill);
     mir_buffer_stream_swap_buffers_sync(bs);
@@ -251,8 +253,11 @@
         return 1;
     }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(spec, pixel_format);
     mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_software);
+#pragma GCC diagnostic pop
     mir_window_spec_set_name(spec, "red");
 
     win[0].window = mir_create_window_sync(spec);

=== modified file 'examples/progressbar.c'
--- examples/progressbar.c	2017-01-18 02:29:37 +0000
+++ examples/progressbar.c	2017-04-11 18:27:10 +0000
@@ -184,7 +184,10 @@
 static void redraw(MirWindow *window, const MirGraphicsRegion *canvas)
 {
     MirGraphicsRegion backbuffer;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirBufferStream *bs = mir_window_get_buffer_stream(window);
+#pragma GCC diagnostic pop
 
     mir_buffer_stream_get_graphics_region(bs, &backbuffer);
     clear_region(&backbuffer, background);
@@ -257,7 +260,10 @@
         mir_connection_release(conn);
         return 1;
     }
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(spec, pixel_format);
+#pragma GCC diagnostic pop
     {
         char name[128];
         snprintf(name, sizeof(name)-1, "Progress Bars (%dHz)", hz);
@@ -265,8 +271,10 @@
         mir_window_spec_set_name(spec, name);
     }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_software);
-
+#pragma GCC diagnostic pop
     window = mir_create_window_sync(spec);
     mir_window_spec_release(spec);
 

=== modified file 'examples/release_at_exit.c'
--- examples/release_at_exit.c	2017-01-18 16:58:17 +0000
+++ examples/release_at_exit.c	2017-04-11 18:27:10 +0000
@@ -47,8 +47,10 @@
     unsigned int valid_formats;
     mir_connection_get_available_surface_formats(connection, &pixel_format, 1, &valid_formats);
     MirWindowSpec *spec = mir_create_normal_window_spec(connection, 640, 480);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(spec, pixel_format);
-
+#pragma GCC diagnostic pop
     window = mir_create_window_sync(spec);
     mir_window_spec_release(spec);
 

=== modified file 'examples/tooltip.c'
--- examples/tooltip.c	2017-01-18 02:29:37 +0000
+++ examples/tooltip.c	2017-04-11 18:27:10 +0000
@@ -97,6 +97,8 @@
     return pixel_format;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 static MirWindow* create_tooltip(MirConnection* const connection, MirWindow* const parent, const MirPixelFormat format)
 {
     MirRectangle zone = { 0, 0, 10, 10 };
@@ -156,3 +158,4 @@
 
     return tooltip;
 }
+#pragma GCC diagnostic pop

=== modified file 'include/client/mir_toolkit/client_types.h'
--- include/client/mir_toolkit/client_types.h	2017-04-11 03:54:16 +0000
+++ include/client/mir_toolkit/client_types.h	2017-04-11 18:27:10 +0000
@@ -186,7 +186,7 @@
 {
     mir_buffer_usage_hardware = 1,
     mir_buffer_usage_software
-} MirBufferUsage;
+} MirBufferUsage __attribute__((deprecated("No longer applicable when using MirRenderSurface")));
 
 /**
  * MirWindowParameters is the structure of minimum required information that
@@ -198,7 +198,11 @@
     int width;
     int height;
     MirPixelFormat pixel_format;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirBufferUsage buffer_usage;
+#pragma GCC diagnostic pop
+
     /**
      * The id of the output to place the surface in.
      *
@@ -208,7 +212,7 @@
      * use the value mir_display_output_id_invalid.
      */
     uint32_t output_id;
-} MirSurfaceParameters __attribute__((deprecated("Use MirWindowParameters instead")));
+} MirSurfaceParameters __attribute__((deprecated("Use mir_window_get apis or listen for attribute events instead")));
 
 enum { mir_platform_package_max = 32 };
 
@@ -577,7 +581,8 @@
 typedef void (*MirRenderSurfaceCallback)(MirRenderSurface*, void* context)
 __attribute__((deprecated("This type is slated for rename due to MirRenderSurface-->MirSurface transition")));
 
-typedef MirSurfaceParameters MirWindowParameters;
+typedef MirSurfaceParameters MirWindowParameters
+__attribute__((deprecated("Use mir_window_get_xxx apis or listen for attribute events instead")));
 
 #pragma GCC diagnostic pop
 

=== modified file 'include/client/mir_toolkit/mir_buffer.h'
--- include/client/mir_toolkit/mir_buffer.h	2017-03-16 03:23:51 +0000
+++ include/client/mir_toolkit/mir_buffer.h	2017-04-11 18:27:10 +0000
@@ -40,7 +40,6 @@
  *   \param [in] connection            The connection
  *   \param [in] width                 Requested buffer width
  *   \param [in] height                Requested buffer height
- *   \param [in] buffer_usage          Requested buffer usage
  *   \param [in] available_callback    The callback called when the buffer
  *                                     is available
  *   \param [in] available_context     The context for the available_callback
@@ -56,7 +55,6 @@
  *   \param [in] connection            The connection
  *   \param [in] width                 Requested buffer width
  *   \param [in] height                Requested buffer height
- *   \param [in] buffer_usage          Requested buffer usage
  *   \return                           The buffer
  **/
 MirBuffer* mir_connection_allocate_buffer_sync(

=== modified file 'include/client/mir_toolkit/mir_buffer_stream.h'
--- include/client/mir_toolkit/mir_buffer_stream.h	2017-01-24 07:49:13 +0000
+++ include/client/mir_toolkit/mir_buffer_stream.h	2017-04-11 18:27:10 +0000
@@ -56,6 +56,7 @@
  * with mir_cursor_configuration_from_buffer_stream, 
  * in order to post images to the system cursor.
  *
+ * \deprecated Use mir_render_surface_get_buffer_stream instead
  * \param [in] connection     A valid connection
  * \param [in] width          Requested buffer width
  * \param [in] height         Requested buffer height
@@ -70,12 +71,16 @@
  *
  * \return                    A handle that can be supplied to mir_wait_for
  */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 MirWaitHandle* mir_connection_create_buffer_stream(MirConnection *connection,
     int width, int height,
     MirPixelFormat format,
     MirBufferUsage buffer_usage,
     MirBufferStreamCallback callback,
-    void* context);
+    void* context)
+__attribute__ ((deprecated("Use mir_render_surface_get_buffer_stream instead")));
+#pragma GCC diagnostic pop
 
 /**
  * Create a new buffer stream unattached to a surface and wait for the result. 
@@ -83,6 +88,7 @@
  * mir_cursor_configuration_from_buffer_stream in order to post images 
  * to the system cursor.
  *
+ * \deprecated Use mir_render_surface_get_buffer_stream instead
  * \param [in] connection       A valid connection
  * \param [in] width            Requested buffer width
  * \param [in] height           Requested buffer height
@@ -93,14 +99,19 @@
  * \return                      The new buffer stream. This is guaranteed non-null, 
  *                              but may be invalid in the case of error.
  */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 MirBufferStream* mir_connection_create_buffer_stream_sync(MirConnection *connection,
     int width, int height,
     MirPixelFormat format,
-    MirBufferUsage buffer_usage);
-
+    MirBufferUsage buffer_usage)
+__attribute__ ((deprecated("Use mir_render_surface_get_buffer_stream instead")));
+#pragma GCC diagnostic pop
 /**
  * Release the supplied stream and any associated buffer. The returned wait
  * handle remains valid until the connection to the server is released.
+ *
+ *   \deprecated A stream obtained through mir_render_surface_get_buffer_stream does not need to be released.
  *   \warning callback could be called from another thread. You must do any
  *            locking appropriate to protect your data accessed in the
  *            callback.
@@ -113,14 +124,17 @@
 MirWaitHandle *mir_buffer_stream_release(
     MirBufferStream * buffer_stream,
     MirBufferStreamCallback callback,
-    void *context);
+    void *context)
+__attribute__ ((deprecated));
 
 /**
  * Release the specified buffer stream like in mir,_buffer_stream_release(), 
  * but also wait for the operation to complete.
+ *   \deprecated A stream obtained through mir_render_surface_get_buffer_stream does not need to be released.
  *   \param [in] buffer_stream  The buffer stream to be released
  */
-void mir_buffer_stream_release_sync(MirBufferStream *buffer_stream);
+void mir_buffer_stream_release_sync(MirBufferStream *buffer_stream)
+__attribute__ ((deprecated));
 
 /**
  * Get the underlying platform type so the buffer obtained in "raw"
@@ -140,19 +154,19 @@
  *   \return                  One of mir_platform_type_android or 
  *                            mir_platform_type_gbm
  */
-/// @cond
-__attribute__ ((deprecated))
-/// @endcond
-MirPlatformType mir_buffer_stream_get_platform_type(MirBufferStream *stream);
+MirPlatformType mir_buffer_stream_get_platform_type(MirBufferStream *stream)
+    __attribute__ ((deprecated));
 
 /**
  * Retrieve the current buffer in "raw" representation.
+ *   \deprecated Use platform specific platform extensions instead
  *   \pre                         The buffer stream is valid
  *   \param [in]  buffer_stream   The buffer stream
  *   \param [out] buffer_package  Structure to be populated
  */
 void mir_buffer_stream_get_current_buffer(MirBufferStream *buffer_stream,
-    MirNativeBuffer **buffer_package);
+    MirNativeBuffer **buffer_package)
+__attribute__ ((deprecated("Use platform specific buffer extensions instead")));
 
 /**
  * Advance a buffer stream's buffer. The returned handle remains valid until the
@@ -195,18 +209,22 @@
 
 /**
  * Retrieve a window type which may be used by EGL.
+ *   \deprecated Use MirRenderSurface *as the window type
  *   \param [in] buffer_stream The buffer stream
  *   \return                   An EGLNativeWindowType that the client can use
  */
-MirEGLNativeWindowType mir_buffer_stream_get_egl_native_window(MirBufferStream *buffer_stream);
+MirEGLNativeWindowType mir_buffer_stream_get_egl_native_window(MirBufferStream *buffer_stream)
+__attribute__ ((deprecated("Use MirRenderSurface *as the window type")));
 
 /**
  * Set the scale associated with all buffers in the stream
+ * \deprecated
  * \param [in] buffer_stream The buffer stream
  * \param [in] scale         The scale
  * \return                  A handle that can be passed to mir_wait_for
  */
-MirWaitHandle *mir_buffer_stream_set_scale(MirBufferStream* buffer_stream, float scale);
+MirWaitHandle *mir_buffer_stream_set_scale(MirBufferStream* buffer_stream, float scale)
+__attribute__ ((deprecated));
 
 /**
  * Set the scale as in mir_buffer_stream_set_scale(), but also wait for the
@@ -214,7 +232,8 @@
  * \param [in] buffer_stream The buffer stream
  * \param [in] scale         The scale
  */
-void mir_buffer_stream_set_scale_sync(MirBufferStream* buffer_stream, float scale);
+void mir_buffer_stream_set_scale_sync(MirBufferStream* buffer_stream, float scale)
+__attribute__ ((deprecated));
 
 /**
  * Set the swapinterval for the stream.

=== modified file 'include/client/mir_toolkit/mir_connection.h'
--- include/client/mir_toolkit/mir_connection.h	2017-03-13 08:12:52 +0000
+++ include/client/mir_toolkit/mir_connection.h	2017-04-11 18:27:10 +0000
@@ -328,21 +328,25 @@
 
 /**
  * Get a display type that can be used with EGL.
+ *   \deprecated Use MirConnection * as the native display instead
  *   \param [in] connection  The connection
  *   \return                 An EGLNativeDisplayType that the client can use
  */
-MirEGLNativeDisplayType mir_connection_get_egl_native_display(MirConnection *connection);
+MirEGLNativeDisplayType mir_connection_get_egl_native_display(MirConnection *connection)
+__attribute__((deprecated("Use MirConnection * as the native display instead")));
 
 /**
  * Get the exact MirPixelFormat to use in creating a surface for a chosen
  * EGLConfig.
+ *   \deprecated Use EGL directly, the EGL implementation will now set correct pixel format"
  *   \param [in] connection  The connection
  *   \param [in] egldisplay  The EGLDisplay for the given config
  *   \param [in] eglconfig   The EGLConfig you have chosen to use
  *   \return                 The MirPixelFormat to use in surface creation
  */
 MirPixelFormat mir_connection_get_egl_pixel_format(
-    MirConnection *connection, void *egldisplay, void *eglconfig);
+    MirConnection *connection, void *egldisplay, void *eglconfig)
+__attribute__((deprecated("Use EGL directly, the EGL implementation will now set correct pixel format")));
 
 /**
  * Get the list of possible formats that a surface can be created with.

=== modified file 'include/client/mir_toolkit/mir_window.h'
--- include/client/mir_toolkit/mir_window.h	2017-04-11 03:54:16 +0000
+++ include/client/mir_toolkit/mir_window.h	2017-04-11 18:27:10 +0000
@@ -529,9 +529,12 @@
 void mir_window_spec_set_cursor_name(MirWindowSpec* spec, char const* name);
 
 /**
- * \note To be deprecated soon. Only for enabling other deprecations.
  *
  * Set the requested pixel format.
+ * \deprecated There will be no default stream associated with a window anymore. Instead create a
+ *             MirRenderSurface and either set the pixel format through EGL (for EGL based rendering) or
+ *             by allocating a cpu accessible buffer through mir_connection_allocate_buffer or
+ *             mir_render_surface_get_buffer_stream
  * \param [in] spec     Specification to mutate
  * \param [in] format   Requested pixel format
  *
@@ -539,12 +542,14 @@
  *          If the server is unable to create a window with this pixel format at
  *          the point mir_create_window() is called it will instead return an invalid window.
  */
-void mir_window_spec_set_pixel_format(MirWindowSpec* spec, MirPixelFormat format);
+void mir_window_spec_set_pixel_format(MirWindowSpec* spec, MirPixelFormat format)
+    __attribute__((deprecated("Use mir_connection_allocate_buffer/mir_render_surface_get_buffer_stream instead")));
 
 /**
  * \note To be deprecated soon. Only for enabling other deprecations.
  *
  * Set the requested buffer usage.
+ * \deprecated There will be no default stream associated with a window anymore. MirBufferUsage is no longer applicable.
  * \param [in] spec     Specification to mutate
  * \param [in] usage    Requested buffer usage
  *
@@ -552,10 +557,12 @@
  *          If the server is unable to create a window with this buffer usage at
  *          the point mir_create_window() is called it will instead return an invalid window.
  */
-void mir_window_spec_set_buffer_usage(MirWindowSpec* spec, MirBufferUsage usage);
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+void mir_window_spec_set_buffer_usage(MirWindowSpec* spec, MirBufferUsage usage)
+    __attribute__((deprecated("No longer applicable, use mir_render_surface apis")));
+#pragma GCC diagnostic pop
 /**
- * \note To be deprecated soon. Waiting for mir_window_spec_set_render_surfaces() to land.
  *
  * Set the streams associated with the spec.
  * streams[0] is the bottom-most stream, and streams[size-1] is the topmost.
@@ -565,6 +572,7 @@
  * but is in the list will be associated with the window.
  * Streams set a displacement from the top-left corner of the window.
  *
+ * \deprecated Use mir_window_spec_add_render_surface
  * \warning disassociating streams from the window will not release() them.
  * \warning It is wiser to arrange the streams within the bounds of the
  *          window the spec is applied to. Shells can define their own
@@ -576,7 +584,8 @@
  */
 void mir_window_spec_set_streams(MirWindowSpec* spec,
                                  MirBufferStreamInfo* streams,
-                                 unsigned int num_streams);
+                                 unsigned int num_streams)
+    __attribute__((deprecated("Use mir_window_spec_add_render_surface instead")));
 
 /**
  * Set the MirWindowSpec to display content contained in a render surface
@@ -691,7 +700,7 @@
  * Retrieve the primary MirBufferStream associated with a window (to advance buffers,
  * obtain EGLNativeWindow, etc...)
  *
- *   \deprecated Users should use mir_window_spec_set_streams() to arrange
+ *   \deprecated Users should use mir_window_spec_add_render_surface() to arrange
  *               the content of a window, instead of relying on a stream
  *               being created by default.
  *   \warning If the window was created with, or modified to have a
@@ -700,8 +709,8 @@
  *            be removed, and this function will return NULL.
  *   \param[in] window The window
  */
-MirBufferStream* mir_window_get_buffer_stream(MirWindow* window);
-
+MirBufferStream* mir_window_get_buffer_stream(MirWindow* window)
+    __attribute__((deprecated("Use mir_window_spec_set_cursor_name/mir_window_spec_set_cursor_render_surface instead")));
 /**
  * Retrieve a text description of the error. The returned string is owned by
  * the library and remains valid until the window or the associated
@@ -715,11 +724,17 @@
 
 /**
  * Get a window's parameters.
- *   \pre                     The window is valid
- *   \param [in]  window      The window
- *   \param [out] parameters  Structure to be populated
+ *  \deprecated Use mir_window getters or listen for state change events instead
+ *  \pre                     The window is valid
+ *  \param [in]  window      The window
+ *  \param [out] parameters  Structure to be populated
  */
-void mir_window_get_parameters(MirWindow* window, MirWindowParameters* parameters);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+void mir_window_get_parameters(MirWindow* window, MirWindowParameters* parameters)
+    __attribute__((deprecated("Use mir_window_get_xxx apis or listen to state/attribute change events instead")));
+#pragma GCC diagnostic pop
+
 
 /**
  * Get the orientation of a window.

=== modified file 'include/platforms/mesa/mir_toolkit/mesa/native_display.h'
--- include/platforms/mesa/mir_toolkit/mesa/native_display.h	2017-01-18 02:29:37 +0000
+++ include/platforms/mesa/mir_toolkit/mesa/native_display.h	2017-04-11 18:27:10 +0000
@@ -48,8 +48,11 @@
     int (*surface_set_swapinterval)(MirMesaEGLNativeSurface* surface, int interval);
     int (*surface_advance_buffer)(MirMesaEGLNativeSurface* surface,
                                   MirBufferPackage* buffer_package);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     int (*surface_get_parameters)(MirMesaEGLNativeSurface* surface,
                                   MirWindowParameters* surface_parameters);
+#pragma GCC diagnostic pop
 };
 
 #ifdef __cplusplus

=== modified file 'playground/mir_egl_platform_shim.c'
--- playground/mir_egl_platform_shim.c	2017-03-10 19:47:57 +0000
+++ playground/mir_egl_platform_shim.c	2017-04-11 18:27:10 +0000
@@ -114,7 +114,10 @@
     info->eglDestroyImageKHR = (PFNEGLDESTROYIMAGEKHRPROC) eglGetProcAddress("eglDestroyImageKHR");
     info->glEGLImageTargetTexture2DOES =
         (PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) eglGetProcAddress("glEGLImageTargetTexture2DOES");
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     return eglGetDisplay(mir_connection_get_egl_native_display(connection));
+#pragma GCC diagnostic pop
 }
 
 EGLBoolean future_driver_eglTerminate(EGLDisplay display)

=== modified file 'src/client/buffer.cpp'
--- src/client/buffer.cpp	2017-03-14 02:26:28 +0000
+++ src/client/buffer.cpp	2017-04-11 18:27:10 +0000
@@ -21,7 +21,8 @@
 #include <boost/throw_exception.hpp>
 
 namespace mcl = mir::client;
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 mcl::Buffer::Buffer(
     MirBufferCallback cb, void* context,
     int buffer_id,
@@ -36,6 +37,7 @@
     usage(usage)
 {
 }
+#pragma GCC diagnostic pop
 
 int mcl::Buffer::rpc_id() const
 {
@@ -101,8 +103,11 @@
     return connection;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 MirBufferUsage mcl::Buffer::buffer_usage() const
 {
+#pragma GCC diagnostic pop
     return usage;
 }
 

=== modified file 'src/client/buffer.h'
--- src/client/buffer.h	2017-01-24 07:37:03 +0000
+++ src/client/buffer.h	2017-04-11 18:27:10 +0000
@@ -37,12 +37,15 @@
 class Buffer : public MirBuffer
 {
 public:
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     Buffer(
         MirBufferCallback cb, void* context,
         int buffer_id,
         std::shared_ptr<ClientBuffer> const& buffer,
         MirConnection* connection,
         MirBufferUsage usage);
+#pragma GCC diagnostic pop
 
     int rpc_id() const override;
 
@@ -54,7 +57,10 @@
     MirGraphicsRegion map_region() override;
     void unmap_region() override;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirBufferUsage buffer_usage() const override;
+#pragma GCC diagnostic pop
     MirPixelFormat pixel_format() const override;
     geometry::Size size() const override;
 
@@ -74,7 +80,10 @@
     bool owned;
     std::shared_ptr<MemoryRegion> mapped_region;
     MirConnection* const connection;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirBufferUsage const usage;
+#pragma GCC diagnostic pop
 };
 }
 }

=== modified file 'src/client/buffer_factory.cpp'
--- src/client/buffer_factory.cpp	2017-03-10 19:47:57 +0000
+++ src/client/buffer_factory.cpp	2017-04-11 18:27:10 +0000
@@ -26,6 +26,8 @@
 namespace mcl = mir::client;
 namespace geom = mir::geometry;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 mcl::BufferFactory::AllocationRequest::AllocationRequest(
     std::shared_ptr<mcl::ClientBufferFactory> const& native_buffer_factory,
     MirConnection* connection,
@@ -67,6 +69,7 @@
     allocation_requests.emplace_back(
         std::make_unique<AllocationRequest>(factory, connection, size, format, usage, cb, cb_context));
 }
+#pragma GCC diagnostic pop
 
 void mcl::BufferFactory::expect_buffer(
     std::shared_ptr<mcl::ClientBufferFactory> const& factory,
@@ -105,7 +108,10 @@
     {
         auto factory = (*request_it)->native_buffer_factory;
         std::shared_ptr<mcl::ClientBuffer> client_buffer;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         auto usage = mir_buffer_usage_hardware;
+#pragma GCC diagnostic pop
         if ((*request_it)->native_request.is_set())
         {
             auto& req = (*request_it)->native_request.value();

=== modified file 'src/client/buffer_factory.h'
--- src/client/buffer_factory.h	2017-03-10 19:47:57 +0000
+++ src/client/buffer_factory.h	2017-04-11 18:27:10 +0000
@@ -30,6 +30,8 @@
 {
 namespace client
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 class ClientBufferFactory;
 class AsyncBufferFactory
 {
@@ -128,6 +130,7 @@
     };
     std::vector<std::unique_ptr<AllocationRequest>> allocation_requests;
 };
+#pragma GCC diagnostic pop
 }
 }
 #endif /* MIR_CLIENT_MIR_BUFFER_FACTORY_H_ */

=== modified file 'src/client/buffer_stream.cpp'
--- src/client/buffer_stream.cpp	2017-03-20 11:24:19 +0000
+++ src/client/buffer_stream.cpp	2017-04-11 18:27:10 +0000
@@ -65,7 +65,8 @@
         platform(platform)
     {
     }
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     void allocate_buffer(geom::Size size, MirPixelFormat format, int usage) override
     {
         mp::BufferAllocation request;
@@ -88,7 +89,7 @@
         server.allocate_buffers(&request, protobuf_void.get(),
             google::protobuf::NewCallback(Requests::ignore_response, protobuf_void));
     }
-
+#pragma GCC diagnostic pop
     void free_buffer(int buffer_id) override
     {
         mp::BufferRelease request;
@@ -418,6 +419,8 @@
     return secured_region;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 /* mcl::EGLNativeSurface interface for EGLNativeWindow integration */
 MirWindowParameters mcl::BufferStream::get_parameters() const
 {
@@ -431,6 +434,7 @@
         static_cast<MirBufferUsage>(protobuf_bs->buffer_usage()),
         mir_display_output_id_invalid};
 }
+#pragma GCC diagnostic pop
 
 void mcl::BufferStream::wait_for_vsync()
 {

=== modified file 'src/client/buffer_stream.h'
--- src/client/buffer_stream.h	2017-03-20 11:24:19 +0000
+++ src/client/buffer_stream.h	2017-04-11 18:27:10 +0000
@@ -110,7 +110,10 @@
     std::shared_ptr<MemoryRegion> secure_for_cpu_write() override;
 
     // mcl::EGLNativeSurface interface
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirWindowParameters get_parameters() const override;
+#pragma GCC diagnostic pop
     void swap_buffers_sync() override;
 
     void request_and_wait_for_configure(MirWindowAttrib attrib, int) override;

=== modified file 'src/client/buffer_vault.cpp'
--- src/client/buffer_vault.cpp	2017-04-04 07:04:57 +0000
+++ src/client/buffer_vault.cpp	2017-04-11 18:27:10 +0000
@@ -99,8 +99,11 @@
 
 void mcl::BufferVault::alloc_buffer(geom::Size size, MirPixelFormat format, int usage)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     buffer_factory->expect_buffer(platform_factory, nullptr, size, format, static_cast<MirBufferUsage>(usage),
         incoming_buffer, this);
+#pragma GCC diagnostic pop
     server_requests->allocate_buffer(size, format, usage);
 }
 

=== modified file 'src/client/error_buffer.cpp'
--- src/client/error_buffer.cpp	2017-01-24 07:37:03 +0000
+++ src/client/error_buffer.cpp	2017-04-11 18:27:10 +0000
@@ -68,7 +68,12 @@
 std::shared_ptr<mcl::ClientBuffer> mcl::ErrorBuffer::client_buffer() const THROW_EXCEPTION
 MirGraphicsRegion mcl::ErrorBuffer::map_region() THROW_EXCEPTION
 void mcl::ErrorBuffer::unmap_region() THROW_EXCEPTION
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 MirBufferUsage mcl::ErrorBuffer::buffer_usage() const THROW_EXCEPTION
+#pragma GCC diagnostic pop
+
 MirPixelFormat mcl::ErrorBuffer::pixel_format() const THROW_EXCEPTION
 geom::Size mcl::ErrorBuffer::size() const THROW_EXCEPTION
 void mcl::ErrorBuffer::increment_age() THROW_EXCEPTION

=== modified file 'src/client/error_buffer.h'
--- src/client/error_buffer.h	2017-01-24 07:37:03 +0000
+++ src/client/error_buffer.h	2017-04-11 18:27:10 +0000
@@ -39,7 +39,10 @@
     std::shared_ptr<ClientBuffer> client_buffer() const override;
     MirGraphicsRegion map_region() override;
     void unmap_region() override;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirBufferUsage buffer_usage() const override;
+#pragma GCC diagnostic pop
     MirPixelFormat pixel_format() const override;
     geometry::Size size() const override;
     MirConnection* allocating_connection() const override;

=== modified file 'src/client/error_render_surface.cpp'
--- src/client/error_render_surface.cpp	2017-01-18 02:29:37 +0000
+++ src/client/error_render_surface.cpp	2017-04-11 18:27:10 +0000
@@ -54,11 +54,14 @@
     return false;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 MirBufferStream* mcl::ErrorRenderSurface::get_buffer_stream(
     int /*width*/, int /*height*/,
     MirPixelFormat /*format*/,
     MirBufferUsage /*buffer_usage*/)
 {
+#pragma GCC diagnostic pop
     BOOST_THROW_EXCEPTION(std::runtime_error(error));
 }
 

=== modified file 'src/client/error_stream.cpp'
--- src/client/error_stream.cpp	2017-03-10 19:47:57 +0000
+++ src/client/error_stream.cpp	2017-04-11 18:27:10 +0000
@@ -60,8 +60,11 @@
     return id;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 MirWindowParameters mcl::ErrorStream::get_parameters() const
 {
+#pragma GCC diagnostic pop
     BOOST_THROW_EXCEPTION(std::runtime_error(error));
 }
 std::shared_ptr<mcl::ClientBuffer> mcl::ErrorStream::get_current_buffer()

=== modified file 'src/client/error_stream.h'
--- src/client/error_stream.h	2017-03-10 19:47:57 +0000
+++ src/client/error_stream.h	2017-04-11 18:27:10 +0000
@@ -31,8 +31,10 @@
     ErrorStream(
         std::string const& error_msg, MirConnection* conn,
         frontend::BufferStreamId id, std::shared_ptr<MirWaitHandle> const& wh);
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirWindowParameters get_parameters() const override;
+#pragma GCC diagnostic pop
     std::shared_ptr<ClientBuffer> get_current_buffer() override;
     uint32_t get_current_buffer_id() override;
     EGLNativeWindowType egl_native_window() override;

=== modified file 'src/client/mir_buffer_stream_api.cpp'
--- src/client/mir_buffer_stream_api.cpp	2017-01-24 07:37:03 +0000
+++ src/client/mir_buffer_stream_api.cpp	2017-04-11 18:27:10 +0000
@@ -47,8 +47,8 @@
 
 }
 
-
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 MirWaitHandle* mir_connection_create_buffer_stream(MirConnection *connection,
     int width, int height,
     MirPixelFormat format,
@@ -82,6 +82,7 @@
     MIR_LOG_UNCAUGHT_EXCEPTION(ex);
     return nullptr;
 }
+#pragma GCC diagnostic pop
 
 MirWaitHandle* mir_buffer_stream_release(
     MirBufferStream* buffer_stream,
@@ -94,7 +95,10 @@
 
 void mir_buffer_stream_release_sync(MirBufferStream *buffer_stream)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_buffer_stream_release(buffer_stream, nullptr, nullptr)->wait_for_all();
+#pragma GCC diagnostic pop
 }
 
 void mir_buffer_stream_get_current_buffer(MirBufferStream* buffer_stream, MirNativeBuffer** buffer_package_out)
@@ -203,7 +207,10 @@
 
 void mir_buffer_stream_set_scale_sync(MirBufferStream* opaque_stream, float scale)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto wh = mir_buffer_stream_set_scale(opaque_stream, scale);
+#pragma GCC diagnostic pop
     if (wh)
         wh->wait_for_all();
 }

=== modified file 'src/client/mir_surface_api.cpp'
--- src/client/mir_surface_api.cpp	2017-04-11 03:54:16 +0000
+++ src/client/mir_surface_api.cpp	2017-04-11 18:27:10 +0000
@@ -478,6 +478,8 @@
     MIR_LOG_UNCAUGHT_EXCEPTION(ex);
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 void mir_window_spec_set_buffer_usage(MirWindowSpec* spec, MirBufferUsage usage)
 try
 {
@@ -488,6 +490,7 @@
 {
     MIR_LOG_UNCAUGHT_EXCEPTION(ex);
 }
+#pragma GCC diagnostic pop
 
 void mir_window_spec_set_streams(MirWindowSpec* spec, MirBufferStreamInfo* streams, unsigned int size)
 try
@@ -674,10 +677,13 @@
     return window->get_error_message();
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 void mir_window_get_parameters(MirWindow* window, MirWindowParameters* parameters)
 {
     *parameters = window->get_parameters();
 }
+#pragma GCC diagnostic pop
 
 MirOrientation mir_window_get_orientation(MirWindow* window)
 {

=== modified file 'src/client/render_surface.cpp'
--- src/client/render_surface.cpp	2017-03-14 02:26:28 +0000
+++ src/client/render_surface.cpp	2017-04-11 18:27:10 +0000
@@ -55,6 +55,8 @@
     return mf::BufferStreamId(protobuf_bs->id().value());
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 MirBufferStream* mcl::RenderSurface::get_buffer_stream(
     int width, int height,
     MirPixelFormat format,
@@ -71,6 +73,7 @@
                                                                       *protobuf_bs);
     if (buffer_usage == mir_buffer_usage_hardware)
     {
+#pragma GCC diagnostic pop
         platform->use_egl_native_window(
             wrapped_native_window, dynamic_cast<EGLNativeSurface*>(stream_from_id.get()));
     }

=== modified file 'src/client/screencast_stream.cpp'
--- src/client/screencast_stream.cpp	2017-03-10 19:47:57 +0000
+++ src/client/screencast_stream.cpp	2017-04-11 18:27:10 +0000
@@ -169,6 +169,8 @@
     screencast_wait_handle.result_received();
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 MirWindowParameters mcl::ScreencastStream::get_parameters() const
 {
     std::lock_guard<decltype(mutex)> lock(mutex);
@@ -180,6 +182,7 @@
         static_cast<MirBufferUsage>(protobuf_bs->buffer_usage()),
         mir_display_output_id_invalid};
 }
+#pragma GCC diagnostic pop
 
 void mcl::ScreencastStream::swap_buffers_sync()
 {

=== modified file 'src/client/screencast_stream.h'
--- src/client/screencast_stream.h	2017-03-10 19:47:57 +0000
+++ src/client/screencast_stream.h	2017-04-11 18:27:10 +0000
@@ -71,8 +71,10 @@
         mir::client::rpc::DisplayServer& server,
         std::shared_ptr<ClientPlatform> const& native_window_factory,
         mir::protobuf::BufferStream const& protobuf_bs);
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirWindowParameters get_parameters() const override;
+#pragma GCC diagnostic pop
     MirWaitHandle* swap_buffers(std::function<void()> const& done) override;
     std::shared_ptr<mir::client::ClientBuffer> get_current_buffer() override;
     uint32_t get_current_buffer_id() override;

=== modified file 'src/include/client/mir/client_platform.h'
--- src/include/client/mir/client_platform.h	2017-01-30 08:13:20 +0000
+++ src/include/client/mir/client_platform.h	2017-04-11 18:27:10 +0000
@@ -74,7 +74,10 @@
     virtual MirNativeBuffer* convert_native_buffer(graphics::NativeBuffer*) const = 0;
     virtual MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig) const = 0;
     virtual uint32_t native_format_for(MirPixelFormat) const = 0;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     virtual uint32_t native_flags_for(MirBufferUsage, mir::geometry::Size) const = 0;
+#pragma GCC diagnostic pop
 };
 
 }

=== modified file 'src/include/client/mir/egl_native_surface.h'
--- src/include/client/mir/egl_native_surface.h	2017-01-18 02:29:37 +0000
+++ src/include/client/mir/egl_native_surface.h	2017-04-11 18:27:10 +0000
@@ -31,7 +31,10 @@
 class EGLNativeSurface
 {
   public:
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     virtual MirWindowParameters get_parameters() const = 0;
+#pragma GCC diagnostic pop
     virtual std::shared_ptr<ClientBuffer> get_current_buffer() = 0;
     virtual void swap_buffers_sync() = 0;
     virtual void request_and_wait_for_configure(MirWindowAttrib a, int value) = 0;

=== modified file 'src/include/client/mir/mir_buffer.h'
--- src/include/client/mir/mir_buffer.h	2017-01-24 07:53:36 +0000
+++ src/include/client/mir/mir_buffer.h	2017-04-11 18:27:10 +0000
@@ -44,8 +44,10 @@
     virtual std::shared_ptr<ClientBuffer> client_buffer() const = 0;
     virtual MirGraphicsRegion map_region() = 0;
     virtual void unmap_region() = 0;
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     virtual MirBufferUsage buffer_usage() const = 0;
+#pragma GCC diagnostic pop
     virtual MirPixelFormat pixel_format() const = 0;
     virtual geometry::Size size() const = 0;
     virtual MirConnection* allocating_connection() const = 0;

=== modified file 'src/include/client/mir/mir_buffer_stream.h'
--- src/include/client/mir/mir_buffer_stream.h	2017-03-10 19:47:57 +0000
+++ src/include/client/mir/mir_buffer_stream.h	2017-04-11 18:27:10 +0000
@@ -77,7 +77,11 @@
 public:
     virtual ~MirBufferStream() = default;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     virtual MirWindowParameters get_parameters() const = 0;
+#pragma GCC diagnostic pop
+
     virtual std::shared_ptr<mir::client::ClientBuffer> get_current_buffer() = 0;
     virtual uint32_t get_current_buffer_id() = 0;
     virtual EGLNativeWindowType egl_native_window() = 0;

=== modified file 'src/include/client/mir/mir_render_surface.h'
--- src/include/client/mir/mir_render_surface.h	2017-03-10 19:47:57 +0000
+++ src/include/client/mir/mir_render_surface.h	2017-04-11 18:27:10 +0000
@@ -32,10 +32,13 @@
     virtual mir::geometry::Size size() const = 0;
     virtual void set_size(mir::geometry::Size) = 0;
     virtual bool valid() const = 0;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     virtual MirBufferStream* get_buffer_stream(
         int width, int height,
         MirPixelFormat format,
         MirBufferUsage buffer_usage) = 0;
+#pragma GCC diagnostic pop
     virtual MirPresentationChain* get_presentation_chain() = 0;
     virtual char const* get_error_message() const = 0;
     virtual ~MirRenderSurface() = default;

=== modified file 'src/platforms/android/client/android_client_platform.cpp'
--- src/platforms/android/client/android_client_platform.cpp	2017-03-16 03:23:51 +0000
+++ src/platforms/android/client/android_client_platform.cpp	2017-04-11 18:27:10 +0000
@@ -474,7 +474,10 @@
     return mga::to_android_format(format);
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 uint32_t mcla::AndroidClientPlatform::native_flags_for(MirBufferUsage usage, mir::geometry::Size) const
 {
+#pragma GCC diagnostic pop
     return mga::convert_to_android_usage(static_cast<mir::graphics::BufferUsage>(usage));
 }

=== modified file 'src/platforms/android/client/android_client_platform.h'
--- src/platforms/android/client/android_client_platform.h	2017-03-14 04:41:33 +0000
+++ src/platforms/android/client/android_client_platform.h	2017-04-11 18:27:10 +0000
@@ -49,7 +49,10 @@
     MirNativeBuffer* convert_native_buffer(graphics::NativeBuffer*) const override;
     MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig) const override;
     uint32_t native_format_for(MirPixelFormat) const override;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     uint32_t native_flags_for(MirBufferUsage, mir::geometry::Size) const override;
+#pragma GCC diagnostic pop
 
 private:
     ClientContext* const context;

=== modified file 'src/platforms/android/utils/test_android_hardware_sanity.cpp'
--- src/platforms/android/utils/test_android_hardware_sanity.cpp	2017-01-30 05:18:36 +0000
+++ src/platforms/android/utils/test_android_hardware_sanity.cpp	2017-04-11 18:27:10 +0000
@@ -117,17 +117,22 @@
 
     auto const spec = mir_create_normal_window_spec(
         connection, test_width, test_height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888);
     mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_software);
+#pragma GCC diagnostic pop
     auto const window = mir_create_window_sync(spec);
     mir_window_spec_release(spec);
 
     EXPECT_THAT(window, IsValid());
     MirGraphicsRegion graphics_region;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_buffer_stream_get_graphics_region(mir_window_get_buffer_stream(window), &graphics_region);
     draw_pattern.draw(graphics_region);
     mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
-
+#pragma GCC diagnostic pop
     auto scene = runner->config.the_scene();
     auto seq = scene->scene_elements_for(this);
     ASSERT_THAT(seq, testing::SizeIs(1));
@@ -166,23 +171,30 @@
         EGL_NONE };
     EGLint context_attribs[] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE };
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto native_display = mir_connection_get_egl_native_display(connection);
+#pragma GCC diagnostic pop
     auto egl_display = eglGetDisplay(native_display);
     eglInitialize(egl_display, &major, &minor);
     eglChooseConfig(egl_display, attribs, &egl_config, 1, &n);
 
     eglGetConfigAttrib(egl_display, egl_config, EGL_NATIVE_VISUAL_ID, &visual_id);
     auto const spec = mir_create_normal_window_spec(connection, test_width, test_height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(spec, select_format_for_visual_id(visual_id));
-
+#pragma GCC diagnostic pop
     auto const mir_surface = mir_create_window_sync(spec);
     mir_window_spec_release(spec);
 
     EXPECT_THAT(mir_surface, IsValid());
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto native_window = static_cast<EGLNativeWindowType>(
         mir_buffer_stream_get_egl_native_window(mir_window_get_buffer_stream(mir_surface)));
-
+#pragma GCC diagnostic pop
     egl_surface = eglCreateWindowSurface(egl_display, egl_config, native_window, NULL);
     context = eglCreateContext(egl_display, egl_config, EGL_NO_CONTEXT, context_attribs);
     eglMakeCurrent(egl_display, egl_surface, egl_surface, context);

=== modified file 'src/platforms/eglstream-kms/client/client_platform.cpp'
--- src/platforms/eglstream-kms/client/client_platform.cpp	2017-01-30 08:13:20 +0000
+++ src/platforms/eglstream-kms/client/client_platform.cpp	2017-04-11 18:27:10 +0000
@@ -91,7 +91,10 @@
     BOOST_THROW_EXCEPTION(std::runtime_error{"no buffer support"});
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 uint32_t mcle::ClientPlatform::native_flags_for(MirBufferUsage, mir::geometry::Size) const
 {
+#pragma GCC diagnostic pop
     BOOST_THROW_EXCEPTION(std::runtime_error{"no buffer support"});
 }

=== modified file 'src/platforms/eglstream-kms/client/client_platform.h'
--- src/platforms/eglstream-kms/client/client_platform.h	2017-01-30 08:13:20 +0000
+++ src/platforms/eglstream-kms/client/client_platform.h	2017-04-11 18:27:10 +0000
@@ -43,7 +43,10 @@
     MirNativeBuffer* convert_native_buffer(graphics::NativeBuffer*) const override;
     MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig) const override;
     uint32_t native_format_for(MirPixelFormat) const override;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     uint32_t native_flags_for(MirBufferUsage, mir::geometry::Size) const override;
+#pragma GCC diagnostic pop
 };
 
 }

=== modified file 'src/platforms/mesa/client/client_platform.cpp'
--- src/platforms/mesa/client/client_platform.cpp	2017-03-16 03:23:51 +0000
+++ src/platforms/mesa/client/client_platform.cpp	2017-04-11 18:27:10 +0000
@@ -445,8 +445,12 @@
     return mgm::mir_format_to_gbm_format(format);
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 uint32_t mclm::ClientPlatform::native_flags_for(MirBufferUsage, mir::geometry::Size size) const
 {
+#pragma GCC diagnostic pop
+
     uint32_t bo_flags{GBM_BO_USE_RENDERING};
     if (size.width.as_uint32_t() >= 800 && size.height.as_uint32_t() >= 600)
         bo_flags |= GBM_BO_USE_SCANOUT;

=== modified file 'src/platforms/mesa/client/client_platform.h'
--- src/platforms/mesa/client/client_platform.h	2017-03-16 03:23:51 +0000
+++ src/platforms/mesa/client/client_platform.h	2017-04-11 18:27:10 +0000
@@ -56,7 +56,10 @@
     MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig) const override;
     void set_gbm_device(gbm_device*);
     uint32_t native_format_for(MirPixelFormat) const override;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     uint32_t native_flags_for(MirBufferUsage, mir::geometry::Size) const override;
+#pragma GCC diagnostic pop
 
 private:
     ClientContext* const context;

=== modified file 'src/platforms/mesa/client/native_surface.cpp'
--- src/platforms/mesa/client/native_surface.cpp	2017-01-18 02:29:37 +0000
+++ src/platforms/mesa/client/native_surface.cpp	2017-04-11 18:27:10 +0000
@@ -41,9 +41,12 @@
     return s->advance_buffer(buffer_package);
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 static int get_parameters_static(MirMesaEGLNativeSurface* surface,
                                   MirWindowParameters* surface_parameters)
 {
+#pragma GCC diagnostic pop
     auto s = static_cast<mclm::NativeSurface*>(surface);
     return s->get_parameters(surface_parameters);
 }
@@ -94,6 +97,8 @@
     return MIR_MESA_FALSE;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 int mclm::NativeSurface::get_parameters(MirWindowParameters* surface_parameters)
 try
 {
@@ -107,6 +112,7 @@
     MIR_LOG_DRIVER_BOUNDARY_EXCEPTION(e);
     return MIR_MESA_FALSE;
 }
+#pragma GCC diagnostic pop
 
 int mclm::NativeSurface::set_swapinterval(int interval)
 try

=== modified file 'src/platforms/mesa/client/native_surface.h'
--- src/platforms/mesa/client/native_surface.h	2017-01-18 02:29:37 +0000
+++ src/platforms/mesa/client/native_surface.h	2017-04-11 18:27:10 +0000
@@ -35,7 +35,10 @@
     explicit NativeSurface(EGLNativeSurface*);
 
     int advance_buffer(MirBufferPackage* buffer_package);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     int get_parameters(MirWindowParameters* surface_parameters);
+#pragma GCC diagnostic pop
     int set_swapinterval(int interval);
     void use_native_surface(EGLNativeSurface* native_surface);
 

=== modified file 'src/server/graphics/nested/mir_client_host_connection.cpp'
--- src/server/graphics/nested/mir_client_host_connection.cpp	2017-03-20 18:24:55 +0000
+++ src/server/graphics/nested/mir_client_host_connection.cpp	2017-04-11 18:27:10 +0000
@@ -353,8 +353,11 @@
 
 EGLNativeDisplayType mgn::MirClientHostConnection::egl_native_display()
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     return reinterpret_cast<EGLNativeDisplayType>(
         mir_connection_get_egl_native_display(mir_connection));
+#pragma GCC diagnostic pop
 }
 
 auto mgn::MirClientHostConnection::create_display_config()
@@ -397,6 +400,8 @@
             properties.size.height.as_int()),
         mir_window_spec_release);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirBufferUsage usage = (properties.usage == mg::BufferUsage::hardware) ?
         mir_buffer_usage_hardware : mir_buffer_usage_software; 
 
@@ -406,6 +411,7 @@
     mir_window_spec_set_fullscreen_on_output(spec.get(), output_id);
     MirBufferStreamInfo info { stream->handle(), displacement.dx.as_int(), displacement.dy.as_int() };
     mir_window_spec_set_streams(spec.get(), &info, 1);
+#pragma GCC diagnostic pop
 
     auto surf = std::shared_ptr<MirClientHostSurface>(
         new MirClientHostSurface(mir_connection, spec.get()),

=== modified file 'src/utils/screencast.cpp'
--- src/utils/screencast.cpp	2017-01-18 13:59:18 +0000
+++ src/utils/screencast.cpp	2017-04-11 18:27:10 +0000
@@ -350,7 +350,8 @@
         static EGLint const context_attribs[] = {
             EGL_CONTEXT_CLIENT_VERSION, 2,
             EGL_NONE };
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         auto native_display =
             reinterpret_cast<EGLNativeDisplayType>(
                 mir_connection_get_egl_native_display(connection));
@@ -358,7 +359,7 @@
         auto native_window =
             reinterpret_cast<EGLNativeWindowType>(
                 mir_buffer_stream_get_egl_native_window(buffer_stream));
-
+#pragma GCC diagnostic pop
         egl_display = eglGetDisplay(native_display);
 
         eglInitialize(egl_display, nullptr, nullptr);

=== modified file 'tests/acceptance-tests/client_mediated_user_gestures.cpp'
--- tests/acceptance-tests/client_mediated_user_gestures.cpp	2017-03-31 10:13:00 +0000
+++ tests/acceptance-tests/client_mediated_user_gestures.cpp	2017-04-11 18:27:10 +0000
@@ -193,8 +193,11 @@
                 have_focus.raise();
         });
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
-
+#pragma GCC diagnostic pop
+    
     EXPECT_THAT(have_focus.wait_for(receive_event_timeout), Eq(true));
 
     reset_window_event_handler();

=== modified file 'tests/acceptance-tests/drag_and_drop.cpp'
--- tests/acceptance-tests/drag_and_drop.cpp	2017-03-24 10:16:59 +0000
+++ tests/acceptance-tests/drag_and_drop.cpp	2017-04-11 18:27:10 +0000
@@ -158,6 +158,8 @@
 
     void create_target_window()
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         another_connection = mir_connect_sync(new_connection().c_str(), "another_connection");
         auto const spec = mir_create_normal_window_spec(
             connection, screen_geometry.size.width.as_int(), screen_geometry.size.height.as_int());
@@ -165,6 +167,7 @@
         mir_window_spec_set_name(spec, "target_window");
         mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
         mir_window_spec_set_event_handler(spec, &window_event_handler, this);
+#pragma GCC diagnostic pop
 
         target_window = mir_create_window_sync(spec);
         mir_window_spec_release(spec);
@@ -234,9 +237,10 @@
             if (mir_window_event_get_attribute_value(window_event))
                 have_focus.raise();
         });
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(w));
-
+#pragma GCC diagnostic pop
     EXPECT_THAT(have_focus.wait_for(receive_event_timeout), Eq(true));
 
     reset_window_event_handler(w);

=== modified file 'tests/acceptance-tests/test_buffer_stream_arrangement.cpp'
--- tests/acceptance-tests/test_buffer_stream_arrangement.cpp	2017-03-14 02:26:28 +0000
+++ tests/acceptance-tests/test_buffer_stream_arrangement.cpp	2017-04-11 18:27:10 +0000
@@ -67,6 +67,8 @@
     swap_buffers();
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 mt::LegacyStream::LegacyStream(MirConnection* connection,
     geom::Size physical_size,
     geom::Rectangle position) :
@@ -296,3 +298,4 @@
 
     EXPECT_THAT(mir_window_get_buffer_stream(window), Eq(nullptr));
 }
+#pragma GCC diagnostic pop
\ No newline at end of file

=== modified file 'tests/acceptance-tests/test_client_cookie.cpp'
--- tests/acceptance-tests/test_client_cookie.cpp	2017-03-14 02:26:28 +0000
+++ tests/acceptance-tests/test_client_cookie.cpp	2017-04-11 18:27:10 +0000
@@ -59,14 +59,18 @@
 
         // Need fullscreen for the cursor events
         auto const spec = mir_create_normal_window_spec(connection, 100, 100);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888);
+#pragma GCC diagnostic pop
         mir_window_spec_set_fullscreen_on_output(spec, 1);
         mir_window_spec_set_event_handler(spec, &cookie_capturing_callback, this);
         window = mir_create_window_sync(spec);
         mir_window_spec_release(spec);
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
-
+#pragma GCC diagnostic pop
         ready_to_accept_events.wait_for(max_wait);
         if (!ready_to_accept_events.raised())
             BOOST_THROW_EXCEPTION(std::runtime_error("Timeout waiting for window to become focused and exposed"));

=== modified file 'tests/acceptance-tests/test_client_cursor_api.cpp'
--- tests/acceptance-tests/test_client_cursor_api.cpp	2017-04-11 03:54:16 +0000
+++ tests/acceptance-tests/test_client_cursor_api.cpp	2017-04-11 18:27:10 +0000
@@ -189,7 +189,10 @@
 MirWindow *make_window(MirConnection *connection, std::string const& client_name)
 {
     auto spec = mir_create_normal_window_spec(connection, 1, 1);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888);
+#pragma GCC diagnostic pop
     mir_window_spec_set_name(spec, client_name.c_str());
 
     WindowReadyHandler event_handler;
@@ -198,8 +201,10 @@
     auto const window = mir_create_window_sync(spec);
     mir_window_spec_release(spec);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
-
+#pragma GCC diagnostic pop
     event_handler.wait_for_window_to_become_focused_and_exposed();
     mir_window_set_event_handler(window, nullptr, nullptr);
 
@@ -275,6 +280,8 @@
     MirWindowSpec * const spec;
 };
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 struct BufferStream
 {
     BufferStream(MirConnection *connection)
@@ -282,13 +289,10 @@
        stream{mir_connection_create_buffer_stream_sync(connection, 24, 24, mir_pixel_format_argb_8888,mir_buffer_usage_software)}
     {}
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     BufferStream(RenderSurface const& surface)
      : stream_owned(false),
        stream{mir_render_surface_get_buffer_stream(surface.get(), 24, 24, mir_pixel_format_argb_8888)}
     {}
-#pragma GCC diagnostic pop
 
     ~BufferStream()
     {
@@ -304,6 +308,7 @@
     bool stream_owned;
     MirBufferStream *stream;
 };
+#pragma GCC diagnostic pop
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"

=== modified file 'tests/acceptance-tests/test_client_focus_notification.cpp'
--- tests/acceptance-tests/test_client_focus_notification.cpp	2017-01-18 02:29:37 +0000
+++ tests/acceptance-tests/test_client_focus_notification.cpp	2017-04-11 18:27:10 +0000
@@ -41,13 +41,18 @@
         connection(connection)
     {
         auto spec = mir_create_normal_window_spec(connection, 100, 100);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888);
+#pragma GCC diagnostic pop
         mir_window_spec_set_event_handler(spec, FocusSurface::handle_event, this);
 
         window = mir_create_window_sync(spec);
         mir_window_spec_release(spec);
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
+#pragma GCC diagnostic pop
     }
 
     ~FocusSurface()

=== modified file 'tests/acceptance-tests/test_client_input.cpp'
--- tests/acceptance-tests/test_client_input.cpp	2017-04-06 13:43:19 +0000
+++ tests/acceptance-tests/test_client_input.cpp	2017-04-11 18:27:10 +0000
@@ -179,7 +179,10 @@
                 mir_connection_get_error_message(connection)});
         }
         auto spec = mir_create_normal_window_spec(connection, surface_width, surface_height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888);
+#pragma GCC diagnostic pop
         mir_window_spec_set_event_handler(spec, handle_event, this);
         mir_window_spec_set_name(spec, name.c_str());
         window = mir_create_window_sync(spec);
@@ -188,9 +191,11 @@
             BOOST_THROW_EXCEPTION(std::runtime_error{std::string{"Failed creating a window: "}+
                 mir_window_get_error_message(window)});
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers_sync(
             mir_window_get_buffer_stream(window));
-
+#pragma GCC diagnostic pop
         ready_to_accept_events.wait_for(4s);
         if (!ready_to_accept_events.raised())
             BOOST_THROW_EXCEPTION(std::runtime_error("Timeout waiting for window to become focused and exposed"));

=== modified file 'tests/acceptance-tests/test_client_library.cpp'
--- tests/acceptance-tests/test_client_library.cpp	2017-03-10 19:47:57 +0000
+++ tests/acceptance-tests/test_client_library.cpp	2017-04-11 18:27:10 +0000
@@ -46,6 +46,7 @@
 {
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
 // Assert our MirSurfaceType is 1to1 to MirWindowType
 static_assert(
     static_cast<int32_t>(mir_surface_type_normal) ==
@@ -151,7 +152,6 @@
     "mir_surface_visibility_exposed != mir_window_visibility_exposed");
 static_assert(sizeof(MirSurfaceVisibility) == sizeof(MirWindowVisibility),
     "sizeof(MirSurfaceVisibility) != sizeof(MirWindowVisibility)");
-#pragma GCC diagnostic pop
 
 struct ClientLibrary : mtf::HeadlessInProcessServer
 {
@@ -239,8 +239,6 @@
     {
         for (int i = 0; i < 10; i++)
         {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_wait_for_one(mir_surface_set_state(surf,
                                             mir_surface_state_maximized));
             mir_wait_for_one(mir_surface_set_state(surf,
@@ -249,7 +247,6 @@
                                             mir_surface_state_fullscreen));
             mir_wait_for_one(mir_surface_set_state(surf,
                                             mir_surface_state_minimized));
-#pragma GCC diagnostic pop
         }
     }
 };
@@ -263,10 +260,10 @@
 {
     MirWaitHandle* wh = mir_connect(new_connection().c_str(), __PRETTY_FUNCTION__, connection_callback, this);
     EXPECT_THAT(wh, NotNull());
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
+
     mir_wait_for(wh);
-#pragma GCC diagnostic pop
+
 
     ASSERT_THAT(connection, NotNull());
     EXPECT_TRUE(mir_connection_is_valid(connection));
@@ -349,10 +346,7 @@
 
 TEST_F(ClientLibrary, creates_surface)
 {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_wait_for(mir_connect(new_connection().c_str(), __PRETTY_FUNCTION__, connection_callback, this));
-#pragma GCC diagnostic pop
 
     int request_width = 640, request_height = 480;
     MirPixelFormat request_format = mir_pixel_format_abgr_8888;
@@ -407,8 +401,6 @@
 
     EXPECT_THAT(mir_window_get_state(window), Eq(mir_window_state_restored));
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_wait_for(mir_surface_set_state(window, mir_surface_state_fullscreen));
     EXPECT_THAT(mir_surface_get_state(window), Eq(mir_surface_state_fullscreen));
 
@@ -429,7 +421,6 @@
         mir_wait_for(mir_surface_set_state(window, mir_surface_state_fullscreen));
         ASSERT_THAT(mir_surface_get_state(window), Eq(mir_surface_state_fullscreen));
     }
-#pragma GCC diagnostic pop
 
     mir_window_release_sync(window);
     mir_connection_release(connection);
@@ -443,6 +434,7 @@
     auto const format = mir_pixel_format_abgr_8888;
     auto const spec = mir_create_normal_window_spec(connection, width, height);
     mir_window_spec_set_pixel_format(spec, format);
+
     mir_window_spec_set_pointer_confinement(spec, mir_pointer_confined_to_window);
     window = mir_create_window_sync(spec);
     mir_window_spec_release(spec);
@@ -594,8 +586,10 @@
     window = mir_create_window_sync(spec);
 
     MirNativeBuffer *native;
+
     auto bs = mir_window_get_buffer_stream(window);
     mir_buffer_stream_get_current_buffer(bs, &native);
+
     EXPECT_TRUE(native->flags & mir_buffer_flag_can_scanout);
     mir_buffer_stream_swap_buffers_sync(bs);
     EXPECT_TRUE(native->flags & mir_buffer_flag_can_scanout);
@@ -605,21 +599,25 @@
     mir_window_spec_set_height(spec, 100);
 
     window = mir_create_window_sync(spec);
+
     bs = mir_window_get_buffer_stream(window);
     mir_buffer_stream_get_current_buffer(bs, &native);
+
     EXPECT_FALSE(native->flags & mir_buffer_flag_can_scanout);
     mir_buffer_stream_swap_buffers_sync(bs);
     EXPECT_FALSE(native->flags & mir_buffer_flag_can_scanout);
     mir_window_release_sync(window);
 
-
     mir_window_spec_set_width(spec, 800);
     mir_window_spec_set_height(spec, 600);
+
     mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_software);
 
     window = mir_create_window_sync(spec);
+
     bs = mir_window_get_buffer_stream(window);
     mir_buffer_stream_get_current_buffer(bs, &native);
+
     EXPECT_FALSE(native->flags & mir_buffer_flag_can_scanout);
     mir_buffer_stream_swap_buffers_sync(bs);
     EXPECT_FALSE(native->flags & mir_buffer_flag_can_scanout);
@@ -630,6 +628,7 @@
     window = mir_create_window_sync(spec);
     bs = mir_window_get_buffer_stream(window);
     mir_buffer_stream_get_current_buffer(bs, &native);
+
     EXPECT_TRUE(native->flags & mir_buffer_flag_can_scanout);
     mir_buffer_stream_swap_buffers_sync(bs);
     EXPECT_TRUE(native->flags & mir_buffer_flag_can_scanout);
@@ -661,6 +660,7 @@
         mir_window_spec_set_height(spec, size.height);
 
         window = mir_create_window_sync(spec);
+
         auto bs = mir_window_get_buffer_stream(window);
 
         MirNativeBuffer *native = NULL;
@@ -687,16 +687,14 @@
     int const n_surfaces = 13;
     size_t old_surface_count = 0;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_wait_for(mir_connect(new_connection().c_str(), __PRETTY_FUNCTION__, connection_callback, this));
-#pragma GCC diagnostic pop
 
     auto const spec =
         mir_create_normal_window_spec(connection, 640, 480);
     mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888);
 
     mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+
     for (int i = 0; i != n_surfaces; ++i)
     {
         old_surface_count = current_surface_count();
@@ -725,18 +723,14 @@
 
 TEST_F(ClientLibrary, client_library_accesses_and_advances_buffers)
 {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_wait_for(mir_connect(new_connection().c_str(), __PRETTY_FUNCTION__, connection_callback, this));
-#pragma GCC diagnostic pop
 
     window = mtf::make_any_surface(connection);
 
     buffers = 0;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
     mir_wait_for(mir_buffer_stream_swap_buffers(mir_window_get_buffer_stream(window), swap_buffers_callback, this));
-#pragma GCC diagnostic pop
+
     EXPECT_THAT(buffers, Eq(1));
 
     mir_window_release(window, release_surface_callback, this);
@@ -754,6 +748,7 @@
     window = mtf::make_any_surface(connection);
 
     mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
+
     EXPECT_TRUE(mir_window_is_valid(window));
     EXPECT_STREQ(mir_window_get_error_message(window), "");
 
@@ -790,18 +785,14 @@
 TEST_F(ClientLibrary, accesses_platform_package)
 {
     using namespace testing;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
     mir_wait_for(mir_connect(new_connection().c_str(), __PRETTY_FUNCTION__, connection_callback, this));
-#pragma GCC diagnostic pop
 
     MirPlatformPackage platform_package;
     ::memset(&platform_package, -1, sizeof(platform_package));
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_connection_get_platform(connection, &platform_package);
-#pragma GCC diagnostic pop
+
     EXPECT_THAT(platform_package, mtf::IsStubPlatformPackage());
 
     mir_connection_release(connection);
@@ -809,10 +800,7 @@
 
 TEST_F(ClientLibrary, accesses_display_info)
 {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_wait_for(mir_connect(new_connection().c_str(), __PRETTY_FUNCTION__, connection_callback, this));
-#pragma GCC diagnostic pop
 
     auto configuration = mir_connection_create_display_configuration(connection);
     ASSERT_THAT(configuration, NotNull());
@@ -836,10 +824,7 @@
 
 TEST_F(ClientLibrary, MultiSurfaceClientTracksBufferFdsCorrectly)
 {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_wait_for(mir_connect(new_connection().c_str(), __PRETTY_FUNCTION__, connection_callback, this));
-#pragma GCC diagnostic pop
 
     auto const surf_one = mtf::make_any_surface(connection);
     auto const surf_two = mtf::make_any_surface(connection);
@@ -901,6 +886,7 @@
     int const width{800}, height{600};
     MirPixelFormat const format{mir_pixel_format_bgr_888};
     auto surface_spec = mir_create_normal_window_spec(connection, width, height);
+
     mir_window_spec_set_pixel_format(surface_spec, format);
 
     auto window = mir_create_window_sync(surface_spec);
@@ -927,6 +913,7 @@
     int const width{800}, height{600};
     MirPixelFormat const format{mir_pixel_format_xbgr_8888};
     auto surface_spec = mir_create_normal_window_spec(connection, width, height);
+
     mir_window_spec_set_pixel_format(surface_spec, format);
 
     window = mir_create_window_sync(surface_spec);
@@ -935,6 +922,7 @@
     EXPECT_THAT(window, IsValid());
 
     MirNativeBuffer* native_buffer;
+
     mir_buffer_stream_get_current_buffer(
         mir_window_get_buffer_stream(window), &native_buffer);
 
@@ -1120,8 +1108,8 @@
     mir_connection_release(connection);
 }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
+
 TEST_F(ClientLibrary, can_get_persistent_surface_id)
 {
     auto connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
@@ -1183,7 +1171,7 @@
     mir_connection_release(first_client);
     mir_connection_release(im_client);
 }
-#pragma GCC diagnostic pop
+
 
 //lp:1661704
 TEST_F(ClientLibrary, can_get_window_id_more_than_once_in_quick_succession)
@@ -1232,3 +1220,4 @@
                                     MIR_CLIENT_API_VERSION_MINOR,
                                     MIR_CLIENT_API_VERSION_PATCH) == mir_get_client_api_version());
 }
+#pragma GCC diagnostic pop

=== modified file 'tests/acceptance-tests/test_client_library_callbacks.cpp'
--- tests/acceptance-tests/test_client_library_callbacks.cpp	2017-01-18 16:58:17 +0000
+++ tests/acceptance-tests/test_client_library_callbacks.cpp	2017-04-11 18:27:10 +0000
@@ -154,11 +154,11 @@
 {
     connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
     window = mtf::make_any_surface(connection);
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto const wh = mir_buffer_stream_swap_buffers(
         mir_window_get_buffer_stream(window), swap_buffers_callback, this);
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
     mir_wait_for(wh);
 #pragma GCC diagnostic pop
 

=== modified file 'tests/acceptance-tests/test_client_library_errors.cpp'
--- tests/acceptance-tests/test_client_library_errors.cpp	2017-03-10 19:47:57 +0000
+++ tests/acceptance-tests/test_client_library_errors.cpp	2017-04-11 18:27:10 +0000
@@ -91,7 +91,10 @@
     ASSERT_THAT(connection, IsValid());
 
     auto spec = mir_create_normal_window_spec(connection, 800, 600);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(spec, mir_pixel_format_xbgr_8888);
+#pragma GCC diagnostic pop
     auto window = mir_create_window_sync(spec);
     mir_window_spec_release(spec);
 
@@ -103,6 +106,8 @@
     mir_connection_release(connection);
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 TEST_F(ClientLibraryErrors, create_buffer_stream_returns_error_object_on_failure)
 {
     std::string const exception_text{"Extravaganza!"};
@@ -123,6 +128,7 @@
     mir_buffer_stream_release_sync(stream);
     mir_connection_release(connection);
 }
+#pragma GCC diagnostic pop
 
 TEST_F(ClientLibraryErrors, create_surface_doesnt_double_close_buffer_file_descriptors_on_error)
 {
@@ -138,7 +144,10 @@
     ASSERT_THAT(connection, IsValid());
 
     auto spec = mir_create_normal_window_spec(connection, 800, 600);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(spec, mir_pixel_format_xbgr_8888);
+#pragma GCC diagnostic pop
     auto window = mir_create_window_sync(spec);
     mir_window_spec_release(spec);
 
@@ -167,7 +176,10 @@
     ASSERT_THAT(connection, IsValid());
 
     auto spec = mir_create_normal_window_spec(connection, 800, 600);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(spec, mir_pixel_format_xbgr_8888);
+#pragma GCC diagnostic pop
     auto window = mir_create_window_sync(spec);
     mir_window_spec_release(spec);
 
@@ -194,7 +206,10 @@
     ASSERT_THAT(connection, IsValid());
 
     auto spec = mir_create_normal_window_spec(connection, 800, 600);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(spec, mir_pixel_format_xbgr_8888);
+#pragma GCC diagnostic pop
     auto window = mir_create_window_sync(spec);
     mir_window_spec_release(spec);
 

=== modified file 'tests/acceptance-tests/test_client_logging.cpp'
--- tests/acceptance-tests/test_client_logging.cpp	2017-01-21 01:13:44 +0000
+++ tests/acceptance-tests/test_client_logging.cpp	2017-04-11 18:27:10 +0000
@@ -54,7 +54,8 @@
     }
 };
 } // namespace
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 TEST_F(ClientLogging, reports_performance)
 {
     auto spec = mir_create_normal_window_spec(connection, 123, 456);
@@ -144,3 +145,4 @@
 
     mir_window_release_sync(window);
 }
+#pragma GCC diagnostic pop
\ No newline at end of file

=== modified file 'tests/acceptance-tests/test_client_scaling.cpp'
--- tests/acceptance-tests/test_client_scaling.cpp	2017-03-14 02:26:28 +0000
+++ tests/acceptance-tests/test_client_scaling.cpp	2017-04-11 18:27:10 +0000
@@ -160,10 +160,12 @@
 {
     using namespace std::literals::chrono_literals;
     auto scale = 2.0f;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto stream = mir_window_get_buffer_stream(window);
     mir_buffer_stream_set_swapinterval(stream, GetParam());
     mir_buffer_stream_set_scale(stream, scale);
-
+#pragma GCC diagnostic pop
     mir_buffer_stream_swap_buffers_sync(stream);
 
     int frames = 0;

=== modified file 'tests/acceptance-tests/test_client_surface_events.cpp'
--- tests/acceptance-tests/test_client_surface_events.cpp	2017-04-11 03:54:16 +0000
+++ tests/acceptance-tests/test_client_surface_events.cpp	2017-04-11 18:27:10 +0000
@@ -425,7 +425,10 @@
         &focus_received);
 
     // Swap buffers to get the window into the scene so it can be focused.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto buffer_stream = mir_window_get_buffer_stream(window);
+#pragma GCC diagnostic pop
     mir_buffer_stream_swap_buffers_sync(buffer_stream);
 
     ASSERT_TRUE(focus_received.wait_for(10s));
@@ -469,7 +472,10 @@
         &focus_received);
 
     // Swap buffers to get the window into the scene so it can be focused.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto buffer_stream = mir_window_get_buffer_stream(window);
+#pragma GCC diagnostic pop
     mir_buffer_stream_swap_buffers_sync(buffer_stream);
 
     ASSERT_TRUE(focus_received.wait_for(10s));
@@ -489,8 +495,10 @@
 
     // Add a new window that will take focus.
     auto focus_grabbing_surface = mtf::make_any_surface(connection);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(focus_grabbing_surface));
-
+#pragma GCC diagnostic pop
     ASSERT_TRUE(unfocus_received.wait_for(10s));
 
     unfocus_received.reset();
@@ -547,7 +555,10 @@
     mt::Signal done;
 
     auto spec = mir_create_normal_window_spec(connection, 100, 100);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888);
+#pragma GCC diagnostic pop
     mir_window_spec_set_event_handler(spec, &raise_signal_on_close_event, &done);
 
     auto window = mir_create_window_sync(spec);
@@ -639,7 +650,10 @@
     EventContext context;
 
     auto spec = mir_create_normal_window_spec(connection, 640, 480);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888);
+#pragma GCC diagnostic pop
     mir_window_spec_set_event_handler(spec, &surface_output_capturing_callback, &context);
     auto window = mir_create_window_sync(spec);
     mir_window_spec_release(spec);
@@ -730,7 +744,10 @@
     ASSERT_THAT(height, Ne(surface_height));
 
     auto spec = mir_create_normal_window_spec(connection, width, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888);
+#pragma GCC diagnostic pop
     mir_window_spec_set_event_handler(spec, callback, &context);
 
     auto window = mir_create_window_sync(spec);

=== modified file 'tests/acceptance-tests/test_client_surface_swap_buffers.cpp'
--- tests/acceptance-tests/test_client_surface_swap_buffers.cpp	2017-03-14 02:26:28 +0000
+++ tests/acceptance-tests/test_client_surface_swap_buffers.cpp	2017-04-11 18:27:10 +0000
@@ -62,9 +62,10 @@
     for (int i = 0; i != 10; ++i)
     {
         mt::Signal buffers_swapped;
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers(mir_window_get_buffer_stream(window), swap_buffers_callback, &buffers_swapped);
-
+#pragma GCC diagnostic pop
         /*
          * ASSERT instead of EXPECT, since if we continue we will block in future
          * mir client calls (e.g mir_connection_release).
@@ -136,6 +137,9 @@
 //LP: #1584784
 TEST_F(SwapBuffersDoesntBlockOnSubmission, can_swap_nbuffers_times_without_blocking)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     for (auto i = 0u; i != nbuffers; ++i)
         mir_buffer_stream_swap_buffers(mir_window_get_buffer_stream(window), nullptr, nullptr);
+#pragma GCC diagnostic pop
 }

=== modified file 'tests/acceptance-tests/test_client_surface_visibility.cpp'
--- tests/acceptance-tests/test_client_surface_visibility.cpp	2017-03-14 02:26:28 +0000
+++ tests/acceptance-tests/test_client_surface_visibility.cpp	2017-04-11 18:27:10 +0000
@@ -109,9 +109,12 @@
 {
     auto const spec = mir_create_normal_window_spec(
         connection, size.width.as_int(), size.height.as_int());
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(spec, mir_pixel_format_bgr_888);
     mir_window_spec_set_name(spec, name);
     mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
     mir_window_spec_set_event_handler(spec, &event_callback, &mock_callback);
     auto window = mir_create_window_sync(spec);
     mir_window_spec_release(spec);
@@ -162,7 +165,10 @@
             mir_window_visibility_exposed,
             [this]
             {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
                 mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
+#pragma GCC diagnostic pop
             });
 
         // GMock is behaving strangely, checking expectations after they

=== modified file 'tests/acceptance-tests/test_client_surfaces.cpp'
--- tests/acceptance-tests/test_client_surfaces.cpp	2017-03-14 04:41:33 +0000
+++ tests/acceptance-tests/test_client_surfaces.cpp	2017-04-11 18:27:10 +0000
@@ -61,7 +61,8 @@
     testing::NiceMock<mtd::MockWindowManager> window_manager;
 };
 }
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 TEST_F(ClientSurfaces, are_created_with_correct_size)
 {
     int width_1 = 640, height_1 = 480, width_2 = 1600, height_2 = 1200;
@@ -338,8 +339,7 @@
     mir_window_release_sync(window);
 }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
 TEST_F(ClientSurfaces, input_methods_get_corret_parent_coordinates)
 {
     using namespace testing;

=== modified file 'tests/acceptance-tests/test_confined_pointer.cpp'
--- tests/acceptance-tests/test_confined_pointer.cpp	2017-02-15 07:38:33 +0000
+++ tests/acceptance-tests/test_confined_pointer.cpp	2017-04-11 18:27:10 +0000
@@ -78,7 +78,10 @@
                 mir_connection_get_error_message(connection)});
         }
         auto spec = mir_create_normal_window_spec(connection, surface_width, surface_height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888);
+#pragma GCC diagnostic pop
         mir_window_spec_set_pointer_confinement(spec, mir_pointer_confined_to_window);
         mir_window_spec_set_name(spec, name.c_str());
         mir_window_spec_set_event_handler(spec, handle_event, this);
@@ -90,9 +93,11 @@
                 mir_window_get_error_message(window)});
         }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers_sync(
             mir_window_get_buffer_stream(window));
-
+#pragma GCC diagnostic pop
         ready_to_accept_events.wait_for(4s);
         if (!ready_to_accept_events.raised())
         {

=== modified file 'tests/acceptance-tests/test_custom_window_management.cpp'
--- tests/acceptance-tests/test_custom_window_management.cpp	2017-03-14 02:26:28 +0000
+++ tests/acceptance-tests/test_custom_window_management.cpp	2017-04-11 18:27:10 +0000
@@ -77,7 +77,10 @@
     auto surface_create() const -> MirWindow*
     {
         auto spec = mir_create_normal_window_spec(connection, 800, 600);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_window_spec_set_pixel_format(spec, mir_pixel_format_bgr_888);
+#pragma GCC diagnostic pop
         auto window = mir_create_window_sync(spec);
         mir_window_spec_release(spec);
 
@@ -302,7 +305,10 @@
     MirPixelFormat const format{mir_pixel_format_bgr_888};
     auto surface_spec = mir_create_normal_window_spec(connection, width, height);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(surface_spec, format);
+#pragma GCC diagnostic pop
     mir_window_spec_set_shell_chrome(surface_spec, mir_shell_chrome_low);
 
     auto const check_add_surface = [](
@@ -332,8 +338,10 @@
     int const width{800}, height{600};
     MirPixelFormat const format{mir_pixel_format_bgr_888};
     auto surface_spec = mir_create_normal_window_spec(connection, width, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(surface_spec, format);
-
+#pragma GCC diagnostic pop
     auto window = mir_create_window_sync(surface_spec);
     mir_window_spec_release(surface_spec);
 
@@ -372,8 +380,10 @@
     int const width{800}, height{600};
     MirPixelFormat const format{mir_pixel_format_bgr_888};
     auto surface_spec = mir_create_normal_window_spec(connection, width, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(surface_spec, format);
-
+#pragma GCC diagnostic pop
     auto window = mir_create_window_sync(surface_spec);
     mir_window_spec_release(surface_spec);
 
@@ -426,13 +436,19 @@
     start_server();
     auto connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
     auto surface_spec = mir_create_normal_window_spec(connection, width, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(surface_spec, format);
+#pragma GCC diagnostic pop
     auto parent = mir_create_window_sync(surface_spec);
     mir_window_spec_release(surface_spec);
 
     surface_spec = mir_create_tip_window_spec(
         connection, width, height, parent, &dummy_rect, mir_edge_attachment_any);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(surface_spec, format);
+#pragma GCC diagnostic pop
 
     mir_window_spec_set_placement(
         surface_spec, &aux_rect, rect_gravity, surface_gravity, placement_hints, offset_dx, offset_dy);
@@ -506,13 +522,19 @@
     start_server();
     auto connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
     auto surface_spec = mir_create_normal_window_spec(connection, width, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(surface_spec, format);
+#pragma GCC diagnostic pop
     auto parent = mir_create_window_sync(surface_spec);
     mir_window_spec_release(surface_spec);
 
     surface_spec = mir_create_menu_window_spec(
         connection, width, height, parent, &dummy_rect, mir_edge_attachment_any);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(surface_spec, format);
+#pragma GCC diagnostic pop
     auto child = mir_create_window_sync(surface_spec);
     mir_window_spec_release(surface_spec);
 
@@ -635,7 +657,10 @@
 
     PlacementCheck placement_check{placement};
     auto surface_spec = mir_create_normal_window_spec(connection, width, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(surface_spec, format);
+#pragma GCC diagnostic pop
     mir_window_spec_set_event_handler(surface_spec, &window_placement_event_callback, &placement_check);
     auto window = mir_create_window_sync(surface_spec);
     mir_window_spec_release(surface_spec);

=== modified file 'tests/acceptance-tests/test_latency.cpp'
--- tests/acceptance-tests/test_latency.cpp	2017-03-14 02:26:28 +0000
+++ tests/acceptance-tests/test_latency.cpp	2017-04-11 18:27:10 +0000
@@ -285,8 +285,10 @@
         std::unique_ptr<MirWindowSpec, decltype(del)> spec(
             mir_create_normal_window_spec(connection, 100, 100),
             del);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_window_spec_set_pixel_format(spec.get(), mir_pixel_format_abgr_8888);
-
+#pragma GCC diagnostic pop
         visible_surface = std::make_unique<mtf::VisibleSurface>(spec.get());
         surface =  *visible_surface;
 
@@ -315,7 +317,10 @@
 
 TEST_F(ClientLatency, average_swap_buffers_sync_latency_is_one_frame)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto stream = mir_window_get_buffer_stream(surface);
+#pragma GCC diagnostic pop
     auto const deadline = steady_clock::now() + 60s;
 
     while (stats.frames_composited() < test_frames &&
@@ -338,7 +343,10 @@
 
 TEST_F(ClientLatency, max_latency_is_limited_to_nbuffers)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto stream = mir_window_get_buffer_stream(surface);
+#pragma GCC diagnostic pop
     auto const deadline = steady_clock::now() + 60s;
 
     while (stats.frames_composited() < test_frames &&
@@ -357,7 +365,10 @@
 
 TEST_F(ClientLatency, dropping_latency_is_closer_to_zero_than_one)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto stream = mir_window_get_buffer_stream(surface);
+#pragma GCC diagnostic pop
     mir_buffer_stream_set_swapinterval(stream, 0);
     stats.swap_interval = 0;
     auto const deadline = steady_clock::now() + 60s;
@@ -381,7 +392,10 @@
 
 TEST_F(ClientLatency, average_async_swap_latency_is_less_than_nbuffers)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto stream = mir_window_get_buffer_stream(surface);
+#pragma GCC diagnostic pop
     auto const deadline = steady_clock::now() + 60s;
 
     while (stats.frames_composited() < test_frames &&
@@ -407,7 +421,10 @@
 
 TEST_F(ClientLatency, max_async_swap_latency_is_limited_to_nbuffers)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto stream = mir_window_get_buffer_stream(surface);
+#pragma GCC diagnostic pop
     auto const deadline = steady_clock::now() + 60s;
 
     while (stats.frames_composited() < test_frames &&
@@ -429,7 +446,10 @@
 
 TEST_F(ClientLatency, async_swap_dropping_latency_is_closer_to_zero_than_one)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto stream = mir_window_get_buffer_stream(surface);
+#pragma GCC diagnostic pop
     mir_buffer_stream_set_swapinterval(stream, 0);
     stats.swap_interval = 0;
     auto const deadline = steady_clock::now() + 60s;
@@ -459,7 +479,10 @@
     int const throttled_input_rate = refresh_rate * 3 / 4;
     microseconds const input_interval(1000000/throttled_input_rate);
     auto next_input_event = high_resolution_clock::now();
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto stream = mir_window_get_buffer_stream(surface);
+#pragma GCC diagnostic pop
     auto const deadline = steady_clock::now() + 60s;
 
     while (stats.frames_composited() < test_frames &&

=== modified file 'tests/acceptance-tests/test_nested_input.cpp'
--- tests/acceptance-tests/test_nested_input.cpp	2017-04-04 07:04:57 +0000
+++ tests/acceptance-tests/test_nested_input.cpp	2017-04-11 18:27:10 +0000
@@ -248,7 +248,10 @@
             this);
 
         window = mtf::make_any_surface(connection, handle_event, this);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
+#pragma GCC diagnostic pop
     }
 
     MOCK_METHOD1(handle_input, void(MirEvent const*));

=== modified file 'tests/acceptance-tests/test_nested_mir.cpp'
--- tests/acceptance-tests/test_nested_mir.cpp	2017-04-11 03:54:16 +0000
+++ tests/acceptance-tests/test_nested_mir.cpp	2017-04-11 18:27:10 +0000
@@ -535,14 +535,20 @@
         Client(nested_mir),
         window(mtf::make_surface(connection, size, format))
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
+#pragma GCC diagnostic pop
     }
 
     ClientWithAPaintedSurface(NestedMirRunner& nested_mir) :
         Client(nested_mir),
         window(mtf::make_any_surface(connection))
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
+#pragma GCC diagnostic pop
     }
 
     ~ClientWithAPaintedSurface()
@@ -562,6 +568,8 @@
     MirWindow* window;
 };
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 struct ClientWithAPaintedSurfaceAndABufferStream : virtual Client, ClientWithAPaintedSurface
 {
     ClientWithAPaintedSurfaceAndABufferStream(NestedMirRunner& nested_mir) :
@@ -584,8 +592,6 @@
     MirBufferStream* const buffer_stream;
 };
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 struct ClientWithAPaintedWindowAndASurface : virtual Client, ClientWithAPaintedSurface
 {
     ClientWithAPaintedWindowAndASurface(NestedMirRunner& nested_mir) :
@@ -684,8 +690,10 @@
     Client client{nested_mir};
 
     auto spec = mir_create_normal_window_spec(client.connection, 800, 600);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888);
-
+#pragma GCC diagnostic pop
     mt::Signal surface_event_received;
     mir_window_spec_set_event_handler(spec, [](MirWindow*, MirEvent const* event, void* ctx)
         {
@@ -786,7 +794,10 @@
             .WillOnce(InvokeWithoutArgs([]{}))
             .WillOnce(InvokeWithoutArgs([&] { wait.raise(); }));
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
+#pragma GCC diagnostic pop
 
         wait.wait_for(timeout);
         Mock::VerifyAndClearExpectations(mock_session_mediator_report.get());

=== modified file 'tests/acceptance-tests/test_new_display_configuration.cpp'
--- tests/acceptance-tests/test_new_display_configuration.cpp	2017-03-21 22:20:26 +0000
+++ tests/acceptance-tests/test_new_display_configuration.cpp	2017-04-11 18:27:10 +0000
@@ -261,6 +261,8 @@
     SimpleClient(std::string const& mir_test_socket) :
         mir_test_socket{mir_test_socket} {}
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     void connect()
     {
         connection = mir_connect_sync(mir_test_socket.c_str(), __PRETTY_FUNCTION__);
@@ -276,7 +278,7 @@
         if (!ready_to_accept_events.raised())
             BOOST_THROW_EXCEPTION(std::runtime_error("Timeout waiting for window to become focused and exposed"));
     }
-
+#pragma GCC diagnostic pop
     static void handle_event(MirWindow*, MirEvent const* ev, void* context)
     {
         auto const client = static_cast<SimpleClient*>(context);

=== modified file 'tests/acceptance-tests/test_presentation_chain.cpp'
--- tests/acceptance-tests/test_presentation_chain.cpp	2017-03-14 04:41:33 +0000
+++ tests/acceptance-tests/test_presentation_chain.cpp	2017-04-11 18:27:10 +0000
@@ -133,9 +133,9 @@
     {
         auto spec = mir_create_normal_window_spec(
             connection, size.width.as_int(), size.height.as_int());
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_window_spec_set_pixel_format(spec, pf);
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_window_spec_add_render_surface(
             spec, chain.content(), size.width.as_int(), size.height.as_int(), 0, 0);
 #pragma GCC diagnostic pop

=== modified file 'tests/acceptance-tests/test_render_override.cpp'
--- tests/acceptance-tests/test_render_override.cpp	2017-03-14 02:26:28 +0000
+++ tests/acceptance-tests/test_render_override.cpp	2017-04-11 18:27:10 +0000
@@ -125,8 +125,11 @@
 
 TEST_F(DisplayBufferCompositorOverride, composite_called_with_surface)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirWindowParameters surface_params;
     mir_window_get_parameters(window, &surface_params);
     mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
+#pragma GCC diagnostic pop
     EXPECT_TRUE(tracker->wait_until_surface_is_rendered_with_size({surface_params.width, surface_params.height}));
 }

=== modified file 'tests/acceptance-tests/test_server_disconnect.cpp'
--- tests/acceptance-tests/test_server_disconnect.cpp	2017-01-18 16:58:17 +0000
+++ tests/acceptance-tests/test_server_disconnect.cpp	2017-04-11 18:27:10 +0000
@@ -83,8 +83,11 @@
 
         while (!signalled.load() && clock::now() < time_limit)
         {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_buffer_stream_swap_buffers_sync(
                 mir_window_get_buffer_stream(window));
+#pragma GCC diagnostic pop
         }
 
         mir_window_release_sync(window);
@@ -119,7 +122,10 @@
 
             create_surface.exec([&] {
                 auto spec = mir_create_normal_window_spec(connection, 800, 600);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
                 mir_window_spec_set_pixel_format(spec, mir_pixel_format_xbgr_8888);
+#pragma GCC diagnostic pop
                 window = mir_create_window_sync(spec);
                 mir_window_spec_release(spec);
             });

=== modified file 'tests/acceptance-tests/test_session_mediator_report.cpp'
--- tests/acceptance-tests/test_session_mediator_report.cpp	2017-01-18 02:29:37 +0000
+++ tests/acceptance-tests/test_session_mediator_report.cpp	2017-04-11 18:27:10 +0000
@@ -159,7 +159,10 @@
     connect_client();
 
     auto const window = mtf::make_any_surface(connection);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto const buffer_stream = mir_window_get_buffer_stream(window);
+#pragma GCC diagnostic pop
     mir_buffer_stream_swap_buffers_sync(buffer_stream);
     mir_window_release_sync(window);
     EXPECT_TRUE(report_received->wait_for(10s));
@@ -198,9 +201,11 @@
     auto report_received = std::make_shared<mt::Signal>();
     ON_CALL(*report, session_create_buffer_stream_called(_))
         .WillByDefault(InvokeWithoutArgs([report_received]() { report_received->raise(); }));
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto const buffer_stream = mir_connection_create_buffer_stream_sync(connection,
         640, 480, mir_pixel_format_abgr_8888, mir_buffer_usage_software);
+#pragma GCC diagnostic pop
     EXPECT_TRUE(report_received->wait_for(10s));
 
     report_received->reset();
@@ -208,6 +213,9 @@
     ON_CALL(*report, session_release_buffer_stream_called(_))
         .WillByDefault(InvokeWithoutArgs([report_received]() { report_received->raise(); }));
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_buffer_stream_release_sync(buffer_stream);
+#pragma GCC diagnostic pop
     EXPECT_TRUE(report_received->wait_for(10s));
 }

=== modified file 'tests/acceptance-tests/test_surface_modifications.cpp'
--- tests/acceptance-tests/test_surface_modifications.cpp	2017-03-14 02:26:28 +0000
+++ tests/acceptance-tests/test_surface_modifications.cpp	2017-04-11 18:27:10 +0000
@@ -73,7 +73,10 @@
         scene_surface->add_observer(mt::fake_shared(surface_observer));
 
         // Swap buffers to ensure window is visible for event based tests
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
+#pragma GCC diagnostic pop
     }
 
     void generate_alt_click_at(Point const& click_position)

=== modified file 'tests/acceptance-tests/test_surface_morphing.cpp'
--- tests/acceptance-tests/test_surface_morphing.cpp	2017-01-18 02:29:37 +0000
+++ tests/acceptance-tests/test_surface_morphing.cpp	2017-04-11 18:27:10 +0000
@@ -181,8 +181,11 @@
             mir_window_spec_set_type(spec, old_type);
             mir_window_spec_set_width(spec, width);
             mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_window_spec_set_pixel_format(spec, pixel_format);
             mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
         });
 
     latest_shell_surface()->add_observer(mt::fake_shared(surface_observer));
@@ -206,8 +209,11 @@
             mir_window_spec_set_type(spec, mir_window_type_normal);
             mir_window_spec_set_width(spec, width);
             mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_window_spec_set_pixel_format(spec, pixel_format);
             mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
         });
 
     auto const window = create_surface([&](MirWindowSpec* spec)
@@ -215,8 +221,11 @@
         mir_window_spec_set_type(spec, old_type);
         mir_window_spec_set_width(spec, width);
         mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_window_spec_set_pixel_format(spec, pixel_format);
         mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
     });
 
     latest_shell_surface()->add_observer(mt::fake_shared(surface_observer));
@@ -247,8 +256,11 @@
             mir_window_spec_set_type(spec, mir_window_type_normal);
             mir_window_spec_set_width(spec, width);
             mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_window_spec_set_pixel_format(spec, pixel_format);
             mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
         });
 
     auto const window = create_surface([&](MirWindowSpec* spec)
@@ -256,8 +268,11 @@
             mir_window_spec_set_type(spec, old_type);
             mir_window_spec_set_width(spec, width);
             mir_window_spec_set_height(spec, height);
-            mir_window_spec_set_pixel_format(spec, pixel_format);
-            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+                                           mir_window_spec_set_pixel_format(spec, pixel_format);
+                                           mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
         });
 
     latest_shell_surface()->add_observer(mt::fake_shared(surface_observer));
@@ -282,8 +297,11 @@
             mir_window_spec_set_type(spec, old_type);
             mir_window_spec_set_width(spec, width);
             mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_window_spec_set_pixel_format(spec, pixel_format);
             mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
         });
 
     latest_shell_surface()->add_observer(mt::fake_shared(surface_observer));
@@ -313,8 +331,11 @@
             mir_window_spec_set_type(spec, mir_window_type_normal);
             mir_window_spec_set_width(spec, width);
             mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_window_spec_set_pixel_format(spec, pixel_format);
             mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
         });
 
     auto const window = create_surface([&](MirWindowSpec* spec)
@@ -322,8 +343,11 @@
             mir_window_spec_set_type(spec, old_type);
             mir_window_spec_set_width(spec, width);
             mir_window_spec_set_height(spec, height);
-            mir_window_spec_set_pixel_format(spec, pixel_format);
-            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+                                           mir_window_spec_set_pixel_format(spec, pixel_format);
+                                           mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
         });
 
     latest_shell_surface()->add_observer(mt::fake_shared(surface_observer));
@@ -348,8 +372,11 @@
            mir_window_spec_set_type(spec, mir_window_type_normal);
            mir_window_spec_set_width(spec, width);
            mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
            mir_window_spec_set_pixel_format(spec, pixel_format);
            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
        });
 
     auto const window = create_surface([&](MirWindowSpec* spec)
@@ -357,8 +384,11 @@
             mir_window_spec_set_type(spec, old_type);
             mir_window_spec_set_width(spec, width);
             mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_window_spec_set_pixel_format(spec, pixel_format);
             mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
         });
 
     latest_shell_surface()->add_observer(mt::fake_shared(surface_observer));

=== modified file 'tests/acceptance-tests/test_surface_placement.cpp'
--- tests/acceptance-tests/test_surface_placement.cpp	2017-01-18 02:29:37 +0000
+++ tests/acceptance-tests/test_surface_placement.cpp	2017-04-11 18:27:10 +0000
@@ -86,7 +86,10 @@
     MirWindow* create_normal_surface(int width, int height, Specifier const& specifier) const
     {
         auto const spec = mir_create_normal_window_spec(connection, width, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_window_spec_set_pixel_format(spec, pixel_format);
+#pragma GCC diagnostic pop
 
         specifier(spec);
 
@@ -479,8 +482,11 @@
             mir_window_spec_set_type(spec, GetParam());
             mir_window_spec_set_width(spec, width);
             mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_window_spec_set_pixel_format(spec, pixel_format);
             mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
         });
 
     auto const shell_surface = latest_shell_surface();
@@ -540,8 +546,11 @@
             mir_window_spec_set_type(spec, GetParam());
             mir_window_spec_set_width(spec, width);
             mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_window_spec_set_pixel_format(spec, pixel_format);
             mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
             mir_window_spec_set_parent(spec, parent);
         });
 

=== modified file 'tests/acceptance-tests/test_surface_raise.cpp'
--- tests/acceptance-tests/test_surface_raise.cpp	2017-01-18 02:29:37 +0000
+++ tests/acceptance-tests/test_surface_raise.cpp	2017-04-11 18:27:10 +0000
@@ -66,12 +66,13 @@
         mir_window_spec_set_event_handler(spec, &cookie_capturing_callback, this);
         mir_window_apply_spec(surface2, spec);
         mir_window_spec_release(spec);
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers_sync(
             mir_window_get_buffer_stream(surface1));
         mir_buffer_stream_swap_buffers_sync(
             mir_window_get_buffer_stream(surface2));
-
+#pragma GCC diagnostic pop
         bool surface_fullscreen = mt::spin_wait_for_condition_or_timeout(
             [this]
             {

=== modified file 'tests/acceptance-tests/test_surface_specification.cpp'
--- tests/acceptance-tests/test_surface_specification.cpp	2017-01-18 02:29:37 +0000
+++ tests/acceptance-tests/test_surface_specification.cpp	2017-04-11 18:27:10 +0000
@@ -44,164 +44,164 @@
 
 namespace
 {
-class MockSurfaceObserver : public ms::NullSurfaceObserver
-{
-public:
-    MOCK_METHOD1(renamed, void(char const*));
-    MOCK_METHOD2(attrib_changed, void(MirWindowAttrib attrib, int value));
-    MOCK_METHOD1(resized_to, void(Size const& size));
-};
-
-struct SurfaceSpecification : mtf::ConnectedClientHeadlessServer
-{
-    SurfaceSpecification() { add_to_environment("MIR_SERVER_ENABLE_INPUT", "OFF"); }
-
-    Rectangle const first_display {{  0, 0}, {640,  480}};
-    Rectangle const second_display{{640, 0}, {640,  480}};
-
-    void SetUp() override
-    {
-        initial_display_layout({first_display, second_display});
-
-        server.wrap_shell([this](std::shared_ptr<msh::Shell> const& wrapped)
-              {
-                  auto const msc = std::make_shared<mtd::WrapShellToTrackLatestSurface>(wrapped);
-                  shell = msc;
-                  return msc;
-              });
-
-        mtf::ConnectedClientHeadlessServer::SetUp();
-
-        init_pixel_format();
-    }
-
-    void TearDown() override
-    {
-        shell.reset();
-        mtf::ConnectedClientHeadlessServer::TearDown();
-    }
-
-    std::shared_ptr<ms::Surface> latest_shell_surface() const
-    {
-        auto const result = shell->latest_surface.lock();
+    class MockSurfaceObserver : public ms::NullSurfaceObserver
+    {
+    public:
+        MOCK_METHOD1(renamed, void(char const*));
+        MOCK_METHOD2(attrib_changed, void(MirWindowAttrib attrib, int value));
+        MOCK_METHOD1(resized_to, void(Size const& size));
+    };
+
+    struct SurfaceSpecification : mtf::ConnectedClientHeadlessServer
+    {
+        SurfaceSpecification() { add_to_environment("MIR_SERVER_ENABLE_INPUT", "OFF"); }
+
+        Rectangle const first_display {{  0, 0}, {640,  480}};
+        Rectangle const second_display{{640, 0}, {640,  480}};
+
+        void SetUp() override
+        {
+            initial_display_layout({first_display, second_display});
+
+            server.wrap_shell([this](std::shared_ptr<msh::Shell> const& wrapped)
+                              {
+                                  auto const msc = std::make_shared<mtd::WrapShellToTrackLatestSurface>(wrapped);
+                                  shell = msc;
+                                  return msc;
+                              });
+
+            mtf::ConnectedClientHeadlessServer::SetUp();
+
+            init_pixel_format();
+        }
+
+        void TearDown() override
+        {
+            shell.reset();
+            mtf::ConnectedClientHeadlessServer::TearDown();
+        }
+
+        std::shared_ptr<ms::Surface> latest_shell_surface() const
+        {
+            auto const result = shell->latest_surface.lock();
 //      ASSERT_THAT(result, NotNull()); //<= doesn't compile!?
-        EXPECT_THAT(result, NotNull());
-        return result;
-    }
-
-    template<typename Specifier>
-    mtf::VisibleSurface create_surface(Specifier const& specifier)
-    {
-        auto del = [] (MirWindowSpec* spec) { mir_window_spec_release(spec); };
-        std::unique_ptr<MirWindowSpec, decltype(del)> spec(mir_create_window_spec(connection), del);
-        specifier(spec.get());
-        return mtf::VisibleSurface{spec.get()};
-    }
-
-    NiceMock<MockSurfaceObserver> surface_observer;
-
-    void change_observed() { signal_change.raise(); }
-    MirPixelFormat pixel_format{mir_pixel_format_invalid};
-    static auto const width = 97;
-    static auto const height= 101;
-    MirInputDeviceId const device_id = MirInputDeviceId(7);
-    std::chrono::nanoseconds const timestamp = std::chrono::nanoseconds(39);
-
-    void generate_alt_click_at(Point const& click_position)
-    {
-        auto const modifiers = mir_input_event_modifier_alt;
-
-        auto const x_axis_value = click_position.x.as_int();
-        auto const y_axis_value = click_position.y.as_int();
-        auto const hscroll_value = 0.0;
-        auto const vscroll_value = 0.0;
-        auto const action = mir_pointer_action_button_down;
-        auto const relative_x_value = 0.0;
-        auto const relative_y_value = 0.0;
-
-        auto const click_event = mev::make_event(device_id, timestamp, cookie, modifiers,
-                                                 action, mir_pointer_button_tertiary,
-                                                 x_axis_value, y_axis_value,
-                                                 hscroll_value, vscroll_value,
-                                                 relative_x_value, relative_y_value);
-
-        server.the_shell()->handle(*click_event);
-    }
-
-    void generate_alt_move_to(Point const& drag_position)
-    {
-        auto const modifiers = mir_input_event_modifier_alt;
-
-        auto const x_axis_value = drag_position.x.as_int();
-        auto const y_axis_value = drag_position.y.as_int();
-        auto const hscroll_value = 0.0;
-        auto const vscroll_value = 0.0;
-        auto const action = mir_pointer_action_motion;
-        auto const relative_x_value = 0.0;
-        auto const relative_y_value = 0.0;
-
-        auto const drag_event = mev::make_event(device_id, timestamp, cookie, modifiers,
-                                                action, mir_pointer_button_tertiary,
-                                                x_axis_value, y_axis_value,
-                                                hscroll_value, vscroll_value,
-                                                relative_x_value, relative_y_value);
-
-        server.the_shell()->handle(*drag_event);
-    }
-
-    void wait_for_arbitrary_change(MirWindow* surface)
-    {
-        auto const new_title = __PRETTY_FUNCTION__;
-
-        EXPECT_CALL(surface_observer, renamed(StrEq(new_title))).
-            WillOnce(InvokeWithoutArgs([&]{ change_observed(); }));
-
-        signal_change.reset();
-
-        auto const spec = mir_create_window_spec(connection);
-
-        mir_window_spec_set_name(spec, new_title);
-
-        mir_window_apply_spec(surface, spec);
-        mir_window_spec_release(spec);
-        signal_change.wait_for(1s);
-    }
-
-private:
-    std::shared_ptr<mtd::WrapShellToTrackLatestSurface> shell;
-    mt::Signal signal_change;
-    std::vector<uint8_t> cookie;
-
-    void init_pixel_format()
-    {
-        unsigned int valid_formats{0};
-        mir_connection_get_available_surface_formats(connection, &pixel_format, 1, &valid_formats);
-    }
-};
-
-struct SurfaceSpecificationCase : SurfaceSpecification, ::testing::WithParamInterface<MirWindowType> {};
-using SurfaceWithoutParent = SurfaceSpecificationCase;
-using SurfaceNeedingParent = SurfaceSpecificationCase;
-using SurfaceMayHaveParent = SurfaceSpecificationCase;
-
-MATCHER(IsValidSurface, "")
-{
-    if (arg == nullptr) return false;
-
-    if (!mir_window_is_valid(arg)) return false;
-
-    return true;
-}
-
-MATCHER_P(WidthEq, value, "")
-{
-    return Width(value) == arg.width;
-}
-
-MATCHER_P(HeightEq, value, "")
-{
-    return Height(value) == arg.height;
-}
+            EXPECT_THAT(result, NotNull());
+            return result;
+        }
+
+        template<typename Specifier>
+        mtf::VisibleSurface create_surface(Specifier const& specifier)
+        {
+            auto del = [] (MirWindowSpec* spec) { mir_window_spec_release(spec); };
+            std::unique_ptr<MirWindowSpec, decltype(del)> spec(mir_create_window_spec(connection), del);
+            specifier(spec.get());
+            return mtf::VisibleSurface{spec.get()};
+        }
+
+        NiceMock<MockSurfaceObserver> surface_observer;
+
+        void change_observed() { signal_change.raise(); }
+        MirPixelFormat pixel_format{mir_pixel_format_invalid};
+        static auto const width = 97;
+        static auto const height= 101;
+        MirInputDeviceId const device_id = MirInputDeviceId(7);
+        std::chrono::nanoseconds const timestamp = std::chrono::nanoseconds(39);
+
+        void generate_alt_click_at(Point const& click_position)
+        {
+            auto const modifiers = mir_input_event_modifier_alt;
+
+            auto const x_axis_value = click_position.x.as_int();
+            auto const y_axis_value = click_position.y.as_int();
+            auto const hscroll_value = 0.0;
+            auto const vscroll_value = 0.0;
+            auto const action = mir_pointer_action_button_down;
+            auto const relative_x_value = 0.0;
+            auto const relative_y_value = 0.0;
+
+            auto const click_event = mev::make_event(device_id, timestamp, cookie, modifiers,
+                                                     action, mir_pointer_button_tertiary,
+                                                     x_axis_value, y_axis_value,
+                                                     hscroll_value, vscroll_value,
+                                                     relative_x_value, relative_y_value);
+
+            server.the_shell()->handle(*click_event);
+        }
+
+        void generate_alt_move_to(Point const& drag_position)
+        {
+            auto const modifiers = mir_input_event_modifier_alt;
+
+            auto const x_axis_value = drag_position.x.as_int();
+            auto const y_axis_value = drag_position.y.as_int();
+            auto const hscroll_value = 0.0;
+            auto const vscroll_value = 0.0;
+            auto const action = mir_pointer_action_motion;
+            auto const relative_x_value = 0.0;
+            auto const relative_y_value = 0.0;
+
+            auto const drag_event = mev::make_event(device_id, timestamp, cookie, modifiers,
+                                                    action, mir_pointer_button_tertiary,
+                                                    x_axis_value, y_axis_value,
+                                                    hscroll_value, vscroll_value,
+                                                    relative_x_value, relative_y_value);
+
+            server.the_shell()->handle(*drag_event);
+        }
+
+        void wait_for_arbitrary_change(MirWindow* surface)
+        {
+            auto const new_title = __PRETTY_FUNCTION__;
+
+            EXPECT_CALL(surface_observer, renamed(StrEq(new_title))).
+                    WillOnce(InvokeWithoutArgs([&]{ change_observed(); }));
+
+            signal_change.reset();
+
+            auto const spec = mir_create_window_spec(connection);
+
+            mir_window_spec_set_name(spec, new_title);
+
+            mir_window_apply_spec(surface, spec);
+            mir_window_spec_release(spec);
+            signal_change.wait_for(1s);
+        }
+
+    private:
+        std::shared_ptr<mtd::WrapShellToTrackLatestSurface> shell;
+        mt::Signal signal_change;
+        std::vector<uint8_t> cookie;
+
+        void init_pixel_format()
+        {
+            unsigned int valid_formats{0};
+            mir_connection_get_available_surface_formats(connection, &pixel_format, 1, &valid_formats);
+        }
+    };
+
+    struct SurfaceSpecificationCase : SurfaceSpecification, ::testing::WithParamInterface<MirWindowType> {};
+    using SurfaceWithoutParent = SurfaceSpecificationCase;
+    using SurfaceNeedingParent = SurfaceSpecificationCase;
+    using SurfaceMayHaveParent = SurfaceSpecificationCase;
+
+    MATCHER(IsValidSurface, "")
+    {
+        if (arg == nullptr) return false;
+
+        if (!mir_window_is_valid(arg)) return false;
+
+        return true;
+    }
+
+    MATCHER_P(WidthEq, value, "")
+    {
+        return Width(value) == arg.width;
+    }
+
+    MATCHER_P(HeightEq, value, "")
+    {
+        return Height(value) == arg.height;
+    }
 }
 
 TEST_F(SurfaceSpecification, surface_spec_min_width_is_respected)
@@ -209,14 +209,17 @@
     auto const min_width = 17;
 
     auto const surface = create_surface([&](MirWindowSpec* spec)
-        {
-            mir_window_spec_set_type(spec, mir_window_type_normal);
-            mir_window_spec_set_width(spec, width);
-            mir_window_spec_set_height(spec, height);
-            mir_window_spec_set_pixel_format(spec, pixel_format);
-            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
-            mir_window_spec_set_min_width(spec, min_width);
-        });
+                                        {
+                                            mir_window_spec_set_type(spec, mir_window_type_normal);
+                                            mir_window_spec_set_width(spec, width);
+                                            mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+                                            mir_window_spec_set_pixel_format(spec, pixel_format);
+                                            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
+                                            mir_window_spec_set_min_width(spec, min_width);
+                                        });
 
     auto const shell_surface = latest_shell_surface();
     shell_surface->add_observer(mt::fake_shared(surface_observer));
@@ -234,14 +237,17 @@
     auto const min_height = 19;
 
     auto const surface = create_surface([&](MirWindowSpec* spec)
-        {
-            mir_window_spec_set_type(spec, mir_window_type_normal);
-            mir_window_spec_set_width(spec, width);
-            mir_window_spec_set_height(spec, height);
-            mir_window_spec_set_pixel_format(spec, pixel_format);
-            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
-            mir_window_spec_set_min_height(spec, min_height);
-        });
+                                        {
+                                            mir_window_spec_set_type(spec, mir_window_type_normal);
+                                            mir_window_spec_set_width(spec, width);
+                                            mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+                                            mir_window_spec_set_pixel_format(spec, pixel_format);
+                                            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
+                                            mir_window_spec_set_min_height(spec, min_height);
+                                        });
 
     auto const shell_surface = latest_shell_surface();
     shell_surface->add_observer(mt::fake_shared(surface_observer));
@@ -259,14 +265,17 @@
     auto const max_width = 23;
 
     auto const surface = create_surface([&](MirWindowSpec* spec)
-        {
-            mir_window_spec_set_type(spec, mir_window_type_normal);
-            mir_window_spec_set_width(spec, width);
-            mir_window_spec_set_height(spec, height);
-            mir_window_spec_set_pixel_format(spec, pixel_format);
-            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
-            mir_window_spec_set_max_width(spec, max_width);
-        });
+                                        {
+                                            mir_window_spec_set_type(spec, mir_window_type_normal);
+                                            mir_window_spec_set_width(spec, width);
+                                            mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+                                            mir_window_spec_set_pixel_format(spec, pixel_format);
+                                            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
+                                            mir_window_spec_set_max_width(spec, max_width);
+                                        });
 
     auto const shell_surface = latest_shell_surface();
     shell_surface->add_observer(mt::fake_shared(surface_observer));
@@ -284,14 +293,17 @@
     auto const max_height = 29;
 
     auto const surface = create_surface([&](MirWindowSpec* spec)
-        {
-            mir_window_spec_set_type(spec, mir_window_type_normal);
-            mir_window_spec_set_width(spec, width);
-            mir_window_spec_set_height(spec, height);
-            mir_window_spec_set_pixel_format(spec, pixel_format);
-            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
-            mir_window_spec_set_max_height(spec, max_height);
-        });
+                                        {
+                                            mir_window_spec_set_type(spec, mir_window_type_normal);
+                                            mir_window_spec_set_width(spec, width);
+                                            mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+                                            mir_window_spec_set_pixel_format(spec, pixel_format);
+                                            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
+                                            mir_window_spec_set_max_height(spec, max_height);
+                                        });
 
     auto const shell_surface = latest_shell_surface();
     shell_surface->add_observer(mt::fake_shared(surface_observer));
@@ -309,14 +321,17 @@
     auto const width_inc = 13;
 
     auto const surface = create_surface([&](MirWindowSpec* spec)
-        {
-            mir_window_spec_set_type(spec, mir_window_type_normal);
-            mir_window_spec_set_width(spec, width);
-            mir_window_spec_set_height(spec, height);
-            mir_window_spec_set_pixel_format(spec, pixel_format);
-            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
-            mir_window_spec_set_width_increment(spec, width_inc);
-        });
+                                        {
+                                            mir_window_spec_set_type(spec, mir_window_type_normal);
+                                            mir_window_spec_set_width(spec, width);
+                                            mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+                                            mir_window_spec_set_pixel_format(spec, pixel_format);
+                                            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
+                                            mir_window_spec_set_width_increment(spec, width_inc);
+                                        });
 
     auto const shell_surface = latest_shell_surface();
     shell_surface->add_observer(mt::fake_shared(surface_observer));
@@ -338,15 +353,18 @@
     auto const min_width = 7;
 
     auto const surface = create_surface([&](MirWindowSpec* spec)
-        {
-            mir_window_spec_set_type(spec, mir_window_type_normal);
-            mir_window_spec_set_width(spec, width);
-            mir_window_spec_set_height(spec, height);
-            mir_window_spec_set_pixel_format(spec, pixel_format);
-            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
-            mir_window_spec_set_width_increment(spec, width_inc);
-            mir_window_spec_set_min_width(spec, min_width);
-        });
+                                        {
+                                            mir_window_spec_set_type(spec, mir_window_type_normal);
+                                            mir_window_spec_set_width(spec, width);
+                                            mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+                                            mir_window_spec_set_pixel_format(spec, pixel_format);
+                                            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
+                                            mir_window_spec_set_width_increment(spec, width_inc);
+                                            mir_window_spec_set_min_width(spec, min_width);
+                                        });
 
     auto const shell_surface = latest_shell_surface();
     shell_surface->add_observer(mt::fake_shared(surface_observer));
@@ -367,14 +385,17 @@
     auto const height_inc = 13;
 
     auto const surface = create_surface([&](MirWindowSpec* spec)
-        {
-            mir_window_spec_set_type(spec, mir_window_type_normal);
-            mir_window_spec_set_width(spec, width);
-            mir_window_spec_set_height(spec, height);
-            mir_window_spec_set_pixel_format(spec, pixel_format);
-            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
-            mir_window_spec_set_height_increment(spec, height_inc);
-        });
+                                        {
+                                            mir_window_spec_set_type(spec, mir_window_type_normal);
+                                            mir_window_spec_set_width(spec, width);
+                                            mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+                                            mir_window_spec_set_pixel_format(spec, pixel_format);
+                                            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
+                                            mir_window_spec_set_height_increment(spec, height_inc);
+                                        });
 
     auto const shell_surface = latest_shell_surface();
     shell_surface->add_observer(mt::fake_shared(surface_observer));
@@ -396,15 +417,18 @@
     auto const min_height = 7;
 
     auto const surface = create_surface([&](MirWindowSpec* spec)
-        {
-            mir_window_spec_set_type(spec, mir_window_type_normal);
-            mir_window_spec_set_width(spec, width);
-            mir_window_spec_set_height(spec, height);
-            mir_window_spec_set_pixel_format(spec, pixel_format);
-            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
-            mir_window_spec_set_height_increment(spec, height_inc);
-            mir_window_spec_set_min_height(spec, min_height);
-        });
+                                        {
+                                            mir_window_spec_set_type(spec, mir_window_type_normal);
+                                            mir_window_spec_set_width(spec, width);
+                                            mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+                                            mir_window_spec_set_pixel_format(spec, pixel_format);
+                                            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
+                                            mir_window_spec_set_height_increment(spec, height_inc);
+                                            mir_window_spec_set_min_height(spec, min_height);
+                                        });
 
     auto const shell_surface = latest_shell_surface();
     shell_surface->add_observer(mt::fake_shared(surface_observer));
@@ -426,14 +450,17 @@
     auto const aspect_height = 7;
 
     auto const surface = create_surface([&](MirWindowSpec* spec)
-        {
-            mir_window_spec_set_type(spec, mir_window_type_normal);
-            mir_window_spec_set_width(spec, width);
-            mir_window_spec_set_height(spec, height);
-            mir_window_spec_set_pixel_format(spec, pixel_format);
-            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
-            mir_window_spec_set_min_aspect_ratio(spec, aspect_width, aspect_height);
-        });
+                                        {
+                                            mir_window_spec_set_type(spec, mir_window_type_normal);
+                                            mir_window_spec_set_width(spec, width);
+                                            mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+                                            mir_window_spec_set_pixel_format(spec, pixel_format);
+                                            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
+                                            mir_window_spec_set_min_aspect_ratio(spec, aspect_width, aspect_height);
+                                        });
 
     auto const shell_surface = latest_shell_surface();
     shell_surface->add_observer(mt::fake_shared(surface_observer));
@@ -456,14 +483,17 @@
     auto const aspect_height = 11;
 
     auto const surface = create_surface([&](MirWindowSpec* spec)
-        {
-            mir_window_spec_set_type(spec, mir_window_type_normal);
-            mir_window_spec_set_width(spec, width);
-            mir_window_spec_set_height(spec, height);
-            mir_window_spec_set_pixel_format(spec, pixel_format);
-            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
-            mir_window_spec_set_max_aspect_ratio(spec, aspect_width, aspect_height);
-        });
+                                        {
+                                            mir_window_spec_set_type(spec, mir_window_type_normal);
+                                            mir_window_spec_set_width(spec, width);
+                                            mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+                                            mir_window_spec_set_pixel_format(spec, pixel_format);
+                                            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
+                                            mir_window_spec_set_max_aspect_ratio(spec, aspect_width, aspect_height);
+                                        });
 
     auto const shell_surface = latest_shell_surface();
     shell_surface->add_observer(mt::fake_shared(surface_observer));
@@ -493,28 +523,31 @@
     auto const expected_aspect_ratio = FloatEq(float(aspect_width)/aspect_height);
 
     auto const surface = create_surface([&](MirWindowSpec* spec)
-        {
-            mir_window_spec_set_type(spec, mir_window_type_normal);
-            mir_window_spec_set_width(spec, width);
-            mir_window_spec_set_height(spec, height);
-            mir_window_spec_set_pixel_format(spec, pixel_format);
-            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
-
-            mir_window_spec_set_min_aspect_ratio(spec, aspect_width, aspect_height);
-            mir_window_spec_set_max_aspect_ratio(spec, aspect_width, aspect_height);
-
-            mir_window_spec_set_min_height(spec, min_height);
-            mir_window_spec_set_min_width(spec, min_width);
-
-            mir_window_spec_set_max_height(spec, max_height);
-            mir_window_spec_set_max_width(spec, max_width);
-
-            mir_window_spec_set_width_increment(spec, width_inc);
-            mir_window_spec_set_height_increment(spec, height_inc);
-
-            mir_window_spec_set_height(spec, min_height);
-            mir_window_spec_set_width(spec, min_width);
-        });
+                                        {
+                                            mir_window_spec_set_type(spec, mir_window_type_normal);
+                                            mir_window_spec_set_width(spec, width);
+                                            mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+                                            mir_window_spec_set_pixel_format(spec, pixel_format);
+                                            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
+
+                                            mir_window_spec_set_min_aspect_ratio(spec, aspect_width, aspect_height);
+                                            mir_window_spec_set_max_aspect_ratio(spec, aspect_width, aspect_height);
+
+                                            mir_window_spec_set_min_height(spec, min_height);
+                                            mir_window_spec_set_min_width(spec, min_width);
+
+                                            mir_window_spec_set_max_height(spec, max_height);
+                                            mir_window_spec_set_max_width(spec, max_width);
+
+                                            mir_window_spec_set_width_increment(spec, width_inc);
+                                            mir_window_spec_set_height_increment(spec, height_inc);
+
+                                            mir_window_spec_set_height(spec, min_height);
+                                            mir_window_spec_set_width(spec, min_width);
+                                        });
 
     auto const shell_surface = latest_shell_surface();
     shell_surface->add_observer(mt::fake_shared(surface_observer));
@@ -534,8 +567,8 @@
         generate_alt_move_to(bottom_right + motion);
 
         Size const expected_size{
-            std::min(max_width,  min_width  + delta*width_inc),
-            std::min(max_height, min_height + delta*height_inc)};
+                std::min(max_width,  min_width  + delta*width_inc),
+                std::min(max_height, min_height + delta*height_inc)};
 
         EXPECT_THAT(static_cast<float>(actual.width.as_int())/actual.height.as_int(), expected_aspect_ratio);
         EXPECT_THAT(actual, Eq(expected_size));
@@ -547,13 +580,16 @@
     auto const type = GetParam();
 
     auto const surface = create_surface([&](MirWindowSpec* spec)
-        {
-            mir_window_spec_set_type(spec, type);
-            mir_window_spec_set_width(spec, width);
-            mir_window_spec_set_height(spec, height);
-            mir_window_spec_set_pixel_format(spec, pixel_format);
-            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
-        });
+                                        {
+                                            mir_window_spec_set_type(spec, type);
+                                            mir_window_spec_set_width(spec, width);
+                                            mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+                                            mir_window_spec_set_pixel_format(spec, pixel_format);
+                                            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
+                                        });
 
     EXPECT_THAT(surface, IsValidSurface());
 }
@@ -563,23 +599,29 @@
     auto const type = GetParam();
 
     auto const parent = create_surface([&](MirWindowSpec* spec)
-        {
-            mir_window_spec_set_type(spec, mir_window_type_normal);
-            mir_window_spec_set_width(spec, width);
-            mir_window_spec_set_height(spec, height);
-            mir_window_spec_set_pixel_format(spec, pixel_format);
-            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
-        });
+                                       {
+                                           mir_window_spec_set_type(spec, mir_window_type_normal);
+                                           mir_window_spec_set_width(spec, width);
+                                           mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+                                           mir_window_spec_set_pixel_format(spec, pixel_format);
+                                           mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
+                                       });
 
     auto const surface = create_surface([&](MirWindowSpec* spec)
-    {
-        mir_window_spec_set_type(spec, type);
-        mir_window_spec_set_width(spec, width);
-        mir_window_spec_set_height(spec, height);
-        mir_window_spec_set_pixel_format(spec, pixel_format);
-        mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
-        mir_window_spec_set_parent(spec, parent);
-    });
+                                        {
+                                            mir_window_spec_set_type(spec, type);
+                                            mir_window_spec_set_width(spec, width);
+                                            mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+                                            mir_window_spec_set_pixel_format(spec, pixel_format);
+                                            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
+                                            mir_window_spec_set_parent(spec, parent);
+                                        });
 
     EXPECT_THAT(surface, Not(IsValidSurface()));
 }
@@ -589,23 +631,29 @@
     auto const type = GetParam();
 
     auto const parent = create_surface([&](MirWindowSpec* spec)
-        {
-            mir_window_spec_set_type(spec, mir_window_type_normal);
-            mir_window_spec_set_width(spec, width);
-            mir_window_spec_set_height(spec, height);
-            mir_window_spec_set_pixel_format(spec, pixel_format);
-            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
-        });
+                                       {
+                                           mir_window_spec_set_type(spec, mir_window_type_normal);
+                                           mir_window_spec_set_width(spec, width);
+                                           mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+                                           mir_window_spec_set_pixel_format(spec, pixel_format);
+                                           mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
+                                       });
 
     auto const surface = create_surface([&](MirWindowSpec* spec)
-        {
-            mir_window_spec_set_type(spec, type);
-            mir_window_spec_set_width(spec, width);
-            mir_window_spec_set_height(spec, height);
-            mir_window_spec_set_pixel_format(spec, pixel_format);
-            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
-            mir_window_spec_set_parent(spec, parent);
-        });
+                                        {
+                                            mir_window_spec_set_type(spec, type);
+                                            mir_window_spec_set_width(spec, width);
+                                            mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+                                            mir_window_spec_set_pixel_format(spec, pixel_format);
+                                            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
+                                            mir_window_spec_set_parent(spec, parent);
+                                        });
 
     EXPECT_THAT(surface, IsValidSurface());
 }
@@ -615,13 +663,16 @@
     auto const type = GetParam();
 
     auto const surface = create_surface([&](MirWindowSpec* spec)
-        {
-            mir_window_spec_set_type(spec, type);
-            mir_window_spec_set_width(spec, width);
-            mir_window_spec_set_height(spec, height);
-            mir_window_spec_set_pixel_format(spec, pixel_format);
-            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
-        });
+                                        {
+                                            mir_window_spec_set_type(spec, type);
+                                            mir_window_spec_set_width(spec, width);
+                                            mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+                                            mir_window_spec_set_pixel_format(spec, pixel_format);
+                                            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
+                                        });
 
     EXPECT_THAT(surface, Not(IsValidSurface()));
 }
@@ -631,23 +682,29 @@
     auto const type = GetParam();
 
     auto const parent = create_surface([&](MirWindowSpec* spec)
-        {
-            mir_window_spec_set_type(spec, mir_window_type_normal);
-            mir_window_spec_set_width(spec, width);
-            mir_window_spec_set_height(spec, height);
-            mir_window_spec_set_pixel_format(spec, pixel_format);
-            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
-        });
+                                       {
+                                           mir_window_spec_set_type(spec, mir_window_type_normal);
+                                           mir_window_spec_set_width(spec, width);
+                                           mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+                                           mir_window_spec_set_pixel_format(spec, pixel_format);
+                                           mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
+                                       });
 
     auto const surface = create_surface([&](MirWindowSpec* spec)
-        {
-            mir_window_spec_set_type(spec, type);
-            mir_window_spec_set_width(spec, width);
-            mir_window_spec_set_height(spec, height);
-            mir_window_spec_set_pixel_format(spec, pixel_format);
-            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
-            mir_window_spec_set_parent(spec, parent);
-        });
+                                        {
+                                            mir_window_spec_set_type(spec, type);
+                                            mir_window_spec_set_width(spec, width);
+                                            mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+                                            mir_window_spec_set_pixel_format(spec, pixel_format);
+                                            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
+                                            mir_window_spec_set_parent(spec, parent);
+                                        });
 
     EXPECT_THAT(surface, IsValidSurface());
 }
@@ -657,22 +714,26 @@
     auto const type = GetParam();
 
     auto const surface = create_surface([&](MirWindowSpec* spec)
-        {
-            mir_window_spec_set_type(spec, type);
-            mir_window_spec_set_width(spec, width);
-            mir_window_spec_set_height(spec, height);
-            mir_window_spec_set_pixel_format(spec, pixel_format);
-            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
-        });
+                                        {
+                                            mir_window_spec_set_type(spec, type);
+                                            mir_window_spec_set_width(spec, width);
+                                            mir_window_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+                                            mir_window_spec_set_pixel_format(spec, pixel_format);
+                                            mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
+
+                                        });
 
     EXPECT_THAT(surface, IsValidSurface());
 }
 
 INSTANTIATE_TEST_CASE_P(SurfaceSpecification, SurfaceWithoutParent,
-    Values(mir_window_type_utility, mir_window_type_normal));
+                        Values(mir_window_type_utility, mir_window_type_normal));
 
 INSTANTIATE_TEST_CASE_P(SurfaceSpecification, SurfaceNeedingParent,
-    Values(mir_window_type_satellite, mir_window_type_gloss, mir_window_type_tip));
+                        Values(mir_window_type_satellite, mir_window_type_gloss, mir_window_type_tip));
 
 INSTANTIATE_TEST_CASE_P(SurfaceSpecification, SurfaceMayHaveParent,
-    Values(mir_window_type_dialog, mir_window_type_freestyle));
+                        Values(mir_window_type_dialog, mir_window_type_freestyle));

=== modified file 'tests/acceptance-tests/test_surfaces_with_output_id.cpp'
--- tests/acceptance-tests/test_surfaces_with_output_id.cpp	2017-01-18 13:59:18 +0000
+++ tests/acceptance-tests/test_surfaces_with_output_id.cpp	2017-04-11 18:27:10 +0000
@@ -134,7 +134,10 @@
                 static_cast<int>(width) - 1,
                 static_cast<int>(height) + 1),
             del);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_window_spec_set_pixel_format(spec.get(), mir_pixel_format_abgr_8888);
+#pragma GCC diagnostic pop
         mir_window_spec_set_fullscreen_on_output(spec.get(), mir_output_get_id(output));
         return std::make_shared<mtf::VisibleSurface>(spec.get());
     }
@@ -151,7 +154,10 @@
                 static_cast<int>(width),
                 static_cast<int>(height)),
             del);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_window_spec_set_pixel_format(spec.get(), mir_pixel_format_abgr_8888);
+#pragma GCC diagnostic pop
         mir_window_spec_set_fullscreen_on_output(spec.get(), mir_output_get_id(output));
         return std::make_shared<mtf::VisibleSurface>(spec.get());
     }

=== modified file 'tests/acceptance-tests/test_system_compositor_window_manager.cpp'
--- tests/acceptance-tests/test_system_compositor_window_manager.cpp	2017-01-18 02:29:37 +0000
+++ tests/acceptance-tests/test_system_compositor_window_manager.cpp	2017-04-11 18:27:10 +0000
@@ -50,7 +50,10 @@
 
     void post_buffer()
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
+#pragma GCC diagnostic pop
     }
 
     SurfaceHandle(SurfaceHandle const&& that) : window{that.window} { window = nullptr; }
@@ -75,8 +78,10 @@
     auto create_surface(int output_id) -> SurfaceHandle
     {
         auto const spec = mir_create_normal_window_spec(connection_, 800, 600);
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_window_spec_set_pixel_format(spec, mir_pixel_format_bgr_888);
+#pragma GCC diagnostic pop
         mir_window_spec_set_fullscreen_on_output(spec, output_id);
         auto const window = mir_create_window_sync(spec);
         mir_window_spec_release(spec);

=== modified file 'tests/include/mir/test/doubles/mock_client_platform.h'
--- tests/include/mir/test/doubles/mock_client_platform.h	2017-02-14 15:09:24 +0000
+++ tests/include/mir/test/doubles/mock_client_platform.h	2017-04-11 18:27:10 +0000
@@ -64,8 +64,10 @@
     MOCK_CONST_METHOD2(get_egl_pixel_format, MirPixelFormat(EGLDisplay, EGLConfig));
     MOCK_METHOD2(request_interface, void*(char const*, int));
     MOCK_CONST_METHOD1(native_format_for, uint32_t(MirPixelFormat));
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MOCK_CONST_METHOD2(native_flags_for, uint32_t(MirBufferUsage, mir::geometry::Size));
-
+#pragma GCC diagnostic pop
     client::ClientContext* client_context = nullptr;
 };
 

=== modified file 'tests/include/mir/test/doubles/mock_egl_native_surface.h'
--- tests/include/mir/test/doubles/mock_egl_native_surface.h	2017-01-18 02:29:37 +0000
+++ tests/include/mir/test/doubles/mock_egl_native_surface.h	2017-04-11 18:27:10 +0000
@@ -32,7 +32,10 @@
 
 struct MockEGLNativeSurface : public client::EGLNativeSurface
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MOCK_CONST_METHOD0(get_parameters, MirWindowParameters());
+#pragma GCC diagnostic pop
     MOCK_METHOD0(get_current_buffer, std::shared_ptr<client::ClientBuffer>());
     MOCK_METHOD0(swap_buffers_sync, void());
     MOCK_METHOD2(request_and_wait_for_configure, void(MirWindowAttrib,int));

=== modified file 'tests/include/mir/test/doubles/mock_mir_buffer.h'
--- tests/include/mir/test/doubles/mock_mir_buffer.h	2017-01-24 07:49:13 +0000
+++ tests/include/mir/test/doubles/mock_mir_buffer.h	2017-04-11 18:27:10 +0000
@@ -45,8 +45,10 @@
     MOCK_CONST_METHOD0(client_buffer, std::shared_ptr<client::ClientBuffer>());
     MOCK_METHOD0(map_region, MirGraphicsRegion());
     MOCK_METHOD0(unmap_region, void());
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MOCK_CONST_METHOD0(buffer_usage, MirBufferUsage());
+#pragma GCC diagnostic pop
     MOCK_CONST_METHOD0(pixel_format, MirPixelFormat());
     MOCK_CONST_METHOD0(size, geometry::Size());
     MOCK_CONST_METHOD0(allocating_connection, MirConnection*());

=== modified file 'tests/include/mir/test/doubles/mock_mir_buffer_stream.h'
--- tests/include/mir/test/doubles/mock_mir_buffer_stream.h	2017-03-10 19:47:57 +0000
+++ tests/include/mir/test/doubles/mock_mir_buffer_stream.h	2017-04-11 18:27:10 +0000
@@ -33,8 +33,10 @@
 struct MockMirBufferStream : public MirBufferStream
 {
     MOCK_METHOD2(release, MirWaitHandle*(MirBufferStreamCallback, void*));
-    
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MOCK_CONST_METHOD0(get_parameters, MirWindowParameters());
+#pragma GCC diagnostic pop
     MOCK_METHOD0(get_current_buffer, std::shared_ptr<client::ClientBuffer>());
     MOCK_METHOD0(get_current_buffer_id, uint32_t());
     MOCK_METHOD0(egl_native_window, EGLNativeWindowType());

=== modified file 'tests/include/mir/test/doubles/stub_buffer_allocator.h'
--- tests/include/mir/test/doubles/stub_buffer_allocator.h	2017-03-10 19:47:57 +0000
+++ tests/include/mir/test/doubles/stub_buffer_allocator.h	2017-04-11 18:27:10 +0000
@@ -51,8 +51,11 @@
     std::shared_ptr<graphics::Buffer> alloc_buffer(geometry::Size sz, uint32_t, uint32_t flags)
     {
         graphics::BufferProperties properties{sz, mir_pixel_format_abgr_8888, graphics::BufferUsage::hardware};
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         if (mir_buffer_usage_software == static_cast<MirBufferUsage>(flags))
-            properties.usage = graphics::BufferUsage::software; 
+            properties.usage = graphics::BufferUsage::software;
+#pragma GCC diagnostic pop
         return std::make_shared<StubBuffer>(std::make_shared<mir_test_framework::NativeBuffer>(properties), sz);
     }
 

=== modified file 'tests/include/mir_test_framework/stub_client_platform_factory.h'
--- tests/include/mir_test_framework/stub_client_platform_factory.h	2017-03-10 19:47:57 +0000
+++ tests/include/mir_test_framework/stub_client_platform_factory.h	2017-04-11 18:27:10 +0000
@@ -52,7 +52,10 @@
     MirNativeBuffer* convert_native_buffer(mir::graphics::NativeBuffer* buf) const override;
     MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig) const override;
     uint32_t native_format_for(MirPixelFormat) const override;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     uint32_t native_flags_for(MirBufferUsage, mir::geometry::Size) const override;
+#pragma GCC diagnostic pop
 
     mir::client::ClientContext* const context;
     MirBufferPackage mutable native_buffer;

=== modified file 'tests/integration-tests/client/test_mirsurface.cpp'
--- tests/integration-tests/client/test_mirsurface.cpp	2017-01-18 02:29:37 +0000
+++ tests/integration-tests/client/test_mirsurface.cpp	2017-04-11 18:27:10 +0000
@@ -62,10 +62,13 @@
 
 MATCHER_P(MatchesRequired, spec, "")
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     return spec->width == arg.size.width.as_int() &&
            spec->height == arg.size.height.as_int() &&
            spec->pixel_format == arg.pixel_format &&
            spec->buffer_usage == static_cast<MirBufferUsage>(arg.buffer_usage);
+#pragma GCC diagnostic pop
 }
 
 MATCHER_P(MatchesOptional, spec, "")
@@ -184,7 +187,10 @@
     auto spec_deleter = [](MirWindowSpec* spec) {mir_window_spec_release(spec);};
     auto spec_temp = mir_create_menu_window_spec(connection, 640, 480,
         parent.get(), &attachment_rect, edge);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(spec_temp, mir_pixel_format_abgr_8888);
+#pragma GCC diagnostic pop
     std::unique_ptr<MirWindowSpec, decltype(spec_deleter)> menu_spec{
         spec_temp,
         spec_deleter
@@ -208,7 +214,10 @@
     auto spec_deleter = [](MirWindowSpec* spec) {mir_window_spec_release(spec);};
     auto spec_temp = mir_create_tip_window_spec(connection, 640, 480,
         parent.get(), &placement_hint, mir_edge_attachment_vertical);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(spec_temp, mir_pixel_format_abgr_8888);
+#pragma GCC diagnostic pop
     std::unique_ptr<MirWindowSpec, decltype(spec_deleter)> tooltip_spec{
         spec_temp,
         spec_deleter
@@ -230,8 +239,10 @@
     };
 
     ASSERT_THAT(dialog_spec, NotNull());
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(dialog_spec.get(), mir_pixel_format_abgr_8888);
-
+#pragma GCC diagnostic pop
     EXPECT_CALL(*mock_shell, create_surface(_, AllOf(IsADialog(), NoParentSet()),_));
     create_surface(dialog_spec.get());
 }
@@ -249,8 +260,10 @@
     };
 
     ASSERT_THAT(dialog_spec, NotNull());
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(dialog_spec.get(), mir_pixel_format_abgr_8888);
-
+#pragma GCC diagnostic pop
     EXPECT_CALL(*mock_shell, create_surface(_, AllOf(IsADialog(), HasParent(parent.get())),_));
     create_surface(dialog_spec.get());
 }

=== modified file 'tests/integration-tests/test_client_screencast.cpp'
--- tests/integration-tests/test_client_screencast.cpp	2017-01-18 02:29:37 +0000
+++ tests/integration-tests/test_client_screencast.cpp	2017-04-11 18:27:10 +0000
@@ -188,8 +188,12 @@
     ASSERT_NE(nullptr, screencast);
     ASSERT_TRUE(mir_screencast_is_valid(screencast));
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto egl_native_window =
         mir_buffer_stream_get_egl_native_window(mir_screencast_get_buffer_stream(screencast));
+#pragma GCC diagnostic pop
+
     EXPECT_NE(MirEGLNativeWindowType(), egl_native_window);
 
     mir_screencast_spec_release(spec);

=== modified file 'tests/integration-tests/test_error_reporting.cpp'
--- tests/integration-tests/test_error_reporting.cpp	2017-01-18 02:29:37 +0000
+++ tests/integration-tests/test_error_reporting.cpp	2017-04-11 18:27:10 +0000
@@ -130,8 +130,10 @@
     ASSERT_THAT(connection, IsValid());
 
     auto const spec = mir_create_normal_window_spec(connection, 640, 480);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888);
-
+#pragma GCC diagnostic pop
     auto const window  = mir_create_window_sync(spec);
     mir_window_spec_release(spec);
 

=== modified file 'tests/integration-tests/test_focus_selection.cpp'
--- tests/integration-tests/test_focus_selection.cpp	2017-01-18 02:29:37 +0000
+++ tests/integration-tests/test_focus_selection.cpp	2017-04-11 18:27:10 +0000
@@ -133,7 +133,10 @@
     ASSERT_TRUE(mir_connection_is_valid(connection));
 
     auto const window = mtf::make_any_surface(connection);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
+#pragma GCC diagnostic pop
     mir_window_release_sync(window);
 
     mir_connection_release(connection);

=== modified file 'tests/integration-tests/test_server_shutdown.cpp'
--- tests/integration-tests/test_server_shutdown.cpp	2017-01-30 05:18:36 +0000
+++ tests/integration-tests/test_server_shutdown.cpp	2017-04-11 18:27:10 +0000
@@ -93,15 +93,21 @@
 
     void swap_sync()
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers_sync(
             mir_window_get_buffer_stream(window));
+#pragma GCC diagnostic pop
     }
 
     void swap_async()
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers(
             mir_window_get_buffer_stream(window),
             null_buffer_stream_callback, nullptr);
+#pragma GCC diagnostic pop
     }
 
     MirConnection* const connection;

=== modified file 'tests/integration-tests/test_stale_frames.cpp'
--- tests/integration-tests/test_stale_frames.cpp	2017-01-18 02:29:37 +0000
+++ tests/integration-tests/test_stale_frames.cpp	2017-04-11 18:27:10 +0000
@@ -292,8 +292,10 @@
     std::set<mg::BufferID> stale_buffers;
 
     stale_buffers.emplace(mir_debug_window_current_buffer_id(window));
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto bs = mir_window_get_buffer_stream(window);
+#pragma GCC diagnostic pop
     mir_buffer_stream_set_swapinterval(bs, GetParam());
     mir_buffer_stream_swap_buffers_sync(bs);
 
@@ -321,8 +323,10 @@
     using namespace testing;
 
     stop_compositor();
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto bs = mir_window_get_buffer_stream(window);
+#pragma GCC diagnostic pop
     mir_buffer_stream_set_swapinterval(bs, GetParam());
     mir_buffer_stream_swap_buffers_sync(bs);
     mir_buffer_stream_swap_buffers_sync(bs);

=== modified file 'tests/integration-tests/test_surface_first_frame_sync.cpp'
--- tests/integration-tests/test_surface_first_frame_sync.cpp	2017-01-30 05:18:36 +0000
+++ tests/integration-tests/test_surface_first_frame_sync.cpp	2017-04-11 18:27:10 +0000
@@ -209,10 +209,11 @@
      * all before we reach this point.
      */
     EXPECT_EQ(0, number_of_executed_render_operations());
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_buffer_stream_swap_buffers_sync(
         mir_window_get_buffer_stream(window));
-
+#pragma GCC diagnostic pop
     /* After submitting the buffer we should get some render operations */
     mir::test::spin_wait_for_condition_or_timeout(
         [this] { return number_of_executed_render_operations() > 0; },

=== modified file 'tests/integration-tests/test_surfaceloop.cpp'
--- tests/integration-tests/test_surfaceloop.cpp	2017-01-18 02:29:37 +0000
+++ tests/integration-tests/test_surfaceloop.cpp	2017-04-11 18:27:10 +0000
@@ -141,7 +141,10 @@
     {
         mtf::BasicClientServerFixture<BufferCounterConfig>::SetUp();
         surface_spec = mir_create_normal_window_spec(connection, 640, 480);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_window_spec_set_pixel_format(surface_spec, mir_pixel_format_abgr_8888);
+#pragma GCC diagnostic pop
     }
 
     void TearDown() override

=== modified file 'tests/integration-tests/test_swapinterval.cpp'
--- tests/integration-tests/test_swapinterval.cpp	2017-01-18 16:58:17 +0000
+++ tests/integration-tests/test_swapinterval.cpp	2017-04-11 18:27:10 +0000
@@ -113,13 +113,19 @@
     {
         mtf::BasicClientServerFixture<ServerConfig>::SetUp();
         window = mtf::make_any_surface(connection);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         stream = mir_connection_create_buffer_stream_sync(
             connection, 10, 10, mir_pixel_format_abgr_8888, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
     }
 
     void TearDown()
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_release_sync(stream);
+#pragma GCC diagnostic pop
         mir_window_release_sync(window);
         mtf::BasicClientServerFixture<ServerConfig>::TearDown();
     }

=== modified file 'tests/mir_test_framework/any_surface.cpp'
--- tests/mir_test_framework/any_surface.cpp	2017-02-15 07:38:33 +0000
+++ tests/mir_test_framework/any_surface.cpp	2017-04-11 18:27:10 +0000
@@ -39,7 +39,10 @@
 MirWindow* mtf::make_any_surface(MirConnection *connection, MirWindowEventCallback callback, void* context)
 {
     auto spec = mir_create_normal_window_spec(connection, width, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(spec, format);
+#pragma GCC diagnostic pop
     mir_window_spec_set_event_handler(spec, callback, context);
     auto window = mir_create_window_sync(spec);
     mir_window_spec_release(spec);
@@ -57,7 +60,10 @@
 {
 
     auto spec = mir_create_normal_window_spec(connection, size.width.as_int(), size.height.as_int());
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(spec, f);
+#pragma GCC diagnostic pop
     auto window = mir_create_window_sync(spec);
     mir_window_spec_release(spec);
 

=== modified file 'tests/mir_test_framework/connected_client_with_a_window.cpp'
--- tests/mir_test_framework/connected_client_with_a_window.cpp	2017-03-14 02:26:28 +0000
+++ tests/mir_test_framework/connected_client_with_a_window.cpp	2017-04-11 18:27:10 +0000
@@ -27,9 +27,12 @@
     auto const spec = mir_create_normal_window_spec(
         connection,
         surface_size.width.as_int(), surface_size.height.as_int());
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888);
     mir_window_spec_set_name(spec, "ConnectedClientWithASurfaceFixtureSurface");
     mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
 
     window = mir_create_window_sync(spec);
     mir_window_spec_release(spec);

=== modified file 'tests/mir_test_framework/stub_client_platform_factory.cpp'
--- tests/mir_test_framework/stub_client_platform_factory.cpp	2017-03-10 19:47:57 +0000
+++ tests/mir_test_framework/stub_client_platform_factory.cpp	2017-04-11 18:27:10 +0000
@@ -223,8 +223,11 @@
     return 0u;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 uint32_t mtf::StubClientPlatform::native_flags_for(MirBufferUsage usage, mir::geometry::Size) const
 {
+#pragma GCC diagnostic pop
     return static_cast<uint32_t>(usage);
 }
 

=== modified file 'tests/mir_test_framework/visible_surface.cpp'
--- tests/mir_test_framework/visible_surface.cpp	2017-01-18 02:29:37 +0000
+++ tests/mir_test_framework/visible_surface.cpp	2017-04-11 18:27:10 +0000
@@ -27,7 +27,10 @@
     // Swap buffers to ensure window is visible for event based tests
     if (mir_window_is_valid(window))
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
+#pragma GCC diagnostic pop
 
         std::unique_lock<std::mutex> lk(mutex);
         if (!cv.wait_for(lk, std::chrono::seconds(5), [this] { return visible; }))

=== modified file 'tests/performance-tests/test_client_startup.cpp'
--- tests/performance-tests/test_client_startup.cpp	2017-01-18 02:29:37 +0000
+++ tests/performance-tests/test_client_startup.cpp	2017-04-11 18:27:10 +0000
@@ -70,7 +70,10 @@
     auto format = find_pixel_format(connection);
 
     auto spec = mir_create_normal_window_spec(connection, 720, 1280);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_window_spec_set_pixel_format(spec, format);
+#pragma GCC diagnostic pop
     auto window = mir_create_window_sync(spec);
 
     mir_window_spec_release(spec);
@@ -92,7 +95,10 @@
 
     auto conn = create_connection();
     auto window = make_surface(conn);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto stream  = mir_window_get_buffer_stream(window);
+#pragma GCC diagnostic pop
     if (!mir_buffer_stream_is_valid(stream))
     {
         std::string error_msg{"Could not get buffer stream from window: "};

=== modified file 'tests/privileged-tests/test_input_events.cpp'
--- tests/privileged-tests/test_input_events.cpp	2017-02-15 07:38:33 +0000
+++ tests/privileged-tests/test_input_events.cpp	2017-04-11 18:27:10 +0000
@@ -199,7 +199,8 @@
         if (!success)
             throw std::runtime_error("Timeout waiting for window to become focused and exposed");
     }
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirSurfaceUPtr create_surface_with_input_handler(
         MirConnection* connection,
         MockInputHandler* handler)
@@ -222,7 +223,7 @@
 
         return MirSurfaceUPtr(window, mir_window_release_sync);
     }
-
+#pragma GCC diagnostic pop
     static int const key_down = 1;
     static int const key_up = 0;
 

=== modified file 'tests/test-clients/impolite-shutdown/scroll.cpp'
--- tests/test-clients/impolite-shutdown/scroll.cpp	2017-01-18 02:29:37 +0000
+++ tests/test-clients/impolite-shutdown/scroll.cpp	2017-04-11 18:27:10 +0000
@@ -38,7 +38,8 @@
 static char const *socket_file = NULL;
 static EGLDisplay disp;
 
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 void create_and_run_scroll_surface(MirConnection *connection)
 {
     /* egl setup */
@@ -193,6 +194,6 @@
 
     return 0;
 }
-
+#pragma GCC diagnostic pop
 
 

=== modified file 'tests/test-clients/mir-stress/src/client.cpp'
--- tests/test-clients/mir-stress/src/client.cpp	2017-01-18 13:59:18 +0000
+++ tests/test-clients/mir-stress/src/client.cpp	2017-04-11 18:27:10 +0000
@@ -58,6 +58,8 @@
     return true;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 bool UnacceleratedClient::create_surface()
 {
     auto display_configuration = mir_connection_create_display_configuration(connection_);
@@ -83,6 +85,7 @@
 
     return true;
 }
+#pragma GCC diagnostic pop
 
 void UnacceleratedClient::release_surface()
 {

=== modified file 'tests/unit-tests/client/test_client_buffer_stream.cpp'
--- tests/unit-tests/client/test_client_buffer_stream.cpp	2017-03-14 04:41:33 +0000
+++ tests/unit-tests/client/test_client_buffer_stream.cpp	2017-04-11 18:27:10 +0000
@@ -107,10 +107,13 @@
     {
         return 0u;
     }
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     uint32_t native_flags_for(MirBufferUsage, mir::geometry::Size) const override
     {
         return 0u;
     }
+#pragma GCC diagnostic pop
 
     static EGLNativeWindowType egl_native_window;
     std::shared_ptr<mcl::ClientBufferFactory> const buffer_factory;
@@ -170,9 +173,11 @@
         ON_CALL(mock_factory, create_buffer(_,An<geom::Size>(),_))
             .WillByDefault(Return(std::make_shared<mtd::NullClientBuffer>()));
     }
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mp::BufferStream a_protobuf_buffer_stream(MirPixelFormat format, MirBufferUsage usage)
     {
+#pragma GCC diagnostic pop
         mp::BufferStream protobuf_bs;
         mp::BufferStreamId bs_id;
         
@@ -221,8 +226,10 @@
     testing::NiceMock<mtd::MockProtobufServer> mock_protobuf_server;
 
     MirPixelFormat const default_pixel_format = mir_pixel_format_argb_8888;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirBufferUsage const default_buffer_usage = mir_buffer_usage_hardware;
-
+#pragma GCC diagnostic pop
     std::shared_ptr<mcl::PerfReport> const perf_report = std::make_shared<mcl::NullPerfReport>();
 
     MirBufferPackage buffer_package = a_buffer_package();

=== modified file 'tests/unit-tests/client/test_mir_buffer.cpp'
--- tests/unit-tests/client/test_mir_buffer.cpp	2017-01-24 07:49:13 +0000
+++ tests/unit-tests/client/test_mir_buffer.cpp	2017-04-11 18:27:10 +0000
@@ -49,7 +49,10 @@
     geom::Width width { 190 };
     geom::Height height { 119 };
     geom::Stride stride { 2211 };
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirBufferUsage usage { mir_buffer_usage_hardware };
+#pragma GCC diagnostic pop
     MirPixelFormat format { mir_pixel_format_abgr_8888 };
     std::shared_ptr<char> vaddr { std::make_shared<char>('\0') };
     MirBufferCallback cb { buffer_callback };

=== modified file 'tests/unit-tests/client/test_mir_connection.cpp'
--- tests/unit-tests/client/test_mir_connection.cpp	2017-03-10 19:47:57 +0000
+++ tests/unit-tests/client/test_mir_connection.cpp	2017-04-11 18:27:10 +0000
@@ -85,6 +85,8 @@
 {
     MOCK_METHOD1(cancel_requests_with_context, void(void*));
     MOCK_METHOD1(generate_buffer, std::unique_ptr<mcl::MirBuffer>(mp::Buffer const&));
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MOCK_METHOD7(expect_buffer, void(
         std::shared_ptr<mcl::ClientBufferFactory> const& native_buffer_factory,
         MirConnection* connection,
@@ -93,6 +95,7 @@
         MirBufferUsage usage,
         MirBufferCallback cb,
         void* cb_context));
+#pragma GCC diagnostic pop
     MOCK_METHOD7(expect_buffer, void(
         std::shared_ptr<mcl::ClientBufferFactory> const& native_buffer_factory,
         MirConnection* connection,
@@ -216,7 +219,10 @@
     MOCK_CONST_METHOD2(get_egl_pixel_format, MirPixelFormat(EGLDisplay, EGLConfig));
     MOCK_METHOD2(request_interface, void*(char const*, int));
     MOCK_CONST_METHOD1(native_format_for, uint32_t(MirPixelFormat));
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MOCK_CONST_METHOD2(native_flags_for, uint32_t(MirBufferUsage, mir::geometry::Size));
+#pragma GCC diagnostic pop
     mcl::ClientContext* client_context = nullptr;
 };
 

=== modified file 'tests/unit-tests/client/test_presentation_chain.cpp'
--- tests/unit-tests/client/test_presentation_chain.cpp	2017-03-10 19:47:57 +0000
+++ tests/unit-tests/client/test_presentation_chain.cpp	2017-04-11 18:27:10 +0000
@@ -49,7 +49,10 @@
     MirConnection* connection {reinterpret_cast<MirConnection*>(this)};
     geom::Size size {100, 200};
     MirPixelFormat format = mir_pixel_format_abgr_8888;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirBufferUsage usage = mir_buffer_usage_software;
+#pragma GCC diagnostic pop
     mtd::MockProtobufServer mock_server;
     int buffer_id {4312};
     mp::Buffer ipc_buf;

=== modified file 'tests/unit-tests/client/test_protobuf_rpc_channel.cpp'
--- tests/unit-tests/client/test_protobuf_rpc_channel.cpp	2017-04-04 07:04:57 +0000
+++ tests/unit-tests/client/test_protobuf_rpc_channel.cpp	2017-04-11 18:27:10 +0000
@@ -690,11 +690,14 @@
 {
     MOCK_METHOD1(cancel_requests_with_context, void(void*));
     MOCK_METHOD1(generate_buffer, std::unique_ptr<mcl::MirBuffer>(mir::protobuf::Buffer const&));
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MOCK_METHOD7(expect_buffer, void(
         std::shared_ptr<mcl::ClientBufferFactory> const&,
         MirConnection*,
         mir::geometry::Size, MirPixelFormat, MirBufferUsage,
         MirBufferCallback, void*));
+#pragma GCC diagnostic pop
     MOCK_METHOD7(expect_buffer, void(
         std::shared_ptr<mcl::ClientBufferFactory> const&,
         MirConnection*, mir::geometry::Size, uint32_t, uint32_t,
@@ -733,11 +736,14 @@
     int buffer_id(3);
     auto stream_map = std::make_shared<MockSurfaceMap>();
     auto mock_buffer_factory = std::make_shared<MockBufferFactory>();
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     EXPECT_CALL(*mock_buffer_factory, generate_buffer(_))
         .WillOnce(InvokeWithoutArgs([&]{
             return std::make_unique<mcl::Buffer>(
                 buffer_cb, nullptr, buffer_id, nullptr, nullptr, mir_buffer_usage_software);
             }));
+#pragma GCC diagnostic pop
     EXPECT_CALL(*stream_map, insert(buffer_id, _));
 
     auto transport = std::make_unique<NiceMock<MockStreamTransport>>();
@@ -769,7 +775,10 @@
     auto stream_map = std::make_shared<MockSurfaceMap>();
     auto mock_buffer_factory = std::make_shared<MockBufferFactory>();
     auto mock_client_buffer = std::make_shared<mtd::MockClientBuffer>();
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto buf = std::make_shared<mcl::Buffer>(buffer_cb, nullptr, buffer_id, mock_client_buffer, nullptr, mir_buffer_usage_software);
+#pragma GCC diagnostic pop
     EXPECT_CALL(*stream_map, buffer(buffer_id)).Times(1)
        .WillOnce(Return(buf));
     EXPECT_CALL(*mock_client_buffer, update_from(_))
@@ -804,7 +813,10 @@
     auto stream_map = std::make_shared<MockSurfaceMap>();
     auto mock_buffer_factory = std::make_shared<MockBufferFactory>();
     auto mock_client_buffer = std::make_shared<mtd::MockClientBuffer>();
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto buf = std::make_shared<mcl::Buffer>(buffer_cb, nullptr, buffer_id, mock_client_buffer, nullptr, mir_buffer_usage_software);
+#pragma GCC diagnostic pop
     EXPECT_CALL(*stream_map, stream(mir::frontend::BufferStreamId{stream_id}))
         .Times(1);
 

=== modified file 'tests/unit-tests/client/test_screencast_stream.cpp'
--- tests/unit-tests/client/test_screencast_stream.cpp	2017-03-10 19:47:57 +0000
+++ tests/unit-tests/client/test_screencast_stream.cpp	2017-04-11 18:27:10 +0000
@@ -78,9 +78,11 @@
         ON_CALL(mock_factory, create_buffer(_,An<geom::Size>(),_))
             .WillByDefault(Return(std::make_shared<mtd::NullClientBuffer>()));
     }
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mp::BufferStream a_protobuf_buffer_stream(MirPixelFormat format, MirBufferUsage usage, MirBufferPackage const& package)
     {
+#pragma GCC diagnostic pop
         mp::BufferStream protobuf_bs;
         mp::BufferStreamId bs_id;
         
@@ -100,8 +102,10 @@
     testing::NiceMock<mtd::MockProtobufServer> mock_protobuf_server;
 
     MirPixelFormat const default_pixel_format = mir_pixel_format_argb_8888;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirBufferUsage const default_buffer_usage = mir_buffer_usage_hardware;
-
+#pragma GCC diagnostic pop
     MirBufferPackage buffer_package = a_buffer_package();
     geom::Size size{buffer_package.width, buffer_package.height};
     mp::BufferStream response = a_protobuf_buffer_stream(

=== modified file 'tests/unit-tests/platforms/android/client/test_egl_native_surface_interpreter.cpp'
--- tests/unit-tests/platforms/android/client/test_egl_native_surface_interpreter.cpp	2017-01-18 04:43:15 +0000
+++ tests/unit-tests/platforms/android/client/test_egl_native_surface_interpreter.cpp	2017-04-11 18:27:10 +0000
@@ -37,6 +37,8 @@
 namespace mt=mir::test;
 namespace mtd=mir::test::doubles;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 struct MockMirSurface : public mcl::EGLNativeSurface
 {
     MockMirSurface(MirWindowParameters params) :
@@ -83,6 +85,7 @@
     MirWindowParameters surf_params;
     std::shared_ptr<mtd::MockClientBuffer> mock_client_buffer;
 };
+#pragma GCC diagnostic pop
 
 TEST_F(AndroidInterpreter, gets_buffer_via_the_surface_on_request)
 {
@@ -244,9 +247,11 @@
 TEST_F(AndroidInterpreter, returns_proper_usage_bits_based_on_surface)
 {
     using namespace testing;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirWindowParameters const software = { "", 1, 2, mir_pixel_format_abgr_8888, mir_buffer_usage_software, 0 };
     MirWindowParameters const hardware = { "", 1, 2, mir_pixel_format_abgr_8888, mir_buffer_usage_hardware, 0 };
-
+#pragma GCC diagnostic pop
     testing::NiceMock<MockMirSurface> mock_surface{surf_params};
     mcla::EGLNativeSurfaceInterpreter interpreter(mock_surface);
 

=== modified file 'tests/unit-tests/platforms/mesa/client/test_native_surface.cpp'
--- tests/unit-tests/platforms/mesa/client/test_native_surface.cpp	2017-01-18 02:29:37 +0000
+++ tests/unit-tests/platforms/mesa/client/test_native_surface.cpp	2017-04-11 18:27:10 +0000
@@ -51,8 +51,10 @@
             .WillByDefault(Return(
                 mt::fake_shared(native_buffer)));
     }
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirWindowParameters surf_params;
+#pragma GCC diagnostic pop
     const char* error_msg = "thrown as part of test";
     mg::mesa::NativeBuffer native_buffer;
     testing::NiceMock<mtd::MockClientBuffer> mock_buffer;
@@ -62,7 +64,10 @@
 
 TEST_F(MesaClientNativeSurfaceTest, basic_parameters)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirWindowParameters params;
+#pragma GCC diagnostic pop
     EXPECT_EQ(MIR_MESA_TRUE, native_surface.surface_get_parameters(&native_surface, &params));
     EXPECT_EQ(surf_params.width, params.width);
     EXPECT_EQ(surf_params.height, params.height);
@@ -139,8 +144,10 @@
 
     EXPECT_CALL(mock_surface, get_parameters())
         .WillOnce(Throw(std::runtime_error(error_msg)));
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirWindowParameters surface_params;
+#pragma GCC diagnostic pop
     EXPECT_EQ(MIR_MESA_FALSE, native_surface.get_parameters(&surface_params));
 }
 
@@ -157,8 +164,10 @@
 TEST_F(MesaClientNativeSurfaceTest, null_native_surface_returns_error)
 {
     using namespace testing;
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirWindowParameters params;
+#pragma GCC diagnostic pop
     MirBufferPackage buffer_package;
 
     mclg::NativeSurface null_native_surface{nullptr};
@@ -174,8 +183,10 @@
 TEST_F(MesaClientNativeSurfaceTest, native_surface_after_null_returns_success)
 {
     using namespace testing;
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirWindowParameters params;
+#pragma GCC diagnostic pop
     MirBufferPackage buffer_package;
 
     mclg::NativeSurface native_surface{nullptr};

=== modified file 'tests/unit-tests/platforms/nested/test_host_buffer.cpp'
--- tests/unit-tests/platforms/nested/test_host_buffer.cpp	2017-04-03 16:22:38 +0000
+++ tests/unit-tests/platforms/nested/test_host_buffer.cpp	2017-04-11 18:27:10 +0000
@@ -72,6 +72,8 @@
             {
                 return nullptr;
             }
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             void expect_buffer(
                 std::shared_ptr<mcl::ClientBufferFactory> const&, 
                 MirConnection* conn, mir::geometry::Size,
@@ -81,6 +83,7 @@
                     buffer = std::make_shared<mcl::Buffer>(cb, ctx, 1, nullptr, conn, usage);
                 cb(reinterpret_cast<MirBuffer*>(buffer.get()), ctx);
             }
+#pragma GCC diagnostic pop
             void expect_buffer(
                 std::shared_ptr<mcl::ClientBufferFactory> const&,
                 MirConnection*, mir::geometry::Size, uint32_t, uint32_t,