Mir

Merge lp:~alan-griffiths/mir/bump-client-ABI into lp:mir

bump-client-ABI
Merge into development-branch

Proposed by Alan Griffiths on 2015-05-11

Status:	Merged
Approved by:	Alan Griffiths on 2015-06-02
Approved revision:	no longer in the source branch.
Merged at revision:	2610
Proposed branch:	lp:~alan-griffiths/mir/bump-client-ABI
Merge into:	lp:mir
Diff against target:	1190 lines (+87/-807) 17 files modified debian/control (+2/-2) debian/libmirclient9.install (+1/-1) include/client/mir_toolkit/mir_client_library_drm.h (+0/-59) include/client/mir_toolkit/mir_connection.h (+0/-6) include/client/mir_toolkit/mir_screencast.h (+0/-7) include/client/mir_toolkit/mir_surface.h (+0/-107) src/client/CMakeLists.txt (+1/-1) src/client/mir_connection.h (+0/-1) src/client/mir_connection_api.cpp (+1/-175) src/client/mir_screencast_api.cpp (+0/-5) src/client/mir_surface_api.cpp (+1/-114) src/client/symbols-debug.map (+1/-1) src/client/symbols.map (+80/-129) tests/acceptance-tests/test_client_library.cpp (+0/-45) tests/client-language/c99.c (+0/-1) tests/integration-tests/CMakeLists.txt (+0/-1) tests/integration-tests/test_drm_auth_magic.cpp (+0/-152)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/bump-client-ABI
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Alexandros Frantzis (community)			Approve on 2015-06-02
Daniel van Vugt		2015-05-11	Approve on 2015-06-02
PS Jenkins bot (community)	continuous-integration		Approve on 2015-06-01
Review via email: mp+258769@code.launchpad.net

Commit message

Bump client ABI and delete ABI maintenance legacy

Description of the change

Bump client ABI and delete ABI maintenance legacy

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-11:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3794/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-05-11:

That's the trouble with ABI breaks...

glmark2-es2-mir: symbol lookup error: glmark2-es2-mir: undefined symbol: mir_connection_create_surface_sync

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2015-05-12:

That's bug 1341490

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-05-13:

Testing locally the archive glmark2-es2-mir correctly picks up the archive libmirclient.so.8 & libmircommon.so.3 and works with the built mir_performance_tests (which picks up the local ones).

So at least the code isn't broken.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-13:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3825/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-05-13:

Err http://ports.ubuntu.com/ubuntu-ports/ vivid/universe glmark2-data all 2014.03-0ubuntu3
Temporary failure resolving 'ports.ubuntu.com'

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-13:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3826/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-05-13:

Managed to reproduce locally!!

Will investigate tomorrow

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-13:

FAILED: Continuous integration, rev:2572
http://jenkins.qa.ubuntu.com/job/mir-ci/3829/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2473
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2472
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2421/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1826/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2421/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3829/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-05-14:

Intermediate result of local investigations. It has something to do with the version of libmirclient.so.8 being picked up. If this comes from 0.13 everything is fine, if it comes from 0.12 then we see an error.

It is tempting to wait for 0.13 to hit achive and resubmit - but these problems tend to come back and bite.

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-05-14:

With a 0.12.1 version of libmirclient.so.8 the failure is:

