Merge lp:~mir-team/mir/pragma-deprecated-functions into lp:mir

[Brandon Schaefer]

Deprecated functions and pragma the use of them internally so we can slowly move to the correct functions, while still releasing this so we can fix downstream projects.

Using this and expanding it to an actual compiling working branch that we plan on checking all downstream uses of mir to then fix them.

https://code.launchpad.net/~mir-team/mir/client-api-deprecation/+merge/309364

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

FAILED: Continuous integration, rev:3789
https://mir-jenkins.ubuntu.com/job/mir-ci/2074/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/2661/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2724
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2716
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2716
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2716
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2690/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2690/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2690/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2690/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2690/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2690/console

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Oookay. This is getting out of hand.

You can avoid all:
   #pragma GCC diagnostic push/pop
by instead defining at the top level:
   -DMIR_SOURCE
and then only applying the deprecated attribute in the header ifndef MIR_SOURCE.
No pragmas required!

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

(1) Remove all the pragmas per above. Just don't apply the deprecated attribute unless "ifndef MIR_SOURCE" within the Mir source tree. Or use a different macro name like MIR_INTERNAL_ALLOW_DEPRECATED - that way we can more clearly undefine it for examples to be sure our examples at least are no longer using deprecated functions.

(2) Unconditionally returning success is wrong. We already know what failure looks like (it leaves the structure uninitialized):
+bool mir_buffer_stream_get_graphics_region(
+ return true;

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Therefore the branch name also needs changing :)

Please resubmit under a new name and follow/prerequisite this approach:
   https://code.launchpad.net/~vanvugt/mir/deprecate-without-pragmas/+merge/309532

That will then let us do all this in a dozen or so lines of code rather than thousands.

review: Needs Resubmitting

[Alan Griffiths (alan-griffiths)]

> Therefore the branch name also needs changing :)
>
> Please resubmit under a new name and follow/prerequisite this approach:
> https://code.launchpad.net/~vanvugt/mir/deprecate-without-
> pragmas/+merge/309532
>
> That will then let us do all this in a dozen or so lines of code rather than
> thousands.

There are three cases to consider:

1. the implementation of a deprecated feature should compile (and will be deleted).
2. a test of a deprecated feature should compile (and will be deleted).
3. an "internal" use of a deprecated feature should /not/ compile "silently".

Both this approach and your alternative address cases 1 & 2.

Your alternative approach makes it much harder to identify and address case 3. An "internal" use should either be migrated to the proposed alternative or "flagged" (e.g. with a pragma) for migration *prior* to deleting the implementation.

First flagging everything with pragmas may be "noisier", but it gets us to a better place for managing migration.

[lp:~mir-team/mir/pragma-deprecated-functions]

3790. By Brandon Schaefer on 2016-10-28

* Merger trunk, fix compiling issues

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

PASSED: Continuous integration, rev:3790
https://mir-jenkins.ubuntu.com/job/mir-ci/2080/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/2667
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2730
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2722
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2722
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2722
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2696
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2696/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/2696
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2696/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2696
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2696/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/2696
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2696/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/2696
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2696/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/2696
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2696/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Unmerged revisions

3790. By Brandon Schaefer on 2016-10-28

* Merger trunk, fix compiling issues

3789. By Brandon Schaefer on 2016-10-28

* pragma around the functions we depend on but haved deprecated
* Move from [[deprecated]] to attribute since we need to support c99

3788. By Alberto Aguirre on 2016-10-26

Start deprecation of client side APIs

=== modified file 'benchmarks/frame-uniformity/touch_measuring_client.cpp'
--- benchmarks/frame-uniformity/touch_measuring_client.cpp	2015-06-17 05:20:42 +0000
+++ benchmarks/frame-uniformity/touch_measuring_client.cpp	2016-10-28 13:38:48 +0000
@@ -38,7 +38,10 @@
     auto const spec = mir_connection_create_spec_for_normal_surface(
         connection, 1024, 1024, pixel_format);
     mir_surface_spec_set_name(spec, "frame-uniformity-test");
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
 
     auto surface = mir_surface_create_sync(spec);
     mir_surface_spec_release(spec);
@@ -61,7 +64,10 @@
 
 void collect_input_and_frame_timing(MirSurface *surface, mt::Barrier& client_ready, std::chrono::high_resolution_clock::duration duration, std::shared_ptr<TouchSamples> const& results)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_set_event_handler(surface, input_callback, results.get());
+#pragma GCC diagnostic pop
     
     client_ready.ready();
 
@@ -69,7 +75,10 @@
     auto end_time = std::chrono::high_resolution_clock::now() + duration;
     while (std::chrono::high_resolution_clock::now() < end_time)
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers_sync(mir_surface_get_buffer_stream(surface));
+#pragma GCC diagnostic pop
         results->record_frame_time(std::chrono::high_resolution_clock::now());
     }
 }
 
=== modified file 'examples/animated_cursor_demo_client.c'
--- examples/animated_cursor_demo_client.c	2016-10-21 07:53:23 +0000
+++ examples/animated_cursor_demo_client.c	2016-10-28 13:38:48 +0000
@@ -68,13 +68,19 @@
 
 MirBufferStream* make_cursor_stream(MirConnection *connection, MirSurface *surface)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirBufferStream* stream = mir_connection_create_buffer_stream_sync(connection,
       24, 24, mir_pixel_format_argb_8888, mir_buffer_usage_software);
+#pragma GCC diagnostic pop
 
     animate_cursor(stream);
 
     MirCursorConfiguration* conf = mir_cursor_configuration_from_buffer_stream(stream, 0, 0);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_wait_for(mir_surface_configure_cursor(surface, conf));
+#pragma GCC diagnostic pop
     mir_cursor_configuration_destroy(conf);
     
     return stream;
 
=== modified file 'examples/basic.c'
--- examples/basic.c	2016-01-29 08:18:22 +0000
+++ examples/basic.c	2016-10-28 13:38:48 +0000
@@ -112,7 +112,10 @@
         platform_package.data_items = -1;
         platform_package.fd_items = -1;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_connection_get_platform(mcd.connection, &platform_package);
+#pragma GCC diagnostic pop
         assert(0 <= platform_package.data_items);
         assert(0 <= platform_package.fd_items);
     }
@@ -120,7 +123,10 @@
     {
         MirModuleProperties properties = { NULL, -1, -1, -1, NULL };
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_connection_get_graphics_module(mcd.connection, &properties);
+#pragma GCC diagnostic pop
 
         assert(NULL != properties.name);
         assert(0 <= properties.major_version);
@@ -160,8 +166,11 @@
     else
         assert(strcmp(mir_surface_get_error_message(mcd.surface), "") == 0);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirBufferStream *bs =
         mir_surface_get_buffer_stream(mcd.surface);
+#pragma GCC diagnostic pop
 
     // We can keep exchanging the current buffer for a new one
     for (int i = 0; i < buffer_swap_count; i++)
@@ -170,7 +179,10 @@
         {
             ///\internal [get_current_buffer_tag]
             MirNativeBuffer* buffer_package = NULL;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             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	2016-10-26 05:15:38 +0000
+++ examples/camera.c	2016-10-28 13:38:48 +0000
@@ -388,7 +388,10 @@
     if (ultrafast)
     {
         pref = camera_pref_speed;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_swapinterval(mir_eglapp_native_surface(), 0);
+#pragma GCC diagnostic pop
     }
     Camera *cam = open_camera(dev_video, pref, 1);
     if (!cam)
@@ -470,7 +473,10 @@
         PTHREAD_MUTEX_INITIALIZER,
         true
     };
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_set_event_handler(surface, on_event, &state);
+#pragma GCC diagnostic pop
 
     bool first_frame = true;
     while (mir_eglapp_running())
@@ -563,7 +569,10 @@
         mir_eglapp_swap_buffers();
     }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_set_event_handler(surface, NULL, NULL);
+#pragma GCC diagnostic pop
     mir_eglapp_cleanup();
     close_camera(cam);
 
 
=== modified file 'examples/client_helpers.cpp'
--- examples/client_helpers.cpp	2016-01-29 08:18:22 +0000
+++ examples/client_helpers.cpp	2016-10-28 13:38:48 +0000
@@ -100,12 +100,15 @@
         }
     }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     return mir_connection_create_buffer_stream_sync(
         connection,
         width,
         height,
         selected_format,
         hardware ? mir_buffer_usage_hardware : mir_buffer_usage_software);
+#pragma GCC diagnostic pop
 }
 
 me::NormalSurface::NormalSurface(me::Connection& connection, unsigned int width, unsigned int height, bool prefers_alpha, bool hardware) :
@@ -153,11 +156,16 @@
     };
 
     mir_surface_spec_set_name(spec.get(), __PRETTY_FUNCTION__);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(spec.get(), hardware ? mir_buffer_usage_hardware : mir_buffer_usage_software);
+#pragma GCC diagnostic pop
     auto surface = mir_surface_create_sync(spec.get());
     return surface;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 me::Context::Context(Connection& connection, MirSurface* surface, int swap_interval) :
     native_display(reinterpret_cast<EGLNativeDisplayType>(
         mir_connection_get_egl_native_display(connection))),
@@ -171,6 +179,7 @@
     make_current();
     eglSwapInterval(display.disp, swap_interval);
 }
+#pragma GCC diagnostic pop
 
 void me::Context::make_current()
 {
 
=== modified file 'examples/client_touch_validator.cpp'
--- examples/client_touch_validator.cpp	2016-10-21 07:53:23 +0000
+++ examples/client_touch_validator.cpp	2016-10-28 13:38:48 +0000
@@ -168,7 +168,10 @@
     TouchState state;
 
     MirSurface *surface = mir_eglapp_native_surface();
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_set_event_handler(surface, on_event, &state);
+#pragma GCC diagnostic pop
 
     float const opacity = mir_eglapp_background_opacity;
     Color red = {opacity, 0.0f, 0.0f, opacity};
 
=== modified file 'examples/cursors_demo_client.c'
--- examples/cursors_demo_client.c	2016-10-21 07:53:23 +0000
+++ examples/cursors_demo_client.c	2016-10-28 13:38:48 +0000
@@ -48,9 +48,10 @@
     size_t real_index = cursor_index % num_cursors;
     
     MirCursorConfiguration *conf = mir_cursor_configuration_from_name(cursors[real_index]);
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_wait_for(mir_surface_configure_cursor(surface, conf));
-    
+#pragma GCC diagnostic pop
     mir_cursor_configuration_destroy(conf);
 }
 
 
=== modified file 'examples/demo_client_display_config.c'
--- examples/demo_client_display_config.c	2016-10-21 07:53:23 +0000
+++ examples/demo_client_display_config.c	2016-10-28 13:38:48 +0000
@@ -97,7 +97,10 @@
 
 static void print_current_configuration(MirConnection *connection)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirDisplayConfiguration *conf = mir_connection_create_display_config(connection);
+#pragma GCC diagnostic pop
 
     for (uint32_t i = 0; i < conf->num_outputs; i++)
     {
@@ -124,7 +127,10 @@
 
 static int apply_configuration(MirConnection *connection, MirDisplayConfiguration *conf)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirWaitHandle* handle = mir_connection_apply_display_config(connection, conf);
+#pragma GCC diagnostic pop
     if (!handle)
     {
         printf("Failed to apply configuration, check that the configuration is valid.\n");
@@ -250,8 +256,11 @@
 static void configure_display(struct ClientContext *context, ConfigurationMode mode,
                               int mode_data)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirDisplayConfiguration *conf =
         mir_connection_create_display_config(context->connection);
+#pragma GCC diagnostic pop
 
     if (mode == configuration_mode_clone)
     {
@@ -368,7 +377,10 @@
     mir_connection_set_display_config_change_callback(
         connection, display_change_callback, &ctx);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_set_event_handler(surface, event_callback, &ctx);
+#pragma GCC diagnostic pop
 
     time_t start = time(NULL);
 
 
=== modified file 'examples/eglapp.c'
--- examples/eglapp.c	2016-10-21 07:53:23 +0000
+++ examples/eglapp.c	2016-10-28 13:38:48 +0000
@@ -409,8 +409,11 @@
     CHECK(ok, "Could not eglChooseConfig");
     CHECK(neglconfigs > 0, "No EGL config available");
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirPixelFormat pixel_format =
         mir_connection_get_egl_pixel_format(connection, egldisplay, eglconfig);
+#pragma GCC diagnostic pop
 
     printf("Mir chose pixel format %d.\n", pixel_format);
     if (alpha_bits == 0)
@@ -431,8 +434,11 @@
 
     /* eglapps are interested in the screen size, so
        use mir_connection_create_display_config */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirDisplayConfiguration* display_config =
         mir_connection_create_display_config(connection);
+#pragma GCC diagnostic pop
 
     const MirDisplayOutput *output = find_active_output(display_config);
 
@@ -477,14 +483,20 @@
 
     CHECK(mir_surface_is_valid(surface), "Can't create a surface");
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_set_event_handler(surface, mir_eglapp_handle_event, NULL);
+#pragma GCC diagnostic pop
     
     MirCursorConfiguration *conf = mir_cursor_configuration_from_name(cursor_name);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_configure_cursor(surface, conf);
     mir_cursor_configuration_destroy(conf);
 
     eglsurface = eglCreateWindowSurface(egldisplay, eglconfig,
         (EGLNativeWindowType)mir_buffer_stream_get_egl_native_window(mir_surface_get_buffer_stream(surface)), NULL);
+#pragma GCC diagnostic pop
     
     CHECK(eglsurface != EGL_NO_SURFACE, "eglCreateWindowSurface failed");
 
 
=== modified file 'examples/eglsquare.cpp'
--- examples/eglsquare.cpp	2015-05-29 12:53:18 +0000
+++ examples/eglsquare.cpp	2016-10-28 13:38:48 +0000
@@ -109,7 +109,10 @@
         context{connection, surface, swap_interval},
         program{context, dimensions.width, dimensions.height}
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface, &on_event, this);
+#pragma GCC diagnostic pop
     }
 
     void on_event(MirEvent const* ev)
@@ -159,7 +162,10 @@
     {
         unsigned int width{0};
         unsigned int height{0};
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         auto display_config = mir_connection_create_display_config(connection);
+#pragma GCC diagnostic pop
         for (auto i = 0u; i < display_config->num_outputs; i++)
         {
             MirDisplayOutput const* out = display_config->outputs + i;
 
=== modified file 'examples/eglstateswitcher.c'
--- examples/eglstateswitcher.c	2016-10-21 07:53:23 +0000
+++ examples/eglstateswitcher.c	2016-10-28 13:38:48 +0000
@@ -43,7 +43,10 @@
         return 1;
 
     MirSurface* const surface = mir_eglapp_native_surface();
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirSurfaceState state = mir_surface_get_state(surface);
+#pragma GCC diagnostic pop
 
     /* This is probably the simplest GL you can do */
     while (mir_eglapp_running())
@@ -72,6 +75,8 @@
 
 void toggle_surface_state(MirSurface* const surface, MirSurfaceState* state)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     switch (mir_surface_get_state(surface))
     {
     PRINT_STATE(mir_surface_state_unknown);
@@ -84,6 +89,7 @@
     default:
         puts("Current state: unknown");
     }
+#pragma GCC diagnostic pop
 
     switch (*state)
     {
@@ -115,5 +121,8 @@
         NEW_STATE(mir_surface_state_maximized);
         break;
     }
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_set_state(surface, *state);
+#pragma GCC diagnostic pop
 }
 
=== modified file 'examples/fingerpaint.c'
--- examples/fingerpaint.c	2016-01-29 08:18:22 +0000
+++ examples/fingerpaint.c	2016-10-28 13:38:48 +0000
@@ -425,9 +425,11 @@
         fprintf(stderr, "Could not connect to a display server: %s\n", mir_connection_get_error_message(conn));
         return 1;
     }
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirDisplayConfiguration *display_config =
         mir_connection_create_display_config(conn);
+#pragma GCC diagnostic pop
 
     const MirDisplayOutput *dinfo = find_active_output(display_config);
     if (dinfo == NULL)
@@ -467,16 +469,21 @@
 
     MirSurfaceSpec *spec = mir_connection_create_spec_for_normal_surface(conn, width, height, pixel_format);
     mir_surface_spec_set_name(spec, "Mir Fingerpaint");
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_software);
+#pragma GCC diagnostic pop
 
     surf = mir_surface_create_sync(spec);
     mir_surface_spec_release(spec);
 
     if (surf != NULL)
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_swapinterval(surf, swap_interval);
         mir_surface_set_event_handler(surf, &on_event, &canvas);
-    
+#pragma GCC diagnostic pop
         canvas.width = width;
         canvas.height = height;
         canvas.stride = canvas.width * BYTES_PER_PIXEL(pixel_format);
@@ -488,10 +495,12 @@
             signal(SIGINT, shutdown);
             signal(SIGTERM, shutdown);
             signal(SIGHUP, shutdown);
-        
+
             clear_region(&canvas, &background);
-        
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             MirBufferStream *bs = mir_surface_get_buffer_stream(surf);
+#pragma GCC diagnostic pop
 
             while (running)
             {
@@ -509,7 +518,10 @@
             }
 
             /* Ensure canvas won't be used after it's freed */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_set_event_handler(surf, NULL, NULL);
+#pragma GCC diagnostic pop
             free(canvas.vaddr);
         }
         else
 
=== modified file 'examples/flicker.c'
--- examples/flicker.c	2016-07-18 07:38:38 +0000
+++ examples/flicker.c	2016-10-28 13:38:48 +0000
@@ -157,7 +157,10 @@
         mir_connection_create_spec_for_normal_surface(connection, 640, 480, pixel_format);
     assert(spec != NULL);
     mir_surface_spec_set_name(spec, __FILE__);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_software);
+#pragma GCC diagnostic pop
 
     surface = mir_surface_create_sync(spec);
     mir_surface_spec_release(spec);
@@ -167,14 +170,20 @@
     assert(strcmp(mir_surface_get_error_message(surface), "") == 0);
     puts("Surface created");
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_set_swapinterval(surface, swapinterval);
+#pragma GCC diagnostic pop
 
     uint32_t pattern[2] = {0};
     fill_pattern(pattern, pixel_format);
 
     MirGraphicsRegion graphics_region;
     int i=0;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirBufferStream *bs = mir_surface_get_buffer_stream(surface);
+#pragma GCC diagnostic pop
 
     signal(SIGINT, shutdown);
     signal(SIGTERM, shutdown);
 
=== modified file 'examples/multi_stream.cpp'
--- examples/multi_stream.cpp	2016-10-20 14:26:23 +0000
+++ examples/multi_stream.cpp	2016-10-28 13:38:48 +0000
@@ -206,7 +206,10 @@
     me::Connection connection{socket, "Multiple MirBufferStream example"};
 
     me::NormalSurface surface{connection, 200, 200, true, false};
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirBufferStream* surface_stream = mir_surface_get_buffer_stream(surface);
+#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);
@@ -276,7 +279,10 @@
         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_surface_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	2015-07-16 07:03:19 +0000
+++ examples/multiwin.c	2016-10-28 13:38:48 +0000
@@ -164,7 +164,10 @@
 static void draw_window(Window *win)
 {
     MirGraphicsRegion region;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirBufferStream *bs = mir_surface_get_buffer_stream(win->surface);
+#pragma GCC diagnostic pop
 
     mir_buffer_stream_get_graphics_region(bs, &region);
     clear_region(&region, &win->fill);
@@ -252,7 +255,10 @@
         return 1;
     }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_software);
+#pragma GCC diagnostic pop
     mir_surface_spec_set_name(spec, "red");
 
     win[0].surface = mir_surface_create_sync(spec);
 
=== modified file 'examples/pointer_confinement.c'
--- examples/pointer_confinement.c	2016-10-21 07:53:23 +0000
+++ examples/pointer_confinement.c	2016-10-28 13:38:48 +0000
@@ -112,7 +112,10 @@
             mir_surface_spec_release(spec);
 
             // If we are grabbing we'll make it NULL which will hide the cursor
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_configure_cursor(surface, conf);
+#pragma GCC diagnostic pop
             mir_cursor_configuration_destroy(conf);
         }
         else if (key_code == XKB_KEY_f)
@@ -221,7 +224,10 @@
     glUseProgram(prog);
 
     MirSurface* surface = mir_eglapp_native_surface();
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_set_event_handler(surface, handle_event, NULL);
+#pragma GCC diagnostic pop
 
     spec = mir_connection_create_spec_for_changes(mir_eglapp_native_connection());
     mir_surface_spec_set_pointer_confinement(spec, mir_pointer_confined_to_surface);
@@ -230,7 +236,10 @@
     mir_surface_spec_release(spec);
 
     // Hide cursor
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_configure_cursor(surface, NULL);
+#pragma GCC diagnostic pop
 
     glClearColor(0.3f, 0.3f, 0.3f, 1.0f);
 
 
=== modified file 'examples/progressbar.c'
--- examples/progressbar.c	2015-06-17 05:20:42 +0000
+++ examples/progressbar.c	2016-10-28 13:38:48 +0000
@@ -184,8 +184,10 @@
 static void redraw(MirSurface *surface, const MirGraphicsRegion *canvas)
 {
     MirGraphicsRegion backbuffer;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirBufferStream *bs = mir_surface_get_buffer_stream(surface);
-
+#pragma GCC diagnostic pop
     mir_buffer_stream_get_graphics_region(bs, &backbuffer);
     clear_region(&backbuffer, background);
     copy_region(&backbuffer, canvas);
@@ -266,7 +268,10 @@
         mir_surface_spec_set_name(spec, name);
     }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_software);
+#pragma GCC diagnostic pop
 
     surf = mir_surface_create_sync(spec);
     mir_surface_spec_release(spec);
 
=== modified file 'examples/prompt_session.c'
--- examples/prompt_session.c	2016-09-08 02:58:56 +0000
+++ examples/prompt_session.c	2016-10-28 13:38:48 +0000
@@ -116,7 +116,10 @@
         platform_package.data_items = -1;
         platform_package.fd_items = -1;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_connection_get_platform(mcd->connection, &platform_package);
+#pragma GCC diagnostic pop
         assert(0 <= platform_package.data_items);
         assert(0 <= platform_package.fd_items);
     }
 
=== modified file 'examples/target.c'
--- examples/target.c	2016-10-21 07:53:23 +0000
+++ examples/target.c	2016-10-28 13:38:48 +0000
@@ -352,7 +352,10 @@
     }
 
     MirSurface *surface = mir_eglapp_native_surface();
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_set_event_handler(surface, on_event, &state);
+#pragma GCC diagnostic pop
 
     while (true)
     {
@@ -421,7 +424,10 @@
         mir_eglapp_swap_buffers();
     }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_set_event_handler(surface, NULL, NULL);
+#pragma GCC diagnostic pop
     mir_eglapp_cleanup();
 
     pthread_join(shutdown_handler_thread, NULL);
 
=== modified file 'examples/tooltip.c'
--- examples/tooltip.c	2016-10-21 07:53:23 +0000
+++ examples/tooltip.c	2016-10-28 13:38:48 +0000
@@ -105,7 +105,10 @@
     MirSurfaceSpec* const spec = mir_connection_create_spec_for_tip(
         connection, width, height, format, parent, &zone, mir_edge_attachment_vertical);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_software);
+#pragma GCC diagnostic pop
     mir_surface_spec_set_name(spec, "tooltip");
     mir_surface_spec_set_min_width(spec, width);
     mir_surface_spec_set_max_width(spec, width);
@@ -115,7 +118,10 @@
     MirSurface* tooltip = mir_surface_create_sync(spec);
     mir_surface_spec_release(spec);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirBufferStream* const bs = mir_surface_get_buffer_stream(tooltip);
+#pragma GCC diagnostic pop
     MirGraphicsRegion buffer;
     mir_buffer_stream_get_graphics_region(bs, &buffer);
 
 
=== modified file 'include/client/mir_toolkit/debug/surface.h'
--- include/client/mir_toolkit/debug/surface.h	2015-02-22 07:46:25 +0000
+++ include/client/mir_toolkit/debug/surface.h	2016-10-28 13:38:48 +0000
@@ -36,16 +36,23 @@
 
 /**
  * Get the ID of the surface's current buffer (only useful for debug purposes)
+ *
+ * \deprecated Not useful anymore
+ *
  *   \pre                         The surface is valid
  *   \param   [in] surface        The surface
  *   \return                      The internal buffer ID of the surface's current buffer.
  *                                This is the buffer that is currently being drawn to,
  *                                and would be returned by mir_surface_get_current_buffer.
  */
+__attribute__ ((deprecated))
 uint32_t mir_debug_surface_current_buffer_id(MirSurface *surface);
 
 /**
  * Get the screen coordinates corresponding to a pair of surface coordinates
+ *
+ * \deprecated Use the "debug_surface_coords" extension instead
+ *
  * \pre                               The surface is valid
  * \param   [in] surface              The surface
  * \param   [in] x, y                 Surface coordinates to map to screen coordinates
@@ -59,6 +66,7 @@
  *          This call will only be interesting for automated testing, where both the client
  *          and shell state is known and constrained.
  */
+__attribute__ ((deprecated))
 bool mir_debug_surface_coords_to_screen(MirSurface* surface,
                                         int x, int y,
                                         int* screen_x, int* screen_y);
 
=== modified file 'include/client/mir_toolkit/mir_buffer_stream.h'
--- include/client/mir_toolkit/mir_buffer_stream.h	2016-10-12 06:03:15 +0000
+++ include/client/mir_toolkit/mir_buffer_stream.h	2016-10-28 13:38:48 +0000
@@ -52,6 +52,8 @@
 /**
  * Create a new buffer stream. 
  *
+ * \deprecated See mir_render_surface_create_buffer_stream
+ *
  * For example, the resulting buffer stream may be used
  * with mir_cursor_configuration_from_buffer_stream, 
  * in order to post images to the system cursor.
@@ -70,6 +72,7 @@
  *
  * \return                    A handle that can be supplied to mir_wait_for
  */