Core was generated by `glmark2-es2-mir --fullscreen'.
Program terminated with signal SIGSEGV, Segmentation fault.
#0 0x00007fe8b318de26 in std::string::assign(char const*, unsigned long) () from /usr/lib/x86_64-linux-gnu/libstdc++.so.6
(gdb) bt
#0 0x00007fe8b318de26 in std::string::assign(char const*, unsigned long) () from /usr/lib/x86_64-linux-gnu/libstdc++.so.6
#1 0x00007fe8b3822871 in MirConnection::MirConnection(mir::client::ConnectionConfiguration&) () from /usr/lib/x86_64-linux-gnu/libmirclient.so.8
#2 0x00007fe8b3827679 in mir_connect () from /usr/lib/x86_64-linux-gnu/libmirclient.so.8
#3 0x00007fe8b38279fb in mir_connect_sync () from /usr/lib/x86_64-linux-gnu/libmirclient.so.8
#4 0x000000000050c402 in ?? ()
#5 0x000000000050aab3 in ?? ()
#6 0x0000000000406bf0 in ?? ()
#7 0x00007fe8b25e4a40 in __libc_start_main (main=0x406520, argc=2, argv=0x7fff42b48018, init=<optimised out>, fini=<optimised out>,
rtld_fini=<optimised out>, stack_end=0x7fff42b48008) at libc-start.c:289
#8 0x000000000040842f in ?? ()
(gdb) f 2
#2 0x00007fe8b3827679 in mir_connect () from /usr/lib/x86_64-linux-gnu/libmirclient.so.8

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-14:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3838/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-05-15:

> That's bug 1341490

Well, maybe.

In this case it isn't directly bumping the client API that causes the failure.

What seems to be happening is that glmark2-es2-mir depends on libmirclient8 and the version of that in archive (0.12.1) depends on libmircommon3. As does libmirplatform6 and the corresponding drivers.

The version of libmirclient8 in 0.13.1 depends on libmircommon4 as does libmirplatform7 and the corresponding drivers.

When the libmirclient8 from 0.12.1 tries to load drivers that use libmircommon4 we get a segfault (I haven't quite traced the full mechanism yet - but loading libmircommon3 and libmircommon4 into the same process clearly "needs care" at best).

There are several ways to produce this crash:

o Having 0.12.1 mir-platform-graphics-mesa2 installed alongside libmircommon3 is one.
(That's what I believe happens in CI)

o Building this branch and running mir_performance_tests via the wrapper link.
(Ensure you don't have a recent libmirclient.so.8 in the libs directory)

Hacking test_glmark2-es2-mir.cpp to unsetenv("MIR_CLIENT_PLATFORM_PATH") actually "fixes" the second case, but is probably a bad idea (and doesn't fix CI which doesn't set that variable in the wrapper).

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-15:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3850/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-19:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3875/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2015-05-22:

Text conflict in src/client/symbols.map
1 conflicts encountered.

Revision history for this message

Daniel van Vugt (vanvugt) on 2015-05-22:

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-27:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3907/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-27:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3909/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2015-05-28:

Might be related to bug 1415321 then. Unfortunately you need 0.13 in archive (and all downstreams like glmark2 rebuilt against it) to resolve that too :P

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-01:

PASSED: Continuous integration, rev:2587
http://jenkins.qa.ubuntu.com/job/mir-ci/3958/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2644
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/155
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2592
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/114
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/114/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2592
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2592/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5442
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20860

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3958/rebuild

review: Approve (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2015-06-02:

Wow such diff, for a single ABI bump.

Not totally confident but it seems about right.

review: Approve

Revision history for this message

Alexandros Frantzis (afrantzis) wrote on 2015-06-02:

Great!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Alan Griffiths

Emanuele Antonio Faraone

Gerry Boland

Mir development team

 === modified file 'debian/control'
 --- debian/control	2015-05-19 21:34:34 +0000
 +++ debian/control	2015-06-01 09:48:29 +0000
@@ -138,7 +138,7 @@
+  .
   Contains header files required to build Mir servers.
--Package: libmirclient8
++Package: libmirclient9
  Section: libs
  Architecture: i386 amd64 armhf arm64
  Multi-Arch: same
@@ -156,7 +156,7 @@
  Architecture: i386 amd64 armhf arm64
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
--Depends: libmirclient8 (= ${binary:Version}),
++Depends: libmirclient9 (= ${binary:Version}),
           libmircommon-dev (= ${binary:Version}),
           libprotobuf-dev (>= 2.4.1),
           ${misc:Depends},
 === renamed file 'debian/libmirclient8.install' => 'debian/libmirclient9.install'
 --- debian/libmirclient8.install	2015-03-31 02:35:42 +0000
 +++ debian/libmirclient9.install	2015-06-01 09:48:29 +0000
@@ -1,1 +1,1 @@
--usr/lib/*/libmirclient.so.8
++usr/lib/*/libmirclient.so.9
 === removed file 'include/client/mir_toolkit/mir_client_library_drm.h'
 --- include/client/mir_toolkit/mir_client_library_drm.h	2015-05-19 21:34:34 +0000
 +++ include/client/mir_toolkit/mir_client_library_drm.h	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
--/*
-- * Copyright © 2012 Canonical Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU Lesser General Public License version 3,
-- * as published by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#ifndef MIR_CLIENT_LIBRARY_DRM_H_
--#define MIR_CLIENT_LIBRARY_DRM_H_
--
--#include "mir_toolkit/mir_client_library.h"
--
--#ifdef __cplusplus
--/**
-- * \addtogroup mir_toolkit
-- * @{
-- */
--extern "C" {
--#endif
--
--struct gbm_device;
--
--typedef void (*mir_drm_auth_magic_callback)(int status, void *context);
--
--/* Authenticates a DRM magic cookie */
--MirWaitHandle *mir_connection_drm_auth_magic(MirConnection *connection,
--                                             unsigned int magic,
--                                             mir_drm_auth_magic_callback callback,
--                                             void *context)
--    __attribute__((__deprecated__("Use mir_connection_platform_operation() with operations from mir_toolkit/mesa/platform_operation.h")));
--
--/**
-- * Set the gbm_device to be used by the EGL implementation.
-- * This is required if the application needs to create EGLImages from
-- * gbm buffers objects created on that gbm device.
-- * \param [in] connection  The connection
-- * \param [in] dev         The gbm_device to set
-- * \return                 A non-zero value if the operation was successful,
-- *                         0 otherwise
-- */
--int mir_connection_drm_set_gbm_device(MirConnection* connection,
--                                      struct gbm_device* dev)
--    __attribute__((__deprecated__("Use mir_connection_platform_operation() with operations from mir_toolkit/mesa/platform_operation.h")));
--
--#ifdef __cplusplus
--}
--/**@}*/
--#endif
--
--#endif /* MIR_CLIENT_LIBRARY_DRM_H_ */
 === modified file 'include/client/mir_toolkit/mir_connection.h'
 --- include/client/mir_toolkit/mir_connection.h	2015-03-31 02:35:42 +0000
 +++ include/client/mir_toolkit/mir_connection.h	2015-06-01 09:48:29 +0000
@@ -104,12 +104,6 @@
      mir_lifecycle_event_callback callback, void* context);
  /**
-- * \deprecated Use mir_connection_create_display_config
-- */
--__attribute__((__deprecated__("Use mir_connection_create_display_config()")))
--void mir_connection_get_display_info(MirConnection *connection, MirDisplayInfo *display_info);
--
--/**
   * Query the display
   *   \warning return value must be destroyed via mir_display_config_destroy()
   *   \warning may return null if connection is invalid
 === modified file 'include/client/mir_toolkit/mir_screencast.h'
 --- include/client/mir_toolkit/mir_screencast.h	2015-03-31 02:35:42 +0000
 +++ include/client/mir_toolkit/mir_screencast.h	2015-06-01 09:48:29 +0000
@@ -56,13 +56,6 @@
   */
  MirBufferStream* mir_screencast_get_buffer_stream(MirScreencast *screencast);
--/**
-- * Get a window type that can be used by EGL.
-- *   \param [in] screencast  The screencast
-- *   \return                 An EGLNativeWindowType that the client can use
-- */
--MirEGLNativeWindowType mir_screencast_egl_native_window(MirScreencast *screencast) __attribute__((__deprecated__("Use mir_screencast_get_buffer_stream and the corresponding mir_buffer_stream* function")));
--
  #ifdef __cplusplus
+ }
  /**@}*/
 === modified file 'include/client/mir_toolkit/mir_surface.h'
 --- include/client/mir_toolkit/mir_surface.h	2015-05-19 21:34:34 +0000
 +++ include/client/mir_toolkit/mir_surface.h	2015-06-01 09:48:29 +0000
@@ -383,42 +383,6 @@
  void mir_surface_spec_release(MirSurfaceSpec* spec);
  /**
-- * Request a new Mir surface on the supplied connection with the supplied
-- * parameters. The returned handle remains valid until the surface has been
-- * released.
-- *   \warning callback could be called from another thread. You must do any
-- *            locking appropriate to protect your data accessed in the
-- *            callback.
-- *   \note    This will soon be deprecated. Use the *_spec_for_* / mir_surface_create()
-- *            two-stage process instead.
-- *   \param [in] connection          The connection
-- *   \param [in] surface_parameters  Request surface parameters
-- *   \param [in] callback            Callback function to be invoked when
-- *                                   request completes
-- *   \param [in,out] context         User data passed to the callback function
-- *   \return                         A handle that can be passed to
-- *                                   mir_wait_for
-- */
--MirWaitHandle *mir_connection_create_surface(
--    MirConnection *connection,
--    MirSurfaceParameters const *surface_parameters,
--    mir_surface_callback callback,
--    void *context) __attribute__((__deprecated__("Use mir_surface_create()")));
--
--/**
-- * Create a surface like in mir_connection_create_surface(), but also wait for
-- * creation to complete and return the resulting surface.
-- *   \note    This will soon be deprecated. Use the create_spec_for/mir_surface_create()
-- *            two-stage process instead.
-- *   \param [in] connection  The connection
-- *   \param [in] params      Parameters describing the desired surface
-- *   \return                 The resulting surface
-- */
--MirSurface *mir_connection_create_surface_sync(
--    MirConnection *connection,
--    MirSurfaceParameters const *params) __attribute__((__deprecated__("Use mir_surface_create_sync()")));
--
--/**
   * Set the event handler to be called when events arrive for a surface.
   *   \warning event_handler could be called from another thread. You must do
   *            any locking appropriate to protect your data accessed in the
@@ -442,13 +406,6 @@
  MirBufferStream* mir_surface_get_buffer_stream(MirSurface *surface);
  /**
-- * Get a window type that can be used for OpenGL ES 2.0 acceleration.
-- *   \param [in] surface  The surface
-- *   \return              An EGLNativeWindowType that the client can use
-- */
--MirEGLNativeWindowType mir_surface_get_egl_native_window(MirSurface *surface) __attribute__((__deprecated__("Use mir_surface_get_buffer_stream and the corresponding mir_buffer_stream* function")));
--
--/**
   * Test for a valid surface
   *   \param [in] surface  The surface
   *   \return              True if the supplied surface is valid, or
@@ -476,58 +433,6 @@
  void mir_surface_get_parameters(MirSurface *surface, MirSurfaceParameters *parameters);
  /**
-- * Get the underlying platform type so the buffer obtained in "raw" representation
-- * in mir_surface_get_current_buffer() can be understood
-- *   \pre                     The surface is valid
-- *   \param [in] surface      The surface
-- *   \return                  One of mir_platform_type_android or mir_platform_type_gbm
-- */
--MirPlatformType mir_surface_get_platform_type(MirSurface *surface) __attribute__((__deprecated__("Use mir_surface_get_buffer_stream and the corresponding mir_buffer_stream* function")));
--
--/**
-- * Get a surface's buffer in "raw" representation.
-- *   \pre                         The surface is valid
-- *   \param [in] surface          The surface
-- *   \param [out] buffer_package  Structure to be populated
-- */
--void mir_surface_get_current_buffer(MirSurface *surface, MirNativeBuffer **buffer_package) __attribute__((__deprecated__("Use mir_surface_get_buffer_stream and the corresponding mir_buffer_stream* function")));
--
--/**
-- * Get a surface's graphics_region, i.e., map the graphics buffer to main
-- * memory.
-- *   \pre                          The surface is valid
-- *   \param [in] surface           The surface
-- *   \param [out] graphics_region  Structure to be populated
-- */
--void mir_surface_get_graphics_region(
--    MirSurface *surface,
--    MirGraphicsRegion *graphics_region) __attribute__((__deprecated__("Use mir_surface_get_buffer_stream and the corresponding mir_buffer_stream* function")));
--                                                                          /**
-- * Advance a surface's buffer. The returned handle remains valid until the next
-- * call to mir_surface_swap_buffers, until the surface has been released or the
-- * connection to the server has been released.
-- *   \warning callback could be called from another thread. You must do any
-- *            locking appropriate to protect your data accessed in the
-- *            callback.
-- *   \param [in] surface      The surface
-- *   \param [in] callback     Callback function to be invoked when the request
-- *                            completes
-- *   \param [in,out] context  User data passed to the callback function
-- *   \return                  A handle that can be passed to mir_wait_for
-- */
--MirWaitHandle *mir_surface_swap_buffers(
--    MirSurface *surface,
--    mir_surface_callback callback,
--    void *context) __attribute__((__deprecated__("Use mir_surface_get_buffer_stream and the corresponding mir_buffer_stream* function")));
--
--/**
-- * Advance a surface's buffer as in mir_surface_swap_buffers(), but also wait
-- * for the operation to complete.
-- *   \param [in] surface  The surface whose buffer to advance
-- */
--void mir_surface_swap_buffers_sync(MirSurface *surface) __attribute__((__deprecated__("Use mir_surface_get_buffer_stream and the corresponding mir_buffer_stream* function")));
--
--/**
   * Release the supplied surface and any associated buffer. The returned wait
   * handle remains valid until the connection to the server is released.
   *   \warning callback could be called from another thread. You must do any
@@ -552,18 +457,6 @@
  void mir_surface_release_sync(MirSurface *surface);
  /**
-- * \deprecated Use mir_debug_surface_id()
-- */
--__attribute__((__deprecated__("Use mir_debug_surface_id()")))
--int mir_surface_get_id(MirSurface *surface);
--
--/**
-- * \deprecated Use the mir_connection_create_spec_for_xxx family of APIs
-- */
--__attribute__((__deprecated__("Use mir_connection_create_spec_for_xxx()")))
--MirWaitHandle* mir_surface_set_type(MirSurface *surface, MirSurfaceType type);
--
--/**
   * Get the type (purpose) of a surface.
   *   \param [in] surface  The surface to query
   *   \return              The type of the surface
 === modified file 'src/client/CMakeLists.txt'
 --- src/client/CMakeLists.txt	2015-05-19 21:34:34 +0000
 +++ src/client/CMakeLists.txt	2015-06-01 09:48:29 +0000
@@ -23,7 +23,7 @@
    ${DRM_INCLUDE_DIRS}
+ )
--set(MIRCLIENT_ABI 8)
++set(MIRCLIENT_ABI 9)
  set(symbol_map ${CMAKE_SOURCE_DIR}/src/client/symbols.map)
  add_definitions(-DMIR_CLIENT_PLATFORM_PATH="${MIR_CLIENT_PLATFORM_PATH}/")
 === modified file 'src/client/mir_connection.h'
 --- src/client/mir_connection.h	2015-05-15 07:32:33 +0000
 +++ src/client/mir_connection.h	2015-06-01 09:48:29 +0000
@@ -29,7 +29,6 @@
  #include "mir_protobuf.pb.h"
  #include "mir_toolkit/mir_client_library.h"
--#include "mir_toolkit/mir_client_library_drm.h"
  #include "mir/client_platform.h"
  #include "mir/client_context.h"
 === modified file 'src/client/mir_connection_api.cpp'
 --- src/client/mir_connection_api.cpp	2015-03-31 02:35:42 +0000
 +++ src/client/mir_connection_api.cpp	2015-06-01 09:48:29 +0000
@@ -20,7 +20,6 @@
  #include "mir_connection_api.h"
  #include "mir_toolkit/mir_connection.h"
--#include "mir_toolkit/mir_client_library_drm.h"
  #include "mir/default_configuration.h"
  #include "mir/raii.h"
@@ -203,55 +202,6 @@
          connection->register_lifecycle_event_callback(callback, context);
+ }
--//TODO: DEPRECATED: remove this function
--void mir_connection_get_display_info(
--    MirConnection* connection,
--    MirDisplayInfo* display_info)
--{
--    auto const config = mir::raii::deleter_for(
--        mir_connection_create_display_config(connection),
--        &mir_display_config_destroy);
--
--    if (config->num_outputs < 1)
--        return;
--
--    MirDisplayOutput* state = nullptr;
--    // We can't handle more than one display, so just populate based on the first
--    // active display we find.
--    for (unsigned int i = 0; i < config->num_outputs; ++i)
--    {
--        if (config->outputs[i].used && config->outputs[i].connected &&
--            config->outputs[i].current_mode < config->outputs[i].num_modes)
--        {
--            state = &config->outputs[i];
--            break;
--        }
--    }
--    // Oh, oh! No connected outputs?!
--    if (state == nullptr)
--    {
--        memset(display_info, 0, sizeof(*display_info));
--        return;
--    }
--
--    MirDisplayMode mode = state->modes[state->current_mode];
--
--    display_info->width = mode.horizontal_resolution;
--    display_info->height = mode.vertical_resolution;
--
--    unsigned int format_items;
--    if (state->num_output_formats > mir_supported_pixel_format_max)
--         format_items = mir_supported_pixel_format_max;
--    else
--         format_items = state->num_output_formats;
--
--    display_info->supported_pixel_format_items = format_items;
--    for(auto i=0u; i < format_items; i++)
--    {
--        display_info->supported_pixel_format[i] = state->output_formats[i];
--    }
--}
--
  MirDisplayConfiguration* mir_connection_create_display_config(
      MirConnection* connection)
+ {
@@ -305,20 +255,7 @@
          connection->available_surface_formats(formats, format_size, *num_valid_formats);
+ }
--extern "C"
--{
--MirWaitHandle* new_mir_connection_platform_operation(
--    MirConnection* connection,
--    MirPlatformMessage const* request,
--    mir_platform_operation_callback callback, void* context);
--MirWaitHandle* old_mir_connection_platform_operation(
--    MirConnection* connection, int /* opcode */,
--    MirPlatformMessage const* request,
--    mir_platform_operation_callback callback, void* context);
--}
--
--__asm__(".symver new_mir_connection_platform_operation,mir_connection_platform_operation@@MIR_CLIENT_8.3");
--MirWaitHandle* new_mir_connection_platform_operation(
++MirWaitHandle* mir_connection_platform_operation(
      MirConnection* connection,
      MirPlatformMessage const* request,
      mir_platform_operation_callback callback, void* context)
@@ -332,115 +269,4 @@
          MIR_LOG_UNCAUGHT_EXCEPTION(ex);
          return nullptr;
+     }
--
--}
--
--// TODO: Remove when we bump so name
--__asm__(".symver old_mir_connection_platform_operation,mir_connection_platform_operation@MIR_CLIENT_8");
--MirWaitHandle* old_mir_connection_platform_operation(
--    MirConnection* connection, int /* opcode */,
--    MirPlatformMessage const* request,
--    mir_platform_operation_callback callback, void* context)
--{
--    return new_mir_connection_platform_operation(connection, request, callback, context);
--}
--
--/**************************
-- * DRM specific functions *
-- **************************/
--
--namespace
--{
--
--struct AuthMagicPlatformOperationContext
--{
--    mir_drm_auth_magic_callback callback;
--    void* context;
--};
--
--void platform_operation_to_auth_magic_callback(
--    MirConnection*, MirPlatformMessage* response, void* context)
--{
--    auto const response_msg = mir::raii::deleter_for(
--        response,
--        &mir_platform_message_release);
--    auto const auth_magic_context =
--        std::unique_ptr<AuthMagicPlatformOperationContext>{
--            static_cast<AuthMagicPlatformOperationContext*>(context)};
--
--    auto response_data = mir_platform_message_get_data(response_msg.get());
--    MirMesaAuthMagicResponse auth_response{-1};
--
--    if (response_data.size == sizeof(auth_response))
--        std::memcpy(&auth_response, response_data.data, response_data.size);
--
--    auth_magic_context->callback(auth_response.status, auth_magic_context->context);
--}
--
--void assign_set_gbm_device_status(
--    MirConnection*, MirPlatformMessage* response, void* context)
--{
--    auto const response_msg = mir::raii::deleter_for(
--        response,
--        &mir_platform_message_release);
--
--    auto const response_data = mir_platform_message_get_data(response_msg.get());
--    MirMesaSetGBMDeviceResponse set_gbm_device_response{-1};
--
--    if (response_data.size == sizeof(set_gbm_device_response))
--        std::memcpy(&set_gbm_device_response, response_data.data, response_data.size);
--
--    auto status_ptr = static_cast<int*>(context);
--    *status_ptr = set_gbm_device_response.status;
--}
--
--}
--
--MirWaitHandle* mir_connection_drm_auth_magic(MirConnection* connection,
--                                             unsigned int magic,
--                                             mir_drm_auth_magic_callback callback,
--                                             void* context)
--{
--    auto const msg = mir::raii::deleter_for(
--        mir_platform_message_create(MirMesaPlatformOperation::auth_magic),
--        &mir_platform_message_release);
--
--    auto const auth_magic_op_context =
--        new AuthMagicPlatformOperationContext{callback, context};
--
--    MirMesaAuthMagicRequest request;
--    request.magic = magic;
--
--    mir_platform_message_set_data(msg.get(), &request, sizeof(request));
--
--    return new_mir_connection_platform_operation(
--        connection,
--        msg.get(),
--        platform_operation_to_auth_magic_callback,
--        auth_magic_op_context);
--}
--
--int mir_connection_drm_set_gbm_device(MirConnection* connection,
--                                      struct gbm_device* gbm_dev)
--{
--    MirMesaSetGBMDeviceRequest const request{gbm_dev};
--
--    auto const msg = mir::raii::deleter_for(
--        mir_platform_message_create(MirMesaPlatformOperation::set_gbm_device),
--        &mir_platform_message_release);
--
--    mir_platform_message_set_data(msg.get(), &request, sizeof(request));
--
--    static int const success{0};
--    int status{-1};
--
--    auto wh = new_mir_connection_platform_operation(
--        connection,
--        msg.get(),
--        assign_set_gbm_device_status,
--        &status);
--
--    mir_wait_for(wh);
--
--    return status == success;
+ }
 === modified file 'src/client/mir_screencast_api.cpp'
 --- src/client/mir_screencast_api.cpp	2015-03-31 02:35:42 +0000
 +++ src/client/mir_screencast_api.cpp	2015-06-01 09:48:29 +0000
@@ -86,11 +86,6 @@
      delete screencast;
+ }
--MirEGLNativeWindowType mir_screencast_egl_native_window(MirScreencast* screencast)
--{
--    return reinterpret_cast<MirEGLNativeWindowType>(mir_buffer_stream_get_egl_native_window(mir_screencast_get_buffer_stream(screencast)));
--}
--
  MirBufferStream *mir_screencast_get_buffer_stream(MirScreencast *screencast)
  try
+ {
 === modified file 'src/client/mir_surface_api.cpp'
 --- src/client/mir_surface_api.cpp	2015-05-19 21:34:34 +0000
 +++ src/client/mir_surface_api.cpp	2015-06-01 09:48:29 +0000
@@ -229,57 +229,14 @@
      delete spec;
+ }
--MirWaitHandle* mir_connection_create_surface(
--    MirConnection* connection,
--    MirSurfaceParameters const* params,
--    mir_surface_callback callback,
--    void* context)
--{
--    MirSurfaceSpec spec{connection, *params};
--    return mir_surface_create(&spec, callback, context);
--}
--
--MirSurface* mir_connection_create_surface_sync(
--    MirConnection* connection,
--    MirSurfaceParameters const* params)
--{
--    MirSurfaceSpec spec{connection, *params};
--    return mir_surface_create_sync(&spec);
--}
--
--__asm__(".symver new_mir_surface_set_event_handler,mir_surface_set_event_handler@@MIR_CLIENT_8.4");
  extern "C"
--void new_mir_surface_set_event_handler(MirSurface* surface,
++void mir_surface_set_event_handler(MirSurface* surface,
                                         mir_surface_event_callback callback,
                                         void* context)
+ {
      surface->set_event_handler(callback, context);
+ }
--// Deprecated but ABI backward compatible --->
--typedef struct MirEventDelegate
--{
--    mir_surface_event_callback callback;
--    void *context;
--} MirEventDelegate;
--
--__asm__(".symver old_mir_surface_set_event_handler,mir_surface_set_event_handler@MIR_CLIENT_8");
--extern "C"
--void old_mir_surface_set_event_handler(MirSurface* surface,
--                                       MirEventDelegate const* delegate)
--{
--    if (delegate)
--        surface->set_event_handler(delegate->callback, delegate->context);
--    else
--        surface->set_event_handler(nullptr, nullptr);
--}
--// <--- Deprecated
--
--MirEGLNativeWindowType mir_surface_get_egl_native_window(MirSurface* surface)
--{
--    return mir_buffer_stream_get_egl_native_window(
--        mir_surface_get_buffer_stream(surface));
--}
  bool mir_surface_is_valid(MirSurface* surface)
+ {
@@ -296,57 +253,6 @@
      *parameters = surface->get_parameters();
+ }
--MirPlatformType mir_surface_get_platform_type(MirSurface* surface)
--{
--    return mir_buffer_stream_get_platform_type(mir_surface_get_buffer_stream(surface));
--}
--
--void mir_surface_get_current_buffer(MirSurface* surface, MirNativeBuffer** buffer_package_out)
--{
--    mir_buffer_stream_get_current_buffer(mir_surface_get_buffer_stream(surface), buffer_package_out);
--}
--
--void mir_surface_get_graphics_region(MirSurface* surface, MirGraphicsRegion* graphics_region)
--{
--    mir_buffer_stream_get_graphics_region(mir_surface_get_buffer_stream(surface), graphics_region);
--}
--
--namespace
--{
--void buffer_to_surface_thunk(MirBufferStream* /* stream */, void* context)
--{
--    auto cb = static_cast<std::function<void()>*>(context);
--    (*cb)();
--}
--}
--
--MirWaitHandle* mir_surface_swap_buffers(
--    MirSurface* surface,
--    mir_surface_callback callback,
--    void* context)
--try
--{
--    auto shim_callback = new std::function<void()>;
--    *shim_callback = [surface, callback, context, shim_callback] ()
--    {
--        if (callback)
--            callback(surface, context);
--        delete shim_callback;
--    };
--    return mir_buffer_stream_swap_buffers(mir_surface_get_buffer_stream(surface), buffer_to_surface_thunk, shim_callback);
--}
--catch (std::exception const& ex)
--{
--    MIR_LOG_UNCAUGHT_EXCEPTION(ex);
--    return nullptr;
--}
--
--void mir_surface_swap_buffers_sync(MirSurface* surface)
--{
--    mir_buffer_stream_swap_buffers_sync(
--        mir_surface_get_buffer_stream(surface));
--}
--
  MirWaitHandle* mir_surface_release(
      MirSurface* surface,
      mir_surface_callback callback, void* context)
@@ -369,25 +275,6 @@
          nullptr));
+ }
--int mir_surface_get_id(MirSurface* /*surface*/)
--{
--    return 0;
--}
--
--MirWaitHandle* mir_surface_set_type(MirSurface* surf,
--                                    MirSurfaceType type)
--{
--    try
--    {
--        return surf ? surf->configure(mir_surface_attrib_type, type) : nullptr;
--    }
--    catch (std::exception const& ex)
--    {
--        MIR_LOG_UNCAUGHT_EXCEPTION(ex);
--        return nullptr;
--    }
--}
--
  MirSurfaceType mir_surface_get_type(MirSurface* surf)
+ {
      MirSurfaceType type = mir_surface_type_normal;
 === modified file 'src/client/symbols-debug.map'
 --- src/client/symbols-debug.map	2015-03-31 02:35:42 +0000
 +++ src/client/symbols-debug.map	2015-06-01 09:48:29 +0000
@@ -1,4 +1,4 @@
--MIR_CLIENT_DEBUG_8 {
++MIR_CLIENT_DEBUG_9 {
   global:
     mir_debug_*;
   local: *;
 === modified file 'src/client/symbols.map'
 --- src/client/symbols.map	2015-05-21 19:25:51 +0000
 +++ src/client/symbols.map	2015-06-01 09:48:29 +0000
@@ -1,23 +1,34 @@
--MIR_CLIENT_8 {
++MIR_CLIENT_9 {
   global:
      mir_arrow_cursor_name;
++    mir_buffer_stream_get_current_buffer;
++    mir_buffer_stream_get_egl_native_window;
++    mir_buffer_stream_get_graphics_region;
++    mir_buffer_stream_get_platform_type;
++    mir_buffer_stream_is_valid;
++    mir_buffer_stream_release;
++    mir_buffer_stream_release_sync;
++    mir_buffer_stream_swap_buffers;
++    mir_buffer_stream_swap_buffers_sync;
      mir_busy_cursor_name;
      mir_caret_cursor_name;
      mir_closed_hand_cursor_name;
      mir_connect;
      mir_connection_api_impl;
      mir_connection_apply_display_config;
++    mir_connection_create_buffer_stream;
++    mir_connection_create_buffer_stream_sync;
      mir_connection_create_display_config;
      mir_connection_create_prompt_session_sync;
      mir_connection_create_screencast_sync;
++    mir_connection_create_spec_for_changes;
++    mir_connection_create_spec_for_dialog;
      mir_connection_create_spec_for_input_method;
++    mir_connection_create_spec_for_menu;
      mir_connection_create_spec_for_modal_dialog;
--    mir_connection_create_surface;
--    mir_connection_create_surface_sync;
--    mir_connection_drm_auth_magic;
--    mir_connection_drm_set_gbm_device;
++    mir_connection_create_spec_for_normal_surface;
++    mir_connection_create_spec_for_tooltip;
      mir_connection_get_available_surface_formats;
--    mir_connection_get_display_info;
      mir_connection_get_egl_native_display;
      mir_connection_get_error_message;
      mir_connection_get_platform;
@@ -28,123 +39,29 @@
      mir_connection_set_lifecycle_event_callback;
      mir_connect_sync;
      mir_cursor_configuration_destroy;
++    mir_cursor_configuration_from_buffer_stream;
      mir_cursor_configuration_from_name;
      mir_default_cursor_name;
      mir_diagonal_resize_bottom_to_top_cursor_name;
      mir_diagonal_resize_top_to_bottom_cursor_name;
      mir_disabled_cursor_name;
      mir_display_config_destroy;
--    mir_horizontal_resize_cursor_name;
--    mir_hsplit_resize_cursor_name;
--    mir_omnidirectional_resize_cursor_name;
--    mir_open_hand_cursor_name;
--    mir_platform_message_create;
--    mir_platform_message_get_data;
--    mir_platform_message_get_fds;
--    mir_platform_message_get_opcode;
--    mir_platform_message_release;
--    mir_platform_message_set_data;
--    mir_platform_message_set_fds;
--    mir_pointing_hand_cursor_name;
--    mir_prompt_session_error_message;
--    mir_prompt_session_is_valid;
--    mir_prompt_session_new_fds_for_prompt_providers;
--    mir_prompt_session_release_sync;
--    mir_screencast_egl_native_window;
--    mir_screencast_release_sync;
--    mir_surface_configure_cursor;
--    mir_surface_get_current_buffer;
--    mir_surface_get_dpi;
--    mir_surface_get_egl_native_window;
--    mir_surface_get_error_message;
--    mir_surface_get_focus;
--    mir_surface_get_graphics_region;
--    mir_surface_get_id;
--    mir_surface_get_orientation;
--    mir_surface_get_parameters;
--    mir_surface_get_platform_type;
--    mir_surface_get_state;
--    mir_surface_get_swapinterval;
--    mir_surface_get_type;
--    mir_surface_get_visibility;
--    mir_surface_is_valid;
--    mir_surface_release;
--    mir_surface_release_sync;
--    mir_surface_set_event_handler;
--    mir_surface_set_state;
--    mir_surface_set_swapinterval;
--    mir_surface_set_type;
--    mir_surface_spec_release;
--    mir_surface_swap_buffers;
--    mir_surface_swap_buffers_sync;
--    mir_vertical_resize_cursor_name;
--    mir_vsplit_resize_cursor_name;
--    mir_wait_for;
--    mir_wait_for_one;
-- local: *;
--};
--MIR_CLIENT_8.1 {
-- global:
--    mir_connection_create_spec_for_normal_surface;
--    mir_surface_create;
--    mir_surface_create_sync;
--    mir_surface_spec_set_buffer_usage;
--    mir_surface_spec_set_fullscreen_on_output;
--    mir_surface_spec_set_height;
--    mir_surface_spec_set_name;
--    mir_surface_spec_set_pixel_format;
--    mir_surface_spec_set_width;
--} MIR_CLIENT_8;
--
--MIR_CLIENT_8.2 {
-- global:
--    mir_surface_get_preferred_orientation;
--    mir_surface_set_preferred_orientation;
--    mir_surface_spec_set_preferred_orientation;
--} MIR_CLIENT_8.1;
--
--MIR_CLIENT_8.3 {   # New in Mir 0.11
-- global:
--    mir_connection_create_spec_for_dialog;
--    mir_connection_create_spec_for_menu;
--    mir_connection_create_spec_for_tooltip;
--    mir_connection_platform_operation;
--} MIR_CLIENT_8.2;
--
--MIR_CLIENT_8.4 {   # New in Mir 0.13
-- global:
--    mir_connection_create_spec_for_changes;
--    mir_surface_apply_spec;
--    mir_surface_set_event_handler;
--    mir_default_cursor_name;
--    mir_disabled_cursor_name;
--    mir_arrow_cursor_name;
--    mir_busy_cursor_name;
--    mir_caret_cursor_name;
--    mir_pointing_hand_cursor_name;
--    mir_open_hand_cursor_name;
--    mir_closed_hand_cursor_name;
--    mir_horizontal_resize_cursor_name;
--    mir_vertical_resize_cursor_name;
--    mir_diagonal_resize_bottom_to_top_cursor_name;
--    mir_diagonal_resize_top_to_bottom_cursor_name;
--    mir_omnidirectional_resize_cursor_name;
--    mir_vsplit_resize_cursor_name;
--    mir_hsplit_resize_cursor_name;
      mir_event_get_close_surface_event;
++    mir_event_get_input_configuration_event;
      mir_event_get_input_event;
      mir_event_get_keymap_event;
      mir_event_get_orientation_event;
      mir_event_get_prompt_session_event;
      mir_event_get_resize_event;
      mir_event_get_surface_event;
--    mir_event_get_input_configuration_event;
      mir_event_get_type;
++    mir_event_ref;
++    mir_event_unref;
++    mir_horizontal_resize_cursor_name;
++    mir_hsplit_resize_cursor_name;
      mir_input_configuration_event_get_action;
++    mir_input_configuration_event_get_device_id;
      mir_input_configuration_event_get_time;
--    mir_input_configuration_event_get_device_id;
--    mir_event_ref;
--    mir_event_unref;
      mir_input_event_get_device_id;
      mir_input_event_get_event_time;
      mir_input_event_get_keyboard_event;
@@ -156,50 +73,84 @@
      mir_keyboard_event_modifiers;
      mir_keyboard_event_scan_code;
      mir_keymap_event_get_rules;
++    mir_omnidirectional_resize_cursor_name;
++    mir_open_hand_cursor_name;
      mir_orientation_event_get_direction;
++    mir_platform_message_create;
++    mir_platform_message_get_data;
++    mir_platform_message_get_fds;
++    mir_platform_message_get_opcode;
++    mir_platform_message_release;
++    mir_platform_message_set_data;
++    mir_platform_message_set_fds;
      mir_pointer_event_action;
      mir_pointer_event_axis_value;
++    mir_pointer_event_buttons;
      mir_pointer_event_button_state;
      mir_pointer_event_modifiers;
++    mir_pointing_hand_cursor_name;
++    mir_prompt_session_error_message;
      mir_prompt_session_event_get_state;
++    mir_prompt_session_is_valid;
++    mir_prompt_session_new_fds_for_prompt_providers;
++    mir_prompt_session_release_sync;
      mir_resize_event_get_height;
      mir_resize_event_get_width;
++    mir_screencast_get_buffer_stream;
++    mir_screencast_release_sync;
++    mir_surface_apply_spec;
++    mir_surface_configure_cursor;
++    mir_surface_create;
++    mir_surface_create_sync;
      mir_surface_event_get_attribute;
      mir_surface_event_get_attribute_value;
++    mir_surface_get_buffer_stream;
++    mir_surface_get_dpi;
++    mir_surface_get_error_message;
++    mir_surface_get_focus;
++    mir_surface_get_orientation;
++    mir_surface_get_parameters;
++    mir_surface_get_preferred_orientation;
++    mir_surface_get_state;
++    mir_surface_get_swapinterval;
++    mir_surface_get_type;
++    mir_surface_get_visibility;
++    mir_surface_is_valid;
++    mir_surface_release;
++    mir_surface_release_sync;
++    mir_surface_set_event_handler;
++    mir_surface_set_preferred_orientation;
++    mir_surface_set_state;
      mir_surface_set_swapinterval;
++    mir_surface_spec_release;
++    mir_surface_spec_set_buffer_usage;
++    mir_surface_spec_set_fullscreen_on_output;
++    mir_surface_spec_set_height;
      mir_surface_spec_set_height_increment;
      mir_surface_spec_set_max_aspect_ratio;
++    mir_surface_spec_set_max_height;
      mir_surface_spec_set_max_width;
--    mir_surface_spec_set_max_height;
      mir_surface_spec_set_min_aspect_ratio;
++    mir_surface_spec_set_min_height;
      mir_surface_spec_set_min_width;
--    mir_surface_spec_set_min_height;
++    mir_surface_spec_set_name;
++    mir_surface_spec_set_pixel_format;
++    mir_surface_spec_set_preferred_orientation;
++    mir_surface_spec_set_width;
      mir_surface_spec_set_width_increment;
--    mir_surface_swap_buffers;
--    mir_surface_swap_buffers_sync;
--    mir_touch_event_modifiers;
      mir_touch_event_action;
      mir_touch_event_axis_value;
++    mir_touch_event_id;
++    mir_touch_event_modifiers;
      mir_touch_event_point_count;
--    mir_touch_event_id;
      mir_touch_event_tooltype;
--    mir_surface_get_buffer_stream;
--    mir_buffer_stream_get_current_buffer;
--    mir_buffer_stream_get_platform_type;
--    mir_buffer_stream_swap_buffers;
--    mir_buffer_stream_swap_buffers_sync;
--    mir_screencast_get_buffer_stream;
--    mir_buffer_stream_get_egl_native_window;
--    mir_buffer_stream_get_graphics_region;
--    mir_connection_create_buffer_stream_sync;
--    mir_cursor_configuration_from_buffer_stream;
--    mir_buffer_stream_release;
--    mir_buffer_stream_release_sync;
--    mir_buffer_stream_is_valid;
--    mir_pointer_event_buttons; # Move to 8.5
--} MIR_CLIENT_8.3;
++    mir_vertical_resize_cursor_name;
++    mir_vsplit_resize_cursor_name;
++    mir_wait_for;
++    mir_wait_for_one;
++};
--MIR_CLIENT_DETAIL_8 {
++MIR_CLIENT_DETAIL_9 {
    global:
      extern "C++" {
        mir::events::make_event*;
 === modified file 'tests/acceptance-tests/test_client_library.cpp'
 --- tests/acceptance-tests/test_client_library.cpp	2015-05-19 21:34:34 +0000
 +++ tests/acceptance-tests/test_client_library.cpp	2015-06-01 09:48:29 +0000
@@ -192,51 +192,6 @@
      mir_connection_release(connection);
+ }
--#pragma GCC diagnostic push
--#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
--
--TEST_F(ClientLibrary, can_set_surface_types)
--{
--    mir_wait_for(mir_connect(new_connection().c_str(), __PRETTY_FUNCTION__, connection_callback, this));
--
--    auto const spec =
--        mir_connection_create_spec_for_normal_surface(
--            connection, 640, 480, mir_pixel_format_abgr_8888);
--
--    mir_wait_for(mir_surface_create(spec, create_surface_callback, this));
--    mir_surface_spec_release(spec);
--
--    EXPECT_THAT(mir_surface_get_type(surface), Eq(mir_surface_type_normal));
--
--    mir_wait_for(mir_surface_set_type(surface, mir_surface_type_freestyle));
--    EXPECT_THAT(mir_surface_get_type(surface), Eq(mir_surface_type_freestyle));
--
--    mir_wait_for(mir_surface_set_type(surface, static_cast<MirSurfaceType>(999)));
--    EXPECT_THAT(mir_surface_get_type(surface), Eq(mir_surface_type_freestyle));
--
--    mir_wait_for(mir_surface_set_type(surface, mir_surface_type_dialog));
--    EXPECT_THAT(mir_surface_get_type(surface), Eq(mir_surface_type_dialog));
--
--    mir_wait_for(mir_surface_set_type(surface, static_cast<MirSurfaceType>(888)));
--    EXPECT_THAT(mir_surface_get_type(surface), Eq(mir_surface_type_dialog));
--
--    // Stress-test synchronization logic with some flooding
--    for (int i = 0; i < 100; i++)
--    {
--        mir_surface_set_type(surface, mir_surface_type_normal);
--        mir_surface_set_type(surface, mir_surface_type_utility);
--        mir_surface_set_type(surface, mir_surface_type_dialog);
--        mir_surface_set_type(surface, mir_surface_type_gloss);
--        mir_surface_set_type(surface, mir_surface_type_freestyle);
--        mir_wait_for(mir_surface_set_type(surface, mir_surface_type_menu));
--        ASSERT_THAT(mir_surface_get_type(surface), Eq(mir_surface_type_menu));
--    }
--
--    mir_wait_for(mir_surface_release(surface, release_surface_callback, this));
--    mir_connection_release(connection);
--}
--#pragma GCC diagnostic pop
--
  TEST_F(ClientLibrary, can_set_surface_state)
+ {
      connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
 === modified file 'tests/client-language/c99.c'
 --- tests/client-language/c99.c	2015-01-21 07:34:50 +0000
 +++ tests/client-language/c99.c	2015-06-01 09:48:29 +0000
@@ -21,7 +21,6 @@
   */
  #include "mir_toolkit/mir_client_library.h"
--#include "mir_toolkit/mir_client_library_drm.h"
  #include "mir_toolkit/debug/surface.h"
  #include "mir_toolkit/event.h"
 === modified file 'tests/integration-tests/CMakeLists.txt'
 --- tests/integration-tests/CMakeLists.txt	2015-05-19 21:34:34 +0000
 +++ tests/integration-tests/CMakeLists.txt	2015-06-01 09:48:29 +0000
@@ -61,7 +61,6 @@
      ${CMAKE_SOURCE_DIR}
+   )
    add_subdirectory(graphics/mesa)
--  list(APPEND INTEGRATION_TESTS_SRCS test_drm_auth_magic.cpp)
  endif()
  link_directories(${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 === removed file 'tests/integration-tests/test_drm_auth_magic.cpp'
 --- tests/integration-tests/test_drm_auth_magic.cpp	2015-05-19 21:34:34 +0000
 +++ tests/integration-tests/test_drm_auth_magic.cpp	1970-01-01 00:00:00 +0000
@@ -1,152 +0,0 @@
--/*
-- * Copyright © 2012 Canonical Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License version 3 as
-- * published by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
-- */
--
--#include "mir/graphics/display.h"
--#include "mir/graphics/platform_ipc_package.h"
--#include "mir/graphics/buffer_ipc_message.h"
--#include "mir/graphics/buffer_basic.h"
--
--#include <boost/exception/errinfo_errno.hpp>
--#include <boost/throw_exception.hpp>
--
--#include "mir_test_doubles/stub_buffer_allocator.h"
--#include "mir_test_doubles/null_platform.h"
--#include "mir_test_framework/display_server_test_fixture.h"
--
--#include "mir_toolkit/mir_client_library.h"
--#include "mir_toolkit/mir_client_library_drm.h"
--#include "mir_toolkit/mesa/platform_operation.h"
--
--#include <gmock/gmock.h>
--#include <gtest/gtest.h>
--
--#include <cstring>
--
--namespace mg = mir::graphics;
--namespace mc = mir::compositor;
--namespace geom = mir::geometry;
--namespace mtf = mir_test_framework;
--namespace mtd = mir::test::doubles;
--namespace
--{
--
--char const* const mir_test_socket = mtf::test_socket_file().c_str();
--
--struct MockAuthenticatingIpcOps : public mg::PlatformIpcOperations
--{
--    MOCK_CONST_METHOD3(pack_buffer, void(mg::BufferIpcMessage&, mg::Buffer const&, mg::BufferIpcMsgType));
--    MOCK_CONST_METHOD2(unpack_buffer, void(mg::BufferIpcMessage&, mg::Buffer const&));
--    MOCK_METHOD0(connection_ipc_package, std::shared_ptr<mg::PlatformIPCPackage>());
--    MOCK_METHOD2(platform_operation, mg::PlatformOperationMessage(
--        unsigned int const, mg::PlatformOperationMessage const&));
--};
--
--class StubAuthenticatingPlatform : public mtd::NullPlatform
--{
--public:
--    StubAuthenticatingPlatform(std::shared_ptr<mg::PlatformIpcOperations> const& ops) :
--        ops{ops}
--    {
--    }
--
--    std::shared_ptr<mg::GraphicBufferAllocator> create_buffer_allocator() override
--    {
--        return std::make_shared<mtd::StubBufferAllocator>();
--    }
--    std::shared_ptr<mg::PlatformIpcOperations> make_ipc_operations() const override
--    {
--        return ops;
--    }
--
--private:
--    std::shared_ptr<mg::PlatformIpcOperations> const ops;
--};
--
--void connection_callback(MirConnection* connection, void* context)
--{
--    auto connection_ptr = static_cast<MirConnection**>(context);
--    *connection_ptr = connection;
--}
--
--void drm_auth_magic_callback(int status, void* client_context)
--{
--    auto status_ptr = static_cast<int*>(client_context);
--    *status_ptr = status;
--}
--
--}
--
--#pragma GCC diagnostic warning "-Wdeprecated-declarations"
--
--TEST_F(BespokeDisplayServerTestFixture, client_drm_auth_magic_calls_platform)
--{
--    static unsigned int const magic{0x10111213};
--    static MirMesaAuthMagicResponse const auth_magic_response{123};
--
--    struct ServerConfig : TestingServerConfiguration
--    {
--        std::shared_ptr<mg::Platform> the_graphics_platform()
--        {
--            using namespace testing;
--            if (!platform)
--            {
--                mg::PlatformOperationMessage pkg;
--                pkg.data.resize(sizeof(auth_magic_response));
--                std::memcpy(pkg.data.data(), &auth_magic_response,
--                            sizeof(auth_magic_response));
--
--                auto ipc_ops = std::make_shared<NiceMock<MockAuthenticatingIpcOps>>();
--                EXPECT_CALL(*ipc_ops, platform_operation(_,_))
--                    .Times(1)
--                    .WillRepeatedly(Return(pkg));
--                ON_CALL(*ipc_ops, connection_ipc_package())
--                    .WillByDefault(Return(std::make_shared<mg::PlatformIPCPackage>()));
--                platform = std::make_shared<StubAuthenticatingPlatform>(ipc_ops);
--            }
--
--            return platform;
--        }
--
--        std::shared_ptr<StubAuthenticatingPlatform> platform;
--    } server_config;
--
--    launch_server_process(server_config);
--
--    struct Client : TestingClientConfiguration
--    {
--        void exec()
--        {
--            MirConnection* connection{nullptr};
--            mir_wait_for(mir_connect(mir_test_socket, __PRETTY_FUNCTION__,
--                                     connection_callback, &connection));
--
--            int status{67};
--
--            ASSERT_TRUE(mir_connection_is_valid(connection));
--
--            mir_wait_for(mir_connection_drm_auth_magic(connection, magic,
--                                                       drm_auth_magic_callback,
--                                                       &status));
--            EXPECT_EQ(auth_magic_response.status, status);
--
--            mir_connection_release(connection);
--        }
--    } client_config;
--
--    launch_client_process(client_config);
--}