+__attribute__ ((deprecated))
 MirWaitHandle* mir_connection_create_buffer_stream(MirConnection *connection,
     int width, int height,
     MirPixelFormat format,
@@ -83,6 +86,8 @@
  * mir_cursor_configuration_from_buffer_stream in order to post images 
  * to the system cursor.
  *
+ * \deprecated See mir_render_surface_create_buffer_stream_sync
+ *
  * \param [in] connection       A valid connection
  * \param [in] width            Requested buffer width
  * \param [in] height           Requested buffer height
@@ -93,6 +98,7 @@
  * \return                      The new buffer stream. This is guaranteed non-null, 
  *                              but may be invalid in the case of error.
  */
+__attribute__ ((deprecated))
 MirBufferStream* mir_connection_create_buffer_stream_sync(MirConnection *connection,
     int width, int height,
     MirPixelFormat format,
@@ -100,6 +106,9 @@
 
 /**
  * Release the supplied stream and any associated buffer. The returned wait
+ *
+ * \note TODO: Cleanup remove callback?
+ *
  * handle remains valid until the connection to the server is released.
  *   \warning callback could be called from another thread. You must do any
  *            locking appropriate to protect your data accessed in the
@@ -140,17 +149,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);
 
 /**
  * Retrieve the current buffer in "raw" representation.
+ *
+ * \deprecated Replaced by a platform specific extension
+ *
  *   \pre                         The buffer stream is valid
  *   \param [in]  buffer_stream   The buffer stream
  *   \param [out] buffer_package  Structure to be populated
  */
+__attribute__ ((deprecated))
 void mir_buffer_stream_get_current_buffer(MirBufferStream *buffer_stream,
     MirNativeBuffer **buffer_package);
 
@@ -181,35 +192,47 @@
 
 /**
  * Retrieve a buffer stream's graphics region
+ *
  *   \warning Depending on platform, this can map the graphics buffer each
  *            time its called. The region remains mapped until
  *            mir_buffer_stream_swap_buffers().
  *   \pre                          The buffer stream is valid
  *   \param [in] buffer_stream     The buffer stream
  *   \param [out] graphics_region  Structure to be populated
+ *   \return                       True if the region is valid, false otherwise.
  */
-void mir_buffer_stream_get_graphics_region(
+bool mir_buffer_stream_get_graphics_region(
     MirBufferStream *buffer_stream,
     MirGraphicsRegion *graphics_region);
 
 /**
  * Retrieve a window type which may be used by EGL.
+ *
+ * \deprecated No replacement, use MirRenderSurface * directly with EGL
+ *
  *   \param [in] buffer_stream The buffer stream
  *   \return                   An EGLNativeWindowType that the client can use
  */
+__attribute__ ((deprecated))
 MirEGLNativeWindowType mir_buffer_stream_get_egl_native_window(MirBufferStream *buffer_stream);
 
 /**
  * Set the scale associated with all buffers in the stream
+ *
+ * \note May need deprecation - Need a consistent API for high DPI scaling/destination size
+ *
  * \param [in] buffer_stream The buffer stream
  * \param [in] scale         The scale
- * \return                  A handle that can be passed to mir_wait_for
+ * \return                   A handle that can be passed to mir_wait_for
  */
 MirWaitHandle *mir_buffer_stream_set_scale(MirBufferStream* buffer_stream, float scale);
 
 /**
  * Set the scale as in mir_buffer_stream_set_scale(), but also wait for the
  * operation to complete.
+ *
+ * \note May need deprecation - Need a consistent API for high DPI scaling/destination size
+ *
  * \param [in] buffer_stream The buffer stream
  * \param [in] scale         The scale
  */
 
=== modified file 'include/client/mir_toolkit/mir_connection.h'
--- include/client/mir_toolkit/mir_connection.h	2016-10-12 06:03:15 +0000
+++ include/client/mir_toolkit/mir_connection.h	2016-10-28 13:38:48 +0000
@@ -89,20 +89,26 @@
 /**
  * Query platform-specific data and/or file descriptors that are required to
  * initialize GL/EGL features.
+ *
+ * \deprecated Use "get_platform" extension
+ *
  *   \param [in]  connection        The connection
  *   \param [out] platform_package  Structure to be populated
  */
+__attribute__ ((deprecated))
 void mir_connection_get_platform(MirConnection *connection, MirPlatformPackage *platform_package);
 
 /**
  * Query graphics platform module.
  *
+ * \deprecated Use "get_graphics_module" extension
  * \note The char pointers in MirModuleProperties are owned by the connection and should not be
  * freed. They remain valid until the connection is released.
  *
  *   \param [in]  connection    The connection
  *   \param [out] properties    Structure to be populated
  */
+__attribute__ ((deprecated))
 void mir_connection_get_graphics_module(MirConnection *connection, MirModuleProperties *properties);
 
 /**
@@ -146,13 +152,14 @@
 /**
  * Query the display
  *
- *   \deprecated  Use mir_connection_create_display_configuration() instead.
+ *   \deprecated  See mir_connection_create_display_configuration()
  *
  *   \warning return value must be destroyed via mir_display_config_destroy()
  *   \warning may return null if connection is invalid
  *   \param [in]  connection        The connection
  *   \return                        structure that describes the display configuration
  */
+__attribute__ ((deprecated))
 MirDisplayConfiguration* mir_connection_create_display_config(MirConnection *connection);
 
 /**
@@ -189,6 +196,8 @@
 /**
  * Apply the display configuration
  *
+ * \deprecated Replace with mir_connection_apply_display_configuration(...)
+ *
  * The display configuration is applied to this connection only (per-connection
  * configuration) and is invalidated when a hardware change occurs. Clients should
  * register a callback with mir_connection_set_display_config_change_callback()
@@ -199,11 +208,14 @@
  *   \param [in] display_configuration  The display_configuration to apply
  *   \return                            A handle that can be passed to mir_wait_for
  */
+__attribute__ ((deprecated))
 MirWaitHandle* mir_connection_apply_display_config(MirConnection *connection, MirDisplayConfiguration* display_configuration);
 
 /**
  * Set the base display configuration
  *
+ * \deprecated Use mir_connection_preview_base_display_configuration/mir_connection_confirm_base_display_configuration
+ *
  * The base display configuration is the configuration the server applies when
  * there is no active per-connection configuration.
  *
@@ -222,6 +234,7 @@
  *   \param [in] display_configuration  The display_configuration to set as base
  *   \return                            A handle that can be passed to mir_wait_for
  */
+__attribute__ ((deprecated))
 MirWaitHandle* mir_connection_set_base_display_config(
     MirConnection* connection,
     MirDisplayConfiguration const* display_configuration);
@@ -298,6 +311,9 @@
 
 /**
  * Get a display type that can be used for OpenGL ES 2.0 acceleration.
+ *
+ * \deprecated No replacement. Use MirConnection * directly with EGL
+ *
  *   \param [in] connection  The connection
  *   \return                 An EGLNativeDisplayType that the client can use
  */
@@ -306,11 +322,15 @@
 /**
  * Get the exact MirPixelFormat to use in creating a surface for a chosen
  * EGLConfig.
+ *
+ * \deprecated No replacement. Use EGL configs directly.
+ *
  *   \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
  */
+__attribute__ ((deprecated))
 MirPixelFormat mir_connection_get_egl_pixel_format(
     MirConnection *connection, void *egldisplay, void *eglconfig);
 
@@ -336,6 +356,8 @@
 /**
  * Perform a platform specific operation.
  *
+ * \deprecated Use the platform extensions API instead
+ *
  * The MirPlatformMessage used for the request needs to remain valid
  * until this operation finishes.
  *
@@ -345,6 +367,7 @@
  * \param [in,out] context User data passed to the callback function
  * \return                 A handle that can be passed to mir_wait_for
  */
+__attribute__ ((deprecated))
 MirWaitHandle* mir_connection_platform_operation(
     MirConnection* connection,
     MirPlatformMessage const* request,
 
=== modified file 'include/client/mir_toolkit/mir_cursor_configuration.h'
--- include/client/mir_toolkit/mir_cursor_configuration.h	2016-09-08 02:58:56 +0000
+++ include/client/mir_toolkit/mir_cursor_configuration.h	2016-10-28 13:38:48 +0000
@@ -57,6 +57,9 @@
  * Returns a new cursor configuration tied to a given buffer stream.
  * If the configuration is successfully applied buffers from the stream will be used 
  * to fill the system cursor.
+ *
+ * \note Replace MirBufferStream with MirRenderSurface
+ *
  *    \param [in] stream      The buffer stream
  *    \param [in] hotspot_x The x-coordinate to use as the cursor's hotspot.
  *    \param [in] hotspot_y The y-coordinate to use as the cursor's hotspot.
 
=== modified file 'include/client/mir_toolkit/mir_display_configuration.h'
--- include/client/mir_toolkit/mir_display_configuration.h	2016-10-20 15:07:39 +0000
+++ include/client/mir_toolkit/mir_display_configuration.h	2016-10-28 13:38:48 +0000
@@ -50,6 +50,8 @@
  * Get the maximum possible number of simultaneously active outputs this system
  * supports.
  *
+ *  No replacement. API is not useful.
+ *
  * \note There may be restrictions on the configuration required to achieve this
  * many active outputs. Typically the achievable number of simultaneously active
  * outputs is lower than this number.
@@ -58,6 +60,7 @@
  * \returns      The maximum number of simultaneously active outputs
  *               supportable at this time.
  */
+__attribute__ ((deprecated))
 int mir_display_config_get_max_simultaneous_outputs(
     MirDisplayConfig const* config);
 
@@ -263,9 +266,12 @@
 /**
  * Get the textual name of an output type.
  *
+ * \deprecated See mir_output_type_name
+ *
  * \param [in]  type  The MirDisplayOutputType to describe.
  * \returns           The name of the output type.
  */
+__attribute__ ((deprecated))
 char const* mir_display_output_type_name(MirDisplayOutputType type);
 
 /**
 
=== modified file 'include/client/mir_toolkit/mir_platform_message.h'
--- include/client/mir_toolkit/mir_platform_message.h	2014-12-10 11:02:04 +0000
+++ include/client/mir_toolkit/mir_platform_message.h	2016-10-28 13:38:48 +0000
@@ -48,16 +48,22 @@
  * Each call to mir_platform_message_create() should be matched by
  * a call to mir_platform_message_release() to avoid memory leaks.
  *
+ * \deprecated Use platform extensions API
+ *
  *   \param [in] opcode    The platform message opcode
  *   \return               The created MirPlatformMessage
  */
+__attribute__ ((deprecated))
 MirPlatformMessage* mir_platform_message_create(unsigned int opcode);
 
 /**
  * Release a platform message.
  *
+ * \deprecated Use platform extensions API
+ *
  *   \param [in] message   The MirPlatformMessage
  */
+__attribute__ ((deprecated))
 void mir_platform_message_release(MirPlatformMessage const* message);
 
 /**
@@ -65,10 +71,13 @@
  *
  * The data is copied into the message.
  *
+ * \deprecated Use platform extensions API
+ *
  *   \param [in] message    The MirPlatformMessage
  *   \param [in] data       Pointer to the data
  *   \param [in] data_size  The size of the data in bytes
  */
+__attribute__ ((deprecated))
 void mir_platform_message_set_data(MirPlatformMessage* message, void const* data, size_t data_size);
 
 /**
@@ -82,18 +91,24 @@
  * is released. The caller is responsible for closing the fds when the message
  * doesn't need them anymore (see also mir_platform_message_get_fds()).
  *
+ * \deprecated Use platform extensions API
+ *
  *   \param [in] message   The MirPlatformMessage
  *   \param [in] fds       Pointer to the array of fds
  *   \param [in] num_fds   The number of fds
  */
+__attribute__ ((deprecated))
 void mir_platform_message_set_fds(MirPlatformMessage* message, int const* fds, size_t num_fds);
 
 /**
  * Get the opcode of a message.
  *
+ * \deprecated Use platform extensions API
+ *
  *   \param [in] message   The MirPlatformMessage
  *   \return               The opcode
  */
+__attribute__ ((deprecated))
 unsigned int mir_platform_message_get_opcode(MirPlatformMessage const* message);
 
 /**
@@ -103,9 +118,11 @@
  * valid only as long as the message is valid and mir_platform_set_data() is
  * not called. You must not change or free the returned data array.
  *
+ * \deprecated Use platform extensions API
  *   \param [in] message   The MirPlatformMessage
  *   \return               The data
  */
+__attribute__ ((deprecated))
 MirPlatformMessageData mir_platform_message_get_data(MirPlatformMessage const* message);
 
 /**
@@ -119,9 +136,11 @@
  * message is released. Users are responsible for getting and closing the
  * fds to avoid leaks.
  *
+ * \deprecated Use platform extensions API
  *   \param [in] message   The MirPlatformMessage
  *   \return               The fds
  */
+__attribute__ ((deprecated))
 MirPlatformMessageFds mir_platform_message_get_fds(MirPlatformMessage const* message);
 
 #ifdef __cplusplus
 
=== modified file 'include/client/mir_toolkit/mir_screencast.h'
--- include/client/mir_toolkit/mir_screencast.h	2016-07-18 07:38:38 +0000
+++ include/client/mir_toolkit/mir_screencast.h	2016-10-28 13:38:48 +0000
@@ -89,10 +89,13 @@
 /**
  * Set the requested number of buffers to use.
  *
+ * \deprecated See mir_screencast_capture_to_buffer
+ *
  * \param [in] spec     Specification to mutate
  * \param [in] nbuffers The number of buffers to allocate for screencasting
  *
  */
+__attribute__ ((deprecated))
 void mir_screencast_spec_set_number_of_buffers(MirScreencastSpec* spec, unsigned int nbuffers);
 
 /**
@@ -135,11 +138,14 @@
  *
  * A screencast allows clients to read the contents of the screen.
  *
+ * \deprecated See mir_screencast_create_sync
+ *
  *   \warning This request may be denied.
  *   \param [in] connection  The connection
  *   \param [in] parameters  The screencast parameters
  *   \return                 The resulting screencast
  */
+__attribute__ ((deprecated))
 MirScreencast* mir_connection_create_screencast_sync(
     MirConnection* connection,
     MirScreencastParameters* parameters);
@@ -155,8 +161,11 @@
  * Retrieve the MirBufferStream associated with a screencast 
  * (to advance buffers, obtain EGLNativeWindowType, etc...)
  * 
+ * \deprecated See mir_screencast_capture_to_buffer
+ *
  *   \param[in] screencast The screencast
  */
+__attribute__ ((deprecated))
 MirBufferStream* mir_screencast_get_buffer_stream(MirScreencast* screencast);
 
 #ifdef __cplusplus
 
=== modified file 'include/client/mir_toolkit/mir_surface.h'
--- include/client/mir_toolkit/mir_surface.h	2016-10-12 06:03:15 +0000
+++ include/client/mir_toolkit/mir_surface.h	2016-10-28 13:38:48 +0000
@@ -232,6 +232,7 @@
 /**
  * Create a surface from a given specification
  *
+ * \note There is no implicit buffer stream creation. See mir_xxx to attach content.
  *
  * \param [in] requested_specification  Specification of the attributes for the created surface
  * \param [in] callback                 Callback function to be invoked when creation is complete
@@ -411,6 +412,9 @@
 
 /**
  * Set the requested pixel format.
+ *
+ * \deprecated No replacement. This property is now part of the backing content
+ *
  * \param [in] spec     Specification to mutate
  * \param [in] format   Requested pixel format
  *
@@ -418,10 +422,14 @@
  *          If the server is unable to create a surface with this pixel format at
  *          the point mir_surface_create() is called it will instead return an invalid surface.
  */
+__attribute__ ((deprecated))
 void mir_surface_spec_set_pixel_format(MirSurfaceSpec* spec, MirPixelFormat format);
 
 /**
  * Set the requested buffer usage.
+ *
+ * \deprecated No replacement. This property is now part of the backing content
+ *
  * \param [in] spec     Specification to mutate
  * \param [in] usage    Requested buffer usage
  *
@@ -429,13 +437,15 @@
  *          If the server is unable to create a surface with this buffer usage at
  *          the point mir_surface_create() is called it will instead return an invalid surface.
  */
+__attribute__ ((deprecated))
 void mir_surface_spec_set_buffer_usage(MirSurfaceSpec* spec, MirBufferUsage usage);
 
 /**
  * \param [in] spec         Specification to mutate
  * \param [in] output_id    ID of output to place surface on. From MirDisplayOutput.output_id
  *
- * \note    If this call returns %true then a valid surface returned from mir_surface_create() is
+ * \note   Update comment below
+ * \note    If this call returns %t then a valid surface returned from mir_surface_create() is
  *          guaranteed to be fullscreen on the specified output. An invalid surface is returned
  *          if the server unable to, or policy prevents it from, honouring this request.
  */
@@ -501,6 +511,8 @@
  * but is in the list will be associated with the surface.
  * Streams set a displacement from the top-left corner of the surface.
  * 
+ * \deprecated Replaced by mir_surface_set_render_surfaces
+ *
  * \warning disassociating streams from the surface will not release() them.
  * \warning It is wiser to arrange the streams within the bounds of the
  *          surface the spec is applied to. Shells can define their own
@@ -510,6 +522,7 @@
  * \param [in] streams     An array of non-null streams info.
  * \param [in] num_streams The number of elements in the streams array.
  */
+__attribute__ ((deprecated))
 void mir_surface_spec_set_streams(MirSurfaceSpec* spec,
                                   MirBufferStreamInfo* streams,
                                   unsigned int num_streams);
@@ -600,6 +613,9 @@
 
 /**
  * Set the event handler to be called when events arrive for a surface.
+ *
+ * \deprecated Use mir_surface_spec_set_event_handler instead.
+ *
  *   \warning event_handler could be called from another thread. You must do
  *            any locking appropriate to protect your data accessed in the
  *            callback. There is also a chance that different events will be
@@ -609,6 +625,7 @@
  *   \param [in] callback       The callback function
  *   \param [in] context        Additional argument to be passed to callback
  */
+__attribute__ ((deprecated))
 void mir_surface_set_event_handler(MirSurface *surface,
                                    mir_surface_event_callback callback,
                                    void* context);
@@ -626,6 +643,7 @@
  *            be removed, and this function will return NULL.
  *   \param[in] surface The surface
  */
+__attribute__ ((deprecated))
 MirBufferStream* mir_surface_get_buffer_stream(MirSurface *surface);
 
 /**
@@ -649,10 +667,14 @@
 
 /**
  * Get a surface's parameters.
+ *
+ * \deprecated MirSurfaceParameters is obsolete.
+ *
  *   \pre                     The surface is valid
  *   \param [in] surface      The surface
  *   \param [out] parameters  Structure to be populated
  */
+__attribute__ ((deprecated))
 void mir_surface_get_parameters(MirSurface *surface, MirSurfaceParameters *parameters);
 
 /**
@@ -681,29 +703,44 @@
 
 /**
  * Get the type (purpose) of a surface.
+ *
+ * \deprecated ? Mostly a convenience function. Look for MirSurfaceType events instead?
+ *
  *   \param [in] surface  The surface to query
  *   \return              The type of the surface
  */
+__attribute__ ((deprecated))
 MirSurfaceType mir_surface_get_type(MirSurface *surface);
 
 /**
  * Change the state of a surface.
+ *
+ * \deprecated Use mir_surface_apply_spec instead
+ *
  *   \param [in] surface  The surface to operate on
  *   \param [in] state    The new state of the surface
  *   \return              A wait handle that can be passed to mir_wait_for
  */
+__attribute__ ((deprecated))
 MirWaitHandle* mir_surface_set_state(MirSurface *surface,
                                      MirSurfaceState state);
 
 /**
  * Get the current state of a surface.
+ *
+ * \deprecated ? Mostly a convenience function. Look for MirSurfaceState events instead?
+ *
  *   \param [in] surface  The surface to query
  *   \return              The state of the surface
  */
+__attribute__ ((deprecated))
 MirSurfaceState mir_surface_get_state(MirSurface *surface);
 
 /**
  * Set the swapinterval for the default stream.
+ *
+ * \deprecated No replacement. This is not a property of the surface anymore.
+ *
  *   \warning EGL users should use eglSwapInterval directly.
  *   \warning Only swapinterval of 0 or 1 is supported.
  *   \warning If the surface was created with, or modified to have a
@@ -716,27 +753,39 @@
  *   \return              A wait handle that can be passed to mir_wait_for,
  *                        or NULL if the interval could not be supported
  */
+__attribute__ ((deprecated))
 MirWaitHandle* mir_surface_set_swapinterval(MirSurface* surface, int interval);
 
 /**
  * Query the swapinterval that the surface is operating with.
  * The default interval is 1.
+ *
+ * \deprecated No replacement. This is not a property of the surface anymore.
+ *
  *   \param [in] surface  The surface to operate on
  *   \return              The swapinterval value that the client is operating with.
  *                        Returns -1 if surface is invalid, or if the default stream
  *                        was removed by use of mir_surface_spec_set_streams().
  */
+__attribute__ ((deprecated))
 int mir_surface_get_swapinterval(MirSurface* surface);
 
 /**
  * Query the DPI value of the surface (dots per inch). This will vary depending
  * on the physical display configuration and where the surface is within it.
+ *
+ * \deprecated ? Mostly a convenience function - Use dpi events instead?
+ *
  *   \return  The DPI of the surface, or zero if unknown.
  */
+__attribute__ ((deprecated))
 int mir_surface_get_dpi(MirSurface* surface);
     
 /**
  * Query the focus state for a surface.
+ *
+ * \deprecated
+ *
  *   \param [in] surface The surface to operate on
  *   \return             The focus state of said surface
  */
@@ -744,6 +793,9 @@
 
 /**
  * Query the visibility state for a surface.
+ *
+ * \deprecated
+ *
  *   \param [in] surface The surface to operate on
  *   \return             The visibility state of said surface
  */
@@ -752,6 +804,9 @@
 /**
  * Choose the cursor state for a surface: whether a cursor is shown, 
  * and which cursor if so.
+ *
+ * \deprecated Use mir_surface_apply_spec instead
+ *
  *    \param [in] surface    The surface to operate on
  *    \param [in] parameters The configuration parameters obtained
  *                           from mir_cursor* family of functions.
@@ -759,30 +814,43 @@
  *                           or NULL if parameters is invalid.
  *
  */
+__attribute__ ((deprecated))
 MirWaitHandle* mir_surface_configure_cursor(MirSurface *surface, MirCursorConfiguration const* parameters);
 
 /**
  * Get the orientation of a surface.
+ *
+ * \deprecated ? Mostly a convenience function - Use dpi events instead?
+ *
  *   \param [in] surface  The surface to query
  *   \return              The orientation of the surface
  */
+__attribute__ ((deprecated))
 MirOrientation mir_surface_get_orientation(MirSurface *surface);
 
 /**
  * Request to set the preferred orientations of a surface.
  * The request may be rejected by the server; to check wait on the
  * result and check the applied value using mir_surface_get_preferred_orientation
+ *
+ * \deprecated Use mir_surface_apply_spec instead
+ *
  *   \param [in] surface     The surface to operate on
  *   \param [in] orientation The preferred orientation modes
  *   \return                 A wait handle that can be passed to mir_wait_for
  */
+__attribute__ ((deprecated))
 MirWaitHandle* mir_surface_set_preferred_orientation(MirSurface *surface, MirOrientationMode orientation);
 
 /**
  * Get the preferred orientation modes of a surface.
+ *
+ * \deprecated No alternative as client should already know what the preferred orientation the surface is set to.
+ *
  *   \param [in] surface  The surface to query
  *   \return              The preferred orientation modes
  */
+__attribute__ ((deprecated))
 MirOrientationMode mir_surface_get_preferred_orientation(MirSurface *surface);
 
 /**
 
=== modified file 'include/core/mir_toolkit/common.h'
--- include/core/mir_toolkit/common.h	2016-10-20 15:05:56 +0000
+++ include/core/mir_toolkit/common.h	2016-10-28 13:38:48 +0000
@@ -349,6 +349,7 @@
 {
     mir_shell_chrome_normal,
     mir_shell_chrome_low,
+    mir_shell_chrome_none
 } MirShellChrome;
 
 /**
 
=== modified file 'playground/eglflash_render_surface.c'
--- playground/eglflash_render_surface.c	2016-10-12 21:49:18 +0000
+++ playground/eglflash_render_surface.c	2016-10-28 13:38:48 +0000
@@ -104,8 +104,11 @@
     CHECK(ok, "Could not eglChooseConfig");
     CHECK(neglconfigs > 0, "No EGL config available");
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirPixelFormat pixel_format =
         mir_connection_get_egl_pixel_format(connection, egldisplay, eglconfig);
+#pragma GCC diagnostic pop
 
     printf("Mir chose pixel format %d.\n", pixel_format);
 
@@ -114,7 +117,10 @@
     CHECK(spec, "Can't create a surface spec");
 
     mir_surface_spec_set_name(spec, appname);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
 
     render_surface = mir_connection_create_render_surface(connection);
     CHECK(mir_render_surface_is_valid(render_surface), "could not create render surface");
 
=== modified file 'playground/render_surface.cpp'
--- playground/render_surface.cpp	2016-10-12 21:49:18 +0000
+++ playground/render_surface.cpp	2016-10-28 13:38:48 +0000
@@ -206,7 +206,10 @@
         pixel_format);
 
     mir_surface_spec_set_name(spec, "Stream");
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_software);
+#pragma GCC diagnostic pop
 
     auto buffer_stream =
         mir_render_surface_create_buffer_stream_sync(render_surface,
 
=== modified file 'src/client/mir_buffer_stream_api.cpp'
--- src/client/mir_buffer_stream_api.cpp	2016-10-13 16:32:59 +0000
+++ src/client/mir_buffer_stream_api.cpp	2016-10-28 13:38:48 +0000
@@ -72,8 +72,11 @@
 try
 {
     MirBufferStream *stream = nullptr;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_connection_create_buffer_stream(connection, width, height, format, buffer_usage,
         reinterpret_cast<mir_buffer_stream_callback>(assign_result), &stream)->wait_for_all();
+#pragma GCC diagnostic push
     return stream;
 }
 catch (std::exception const& ex)
@@ -148,7 +151,7 @@
         nullptr));
 }
 
-void mir_buffer_stream_get_graphics_region(
+bool mir_buffer_stream_get_graphics_region(
     MirBufferStream *buffer_stream,
     MirGraphicsRegion *region_out)
 try
@@ -161,10 +164,13 @@
     region_out->stride = secured_region->stride.as_uint32_t();
     region_out->pixel_format = secured_region->format;
     region_out->vaddr = secured_region->vaddr.get();
+
+    return true;
 }
 catch (std::exception const& ex)
 {
     MIR_LOG_UNCAUGHT_EXCEPTION(ex);
+    return false;
 }
 
 MirEGLNativeWindowType mir_buffer_stream_get_egl_native_window(MirBufferStream* buffer_stream)
 
=== modified file 'src/client/mir_connection.cpp'
--- src/client/mir_connection.cpp	2016-10-21 09:20:55 +0000
+++ src/client/mir_connection.cpp	2016-10-28 13:38:48 +0000
@@ -643,10 +643,15 @@
 void MirConnection::done_platform_operation(
     mir_platform_operation_callback callback, void* context)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto reply = mir_platform_message_create(platform_operation_reply->opcode());
+#pragma GCC diagnostic pop
 
     set_error_message(platform_operation_reply->error());
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_platform_message_set_data(
         reply,
         platform_operation_reply->data().data(),
@@ -656,6 +661,7 @@
         reply,
         platform_operation_reply->fd().data(),
         platform_operation_reply->fd().size());
+#pragma GCC diagnostic pop
 
     callback(this, reply, context);
 
@@ -676,9 +682,12 @@
 
     mp::PlatformOperationMessage protobuf_request;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     protobuf_request.set_opcode(mir_platform_message_get_opcode(request));
     auto const request_data = mir_platform_message_get_data(request);
     auto const request_fds = mir_platform_message_get_fds(request);
+#pragma GCC diagnostic pop
 
     protobuf_request.set_data(request_data.data, request_data.size);
     for (size_t i = 0; i != request_fds.num_fds; ++i)
 
=== modified file 'src/platforms/android/utils/test_android_hardware_sanity.cpp'
--- src/platforms/android/utils/test_android_hardware_sanity.cpp	2016-10-12 06:56:27 +0000
+++ src/platforms/android/utils/test_android_hardware_sanity.cpp	2016-10-28 13:38:48 +0000
@@ -117,15 +117,21 @@
 
     auto const spec = mir_connection_create_spec_for_normal_surface(
         connection, test_width, test_height, mir_pixel_format_abgr_8888);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_software);
+#pragma GCC diagnostic pop
     auto const surface = mir_surface_create_sync(spec);
     mir_surface_spec_release(spec);
 
     EXPECT_THAT(surface, IsValid());
     MirGraphicsRegion graphics_region;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_buffer_stream_get_graphics_region(mir_surface_get_buffer_stream(surface), &graphics_region);
     draw_pattern.draw(graphics_region);
     mir_buffer_stream_swap_buffers_sync(mir_surface_get_buffer_stream(surface));
+#pragma GCC diagnostic pop
 
     auto scene = runner->config.the_scene();
     auto seq = scene->scene_elements_for(this);
@@ -178,8 +184,11 @@
 
     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_surface_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);
 
=== modified file 'src/platforms/mesa/client/client_platform.cpp'
--- src/platforms/mesa/client/client_platform.cpp	2016-10-12 06:03:15 +0000
+++ src/platforms/mesa/client/client_platform.cpp	2016-10-28 13:38:48 +0000
@@ -121,8 +121,11 @@
 MirPlatformMessage* mclm::ClientPlatform::platform_operation(
     MirPlatformMessage const* msg)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto const op = mir_platform_message_get_opcode(msg);
     auto const msg_data = mir_platform_message_get_data(msg);
+#pragma GCC diagnostic pop
 
     if (op == MirMesaPlatformOperation::set_gbm_device &&
         msg_data.size == sizeof(MirMesaSetGBMDeviceRequest))
@@ -134,8 +137,11 @@
 
         static int const success{0};
         MirMesaSetGBMDeviceResponse const response{success};
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         auto const response_msg = mir_platform_message_create(op);
         mir_platform_message_set_data(response_msg, &response, sizeof(response));
+#pragma GCC diagnostic pop
 
         return response_msg;
     }
 
=== modified file 'src/server/graphics/nested/mir_client_host_connection.cpp'
--- src/server/graphics/nested/mir_client_host_connection.cpp	2016-10-12 06:03:15 +0000
+++ src/server/graphics/nested/mir_client_host_connection.cpp	2016-10-28 13:38:48 +0000
@@ -128,13 +128,19 @@
 
     EGLNativeWindowType egl_native_window() override
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         return reinterpret_cast<EGLNativeWindowType>(
             mir_buffer_stream_get_egl_native_window(mir_surface_get_buffer_stream(mir_surface)));
+#pragma GCC diagnostic pop
     }
 
     void set_event_handler(mir_surface_event_callback cb, void* context) override
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(mir_surface, cb, context);
+#pragma GCC diagnostic pop
     }
 
     void set_cursor_image(mg::CursorImage const& image)
@@ -165,12 +171,15 @@
 
         if (new_cursor)
         {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             cursor = mir_connection_create_buffer_stream_sync(
                 mir_connection,
                 image_width,
                 image_height,
                 cursor_pixel_format,
                 mir_buffer_usage_software);
+#pragma GCC diagnostic pop
 
             mir_buffer_stream_get_graphics_region(cursor, &g);
         }
@@ -186,7 +195,10 @@
             auto conf = mir_cursor_configuration_from_buffer_stream(
                 cursor, cursor_hotspot.dx.as_int(), cursor_hotspot.dy.as_int());
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_configure_cursor(mir_surface, conf);
+#pragma GCC diagnostic pop
             mir_cursor_configuration_destroy(conf);
         }
     }
@@ -196,7 +208,10 @@
         if (cursor) { mir_buffer_stream_release_sync(cursor); cursor = nullptr; }
 
         auto conf = mir_cursor_configuration_from_name(mir_disabled_cursor_name);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_configure_cursor(mir_surface, conf);
+#pragma GCC diagnostic pop
         mir_cursor_configuration_destroy(conf);
     }
 
@@ -210,6 +225,8 @@
 class MirClientHostStream : public mgn::HostStream
 {
 public:
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirClientHostStream(MirConnection* connection, mg::BufferProperties const& properties) :
         stream(mir_connection_create_buffer_stream_sync(connection,
             properties.size.width.as_int(), properties.size.height.as_int(),
@@ -217,6 +234,7 @@
             (properties.usage == mg::BufferUsage::hardware) ? mir_buffer_usage_hardware : mir_buffer_usage_software))
     {
     }
+#pragma GCC diagnostic pop
 
     ~MirClientHostStream()
     {
@@ -225,7 +243,10 @@
 
     EGLNativeWindowType egl_native_window() const override
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         return reinterpret_cast<EGLNativeWindowType>(mir_buffer_stream_get_egl_native_window(stream));
+#pragma GCC diagnostic pop
     }
 
     MirBufferStream* handle() const override
@@ -314,7 +335,10 @@
 std::vector<int> mgn::MirClientHostConnection::platform_fd_items()
 {
     MirPlatformPackage pkg;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_connection_get_platform(mir_connection, &pkg);
+#pragma GCC diagnostic pop
     return std::vector<int>(pkg.fd, pkg.fd + pkg.fd_items);
 }
 
@@ -327,12 +351,15 @@
 auto mgn::MirClientHostConnection::create_display_config()
     -> std::shared_ptr<MirDisplayConfiguration>
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     return std::shared_ptr<MirDisplayConfiguration>(
         mir_connection_create_display_config(mir_connection),
         [] (MirDisplayConfiguration* c)
         {
             if (c) mir_display_config_destroy(c);
         });
+#pragma GCC diagnostic pop
 }
 
 void mgn::MirClientHostConnection::set_display_config_change_callback(
@@ -347,7 +374,10 @@
 void mgn::MirClientHostConnection::apply_display_config(
     MirDisplayConfiguration& display_config)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_wait_for(mir_connection_apply_display_config(mir_connection, &display_config));
+#pragma GCC diagnostic pop
 }
 
 std::shared_ptr<mgn::HostSurface> mgn::MirClientHostConnection::create_surface(
@@ -369,10 +399,16 @@
         mir_buffer_usage_hardware : mir_buffer_usage_software; 
 
     mir_surface_spec_set_name(spec.get(), name);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(spec.get(), usage);
+#pragma GCC diagnostic pop
     mir_surface_spec_set_fullscreen_on_output(spec.get(), output_id);
     MirBufferStreamInfo info { stream->handle(), displacement.dx.as_int(), displacement.dy.as_int() };
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_streams(spec.get(), &info, 1);
+#pragma GCC diagnostic pop
 
     auto surf = std::shared_ptr<MirClientHostSurface>(
         new MirClientHostSurface(mir_connection, spec.get()),
@@ -394,6 +430,8 @@
 mg::PlatformOperationMessage mgn::MirClientHostConnection::platform_operation(
     unsigned int op, mg::PlatformOperationMessage const& request)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto const msg = mir::raii::deleter_for(
         mir_platform_message_create(op),
         mir_platform_message_release);
@@ -413,6 +451,7 @@
 
     auto reply_data = mir_platform_message_get_data(reply.get());
     auto reply_fds = mir_platform_message_get_fds(reply.get());
+#pragma GCC diagnostic pop
 
     return PlatformOperationMessage{
         {static_cast<uint8_t const*>(reply_data.data),
@@ -445,7 +484,10 @@
 {
     MirModuleProperties properties = { nullptr, 0, 0, 0, nullptr };
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_connection_get_graphics_module(mir_connection, &properties);
+#pragma GCC diagnostic pop
 
     if (properties.filename == nullptr)
     {
 
=== modified file 'src/utils/out.c'
--- src/utils/out.c	2016-10-12 06:03:15 +0000
+++ src/utils/out.c	2016-10-28 13:38:48 +0000
@@ -84,7 +84,11 @@
 
     printf("Connected to server: %s\n", server ? server : "<default>");
 
+    // TODO Update to the new DisplayConfig API
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirDisplayConfiguration *conf = mir_connection_create_display_config(conn);
+#pragma GCC diagnostic pop
     if (conf == NULL)
     {
         fprintf(stderr, "Failed to get display configuration (!?)\n");
@@ -102,11 +106,14 @@
         {
             const MirDisplayOutput *out = conf->outputs + i;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             printf("Output %u: Card %u, %s, %s",
                    out->output_id,
                    out->card_id,
                    mir_display_output_type_name(out->type),
                    out->connected ? "connected" : "disconnected");
+#pragma GCC diagnostic pop
 
             if (out->connected)
             {
 
=== modified file 'src/utils/ping.c'
--- src/utils/ping.c	2015-06-17 05:20:42 +0000
+++ src/utils/ping.c	2016-10-28 13:38:48 +0000
@@ -86,7 +86,10 @@
                                                  &valid_formats);
 
     MirSurfaceSpec *spec = mir_connection_create_spec_for_normal_surface(conn, 1, 1, formats[0]);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_software);
+#pragma GCC diagnostic pop
     mir_surface_spec_set_name(spec, "ping");
 
     MirSurface *surf = mir_surface_create_sync(spec);
@@ -116,7 +119,10 @@
         long long start, duration;
 
         start = now();
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_wait_for(mir_surface_set_preferred_orientation(surf, types[t]));
+#pragma GCC diagnostic pop
         duration = now() - start;
         t ^= 1;
 
 
=== modified file 'src/utils/screencast.cpp'
--- src/utils/screencast.cpp	2015-07-16 07:03:19 +0000
+++ src/utils/screencast.cpp	2016-10-28 13:38:48 +0000
@@ -326,9 +326,12 @@
             reinterpret_cast<EGLNativeDisplayType>(
                 mir_connection_get_egl_native_display(connection));
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         auto native_window =
             reinterpret_cast<EGLNativeWindowType>(
                 mir_buffer_stream_get_egl_native_window(buffer_stream));
+#pragma GCC diagnostic push
 
         egl_display = eglGetDisplay(native_display);
 
@@ -515,9 +518,12 @@
         throw std::runtime_error(std::string(msg));
     }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto const display_config = mir::raii::deleter_for(
         mir_connection_create_display_config(connection.get()),
         &mir_display_config_destroy);
+#pragma GCC diagnostic push
 
     if (display_config == nullptr)
         throw std::runtime_error("Failed to get display configuration\n");
@@ -535,7 +541,10 @@
     if (mir_screencast == nullptr)
         throw std::runtime_error("Failed to create screencast");
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto buffer_stream = mir_screencast_get_buffer_stream(mir_screencast.get());
+#pragma GCC diagnostic push
     if (buffer_stream == nullptr)
         throw std::runtime_error("Failed to obtain buffer stream from screencast");
 
 
=== modified file 'src/utils/vanity.c'
--- src/utils/vanity.c	2016-10-21 07:53:23 +0000
+++ src/utils/vanity.c	2016-10-28 13:38:48 +0000
@@ -718,7 +718,10 @@
         false
     };
     MirSurface* surface = mir_eglapp_native_surface();
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_set_event_handler(surface, on_event, &state);
+#pragma GCC diagnostic pop
 
     GLint tint = glGetUniformLocation(prog, "tint");
 
@@ -840,7 +843,10 @@
         last_swap_time = swap_time;
     }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_set_event_handler(surface, NULL, NULL);
+#pragma GCC diagnostic pop
     mir_eglapp_cleanup();
 
     pthread_join(capture_thread, NULL);
 
=== modified file 'tests/acceptance-tests/test_buffer_stream_arrangement.cpp'
--- tests/acceptance-tests/test_buffer_stream_arrangement.cpp	2016-10-12 06:03:15 +0000
+++ tests/acceptance-tests/test_buffer_stream_arrangement.cpp	2016-10-28 13:38:48 +0000
@@ -66,6 +66,8 @@
 
 struct Stream
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     Stream(MirConnection* connection, geom::Rectangle rect) :
         stream(mir_connection_create_buffer_stream_sync(
             connection,
@@ -79,6 +81,7 @@
     {
         mir_buffer_stream_swap_buffers_sync(stream);
     }
+#pragma GCC diagnostic pop
 
     ~Stream()
     {
@@ -237,8 +240,11 @@
     auto const spec = mir_connection_create_spec_for_normal_surface(
         connection, surface_size.width.as_int(), surface_size.height.as_int(), mir_pixel_format_abgr_8888);
     mir_surface_spec_set_name(spec, "BufferStreamArrangement.can_be_specified_when_creating_surface");
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
     mir_surface_spec_set_streams(spec, infos.data(), infos.size());
+#pragma GCC diagnostic pop
 
     surface = mir_surface_create_sync(spec);
     mir_surface_spec_release(spec);
@@ -259,7 +265,10 @@
     }
 
     auto change_spec = mir_connection_create_spec_for_changes(connection);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_streams(change_spec, infos.data(), infos.size());
+#pragma GCC diagnostic pop
     mir_surface_apply_spec(surface, change_spec);
     mir_surface_spec_release(change_spec);
 
@@ -294,7 +303,10 @@
 
     auto spec = mir_connection_create_spec_for_normal_surface(
         connection, 100, 100, mir_pixel_format_abgr_8888);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_streams(spec, infos.data(), infos.size());
+#pragma GCC diagnostic pop
     auto surface = mir_surface_create_sync(spec);
     mir_surface_spec_release(spec);
     EXPECT_TRUE(mir_surface_is_valid(surface));
@@ -304,7 +316,10 @@
 TEST_F(BufferStreamArrangement, when_non_default_streams_are_set_surface_get_stream_gives_null)
 {
     using namespace testing;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     EXPECT_TRUE(mir_buffer_stream_is_valid(mir_surface_get_buffer_stream(surface)));
+#pragma GCC diagnostic pop
 
     std::vector<MirBufferStreamInfo> infos(streams.size());
     auto i = 0u;
@@ -316,9 +331,12 @@
             stream->position().y.as_int()};
     }
     auto change_spec = mir_connection_create_spec_for_changes(connection);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_streams(change_spec, infos.data(), infos.size());
     mir_surface_apply_spec(surface, change_spec);
     mir_surface_spec_release(change_spec);
 
     EXPECT_THAT(mir_surface_get_buffer_stream(surface), Eq(nullptr));
+#pragma GCC diagnostic pop
 }
 
=== modified file 'tests/acceptance-tests/test_client_cookie.cpp'
--- tests/acceptance-tests/test_client_cookie.cpp	2016-07-18 07:38:38 +0000
+++ tests/acceptance-tests/test_client_cookie.cpp	2016-10-28 13:38:48 +0000
@@ -65,7 +65,10 @@
         surface = mir_surface_create_sync(spec);
         mir_surface_spec_release(spec);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers_sync(mir_surface_get_buffer_stream(surface));
+#pragma GCC diagnostic pop
 
         ready_to_accept_events.wait_for(max_wait);
         if (!ready_to_accept_events.raised())
 
=== modified file 'tests/acceptance-tests/test_client_focus_notification.cpp'
--- tests/acceptance-tests/test_client_focus_notification.cpp	2016-07-18 07:38:38 +0000
+++ tests/acceptance-tests/test_client_focus_notification.cpp	2016-10-28 13:38:48 +0000
@@ -46,7 +46,10 @@
         surface = mir_surface_create_sync(spec);
         mir_surface_spec_release(spec);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers_sync(mir_surface_get_buffer_stream(surface));
+#pragma GCC diagnostic pop
     }
 
     ~FocusSurface()
 
=== modified file 'tests/acceptance-tests/test_client_input.cpp'
--- tests/acceptance-tests/test_client_input.cpp	2016-10-12 06:03:15 +0000
+++ tests/acceptance-tests/test_client_input.cpp	2016-10-28 13:38:48 +0000
@@ -97,10 +97,12 @@
         if (!mir_surface_is_valid(surface))
             BOOST_THROW_EXCEPTION(std::runtime_error{std::string{"Failed creating a surface: "}+
                 mir_surface_get_error_message(surface)});
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface, handle_event, this);
         mir_buffer_stream_swap_buffers_sync(
             mir_surface_get_buffer_stream(surface));
+#pragma GCC diagnostic pop
 
         ready_to_accept_events.wait_for(4s);
         if (!ready_to_accept_events.raised())
@@ -144,7 +146,10 @@
         // Remove the event handler to avoid handling spurious events unrelated
         // to the tests (e.g. pointer leave events when the surface is destroyed),
         // which can cause test expectations to fail.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface, null_event_handler, nullptr);
+#pragma GCC diagnostic pop
         mir_surface_release_sync(surface);
         mir_connection_release(connection);
     }
 
=== modified file 'tests/acceptance-tests/test_client_library.cpp'
--- tests/acceptance-tests/test_client_library.cpp	2016-08-09 14:32:31 +0000
+++ tests/acceptance-tests/test_client_library.cpp	2016-10-28 13:38:48 +0000
@@ -113,6 +113,8 @@
     {
         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,
@@ -121,6 +123,7 @@
                                             mir_surface_state_fullscreen));
             mir_wait_for_one(mir_surface_set_state(surf,
                                             mir_surface_state_minimized));
+#pragma GCC diagnostic pop
         }
     }
     
@@ -227,7 +230,10 @@
 
     auto spec = mir_connection_create_spec_for_normal_surface(connection, request_width,
                                                               request_height, request_format);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(spec, request_buffer_usage);
+#pragma GCC diagnostic pop
     surface = mir_surface_create_sync(spec);
     mir_surface_spec_release(spec);
 
@@ -236,7 +242,10 @@
     EXPECT_THAT(mir_surface_get_error_message(surface), StrEq(""));
 
     MirSurfaceParameters response_params;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_get_parameters(surface, &response_params);
+#pragma GCC diagnostic pop
     EXPECT_EQ(request_width, response_params.width);
     EXPECT_EQ(request_height, response_params.height);
     EXPECT_EQ(request_format, response_params.pixel_format);
@@ -257,6 +266,8 @@
     mir_wait_for(mir_surface_create(spec, create_surface_callback, this));
     mir_surface_spec_release(spec);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     EXPECT_THAT(mir_surface_get_state(surface), Eq(mir_surface_state_restored));
 
     mir_wait_for(mir_surface_set_state(surface, mir_surface_state_fullscreen));
@@ -279,6 +290,7 @@
         mir_wait_for(mir_surface_set_state(surface, mir_surface_state_fullscreen));
         ASSERT_THAT(mir_surface_get_state(surface), Eq(mir_surface_state_fullscreen));
     }
+#pragma GCC diagnostic pop
 
     mir_surface_release_sync(surface);
     mir_connection_release(connection);
@@ -404,7 +416,10 @@
     surface = mir_surface_create_sync(spec);
     mir_surface_spec_release(spec);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto const buffer_stream = mir_surface_get_buffer_stream(surface);
+#pragma GCC diagnostic pop
 
     MirGraphicsRegion graphics_region;
     mir_buffer_stream_get_graphics_region(buffer_stream, &graphics_region);
@@ -427,7 +442,10 @@
     mir_surface_spec_release(spec);
 
     // Expect zero (not wired up to detect the physical display yet)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     EXPECT_THAT(mir_surface_get_dpi(surface), Eq(0));
+#pragma GCC diagnostic pop
 
     mir_surface_release_sync(surface);
     mir_connection_release(connection);
@@ -440,13 +458,19 @@
     auto const spec =
         mir_connection_create_spec_for_normal_surface(
             connection, 1280, 1024, mir_pixel_format_abgr_8888);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
 
     surface = mir_surface_create_sync(spec);
 
     MirNativeBuffer *native;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto bs = mir_surface_get_buffer_stream(surface);
     mir_buffer_stream_get_current_buffer(bs, &native);
+#pragma GCC diagnostic pop
     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);
@@ -456,8 +480,11 @@
     mir_surface_spec_set_height(spec, 100);
 
     surface = mir_surface_create_sync(spec);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     bs = mir_surface_get_buffer_stream(surface);
     mir_buffer_stream_get_current_buffer(bs, &native);
+#pragma GCC diagnostic pop
     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);
@@ -466,21 +493,33 @@
 
     mir_surface_spec_set_width(spec, 800);
     mir_surface_spec_set_height(spec, 600);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_software);
+#pragma GCC diagnostic pop
 
     surface = mir_surface_create_sync(spec);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     bs = mir_surface_get_buffer_stream(surface);
     mir_buffer_stream_get_current_buffer(bs, &native);
+#pragma GCC diagnostic pop
     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_surface_release_sync(surface);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
 
     surface = mir_surface_create_sync(spec);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     bs = mir_surface_get_buffer_stream(surface);
     mir_buffer_stream_get_current_buffer(bs, &native);
+#pragma GCC diagnostic pop
     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);
@@ -497,7 +536,10 @@
     auto const spec =
         mir_connection_create_spec_for_normal_surface(
             connection, 0, 0, mir_pixel_format_abgr_8888);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
 
     struct {int width, height;} const sizes[] =
     {
@@ -512,6 +554,8 @@
         mir_surface_spec_set_height(spec, size.height);
 
         surface = mir_surface_create_sync(spec);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         auto bs = mir_surface_get_buffer_stream(surface);
 
         MirNativeBuffer *native = NULL;
@@ -525,6 +569,7 @@
         ASSERT_THAT(native, NotNull());
         EXPECT_THAT(native->width, Eq(size.width));
         ASSERT_THAT(native->height, Eq(size.height));
+#pragma GCC diagnostic pop
 
         mir_surface_release_sync(surface);
     }
@@ -543,8 +588,10 @@
     auto const spec =
         mir_connection_create_spec_for_normal_surface(
             connection, 640, 480, mir_pixel_format_abgr_8888);
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
     for (int i = 0; i != n_surfaces; ++i)
     {
         old_surface_count = current_surface_count();
@@ -576,7 +623,10 @@
     surface = 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_surface_get_buffer_stream(surface), next_buffer_callback, this));
+#pragma GCC diagnostic pop
     EXPECT_THAT(buffers, Eq(1));
 
     mir_wait_for(mir_surface_release(surface, release_surface_callback, this));
@@ -592,7 +642,10 @@
 
     surface = mtf::make_any_surface(connection);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_buffer_stream_swap_buffers_sync(mir_surface_get_buffer_stream(surface));
+#pragma GCC diagnostic pop
     EXPECT_TRUE(mir_surface_is_valid(surface));
     EXPECT_STREQ(mir_surface_get_error_message(surface), "");
 
@@ -617,7 +670,10 @@
     b.join();
     c.join();
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     EXPECT_THAT(mir_surface_get_state(surface), Eq(mir_surface_state_minimized));
+#pragma GCC diagnostic pop
 
     mir_surface_release_sync(surface);
 
@@ -634,7 +690,10 @@
     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);
@@ -644,7 +703,10 @@
 {
     mir_wait_for(mir_connect(new_connection().c_str(), __PRETTY_FUNCTION__, connection_callback, this));
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto configuration = mir_connection_create_display_config(connection);
+#pragma GCC diagnostic pop
     ASSERT_THAT(configuration, NotNull());
     ASSERT_GT(configuration->num_outputs, 0u);
     ASSERT_THAT(configuration->outputs, NotNull());
@@ -674,10 +736,13 @@
 
     while (buffers < 1024)
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers_sync(
             mir_surface_get_buffer_stream(surf_one));
         mir_buffer_stream_swap_buffers_sync(
             mir_surface_get_buffer_stream(surf_two));
+#pragma GCC diagnostic pop
 
         buffers++;
     }
@@ -726,12 +791,15 @@
     EXPECT_THAT(surface, IsValid());
 
     MirNativeBuffer* native_buffer;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_buffer_stream_get_current_buffer(
         mir_surface_get_buffer_stream(surface), &native_buffer);
 
     EXPECT_THAT(native_buffer->width, Eq(width));
     EXPECT_THAT(native_buffer->height, Eq(height));
     EXPECT_THAT(mir_surface_get_type(surface), Eq(mir_surface_type_normal));
+#pragma GCC diagnostic pop
 
     mir_surface_release_sync(surface);
     mir_connection_release(connection);
@@ -753,12 +821,15 @@
     EXPECT_THAT(surface, IsValid());
 
     MirNativeBuffer* native_buffer;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_buffer_stream_get_current_buffer(
         mir_surface_get_buffer_stream(surface), &native_buffer);
 
     EXPECT_THAT(native_buffer->width, Eq(width));
     EXPECT_THAT(native_buffer->height, Eq(height));
     EXPECT_THAT(mir_surface_get_type(surface), Eq(mir_surface_type_normal));
+#pragma GCC diagnostic pop
 
     mir_surface_release_sync(surface);
     mir_connection_release(connection);
@@ -781,11 +852,14 @@
     mir_surface_spec_set_width(surface_spec, width);
     mir_surface_spec_set_height(surface_spec, height);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirPixelFormat const pixel_format{mir_pixel_format_argb_8888};
     mir_surface_spec_set_pixel_format(surface_spec, pixel_format);
 
     MirBufferUsage const buffer_usage{mir_buffer_usage_hardware};
     mir_surface_spec_set_buffer_usage(surface_spec, buffer_usage);
+#pragma GCC diagnostic pop
 
     auto surface = mir_surface_create_sync(surface_spec);
     mir_surface_spec_release(surface_spec);
@@ -807,7 +881,10 @@
                                                                       mir_pixel_format_xbgr_8888);
 
     // We need to specify a valid output id, so we need to find which ones are valid...
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto configuration = mir_connection_create_display_config(connection);
+#pragma GCC diagnostic pop
     ASSERT_THAT(configuration->num_outputs, Ge(1));
 
     auto const requested_output = configuration->outputs[0];
@@ -820,8 +897,11 @@
     EXPECT_THAT(surface, IsValid());
 
     MirNativeBuffer* native_buffer;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_buffer_stream_get_current_buffer(
         mir_surface_get_buffer_stream(surface), &native_buffer);
+#pragma GCC diagnostic pop
 
     EXPECT_THAT(native_buffer->width,
                 Eq(requested_output.modes[requested_output.current_mode].horizontal_resolution));
@@ -854,7 +934,10 @@
                                                                       mir_pixel_format_bgr_888);
 
     MirBufferUsage const buffer_usage{mir_buffer_usage_hardware};
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(surface_spec, buffer_usage);
+#pragma GCC diagnostic pop
 
     auto surface = mir_surface_create_sync(surface_spec);
     mir_surface_spec_release(surface_spec);
@@ -864,8 +947,11 @@
     MirNativeBuffer* native_buffer;
     // We use the fact that our stub client platform returns NULL if asked for a native
     // buffer on a surface with mir_buffer_usage_software set.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_buffer_stream_get_current_buffer(
         mir_surface_get_buffer_stream(surface), &native_buffer);
+#pragma GCC diagnostic pop
 
     EXPECT_THAT(native_buffer, Not(Eq(nullptr)));
 
@@ -884,7 +970,10 @@
                                                                       mir_pixel_format_bgr_888);
 
     MirBufferUsage const buffer_usage{mir_buffer_usage_software};
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(surface_spec, buffer_usage);
+#pragma GCC diagnostic pop
 
     auto surface = mir_surface_create_sync(surface_spec);
     mir_surface_spec_release(surface_spec);
@@ -894,8 +983,11 @@
     MirGraphicsRegion graphics_region;
     // We use the fact that our stub client platform returns a NULL vaddr if
     // asked to map a hardware buffer.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_buffer_stream_get_graphics_region(
         mir_surface_get_buffer_stream(surface), &graphics_region);
+#pragma GCC diagnostic pop
 
     EXPECT_THAT(graphics_region.vaddr, Not(Eq(nullptr)));
 
@@ -936,8 +1028,11 @@
      *
      * Without manual dispatch, it's racy to try and test that.
      */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_set_event_handler(surface, &dummy_event_handler_one, nullptr);
     mir_surface_set_event_handler(surface, &dummy_event_handler_two, nullptr);
+#pragma GCC diagnostic pop
 
     mir_surface_release_sync(surface);
     mir_connection_release(connection);
@@ -1012,9 +1107,11 @@
 {
     connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
     ASSERT_TRUE(mir_connection_is_valid(connection));
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto stream = mir_connection_create_buffer_stream_sync(connection,
         640, 480, mir_pixel_format_abgr_8888, mir_buffer_usage_software);
+#pragma GCC diagnostic pop
 
     ASSERT_THAT(stream, NotNull());
     EXPECT_TRUE(mir_buffer_stream_is_valid(stream));
 
=== modified file 'tests/acceptance-tests/test_client_library_callbacks.cpp'
--- tests/acceptance-tests/test_client_library_callbacks.cpp	2015-07-23 10:55:34 +0000
+++ tests/acceptance-tests/test_client_library_callbacks.cpp	2016-10-28 13:38:48 +0000
@@ -148,9 +148,11 @@
 {
     connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
     surface = mtf::make_any_surface(connection);
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto const wh = mir_buffer_stream_swap_buffers(
         mir_surface_get_buffer_stream(surface), next_buffer_callback, this);
+#pragma GCC diagnostic pop
     mir_wait_for(wh);
 
     EXPECT_THAT(buffers, Eq(1));
 
=== modified file 'tests/acceptance-tests/test_client_logging.cpp'
--- tests/acceptance-tests/test_client_logging.cpp	2016-07-18 07:38:38 +0000
+++ tests/acceptance-tests/test_client_logging.cpp	2016-10-28 13:38:48 +0000
@@ -61,7 +61,10 @@
                    connection, 123, 456, mir_pixel_format_abgr_8888);
     ASSERT_THAT(spec, NotNull());
     mir_surface_spec_set_name(spec, "Rumpelstiltskin");
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_software);
+#pragma GCC diagnostic pop
     auto surf = mir_surface_create_sync(spec);
     ASSERT_THAT(surf, NotNull());
     mir_surface_spec_release(spec);
@@ -69,7 +72,10 @@
     int const target_fps = 10;
     int const nseconds = 3;
     auto const target_render_time = std::chrono::milliseconds(3);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto bs = mir_surface_get_buffer_stream(surf);
+#pragma GCC diagnostic pop
     for (int s = 0; s < nseconds; ++s)
     {
         for (int f = 0; f < target_fps; ++f)
 
=== modified file 'tests/acceptance-tests/test_client_platform_operation.cpp'
--- tests/acceptance-tests/test_client_platform_operation.cpp	2015-06-25 03:00:08 +0000
+++ tests/acceptance-tests/test_client_platform_operation.cpp	2016-10-28 13:38:48 +0000
@@ -34,15 +34,20 @@
 
     MirPlatformMessage* platform_operation_add(std::vector<int> const& nums)
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         auto const request = mir_platform_message_create(add_opcode);
+#pragma GCC diagnostic push
         mir_platform_message_set_data(request, nums.data(), sizeof(int) * nums.size());
         MirPlatformMessage* reply;
 
         auto const platform_op_done = mir_connection_platform_operation(
             connection, request, assign_reply, &reply);
         mir_wait_for(platform_op_done);
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_platform_message_release(request);
+#pragma GCC diagnostic pop
 
         return reply;
     }
@@ -52,7 +57,10 @@
         unsigned int const echo_fd_opcode =
             static_cast<unsigned int>(mtf::StubGraphicsPlatformOperation::echo_fd);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         auto const request = mir_platform_message_create(echo_fd_opcode);
+#pragma GCC diagnostic pop
         mir_platform_message_set_fds(request, &fd, 1);
         MirPlatformMessage* reply;
 
@@ -60,7 +68,10 @@
                 connection, request, assign_reply, &reply);
         mir_wait_for(platform_op_done);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_platform_message_release(request);
+#pragma GCC diagnostic pop
 
         return reply;
     }
@@ -72,7 +83,10 @@
 MATCHER_P(MessageDataAsIntsEq, v, "")
 {
     using namespace testing;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto msg_data = mir_platform_message_get_data(arg);
+#pragma GCC diagnostic pop
     if (msg_data.size % sizeof(int) != 0)
         throw std::runtime_error("Data is not an array of ints");
 
@@ -84,19 +98,28 @@
 
 MATCHER(MessageDataIsEmpty, "")
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto const msg_data = mir_platform_message_get_data(arg);
+#pragma GCC diagnostic pop
     return msg_data.size == 0 && msg_data.data == nullptr;
 }
 
 MATCHER_P(MessageOpcodeEq, opcode, "")
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto const msg_opcode = mir_platform_message_get_opcode(arg);
+#pragma GCC diagnostic pop
     return msg_opcode == opcode;
 }
 
 MATCHER(MessageFdsIsEmpty, "")
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto const msg_fds = mir_platform_message_get_fds(arg);
+#pragma GCC diagnostic pop
     return msg_fds.num_fds == 0 && msg_fds.fds == nullptr;
 }
 
@@ -113,7 +136,10 @@
 
     EXPECT_THAT(reply, MessageDataAsIntsEq(std::vector<int>{num1 + num2}));
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_platform_message_release(reply);
+#pragma GCC diagnostic pop
 }
 
 TEST_F(ClientPlatformOperation, does_not_set_connection_error_message_on_success)
@@ -124,7 +150,10 @@
 
     EXPECT_THAT(mir_connection_get_error_message(connection), StrEq(""));
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_platform_message_release(reply);
+#pragma GCC diagnostic pop
 }
 
 TEST_F(ClientPlatformOperation, reply_has_opcode_of_request)
@@ -135,7 +164,10 @@
 
     EXPECT_THAT(reply, MessageOpcodeEq(add_opcode));
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_platform_message_release(reply);
+#pragma GCC diagnostic pop
 }
 
 TEST_F(ClientPlatformOperation, returns_empty_reply_on_error)
@@ -147,7 +179,10 @@
     EXPECT_THAT(reply, MessageDataIsEmpty());
     EXPECT_THAT(reply, MessageFdsIsEmpty());
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_platform_message_release(reply);
+#pragma GCC diagnostic pop
 }
 
 TEST_F(ClientPlatformOperation, sets_connection_error_message_on_error)
@@ -158,7 +193,10 @@
 
     EXPECT_THAT(mir_connection_get_error_message(connection), StrNe(""));
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_platform_message_release(reply);
+#pragma GCC diagnostic pop
 }
 
 TEST_F(ClientPlatformOperation, exchanges_fd_items_with_platform)
@@ -173,7 +211,10 @@
     auto const reply = platform_operation_echo_fd(pipe.read_fd());
     EXPECT_THAT(reply, MessageDataIsEmpty());
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto const reply_fds = mir_platform_message_get_fds(reply);
+#pragma GCC diagnostic pop
     EXPECT_THAT(reply_fds.num_fds, Eq(1));
 
     auto const reply_fd = reply_fds.fds[0];
@@ -184,5 +225,8 @@
     EXPECT_THAT(reply_char, Eq(sent_char));
 
     close(reply_fd);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_platform_message_release(reply);
+#pragma GCC diagnostic pop
 }
 
=== modified file 'tests/acceptance-tests/test_client_scaling.cpp'
--- tests/acceptance-tests/test_client_scaling.cpp	2016-07-18 07:38:38 +0000
+++ tests/acceptance-tests/test_client_scaling.cpp	2016-10-28 13:38:48 +0000
@@ -160,7 +160,10 @@
 {
     using namespace std::literals::chrono_literals;
     auto scale = 2.0f;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto stream = mir_surface_get_buffer_stream(surface);
+#pragma GCC diagnostic pop
     mir_buffer_stream_set_scale(stream, scale);
 
     mir_buffer_stream_swap_buffers_sync(stream);
 
=== modified file 'tests/acceptance-tests/test_client_screencast.cpp'
--- tests/acceptance-tests/test_client_screencast.cpp	2016-07-18 07:38:38 +0000
+++ tests/acceptance-tests/test_client_screencast.cpp	2016-10-28 13:38:48 +0000
@@ -70,6 +70,8 @@
 
     MirScreencastParameters params = default_screencast_params;
     params.width = params.height = 0;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto screencast = mir_connection_create_screencast_sync(connection, &params);
     EXPECT_FALSE(mir_screencast_is_valid(screencast));
 
@@ -86,6 +88,7 @@
     params.pixel_format = mir_pixel_format_invalid;
 
     screencast = mir_connection_create_screencast_sync(connection, &params);
+#pragma GCC diagnostic pop
     EXPECT_FALSE(mir_screencast_is_valid(screencast));
 
     mir_screencast_release_sync(screencast);
@@ -101,7 +104,10 @@
 
     auto const connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto screencast = mir_connection_create_screencast_sync(connection, &default_screencast_params);
+#pragma GCC diagnostic pop
     EXPECT_FALSE(mir_screencast_is_valid(screencast));
 
     mir_screencast_release_sync(screencast);
 
=== modified file 'tests/acceptance-tests/test_client_surface_events.cpp'
--- tests/acceptance-tests/test_client_surface_events.cpp	2016-09-30 08:31:53 +0000
+++ tests/acceptance-tests/test_client_surface_events.cpp	2016-10-28 13:38:48 +0000
@@ -128,12 +128,15 @@
 
         mtf::ConnectedClientWithASurface::SetUp();
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface, &event_callback, this);
 
         scene_surface = the_latest_surface();
 
         other_surface = mtf::make_any_surface(connection);
         mir_surface_set_event_handler(other_surface, nullptr, nullptr);
+#pragma GCC diagnostic pop
 
         reset_last_event();
     }
@@ -153,8 +156,11 @@
 TEST_F(ClientSurfaceEvents, surface_receives_state_events)
 {
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_wait_for(mir_surface_set_state(surface, mir_surface_state_fullscreen));
         mir_wait_for(mir_surface_set_state(other_surface, mir_surface_state_vertmaximized));
+#pragma GCC diagnostic pop
 
         std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex};
 
@@ -162,7 +168,10 @@
     }
 
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_wait_for(mir_surface_set_state(surface, static_cast<MirSurfaceState>(999)));
+#pragma GCC diagnostic pop
 
         std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex};
         EXPECT_THAT(last_event, mt::SurfaceEvent(mir_surface_attrib_state, mir_surface_state_fullscreen));
@@ -171,7 +180,10 @@
     reset_last_event();
 
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_wait_for(mir_surface_set_state(surface, mir_surface_state_vertmaximized));
+#pragma GCC diagnostic pop
 
         std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex};
 
@@ -181,8 +193,11 @@
     reset_last_event();
 
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_wait_for(mir_surface_set_state(surface, static_cast<MirSurfaceState>(777)));
         mir_wait_for(mir_surface_set_state(other_surface, mir_surface_state_maximized));
+#pragma GCC diagnostic pop
 
         std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex};
 
@@ -225,8 +240,10 @@
         scene_surface->set_orientation(direction);
 
         EXPECT_TRUE(wait_for_event(std::chrono::seconds(1)));
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         EXPECT_THAT(mir_surface_get_orientation(surface), Eq(direction));
+#pragma GCC diagnostic pop
     }
 }
 
@@ -255,8 +272,11 @@
     {
         reset_last_event();
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_wait_for(mir_surface_set_preferred_orientation(surface, mode));
         EXPECT_THAT(mir_surface_get_preferred_orientation(surface), Eq(mode));
+#pragma GCC diagnostic pop
     }
 }
 
@@ -306,7 +326,10 @@
 {
     set_event_filter(mir_event_type_close_surface);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_set_event_handler(surface, nullptr, nullptr);
+#pragma GCC diagnostic pop
     scene_surface->request_client_surface_close();
 
     EXPECT_FALSE(wait_for_event(std::chrono::seconds(1)));
@@ -348,6 +371,8 @@
     auto surface = mtf::make_any_surface(connection);
 
     mt::Signal focus_received;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_set_event_handler(
         surface,
         [](MirSurface*, MirEvent const* event, void* ctx)
@@ -359,14 +384,20 @@
             }
         },
         &focus_received);
+#pragma GCC diagnostic pop
 
     // Swap buffers to get the surface into the scene so it can be focused.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto buffer_stream = mir_surface_get_buffer_stream(surface);
+#pragma GCC diagnostic pop
     mir_buffer_stream_swap_buffers_sync(buffer_stream);
 
     ASSERT_TRUE(focus_received.wait_for(10s));
 
     mt::Signal unfocus_received;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_set_event_handler(
         surface,
         [](MirSurface*, MirEvent const* event, void* ctx)
@@ -378,6 +409,7 @@
             }
         },
         &unfocus_received);
+#pragma GCC diagnostic pop
 
     mir_surface_release_sync(surface);
 
@@ -392,6 +424,8 @@
     auto surface = mtf::make_any_surface(connection);
 
     mt::Signal focus_received;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_set_event_handler(
         surface,
         [](MirSurface*, MirEvent const* event, void* ctx)
@@ -403,14 +437,20 @@
             }
         },
         &focus_received);
+#pragma GCC diagnostic pop
 
     // Swap buffers to get the surface into the scene so it can be focused.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto buffer_stream = mir_surface_get_buffer_stream(surface);
+#pragma GCC diagnostic pop
     mir_buffer_stream_swap_buffers_sync(buffer_stream);
 
     ASSERT_TRUE(focus_received.wait_for(10s));
 
     mt::Signal unfocus_received;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_set_event_handler(
         surface,
         [](MirSurface*, MirEvent const* event, void* ctx)
@@ -422,10 +462,14 @@
             }
         },
         &unfocus_received);
+#pragma GCC diagnostic pop
 
     // Add a new surface 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_surface_get_buffer_stream(focus_grabbing_surface));
+#pragma GCC diagnostic pop
 
     ASSERT_TRUE(unfocus_received.wait_for(10s));
 
@@ -483,7 +527,10 @@
     mt::Signal done;
 
     auto spec = mir_connection_create_spec_for_normal_surface(connection, 100, 100, mir_pixel_format_abgr_8888);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_event_handler(spec, &raise_signal_on_close_event, &done);
+#pragma GCC diagnostic pop
 
     auto surface = mir_surface_create_sync(spec);
 
@@ -574,7 +621,10 @@
     EventContext context;
 
     auto spec = mir_connection_create_spec_for_normal_surface(connection, 640, 480, mir_pixel_format_abgr_8888);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_event_handler(spec, &surface_output_capturing_callback, &context);
+#pragma GCC diagnostic pop
     auto surface = mir_surface_create_sync(spec);
     mir_surface_spec_release(spec);
 
 
=== modified file 'tests/acceptance-tests/test_client_surface_swap_buffers.cpp'
--- tests/acceptance-tests/test_client_surface_swap_buffers.cpp	2016-05-31 12:27:12 +0000
+++ tests/acceptance-tests/test_client_surface_swap_buffers.cpp	2016-10-28 13:38:48 +0000
@@ -63,7 +63,10 @@
     {
         mt::Signal buffers_swapped;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers(mir_surface_get_buffer_stream(surface), swap_buffers_callback, &buffers_swapped);
+#pragma GCC diagnostic pop
 
         /*
          * ASSERT instead of EXPECT, since if we continue we will block in future
@@ -136,6 +139,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_surface_get_buffer_stream(surface), nullptr, nullptr);
+#pragma GCC diagnostic pop
 }
 
=== modified file 'tests/acceptance-tests/test_client_surface_visibility.cpp'
--- tests/acceptance-tests/test_client_surface_visibility.cpp	2016-08-11 07:24:14 +0000
+++ tests/acceptance-tests/test_client_surface_visibility.cpp	2016-10-28 13:38:48 +0000
@@ -109,8 +109,11 @@
     auto const spec = mir_connection_create_spec_for_normal_surface(
         connection, size.width.as_int(), size.height.as_int(), mir_pixel_format_bgr_888);
     mir_surface_spec_set_name(spec, name);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
     mir_surface_spec_set_event_handler(spec, &event_callback, &mock_callback);
+#pragma GCC diagnostic pop
     auto surface = mir_surface_create_sync(spec);
     mir_surface_spec_release(spec);
     return surface;
@@ -126,7 +129,10 @@
 
     ~Surface()
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface, null_event_callback, nullptr);
+#pragma GCC diagnostic pop
         mir_surface_release_sync(surface);
     }
 
@@ -156,12 +162,15 @@
 private:
     void wait_for_visible_and_focused()
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         expect_surface_visibility_event_after(
             mir_surface_visibility_exposed,
             [this]
             {
                 mir_buffer_stream_swap_buffers_sync(mir_surface_get_buffer_stream(surface));
             });
+#pragma GCC diagnostic pop
 
         // GMock is behaving strangely, checking expectations after they
         // have been cleared, so we use spin_wait() instead.
 
=== modified file 'tests/acceptance-tests/test_client_surfaces.cpp'
--- tests/acceptance-tests/test_client_surfaces.cpp	2016-08-09 08:13:02 +0000
+++ tests/acceptance-tests/test_client_surfaces.cpp	2016-10-28 13:38:48 +0000
@@ -134,6 +134,8 @@
     mir_surface_spec_release(spec);
 
     MirSurfaceParameters response_params;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_get_parameters(ssync->surface, &response_params);
     EXPECT_EQ(640, response_params.width);
     EXPECT_EQ(480, response_params.height);
@@ -141,6 +143,7 @@
     EXPECT_EQ(mir_buffer_usage_hardware, response_params.buffer_usage);
 
     mir_surface_get_parameters(ssync[1].surface, &response_params);
+#pragma GCC diagnostic pop
     EXPECT_EQ(1600, response_params.width);
     EXPECT_EQ(1200, response_params.height);
     EXPECT_EQ(mir_pixel_format_abgr_8888, response_params.pixel_format);
@@ -207,6 +210,8 @@
     ASSERT_THAT(spec, NotNull());
 
     MirOrientationMode mode{GetParam()};
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_preferred_orientation(spec, mode);
 
     auto surface = mir_surface_create_sync(spec);
@@ -214,6 +219,7 @@
 
     ASSERT_THAT(surface, IsValid());
     EXPECT_EQ(mir_surface_get_preferred_orientation(surface), mode);
+#pragma GCC diagnostic pop
 
     mir_surface_release_sync(surface);
 }
@@ -238,7 +244,10 @@
     mir_surface_spec_release(spec);
 
     ASSERT_THAT(menu, IsValid());
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     EXPECT_EQ(mir_surface_get_type(menu), mir_surface_type_menu);
+#pragma GCC diagnostic pop
 
     mir_surface_release_sync(parent);
     mir_surface_release_sync(menu);
@@ -279,7 +288,10 @@
     mir_surface_spec_release(spec);
 
     ASSERT_THAT(tooltip, IsValid());
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     EXPECT_EQ(mir_surface_get_type(tooltip), mir_surface_type_tip);
+#pragma GCC diagnostic pop
 
     mir_surface_release_sync(parent);
     mir_surface_release_sync(tooltip);
@@ -295,7 +307,10 @@
     mir_surface_spec_release(spec);
 
     ASSERT_THAT(dialog, IsValid());
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     EXPECT_EQ(mir_surface_get_type(dialog), mir_surface_type_dialog);
+#pragma GCC diagnostic pop
 
     mir_surface_release_sync(dialog);
 }
@@ -311,7 +326,10 @@
     mir_surface_spec_release(spec);
 
     ASSERT_THAT(dialog, IsValid());
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     EXPECT_EQ(mir_surface_get_type(dialog), mir_surface_type_dialog);
+#pragma GCC diagnostic pop
 
     mir_surface_release_sync(parent);
     mir_surface_release_sync(dialog);
@@ -325,8 +343,10 @@
 
     auto im = mir_surface_create_sync(spec);
     mir_surface_spec_release(spec);
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     EXPECT_EQ(mir_surface_get_type(im), mir_surface_type_inputmethod);
+#pragma GCC diagnostic pop
 
     mir_surface_release_sync(im);
 }
 
=== modified file 'tests/acceptance-tests/test_client_with_custom_display_config_deadlock.cpp'
--- tests/acceptance-tests/test_client_with_custom_display_config_deadlock.cpp	2015-02-22 07:46:25 +0000
+++ tests/acceptance-tests/test_client_with_custom_display_config_deadlock.cpp	2016-10-28 13:38:48 +0000
@@ -38,8 +38,11 @@
     auto second_surface = mtf::make_any_surface(connection);
     ASSERT_TRUE(mir_surface_is_valid(second_surface));
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto configuration = mir_connection_create_display_config(connection);
     mir_wait_for(mir_connection_apply_display_config(connection, configuration));
+#pragma GCC diagnostic pop
     EXPECT_STREQ("", mir_connection_get_error_message(connection));
     mir_display_config_destroy(configuration);
 
 
=== modified file 'tests/acceptance-tests/test_confined_pointer.cpp'
--- tests/acceptance-tests/test_confined_pointer.cpp	2016-09-09 03:47:07 +0000
+++ tests/acceptance-tests/test_confined_pointer.cpp	2016-10-28 13:38:48 +0000
@@ -88,9 +88,12 @@
                 mir_surface_get_error_message(surface)});
         }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface, handle_event, this);
         mir_buffer_stream_swap_buffers_sync(
             mir_surface_get_buffer_stream(surface));
+#pragma GCC diagnostic push
 
         ready_to_accept_events.wait_for(4s);
         if (!ready_to_accept_events.raised())
@@ -147,7 +150,10 @@
         // Remove the event handler to avoid handling spurious events unrelated
         // to the tests (e.g. pointer leave events when the surface is destroyed),
         // which can cause test expectations to fail.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface, null_event_handler, nullptr);
+#pragma GCC diagnostic pop
         mir_surface_release_sync(surface);
         mir_connection_release(connection);
     }
 
=== modified file 'tests/acceptance-tests/test_custom_window_management.cpp'
--- tests/acceptance-tests/test_custom_window_management.cpp	2016-09-20 04:32:25 +0000
+++ tests/acceptance-tests/test_custom_window_management.cpp	2016-10-28 13:38:48 +0000
@@ -281,8 +281,10 @@
 
         EXPECT_CALL(window_manager, set_surface_attribute(_, WeakPtrEq(server_surface[i]), mir_surface_attrib_state,_))
             .WillOnce(WithArg<3>(Invoke([&](int value) { received.raise(); return value; })));
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_state(client_surface[i], mir_surface_state_maximized);
+#pragma GCC diagnostic pop
 
         received.wait_for(400ms);
     }
 
=== modified file 'tests/acceptance-tests/test_debug_api.cpp'
--- tests/acceptance-tests/test_debug_api.cpp	2016-01-29 08:18:22 +0000
+++ tests/acceptance-tests/test_debug_api.cpp	2016-10-28 13:38:48 +0000
@@ -157,7 +157,10 @@
     int screen_x, screen_y, x, y;
     x = 35, y = 21;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     ASSERT_TRUE(mir_debug_surface_coords_to_screen(surf, x, y, &screen_x, &screen_y));
+#pragma GCC diagnostic pop
     EXPECT_EQ(x + surface_location.top_left.x.as_int(), screen_x);
     EXPECT_EQ(y + surface_location.top_left.y.as_int(), screen_y);
 
@@ -170,7 +173,10 @@
     surf = mtf::make_any_surface(connection);
     ASSERT_TRUE(mir_surface_is_valid(surf));
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     ASSERT_TRUE(mir_debug_surface_coords_to_screen(surf, x, y, &screen_x, &screen_y));
+#pragma GCC diagnostic pop
     EXPECT_EQ(x + surface_location.top_left.x.as_int(), screen_x);
     EXPECT_EQ(y + surface_location.top_left.y.as_int(), screen_y);
 
@@ -186,7 +192,10 @@
 
     int screen_x, screen_y;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     EXPECT_FALSE(mir_debug_surface_coords_to_screen(surf, 0, 0, &screen_x, &screen_y));
+#pragma GCC diagnostic pop
 
     mir_surface_release_sync(surf);
 }
@@ -206,7 +215,10 @@
 
     int screen_x, screen_y;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     EXPECT_TRUE(mir_debug_surface_coords_to_screen(surf, 0, 0, &screen_x, &screen_y));
+#pragma GCC diagnostic pop
     EXPECT_EQ(testpoint.x.as_int(), screen_x);
     EXPECT_EQ(testpoint.y.as_int(), screen_y);
 
 
=== modified file 'tests/acceptance-tests/test_display_configuration.cpp'
--- tests/acceptance-tests/test_display_configuration.cpp	2016-07-18 07:38:38 +0000
+++ tests/acceptance-tests/test_display_configuration.cpp	2016-10-28 13:38:48 +0000
@@ -118,7 +118,10 @@
 
 TEST_F(LegacyDisplayConfigurationTest, display_configuration_reaches_client)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto configuration = mir_connection_create_display_config(connection);
+#pragma GCC diagnostic pop
 
     EXPECT_THAT(*configuration,
                 mt::DisplayConfigMatches(std::cref(stub_display_config)));
@@ -130,7 +133,10 @@
 {
 void display_change_handler(MirConnection* connection, void* context)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto configuration = mir_connection_create_display_config(connection);
+#pragma GCC diagnostic pop
 
     EXPECT_THAT(*configuration,
                 mt::DisplayConfigMatches(std::cref(changed_stub_display_config)));
@@ -159,6 +165,8 @@
     // we're emulating a client that is passively subscribed, we will just wait for the display
     // configuration to change and then will check the new config.
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto configuration = mir_connection_create_display_config(unsubscribed_connection);
     while(configuration->num_outputs != changed_stub_display_config.outputs.size())
     {
@@ -166,6 +174,7 @@
         std::this_thread::sleep_for(std::chrono::microseconds(500));
         configuration = mir_connection_create_display_config(unsubscribed_connection);
     }
+#pragma GCC diagnostic pop
 
     EXPECT_THAT(*configuration,
                 mt::DisplayConfigMatches(std::cref(changed_stub_display_config)));
@@ -180,10 +189,12 @@
     stub_authorizer.allow_configure_display = false;
 
     auto connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto configuration = mir_connection_create_display_config(connection);
 
     mir_wait_for(mir_connection_apply_display_config(connection, configuration));
+#pragma GCC diagnostic pop
     EXPECT_THAT(mir_connection_get_error_message(connection),
                 testing::HasSubstr("not authorized to apply display configurations"));
 
@@ -205,7 +216,10 @@
         auto const spec = mir_connection_create_spec_for_normal_surface(connection, 100, 100, mir_pixel_format_abgr_8888);
         surface = mir_surface_create_sync(spec);
         mir_surface_spec_release(spec);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers_sync(mir_surface_get_buffer_stream(surface));
+#pragma GCC diagnostic pop
     }
 
     void disconnect()
@@ -230,21 +244,30 @@
 
     void apply_config()
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         auto configuration = mir_connection_create_display_config(connection);
         mir_wait_for(mir_connection_apply_display_config(connection, configuration));
+#pragma GCC diagnostic pop
         EXPECT_STREQ("", mir_connection_get_error_message(connection));
         mir_display_config_destroy(configuration);
     }
 
     std::unique_ptr<MirDisplayConfiguration,void(*)(MirDisplayConfiguration*)> get_base_config()
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         return {mir_connection_create_display_config(connection),
                 mir_display_config_destroy};
+#pragma GCC diagnostic pop
     }
 
     void set_base_config(MirDisplayConfiguration* configuration)
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_wait_for(mir_connection_set_base_display_config(connection, configuration));
+#pragma GCC diagnostic pop
         EXPECT_STREQ("", mir_connection_get_error_message(connection));
     }
 };
@@ -281,8 +304,11 @@
     simple_client.connect();
 
     /* Apply the display config while not focused */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto const configuration = mir_connection_create_display_config(connection);
     mir_wait_for(mir_connection_apply_display_config(connection, configuration));
+#pragma GCC diagnostic pop
     mir_display_config_destroy(configuration);
 
     wait_for_server_actions_to_finish(*server.the_main_loop());
@@ -366,7 +392,10 @@
 {
     auto context = reinterpret_cast<DisplayConfigMatchingContext*>(ctx);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto config = mir_connection_create_display_config(connection);
+#pragma GCC diagnostic pop
     context->matcher(config);
     mir_display_config_destroy(config);
     context->done.raise();
@@ -499,8 +528,11 @@
 
     auto connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto configuration = mir_connection_create_display_config(connection);
     mir_wait_for(mir_connection_set_base_display_config(connection, configuration));
+#pragma GCC diagnostic pop
     EXPECT_THAT(mir_connection_get_error_message(connection),
                 testing::HasSubstr("not authorized to set base display configuration"));
 
 
=== modified file 'tests/acceptance-tests/test_latency.cpp'
--- tests/acceptance-tests/test_latency.cpp	2016-10-19 17:21:54 +0000
+++ tests/acceptance-tests/test_latency.cpp	2016-10-28 13:38:48 +0000
@@ -286,9 +286,12 @@
 {
     using namespace testing;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto stream = mir_surface_get_buffer_stream(surface);
     for(auto i = 0u; i < test_submissions; i++) {
         auto submission_id = mir_debug_surface_current_buffer_id(surface);
+#pragma GCC diagnostic pop
         stats.record_submission(submission_id);
         mir_buffer_stream_swap_buffers_sync(stream);
     }
@@ -308,9 +311,12 @@
 {
     using namespace testing;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto stream = mir_surface_get_buffer_stream(surface);
     for(auto i = 0u; i < test_submissions; i++) {
         auto submission_id = mir_debug_surface_current_buffer_id(surface);
+#pragma GCC diagnostic pop
         stats.record_submission(submission_id);
         mir_buffer_stream_swap_buffers_sync(stream);
     }
@@ -326,13 +332,19 @@
 {
     using namespace testing;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto stream = mir_surface_get_buffer_stream(surface);
     mir_buffer_stream_set_swapinterval(stream, 0);
+#pragma GCC diagnostic pop
     stats.swap_interval = 0;
 
     do
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         auto submission_id = mir_debug_surface_current_buffer_id(surface);
+#pragma GCC diagnostic pop
         stats.record_submission(submission_id);
         mir_buffer_stream_swap_buffers_sync(stream);
     } while (!stats.wait_for_posts(test_submissions, std::chrono::seconds(0)));
@@ -352,13 +364,15 @@
     std::chrono::microseconds const input_interval(1000000/throttled_input_rate);
     auto next_input_event = std::chrono::high_resolution_clock::now();
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto stream = mir_surface_get_buffer_stream(surface);
     for (auto i = 0u; i < test_submissions; i++)
     {
         std::this_thread::sleep_until(next_input_event);
         next_input_event += input_interval;
-
         auto submission_id = mir_debug_surface_current_buffer_id(surface);
+#pragma GCC diagnostic pop
         stats.record_submission(submission_id);
         mir_buffer_stream_swap_buffers_sync(stream);
     }
 
=== modified file 'tests/acceptance-tests/test_mirblob.cpp'
--- tests/acceptance-tests/test_mirblob.cpp	2015-09-03 11:54:34 +0000
+++ tests/acceptance-tests/test_mirblob.cpp	2016-10-28 13:38:48 +0000
@@ -34,7 +34,10 @@
 {
     std::vector<uint8_t> buffer;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto const save_display_config = mir_connection_create_display_config(connection);
+#pragma GCC diagnostic pop
 
     {
         auto const save_blob = mir_blob_from_display_configuration(save_display_config);
@@ -55,4 +58,4 @@
 
     mir_display_config_destroy(restore_display_config);
     mir_display_config_destroy(save_display_config);
-}
 \ No newline at end of file
+}
 
=== modified file 'tests/acceptance-tests/test_nested_input.cpp'
--- tests/acceptance-tests/test_nested_input.cpp	2016-10-12 06:03:15 +0000
+++ tests/acceptance-tests/test_nested_input.cpp	2016-10-28 13:38:48 +0000
@@ -126,8 +126,11 @@
         // Ensure the nested server posts a frame
         connection = mir_connect_sync(connect_string.c_str(), __PRETTY_FUNCTION__);
         surface = mtf::make_any_surface(connection);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface, handle_event, this);
         mir_buffer_stream_swap_buffers_sync(mir_surface_get_buffer_stream(surface));
+#pragma GCC diagnostic pop
     }
 
     MOCK_METHOD1(handle_input, void(MirEvent const*));
@@ -166,7 +169,10 @@
     static void null_event_handler(MirSurface*, MirEvent const*, void*) {};
     ~ExposedSurface()
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface, null_event_handler, nullptr);
+#pragma GCC diagnostic pop
         mir_surface_release_sync(surface);
         mir_connection_release(connection);
     }
 
=== modified file 'tests/acceptance-tests/test_nested_mir.cpp'
--- tests/acceptance-tests/test_nested_mir.cpp	2016-10-13 14:30:55 +0000
+++ tests/acceptance-tests/test_nested_mir.cpp	2016-10-28 13:38:48 +0000
@@ -413,7 +413,10 @@
 
     void wait_until_surface_ready(MirSurface* surface)
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface, wait_for_key_a_event, this);
+#pragma GCC diagnostic pop
 
         auto const dummy_events_received = mt::spin_wait_for_condition_or_timeout(
             [this]
@@ -429,7 +432,10 @@
 
         EXPECT_TRUE(dummy_events_received);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface, nullptr, nullptr);
+#pragma GCC diagnostic pop
     }
 
 protected:
@@ -608,9 +614,12 @@
 
     void update_display_configuration(void (*changer)(MirDisplayConfiguration* config))
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         auto const configuration = mir_connection_create_display_config(connection);
         changer(configuration);
         mir_wait_for(mir_connection_apply_display_config(connection, configuration));
+#pragma GCC diagnostic pop
         mir_display_config_destroy(configuration);
     }
 
@@ -618,7 +627,10 @@
     {
         mt::Signal initial_condition;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         auto const configuration = mir_connection_create_display_config(connection);
+#pragma GCC diagnostic pop
 
         changer(configuration);
 
@@ -626,8 +638,10 @@
             .WillRepeatedly(InvokeWithoutArgs([] {}));
         EXPECT_CALL(display, configure(mt::DisplayConfigMatches(configuration)))
             .WillRepeatedly(InvokeWithoutArgs([&] { initial_condition.raise(); }));
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_wait_for(mir_connection_apply_display_config(connection, configuration));
+#pragma GCC diagnostic pop
 
         initial_condition.wait_for(timeout);
         mir_display_config_destroy(configuration);
@@ -654,14 +668,20 @@
         Client(nested_mir),
         surface(mtf::make_surface(connection, size, format))
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers_sync(mir_surface_get_buffer_stream(surface));
+#pragma GCC diagnostic pop
     }
 
     ClientWithAPaintedSurface(NestedMirRunner& nested_mir) :
         Client(nested_mir),
         surface(mtf::make_any_surface(connection))
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers_sync(mir_surface_get_buffer_stream(surface));
+#pragma GCC diagnostic pop
     }
 
     ~ClientWithAPaintedSurface()
@@ -683,6 +703,8 @@
 
 struct ClientWithAPaintedSurfaceAndABufferStream : virtual Client, ClientWithAPaintedSurface
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     ClientWithAPaintedSurfaceAndABufferStream(NestedMirRunner& nested_mir) :
         Client(nested_mir),
         ClientWithAPaintedSurface(nested_mir),
@@ -694,6 +716,7 @@
     {
         mir_buffer_stream_swap_buffers_sync(buffer_stream);
     }
+#pragma GCC diagnostic pop
 
     ~ClientWithAPaintedSurfaceAndABufferStream()
     {
@@ -774,6 +797,8 @@
         mir_pixel_format_abgr_8888);
 
     mt::Signal surface_event_received;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_event_handler(spec, [](MirSurface*, MirEvent const* event, void* ctx)
         {
             if (mir_event_get_type(event) == mir_event_type_surface_output)
@@ -786,6 +811,7 @@
             }
         },
         &surface_event_received);
+#pragma GCC diagnostic pop
 
     auto surface = mir_surface_create_sync(spec);
     mir_surface_spec_release(spec);
@@ -873,7 +899,10 @@
             .WillOnce(InvokeWithoutArgs([]{}))
             .WillOnce(InvokeWithoutArgs([&] { wait.raise(); }));
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers_sync(mir_surface_get_buffer_stream(surface));
+#pragma GCC diagnostic pop
 
         wait.wait_for(timeout);
         Mock::VerifyAndClearExpectations(mock_session_mediator_report.get());
@@ -926,7 +955,10 @@
 
     ClientWithAPaintedSurface client(nested_mir);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto const configuration = mir_connection_create_display_config(client.connection);
+#pragma GCC diagnostic pop
 
     for (auto new_orientation :
         {mir_orientation_left, mir_orientation_right, mir_orientation_inverted, mir_orientation_normal,
@@ -942,8 +974,10 @@
 
         EXPECT_CALL(*the_mock_display_configuration_report(), new_configuration(mt::DisplayConfigMatches(configuration)))
             .WillRepeatedly(InvokeWithoutArgs([&] { config_reported.raise(); }));
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_wait_for(mir_connection_apply_display_config(client.connection, configuration));
+#pragma GCC diagnostic pop
 
         config_reported.wait_for(timeout);
         Mock::VerifyAndClearExpectations(the_mock_display_configuration_report().get());
@@ -978,7 +1012,10 @@
                     }));
 
     auto conf = mir_cursor_configuration_from_buffer_stream(client.buffer_stream, 0, 0);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_wait_for(mir_surface_configure_cursor(client.surface, conf));
+#pragma GCC diagnostic pop
     mir_cursor_configuration_destroy(conf);
 
     EXPECT_TRUE(condition.wait_for(timeout));
@@ -1028,7 +1065,10 @@
     for (auto const name : cursor_names)
     {
         auto const cursor = mir_cursor_configuration_from_name(name);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_wait_for(mir_surface_configure_cursor(client.surface, cursor));
+#pragma GCC diagnostic pop
         mir_cursor_configuration_destroy(cursor);
 
         EXPECT_TRUE(condition.wait_for(long_timeout));
@@ -1059,7 +1099,10 @@
         .WillOnce(mt::WakeUp(&condition));
 
     auto conf = mir_cursor_configuration_from_buffer_stream(client.buffer_stream, 0, 0);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_wait_for(mir_surface_configure_cursor(client.surface, conf));
+#pragma GCC diagnostic pop
     mir_cursor_configuration_destroy(conf);
 
     std::this_thread::sleep_for(500ms);
@@ -1258,7 +1301,10 @@
 
     ASSERT_TRUE(client_config_changed.raised());
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto const configuration = mir_connection_create_display_config(client.connection);
+#pragma GCC diagnostic pop
 
     EXPECT_THAT(configuration, mt::DisplayConfigMatches(*new_config));
 
@@ -1359,7 +1405,10 @@
     expected_config.for_each_output([](mg::UserDisplayConfigurationOutput& output)
         { output.top_left = {0, 0}; });
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto const configuration = mir_connection_create_display_config(client.connection);
+#pragma GCC diagnostic pop
 
     EXPECT_THAT(configuration, mt::DisplayConfigMatches(expected_config));
 
@@ -1471,7 +1520,10 @@
 
     EXPECT_TRUE(condition.raised());
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto const configuration = mir_connection_create_display_config(client.connection);
+#pragma GCC diagnostic pop
 
     EXPECT_THAT(configuration, mt::DisplayConfigMatches(*new_config));
 
 
=== modified file 'tests/acceptance-tests/test_new_display_configuration.cpp'
--- tests/acceptance-tests/test_new_display_configuration.cpp	2016-10-12 06:03:15 +0000
+++ tests/acceptance-tests/test_new_display_configuration.cpp	2016-10-28 13:38:48 +0000
@@ -200,7 +200,10 @@
         auto const spec = mir_connection_create_spec_for_normal_surface(connection, 100, 100, mir_pixel_format_abgr_8888);
         surface = mir_surface_create_sync(spec);
         mir_surface_spec_release(spec);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers_sync(mir_surface_get_buffer_stream(surface));
+#pragma GCC diagnostic pop
     }
 
     void disconnect()
 
=== modified file 'tests/acceptance-tests/test_render_override.cpp'
--- tests/acceptance-tests/test_render_override.cpp	2015-06-17 05:20:42 +0000
+++ tests/acceptance-tests/test_render_override.cpp	2016-10-28 13:38:48 +0000
@@ -126,7 +126,10 @@
 TEST_F(DisplayBufferCompositorOverride, composite_called_with_surface)
 {
     MirSurfaceParameters surface_params;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_get_parameters(surface, &surface_params);
     mir_buffer_stream_swap_buffers_sync(mir_surface_get_buffer_stream(surface));
+#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	2016-08-25 01:11:51 +0000
+++ tests/acceptance-tests/test_server_disconnect.cpp	2016-10-28 13:38:48 +0000
@@ -86,8 +86,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_surface_get_buffer_stream(surface));
+#pragma GCC diagnostic pop
         }
 
         mir_surface_release_sync(surface);
@@ -130,8 +133,11 @@
             });
 
             configure_display.exec([&] {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
                 auto config = mir_connection_create_display_config(connection);
                 mir_wait_for(mir_connection_apply_display_config(connection, config));
+#pragma GCC diagnostic pop
                 mir_display_config_destroy(config);
             });
 
 
=== modified file 'tests/acceptance-tests/test_session_mediator_report.cpp'
--- tests/acceptance-tests/test_session_mediator_report.cpp	2016-10-05 08:42:26 +0000
+++ tests/acceptance-tests/test_session_mediator_report.cpp	2016-10-28 13:38:48 +0000
@@ -136,7 +136,10 @@
     connect_client();
 
     auto const surface = mtf::make_any_surface(connection);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto const buffer_stream = mir_surface_get_buffer_stream(surface);
+#pragma GCC diagnostic pop
     mir_buffer_stream_swap_buffers_sync(buffer_stream);
     mir_surface_release_sync(surface);
 }
@@ -160,8 +163,11 @@
     connect_client();
 
     EXPECT_CALL(report, session_create_buffer_stream_called(_));
+#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
     testing::Mock::VerifyAndClearExpectations(&report);
 
     EXPECT_CALL(report, session_release_buffer_stream_called(_));
 
=== modified file 'tests/acceptance-tests/test_surface_modifications.cpp'
--- tests/acceptance-tests/test_surface_modifications.cpp	2016-04-19 07:47:24 +0000
+++ tests/acceptance-tests/test_surface_modifications.cpp	2016-10-28 13:38:48 +0000
@@ -71,7 +71,10 @@
         scene_surface->add_observer(mt::fake_shared(surface_observer));
 
         // Swap buffers to ensure surface is visible for event based tests
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers_sync(mir_surface_get_buffer_stream(surface));
+#pragma GCC diagnostic pop
     }
 
     void generate_alt_click_at(Point const& click_position)
@@ -527,7 +530,10 @@
 
     apply_changes([&](MirSurfaceSpec* spec)
         {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_state(spec, new_state);
+#pragma GCC diagnostic pop
         });
 }
 
@@ -541,12 +547,18 @@
 
     apply_changes([&](MirSurfaceSpec* spec)
         {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_state(spec, initial_state);
+#pragma GCC diagnostic pop
         });
 
     apply_changes([&](MirSurfaceSpec* spec)
        {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
            mir_surface_spec_set_state(spec, new_state);
+#pragma GCC diagnostic pop
        });
 }
 
@@ -572,8 +584,11 @@
     EXPECT_CALL(surface_observer, hidden_set_to(is_visible(initial_state)));
     EXPECT_CALL(surface_observer, hidden_set_to(is_visible(new_state)));
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_wait_for(mir_surface_set_state(surface, initial_state));
     mir_wait_for(mir_surface_set_state(surface, new_state));
+#pragma GCC diagnostic pop
 }
 
 INSTANTIATE_TEST_CASE_P(SurfaceModifications, SurfaceStateCase,
 
=== modified file 'tests/acceptance-tests/test_surface_morphing.cpp'
--- tests/acceptance-tests/test_surface_morphing.cpp	2016-01-29 08:18:22 +0000
+++ tests/acceptance-tests/test_surface_morphing.cpp	2016-10-28 13:38:48 +0000
@@ -181,8 +181,11 @@
             mir_surface_spec_set_type(spec, old_type);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_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_surface_spec_set_type(spec, mir_surface_type_normal);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
         });
 
     auto const surface = create_surface([&](MirSurfaceSpec* spec)
@@ -215,8 +221,11 @@
         mir_surface_spec_set_type(spec, old_type);
         mir_surface_spec_set_width(spec, width);
         mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_spec_set_pixel_format(spec, pixel_format);
         mir_surface_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_surface_spec_set_type(spec, mir_surface_type_normal);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
         });
 
     auto const surface = create_surface([&](MirSurfaceSpec* spec)
@@ -256,8 +268,11 @@
             mir_surface_spec_set_type(spec, old_type);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_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_surface_spec_set_type(spec, old_type);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_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_surface_spec_set_type(spec, mir_surface_type_normal);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
         });
 
     auto const surface = create_surface([&](MirSurfaceSpec* spec)
@@ -322,8 +343,11 @@
             mir_surface_spec_set_type(spec, old_type);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_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_surface_spec_set_type(spec, mir_surface_type_normal);
            mir_surface_spec_set_width(spec, width);
            mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
            mir_surface_spec_set_pixel_format(spec, pixel_format);
            mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
        });
 
     auto const surface = create_surface([&](MirSurfaceSpec* spec)
@@ -357,8 +384,11 @@
             mir_surface_spec_set_type(spec, old_type);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_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	2016-06-20 17:10:33 +0000
+++ tests/acceptance-tests/test_surface_placement.cpp	2016-10-28 13:38:48 +0000
@@ -479,8 +479,11 @@
             mir_surface_spec_set_type(spec, GetParam());
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
         });
 
     auto const shell_surface = latest_shell_surface();
@@ -540,8 +543,11 @@
             mir_surface_spec_set_type(spec, GetParam());
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
             mir_surface_spec_set_parent(spec, parent);
         });
 
 
=== modified file 'tests/acceptance-tests/test_surface_raise.cpp'
--- tests/acceptance-tests/test_surface_raise.cpp	2016-07-18 07:38:38 +0000
+++ tests/acceptance-tests/test_surface_raise.cpp	2016-10-28 13:38:48 +0000
@@ -53,6 +53,8 @@
         ConnectedClientHeadlessServer::SetUp();
 
        surface1 = mtf::make_any_surface(connection);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface1, &cookie_capturing_callback, this);
         mir_buffer_stream_swap_buffers_sync(
             mir_surface_get_buffer_stream(surface1));
@@ -61,6 +63,7 @@
         mir_surface_set_event_handler(surface2, &cookie_capturing_callback, this);
         mir_buffer_stream_swap_buffers_sync(
             mir_surface_get_buffer_stream(surface2));
+#pragma GCC diagnostic pop
 
         // Need fullscreen for the cursor events
         auto const spec = mir_connection_create_spec_for_changes(connection);
@@ -68,12 +71,15 @@
         mir_surface_apply_spec(surface1, spec);
         mir_surface_apply_spec(surface2, spec);
         mir_surface_spec_release(spec);
-        
+
         bool surface_fullscreen = mt::spin_wait_for_condition_or_timeout(
             [this]
             {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
                 return mir_surface_get_state(surface1) == mir_surface_state_fullscreen &&
                        mir_surface_get_state(surface2) == mir_surface_state_fullscreen;
+#pragma GCC diagnostic pop
             },
             std::chrono::seconds{max_wait});
 
 
=== modified file 'tests/acceptance-tests/test_surface_specification.cpp'
--- tests/acceptance-tests/test_surface_specification.cpp	2016-04-19 07:47:24 +0000
+++ tests/acceptance-tests/test_surface_specification.cpp	2016-10-28 13:38:48 +0000
@@ -213,8 +213,11 @@
             mir_surface_spec_set_type(spec, mir_surface_type_normal);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
             mir_surface_spec_set_min_width(spec, min_width);
         });
 
@@ -238,8 +241,11 @@
             mir_surface_spec_set_type(spec, mir_surface_type_normal);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
             mir_surface_spec_set_min_height(spec, min_height);
         });
 
@@ -263,8 +269,11 @@
             mir_surface_spec_set_type(spec, mir_surface_type_normal);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
             mir_surface_spec_set_max_width(spec, max_width);
         });
 
@@ -288,8 +297,11 @@
             mir_surface_spec_set_type(spec, mir_surface_type_normal);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
             mir_surface_spec_set_max_height(spec, max_height);
         });
 
@@ -313,8 +325,11 @@
             mir_surface_spec_set_type(spec, mir_surface_type_normal);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
             mir_surface_spec_set_width_increment(spec, width_inc);
         });
 
@@ -342,8 +357,11 @@
             mir_surface_spec_set_type(spec, mir_surface_type_normal);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
             mir_surface_spec_set_width_increment(spec, width_inc);
             mir_surface_spec_set_min_width(spec, min_width);
         });
@@ -371,8 +389,11 @@
             mir_surface_spec_set_type(spec, mir_surface_type_normal);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
             mir_surface_spec_set_height_increment(spec, height_inc);
         });
 
@@ -400,8 +421,11 @@
             mir_surface_spec_set_type(spec, mir_surface_type_normal);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
             mir_surface_spec_set_height_increment(spec, height_inc);
             mir_surface_spec_set_min_height(spec, min_height);
         });
@@ -430,8 +454,11 @@
             mir_surface_spec_set_type(spec, mir_surface_type_normal);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
             mir_surface_spec_set_min_aspect_ratio(spec, aspect_width, aspect_height);
         });
 
@@ -460,8 +487,11 @@
             mir_surface_spec_set_type(spec, mir_surface_type_normal);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
             mir_surface_spec_set_max_aspect_ratio(spec, aspect_width, aspect_height);
         });
 
@@ -497,8 +527,11 @@
             mir_surface_spec_set_type(spec, mir_surface_type_normal);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
 
             mir_surface_spec_set_min_aspect_ratio(spec, aspect_width, aspect_height);
             mir_surface_spec_set_max_aspect_ratio(spec, aspect_width, aspect_height);
@@ -551,8 +584,11 @@
             mir_surface_spec_set_type(spec, type);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
         });
 
     EXPECT_THAT(surface, IsValidSurface());
@@ -567,8 +603,11 @@
             mir_surface_spec_set_type(spec, mir_surface_type_normal);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
         });
 
     auto const surface = create_surface([&](MirSurfaceSpec* spec)
@@ -576,8 +615,11 @@
         mir_surface_spec_set_type(spec, type);
         mir_surface_spec_set_width(spec, width);
         mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_spec_set_pixel_format(spec, pixel_format);
         mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
         mir_surface_spec_set_parent(spec, parent);
     });
 
@@ -593,8 +635,11 @@
             mir_surface_spec_set_type(spec, mir_surface_type_normal);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
         });
 
     auto const surface = create_surface([&](MirSurfaceSpec* spec)
@@ -602,8 +647,11 @@
             mir_surface_spec_set_type(spec, type);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
             mir_surface_spec_set_parent(spec, parent);
         });
 
@@ -619,8 +667,11 @@
             mir_surface_spec_set_type(spec, type);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
         });
 
     EXPECT_THAT(surface, Not(IsValidSurface()));
@@ -635,8 +686,11 @@
             mir_surface_spec_set_type(spec, mir_surface_type_normal);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
         });
 
     auto const surface = create_surface([&](MirSurfaceSpec* spec)
@@ -644,8 +698,11 @@
             mir_surface_spec_set_type(spec, type);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
             mir_surface_spec_set_parent(spec, parent);
         });
 
@@ -661,8 +718,11 @@
             mir_surface_spec_set_type(spec, type);
             mir_surface_spec_set_width(spec, width);
             mir_surface_spec_set_height(spec, height);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_surface_spec_set_pixel_format(spec, pixel_format);
             mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
         });
 
     EXPECT_THAT(surface, IsValidSurface());
 
=== modified file 'tests/acceptance-tests/test_surfaces_with_output_id.cpp'
--- tests/acceptance-tests/test_surfaces_with_output_id.cpp	2016-01-29 08:18:22 +0000
+++ tests/acceptance-tests/test_surfaces_with_output_id.cpp	2016-10-28 13:38:48 +0000
@@ -110,8 +110,10 @@
         initial_display_layout(display_rects);
         mtf::ConnectedClientHeadlessServer::SetUp();
         ASSERT_THAT(tracking_shell, NotNull());
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         config = mir_connection_create_display_config(connection);
+#pragma GCC diagnostic pop
         ASSERT_TRUE(config != NULL);
     }
 
 
=== modified file 'tests/acceptance-tests/test_system_compositor_window_manager.cpp'
--- tests/acceptance-tests/test_system_compositor_window_manager.cpp	2016-06-08 13:49:11 +0000
+++ tests/acceptance-tests/test_system_compositor_window_manager.cpp	2016-10-28 13:38:48 +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_surface_get_buffer_stream(surface));
+#pragma GCC diagnostic pop
     }
 
     SurfaceHandle(SurfaceHandle const&& that) : surface{that.surface} { surface = nullptr; }
@@ -81,7 +84,10 @@
         auto const surface = mir_surface_create_sync(spec);
         mir_surface_spec_release(spec);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface, on_surface_event, this);
+#pragma GCC diagnostic pop
 
         return SurfaceHandle{surface};
     };
 
=== modified file 'tests/acceptance-tests/throwback/test_client_cursor_api.cpp'
--- tests/acceptance-tests/throwback/test_client_cursor_api.cpp	2016-07-18 07:38:38 +0000
+++ tests/acceptance-tests/throwback/test_client_cursor_api.cpp	2016-10-28 13:38:48 +0000
@@ -137,10 +137,11 @@
                 mir_surface_spec_set_name(spec, client_name.c_str());
                 auto const surface = mir_surface_create_sync(spec);
                 mir_surface_spec_release(spec);
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
                 mir_buffer_stream_swap_buffers_sync(
                     mir_surface_get_buffer_stream(surface));
-
+#pragma GCC diagnostic pop
                 wait_for_surface_to_become_focused_and_exposed(surface);
 
                 setup_cursor(surface);
@@ -189,7 +190,10 @@
     void setup_cursor(MirSurface* surface) override
     {
         auto conf = mir_cursor_configuration_from_name(mir_disabled_cursor_name);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_wait_for(mir_surface_configure_cursor(surface, conf));
+#pragma GCC diagnostic pop
         mir_cursor_configuration_destroy(conf);
     }
 };
@@ -208,7 +212,10 @@
     void setup_cursor(MirSurface* surface) override
     {
         auto conf = mir_cursor_configuration_from_name(cursor_name.c_str());
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_wait_for(mir_surface_configure_cursor(surface, conf));
+#pragma GCC diagnostic pop
         mir_cursor_configuration_destroy(conf);
     }
 
@@ -377,10 +384,11 @@
         {
             auto conf1 = mir_cursor_configuration_from_name(cursor_name.c_str());
             auto conf2 = mir_cursor_configuration_from_name(mir_disabled_cursor_name);
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_wait_for(mir_surface_configure_cursor(surface, conf1));
             mir_wait_for(mir_surface_configure_cursor(surface, conf2));
-
+#pragma GCC diagnostic pop
             mir_cursor_configuration_destroy(conf1);
             mir_cursor_configuration_destroy(conf2);
         }
@@ -415,14 +423,20 @@
 
         void setup_cursor(MirSurface* surface) override
         {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             auto stream = mir_connection_create_buffer_stream_sync(
                 connection, 24, 24, mir_pixel_format_argb_8888,
                 mir_buffer_usage_software);
+#pragma GCC diagnostic pop
             auto conf = mir_cursor_configuration_from_buffer_stream(stream, hotspot_x, hotspot_y);
 
             mir_buffer_stream_swap_buffers_sync(stream);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             mir_wait_for(mir_surface_configure_cursor(surface, conf));
+#pragma GCC diagnostic pop
             
             mir_cursor_configuration_destroy(conf);            
             
@@ -468,9 +482,12 @@
         // for the test logic. - alan_g
         std::this_thread::sleep_for(std::chrono::milliseconds(20));
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_state(surface, mir_surface_state_fullscreen);
         auto conf = mir_cursor_configuration_from_name(mir_disabled_cursor_name);
         mir_surface_configure_cursor(surface, conf);
+#pragma GCC diagnostic pop
         mir_cursor_configuration_destroy(conf);
     }
 };
 
=== modified file 'tests/acceptance-tests/throwback/test_client_library_errors.cpp'
--- tests/acceptance-tests/throwback/test_client_library_errors.cpp	2016-10-21 07:53:23 +0000
+++ tests/acceptance-tests/throwback/test_client_library_errors.cpp	2016-10-28 13:38:48 +0000
@@ -234,9 +234,11 @@
     auto connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
 
     ASSERT_THAT(connection, IsValid());
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto stream = mir_connection_create_buffer_stream_sync(connection,
         640, 480, mir_pixel_format_abgr_8888, mir_buffer_usage_software);
+#pragma GCC diagnostic pop
     ASSERT_NE(stream, nullptr);
     EXPECT_FALSE(mir_buffer_stream_is_valid(stream));
     EXPECT_THAT(mir_buffer_stream_get_error_message(stream), testing::HasSubstr(exception_text));
@@ -438,5 +440,8 @@
 TEST_F(ClientLibraryErrorsDeathTest, creating_screencast_with_invalid_connection)
 {
     MirScreencastParameters params{{0, 0, 1, 1}, 1, 1, mir_pixel_format_abgr_8888};
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     EXPECT_DEATH(mir_connection_create_screencast_sync(nullptr, &params), "");
+#pragma GCC diagnostic pop
 }
 
=== modified file 'tests/acceptance-tests/throwback/test_presentation_chain.cpp'
--- tests/acceptance-tests/throwback/test_presentation_chain.cpp	2016-10-21 07:53:23 +0000
+++ tests/acceptance-tests/throwback/test_presentation_chain.cpp	2016-10-28 13:38:48 +0000
@@ -347,7 +347,10 @@
 TEST_F(PresentationChain, destroying_a_chain_will_return_buffers_associated_with_chain)
 {
     auto chain = mir_connection_create_presentation_chain_sync(connection);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto stream = mir_connection_create_buffer_stream_sync(connection, 25, 12, mir_pixel_format_abgr_8888, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
     ASSERT_TRUE(mir_presentation_chain_is_valid(chain));
 
     auto spec = mir_connection_create_spec_for_normal_surface(
 
=== modified file 'tests/acceptance-tests/throwback/test_shell_control_of_surface_configuration.cpp'
--- tests/acceptance-tests/throwback/test_shell_control_of_surface_configuration.cpp	2016-01-29 08:18:22 +0000
+++ tests/acceptance-tests/throwback/test_shell_control_of_surface_configuration.cpp	2016-10-28 13:38:48 +0000
@@ -88,9 +88,11 @@
     EXPECT_CALL(*mock_window_manager,
         set_surface_attribute(_, _, mir_surface_attrib_state, Eq(mir_surface_state_maximized)));
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_wait_for(mir_surface_set_state(surface, mir_surface_state_maximized));
-
     EXPECT_THAT(mir_surface_get_state(surface), Eq(mir_surface_state_maximized));
+#pragma GCC diagnostic pop
 }
 
 TEST_F(ShellSurfaceConfiguration, the_window_manager_may_interfere_with_attribute_changes)
@@ -109,7 +111,9 @@
         set_surface_attribute(_, _, mir_surface_attrib_state, Eq(mir_surface_state_maximized)))
         .WillOnce(Invoke(set_to_vertmax));
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_wait_for(mir_surface_set_state(surface, mir_surface_state_maximized));
-
     EXPECT_THAT(mir_surface_get_state(surface), Eq(mir_surface_state_vertmaximized));
+#pragma GCC diagnostic pop
 }
 
=== modified file 'tests/integration-tests/test_client_screencast.cpp'
--- tests/integration-tests/test_client_screencast.cpp	2016-10-12 06:03:15 +0000
+++ tests/integration-tests/test_client_screencast.cpp	2016-10-28 13:38:48 +0000
@@ -121,7 +121,10 @@
 
     EXPECT_CALL(mock_screencast(), destroy_session(screencast_session_id));
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto screencast = mir_connection_create_screencast_sync(connection, &default_screencast_params);
+#pragma GCC diagnostic pop
     ASSERT_NE(nullptr, screencast);
     ASSERT_TRUE(mir_screencast_is_valid(screencast));
 
@@ -151,7 +154,10 @@
 
     EXPECT_CALL(mock_screencast(), destroy_session(_));
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto screencast = mir_connection_create_screencast_sync(connection, &default_screencast_params);
+#pragma GCC diagnostic pop
     ASSERT_NE(nullptr, screencast);
     ASSERT_TRUE(mir_screencast_is_valid(screencast));
 
@@ -171,12 +177,15 @@
         .WillOnce(Return(stub_buffer));
     EXPECT_CALL(mock_screencast(), destroy_session(_));
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto screencast = mir_connection_create_screencast_sync(connection, &default_screencast_params);
     ASSERT_NE(nullptr, screencast);
     ASSERT_TRUE(mir_screencast_is_valid(screencast));
 
     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_release_sync(screencast);
@@ -189,7 +198,10 @@
     EXPECT_CALL(mock_screencast(), create_session(_, _, _, _, _))
         .WillOnce(Throw(std::runtime_error(an_error_message)));
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto screencast = mir_connection_create_screencast_sync(connection, &default_screencast_params);
+#pragma GCC diagnostic pop
     ASSERT_NE(nullptr, screencast);
     ASSERT_FALSE(mir_screencast_is_valid(screencast));
 
@@ -230,7 +242,10 @@
     MirRectangle const capture_region = as_mir_rect(region);
     mir_screencast_spec_set_capture_region(spec, &capture_region);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_screencast_spec_set_number_of_buffers(spec, num_buffers);
+#pragma GCC diagnostic pop
     mir_screencast_spec_set_mirror_mode(spec, mirror_mode);
 
     auto screencast = mir_screencast_create_sync(spec);
 
=== modified file 'tests/integration-tests/test_focus_selection.cpp'
--- tests/integration-tests/test_focus_selection.cpp	2015-06-26 08:00:59 +0000
+++ tests/integration-tests/test_focus_selection.cpp	2016-10-28 13:38:48 +0000
@@ -133,7 +133,10 @@
     ASSERT_TRUE(mir_connection_is_valid(connection));
 
     auto const surface = mtf::make_any_surface(connection);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_buffer_stream_swap_buffers_sync(mir_surface_get_buffer_stream(surface));
+#pragma GCC diagnostic pop
     mir_surface_release_sync(surface);
 
     mir_connection_release(connection);
 
=== modified file 'tests/integration-tests/test_server_shutdown.cpp'
--- tests/integration-tests/test_server_shutdown.cpp	2016-01-29 08:18:22 +0000
+++ tests/integration-tests/test_server_shutdown.cpp	2016-10-28 13:38:48 +0000
@@ -95,15 +95,21 @@
 
     void swap_sync()
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers_sync(
             mir_surface_get_buffer_stream(surface));
+#pragma GCC diagnostic pop
     }
 
     void swap_async()
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers(
             mir_surface_get_buffer_stream(surface),
             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	2016-08-01 14:43:19 +0000
+++ tests/integration-tests/test_stale_frames.cpp	2016-10-28 13:38:48 +0000
@@ -183,6 +183,8 @@
 
     std::set<mg::BufferID> stale_buffers;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     stale_buffers.emplace(mir_debug_surface_current_buffer_id(surface));
 
     auto bs = mir_surface_get_buffer_stream(surface);
@@ -194,6 +196,7 @@
     EXPECT_THAT(stale_buffers.size(), Eq(2));
 
     auto const fresh_buffer = mg::BufferID{mir_debug_surface_current_buffer_id(surface)};
+#pragma GCC diagnostic pop
     mir_buffer_stream_swap_buffers_sync(bs);
 
     start_compositor();
@@ -212,11 +215,14 @@
 
     stop_compositor();
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto bs = mir_surface_get_buffer_stream(surface);
     mir_buffer_stream_swap_buffers_sync(bs);
     mir_buffer_stream_swap_buffers_sync(bs);
 
     auto const fresh_buffer = mg::BufferID{mir_debug_surface_current_buffer_id(surface)};
+#pragma GCC diagnostic pop
     mir_buffer_stream_swap_buffers_sync(bs);
 
     start_compositor();
 
=== modified file 'tests/integration-tests/test_submit_buffer.cpp'
--- tests/integration-tests/test_submit_buffer.cpp	2016-10-20 14:17:36 +0000
+++ tests/integration-tests/test_submit_buffer.cpp	2016-10-28 13:38:48 +0000
@@ -314,8 +314,11 @@
     while(Clock::now() < pt)
     {
         //auto z = mir_debug_surface_current_buffer_id(surface);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         if (mir_debug_surface_current_buffer_id(surface) == id.as_value())
             return true;
+#pragma GCC diagnostic pop
         std::this_thread::yield();
     }
     return false;
 
=== modified file 'tests/integration-tests/test_surface_first_frame_sync.cpp'
--- tests/integration-tests/test_surface_first_frame_sync.cpp	2016-08-01 14:43:19 +0000
+++ tests/integration-tests/test_surface_first_frame_sync.cpp	2016-10-28 13:38:48 +0000
@@ -210,8 +210,11 @@
      */
     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_surface_get_buffer_stream(surface));
+#pragma GCC diagnostic pop
 
     /* After submitting the buffer we should get some render operations */
     mir::test::spin_wait_for_condition_or_timeout(
 
=== modified file 'tests/integration-tests/test_swapinterval.cpp'
--- tests/integration-tests/test_swapinterval.cpp	2016-10-26 05:15:38 +0000
+++ tests/integration-tests/test_swapinterval.cpp	2016-10-28 13:38:48 +0000
@@ -113,8 +113,11 @@
     {
         mtf::BasicClientServerFixture<ServerConfig>::SetUp();
         surface = 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()
@@ -135,6 +138,8 @@
 
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 TEST_F(SwapInterval, defaults_to_one)
 {
     EXPECT_EQ(1, mir_buffer_stream_get_swapinterval(stream));
@@ -192,3 +197,4 @@
     EXPECT_EQ(original_swapinterval, mir_surface_get_swapinterval(surface));
     EXPECT_EQ(original_framedropping, framedropping_enabled());
 }
+#pragma GCC diagnostic pop
 
=== modified file 'tests/mir_test/display_config_matchers.cpp'
--- tests/mir_test/display_config_matchers.cpp	2016-10-20 15:05:56 +0000
+++ tests/mir_test/display_config_matchers.cpp	2016-10-28 13:38:48 +0000
@@ -190,11 +190,14 @@
     TestDisplayConfiguration(MirDisplayConfig const* config)
     {
         /* Cards; fake it, 'cause we only ever support 1 card at the moment */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         cards.push_back(
             mg::DisplayConfigurationCard{
                 mg::DisplayConfigurationCardId{1},
                 static_cast<size_t>(mir_display_config_get_max_simultaneous_outputs(config))
             });
+#pragma GCC diagnostic pop
 
         /* Outputs */
         for (int i = 0; i < mir_display_config_get_num_outputs(config); i++)
 
=== modified file 'tests/mir_test_framework/connected_client_with_a_surface.cpp'
--- tests/mir_test_framework/connected_client_with_a_surface.cpp	2016-01-29 08:18:22 +0000
+++ tests/mir_test_framework/connected_client_with_a_surface.cpp	2016-10-28 13:38:48 +0000
@@ -27,7 +27,11 @@
     auto const spec = mir_connection_create_spec_for_normal_surface(
         connection, surface_size.width.as_int(), surface_size.height.as_int(), mir_pixel_format_abgr_8888);
     mir_surface_spec_set_name(spec, "ConnectedClientWithASurfaceFixtureSurface");
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
 
     surface = mir_surface_create_sync(spec);
     mir_surface_spec_release(spec);
 
=== modified file 'tests/mir_test_framework/visible_surface.cpp'
--- tests/mir_test_framework/visible_surface.cpp	2016-01-08 12:40:51 +0000
+++ tests/mir_test_framework/visible_surface.cpp	2016-10-28 13:38:48 +0000
@@ -27,7 +27,10 @@
     // Swap buffers to ensure surface is visible for event based tests
     if (mir_surface_is_valid(surface))
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_buffer_stream_swap_buffers_sync(mir_surface_get_buffer_stream(surface));
+#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	2016-05-10 23:20:32 +0000
+++ tests/performance-tests/test_client_startup.cpp	2016-10-28 13:38:48 +0000
@@ -92,7 +92,10 @@
 
     auto conn = create_connection();
     auto surf = make_surface(conn);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto stream  = mir_surface_get_buffer_stream(surf);
+#pragma GCC diagnostic pop
     if (!mir_buffer_stream_is_valid(stream))
     {
         std::string error_msg{"Could not get buffer stream from surface: "};
 
=== modified file 'tests/privileged-tests/test_input_events.cpp'
--- tests/privileged-tests/test_input_events.cpp	2016-08-09 08:13:02 +0000
+++ tests/privileged-tests/test_input_events.cpp	2016-10-28 13:38:48 +0000
@@ -213,9 +213,12 @@
         if (!mir_surface_is_valid(surface))
             throw std::runtime_error("Failed to create MirSurface");
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface, handle_input, handler);
         mir_buffer_stream_swap_buffers_sync(
             mir_surface_get_buffer_stream(surface));
+#pragma GCC diagnostic pop
 
         wait_for_surface_to_become_focused_and_exposed(surface);
 
 
=== modified file 'tests/test-clients/impolite-shutdown/scroll.cpp'
--- tests/test-clients/impolite-shutdown/scroll.cpp	2016-03-29 16:37:11 +0000
+++ tests/test-clients/impolite-shutdown/scroll.cpp	2016-10-28 13:38:48 +0000
@@ -64,9 +64,11 @@
     rc = eglChooseConfig(disp, attribs, &egl_config, 1, &n);
     assert(rc == EGL_TRUE);
     assert(n == 1);
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirPixelFormat pixel_format =
         mir_connection_get_egl_pixel_format(connection, disp, egl_config);
+#pragma GCC diagnostic pop
 
     printf("Mir chose pixel format %d\n", pixel_format);
 
@@ -80,7 +82,10 @@
     assert(spec != nullptr);
 
     mir_surface_spec_set_name(spec.get(), __PRETTY_FUNCTION__);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(spec.get(), mir_buffer_usage_hardware);
+#pragma GCC diagnostic pop
 
     MirSurface *surface = mir_surface_create_sync(spec.get());
     spec.reset();
@@ -90,9 +95,12 @@
     assert(strcmp(mir_surface_get_error_message(surface), "") == 0);
     puts("Surface created");
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     EGLNativeWindowType native_window =
         (EGLNativeWindowType)mir_buffer_stream_get_egl_native_window(
             mir_surface_get_buffer_stream(surface));
+#pragma GCC diagnostic pop
     assert(native_window != (EGLNativeWindowType)NULL);
 
     egl_surface = eglCreateWindowSurface(disp, egl_config, native_window, NULL);
@@ -171,7 +179,10 @@
     assert(strcmp(mir_connection_get_error_message(connection), "") == 0);
     puts("Connected");
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     EGLNativeDisplayType native_display = (EGLNativeDisplayType) mir_connection_get_egl_native_display(connection);
+#pragma GCC diagnostic pop
     disp = eglGetDisplay(native_display);
     assert(disp != EGL_NO_DISPLAY);
 
 
=== modified file 'tests/test-clients/mir-stress/src/client.cpp'
--- tests/test-clients/mir-stress/src/client.cpp	2015-06-17 05:20:42 +0000
+++ tests/test-clients/mir-stress/src/client.cpp	2016-10-28 13:38:48 +0000
@@ -60,7 +60,10 @@
 
 bool UnacceleratedClient::create_surface()
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto display_configuration = mir_connection_create_display_config(connection_);
+#pragma GCC diagnostic pop
     if (display_configuration->num_outputs < 1)
         return false;
 
@@ -75,7 +78,10 @@
     auto const spec = mir_connection_create_spec_for_normal_surface(
         connection_, 640, 480, pixel_format);
     mir_surface_spec_set_name(spec, __PRETTY_FUNCTION__);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_software);
+#pragma GCC diagnostic pop
 
     surface_ = mir_surface_create_sync(spec);
     mir_surface_spec_release(spec);
 
=== modified file 'tests/unit-tests/client/test_mir_connection.cpp'
--- tests/unit-tests/client/test_mir_connection.cpp	2016-10-21 09:20:55 +0000
+++ tests/unit-tests/client/test_mir_connection.cpp	2016-10-28 13:38:48 +0000
@@ -615,12 +615,15 @@
     using namespace testing;
 
     unsigned int const opcode{42};
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto const request = mir::raii::deleter_for(
         mir_platform_message_create(opcode),
         &mir_platform_message_release);
     auto const response = mir::raii::deleter_for(
         mir_platform_message_create(opcode),
         &mir_platform_message_release);
+#pragma GCC diagnostic pop
 
     EXPECT_CALL(*mock_platform, platform_operation(request.get()))
         .WillOnce(Return(response.get()));
@@ -645,9 +648,12 @@
     using namespace testing;
 
     unsigned int const opcode{42};
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto const request = mir::raii::deleter_for(
         mir_platform_message_create(opcode),
         &mir_platform_message_release);
+#pragma GCC diagnostic pop
 
     EXPECT_CALL(*mock_platform, platform_operation(_))
         .WillOnce(Return(nullptr));
@@ -664,8 +670,11 @@
         request.get(), assign_response, &returned_response);
     mir_wait_for(op_wh);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     EXPECT_THAT(mir_platform_message_get_opcode(returned_response), Eq(opcode));
     mir_platform_message_release(returned_response);
+#pragma GCC diagnostic pop
 }
 
 TEST_F(MirConnectionTest, wait_handle_is_signalled_during_stream_creation_error)
 
=== modified file 'tests/unit-tests/platforms/mesa/client/test_client_platform.cpp'
--- tests/unit-tests/platforms/mesa/client/test_client_platform.cpp	2016-09-01 23:08:33 +0000
+++ tests/unit-tests/platforms/mesa/client/test_client_platform.cpp	2016-10-28 13:38:48 +0000
@@ -58,11 +58,14 @@
 {
     MirPlatformMessage* set_gbm_device(gbm_device* dev)
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         auto request_msg = mir::raii::deleter_for(
             mir_platform_message_create(MirMesaPlatformOperation::set_gbm_device),
             &mir_platform_message_release);
         MirMesaSetGBMDeviceRequest const request{dev};
         mir_platform_message_set_data(request_msg.get(), &request, sizeof(request));
+#pragma GCC diagnostic pop
 
         return platform->platform_operation(request_msg.get());
     }
@@ -97,12 +100,18 @@
     int const success{0};
     auto const gbm_dev_dummy = reinterpret_cast<gbm_device*>(this);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto response_msg = mir::raii::deleter_for(
         set_gbm_device(gbm_dev_dummy),
         &mir_platform_message_release);
+#pragma GCC diagnostic pop
 
     ASSERT_THAT(response_msg, NotNull());
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto const response_data = mir_platform_message_get_data(response_msg.get());
+#pragma GCC diagnostic pop
     ASSERT_THAT(response_data.size, Eq(sizeof(MirMesaSetGBMDeviceResponse)));
 
     MirMesaSetGBMDeviceResponse response{-1};
@@ -119,9 +128,12 @@
     int const previous_data_count{pkg.data_items};
     auto const gbm_dev_dummy = reinterpret_cast<gbm_device*>(this);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     auto response_msg = mir::raii::deleter_for(
         set_gbm_device(gbm_dev_dummy),
         &mir_platform_message_release);
+#pragma GCC diagnostic pop
 
     platform->populate(pkg);
     EXPECT_THAT(pkg.data_items, Eq(previous_data_count + (sizeof(gbm_dev_dummy) / sizeof(int))));