Mir

Merge lp:~alan-griffiths/mir/0.28.1-to-ubuntu into lp:mir/ubuntu

0.28.1-to-ubuntu
Merge into ubuntu

Proposed by Alan Griffiths on 2017-10-26

Status:	Merged
Approved by:	Alan Griffiths on 2017-10-30
Approved revision:	1311
Merged at revision:	1308
Proposed branch:	lp:~alan-griffiths/mir/0.28.1-to-ubuntu
Merge into:	lp:mir/ubuntu
Diff against target:	2619 lines (+704/-854) 58 files modified CMakeLists.txt (+16/-5) benchmarks/frame-uniformity/CMakeLists.txt (+0/-6) cmake/ABICheck.cmake (+0/-114) cmake/FindGtestGmock.cmake (+55/-91) debian/changelog (+29/-0) debian/control (+0/-2) doc/abi_compatibility_tools.md (+0/-26) doc/getting_and_using_mir.md (+4/-1) doc/getting_involved_in_mir.md (+32/-17) examples/CMakeLists.txt (+93/-180) examples/miral-kiosk/CMakeLists.txt (+5/-0) examples/miral-shell/miral-app.sh (+8/-2) examples/miral-shell/miral-desktop.sh (+8/-2) examples/miral-shell/miral-run.sh (+12/-1) examples/miral-shell/miral-xrun.sh (+8/-3) examples/miral-shell/shell_main.cpp (+1/-1) examples/miral-shell/spinner/eglspinner.cpp (+17/-2) examples/miral-shell/titlebar_config.cpp (+19/-1) include/core/mir/optional_value.h (+5/-0) include/server/mir/server_action_queue.h (+10/-0) include/server/mir/shell/persistent_surface_store.h (+1/-1) src/CMakeLists.txt (+2/-1) src/capnproto/CMakeLists.txt (+6/-1) src/include/server/mir/glib_main_loop.h (+5/-0) src/miral/CMakeLists.txt (+12/-7) src/miral/runner.cpp (+2/-2) src/platforms/eglstream-kms/server/display.cpp (+0/-1) src/platforms/eglstream-kms/server/egl_output.cpp (+1/-1) src/platforms/mesa/server/buffer_allocator.cpp (+2/-3) src/platforms/mesa/server/kms/cursor.cpp (+0/-1) src/platforms/mesa/server/kms/display_buffer.cpp (+4/-6) src/protobuf/symbols.map (+24/-0) src/server/CMakeLists.txt (+7/-0) src/server/frontend/wayland/wayland_connector.cpp (+130/-18) src/server/frontend/wayland/wayland_connector.h (+5/-1) src/server/frontend/wayland/wayland_default_configuration.cpp (+1/-0) src/server/glib_main_loop.cpp (+55/-1) src/server/input/default_input_device_hub.cpp (+8/-7) src/server/shell/default_persistent_surface_store.cpp (+1/-1) src/utils/CMakeLists.txt (+2/-0) src/utils/run.cpp (+1/-1) tests/CMakeLists.txt (+2/-1) tests/include/mir/test/doubles/triggered_main_loop.h (+1/-0) tests/integration-tests/CMakeLists.txt (+1/-2) tests/mir_test_doubles/CMakeLists.txt (+2/-2) tests/mir_test_doubles/triggered_main_loop.cpp (+6/-0) tests/mir_test_framework/CMakeLists.txt (+2/-2) tests/mir_test_framework/canonical_window_manager.cpp (+1/-1) tests/miral/drag_and_drop.cpp (+1/-1) tests/performance-tests/CMakeLists.txt (+1/-1) tests/unit-tests/CMakeLists.txt (+2/-4) tests/unit-tests/platforms/mesa/kms/test_cursor.cpp (+6/-7) tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp (+1/-1) tests/unit-tests/scene/test_mediating_display_changer.cpp (+6/-0) tests/unit-tests/test_glib_main_loop.cpp (+70/-0) tests/unit-tests/test_raii.cpp (+2/-0) tools/abi_check.sh (+0/-315) tools/setup-partial-armhf-chroot.sh (+9/-10)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/0.28.1-to-ubuntu
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Alan Griffiths			Abstain on 2017-10-30
Mir CI Bot	continuous-integration	2017-10-26	Approve on 2017-10-27
Review via email: mp+332861@code.launchpad.net

Commit message

Mir 0.28.1 release to ubuntu

Mir CI Bot (mir-ci-bot) wrote on 2017-10-26:

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

review: Needs Fixing (continuous-integration)

lp:~alan-griffiths/mir/0.28.1-to-ubuntu updated on 2017-10-27

1309. By Alan Griffiths on 2017-10-27: Make frame_uniformity_test_client link command what it actually used to be
1310. By Alan Griffiths on 2017-10-27: Remove unused mir-test-assist library

Mir CI Bot (mir-ci-bot) wrote on 2017-10-27:

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

review: Approve (continuous-integration)

Alan Griffiths (alan-griffiths) wrote on 2017-10-27:

The (build-time) code that locates the miral-shell titlebar font fails to find any font on the build machine (as it doesn't have desktop options installed).

review: Needs Fixing

Mir CI Bot (mir-ci-bot) wrote on 2017-10-27:

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

review: Approve (continuous-integration)

lp:~alan-griffiths/mir/0.28.1-to-ubuntu updated on 2017-10-27

1311. By Alan Griffiths on 2017-10-27: Try to find default font at runtime, not build time

Mir CI Bot (mir-ci-bot) wrote on 2017-10-27:

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

review: Approve (continuous-integration)

Alan Griffiths (alan-griffiths) wrote on 2017-10-28:

> The (build-time) code that locates the miral-shell titlebar font fails to find
> any font on the build machine (as it doesn't have desktop options installed).

Sorted

review: Abstain

Alan Griffiths (alan-griffiths) wrote on 2017-10-30:

I'm still seeing bug 1720223 on the mesa-drm platform

review: Needs Fixing

Alan Griffiths (alan-griffiths) wrote on 2017-10-30:

> I'm still seeing bug 1720223 on the mesa-drm platform

Actually, that was bug 1728574

But still voting "needs fixing" as the following test is failing on artful:

Mir-on-Mir

Use an X11 based desktop (Unity, Gnome, etc.). These tests run for a default 10 seconds.
Start two terminal sessions, one for a "host" server, one to launch the tests.

Start a "host" server: $ mir_demo_server --window-manager system-compositor
Test that S/W rendering clients run and can be moved(resized) with Alt+Left(Middle)-Button:

...

$ mir_demo_server --no-file --host $XDG_RUNTIME_DIR/mir_socket --test-timeout 10 --test-client mir_demo_client_egltriangle

When resizing the triangle, the nested server crashes. (Doesn't happen with the same code built for Zesty.)

Alan Griffiths (alan-griffiths) wrote on 2017-10-30:

> > I'm still seeing bug 1720223 on the mesa-drm platform
>
> Actually, that was bug 1728574
>
> But still voting "needs fixing" as the following test is failing on artful:
>
> Mir-on-Mir
>
> Use an X11 based desktop (Unity, Gnome, etc.). These tests run for a
> default 10 seconds.
> Start two terminal sessions, one for a "host" server, one to launch the
> tests.
>
> Start a "host" server: $ mir_demo_server --window-manager system-
> compositor
> Test that S/W rendering clients run and can be moved(resized) with
> Alt+Left(Middle)-Button:
>
> ...
>
> $ mir_demo_server --no-file --host $XDG_RUNTIME_DIR/mir_socket --test-
> timeout 10 --test-client mir_demo_client_egltriangle
>
> When resizing the triangle, the nested server crashes. (Doesn't happen with
> the same code built for Zesty.)

Mmm, this happens with 0.28.0 too.

What was different when testing 0.20.0? It was shortly before the Artful releasee and my laptop had been upgraded to Artful (and had U7 installed). Since then Artful has been released and re-installed on the laptop from an ISO image.

review: Abstain

Alan Griffiths (alan-griffiths) wrote on 2017-10-30:

> Mmm, this happens with 0.28.0 too.

Logged as bug 1728613

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

Mir development team

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2017-10-11 15:00:09 +0000
 +++ CMakeLists.txt	2017-10-27 17:26:09 +0000
@@ -1,4 +1,4 @@
--# Copyright © 2012 Canonical Ltd.
++# Copyright © 2012-2017 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 2 or 3 as
@@ -29,7 +29,7 @@
  set(MIR_VERSION_MAJOR 0)
  set(MIR_VERSION_MINOR 28)
--set(MIR_VERSION_PATCH 0)
++set(MIR_VERSION_PATCH 1)
  add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
  add_definitions(-DMIR_VERSION_MINOR=${MIR_VERSION_MINOR})
@@ -275,6 +275,16 @@
    pkg_check_modules(DRM REQUIRED libdrm)
  endif()
++# This incantation gets the MIR_EGL_SUPPORTED default right for Mesa
++execute_process(COMMAND grep mir_toolkit /usr/include/EGL/eglplatform.h
++        OUTPUT_VARIABLE MIR_EGL_SUPPORTED_OUT)
++
++if (MIR_EGL_SUPPORTED_OUT STREQUAL "")
++  option(MIR_EGL_SUPPORTED "Build examples that depend on Mir EGL." OFF)
++else()
++  option(MIR_EGL_SUPPORTED "Build examples that depend on Mir EGL." ON)
++endif()
++
  set(MIR_TRACEPOINT_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/mir/tools)
  set(MIR_GENERATED_INCLUDE_DIRECTORIES)
@@ -288,9 +298,10 @@
    add_definitions(-DMIR_LIBINPUT_HAS_ACCEL_PROFILE=1)
  endif ()
--add_subdirectory(benchmarks/)
  add_subdirectory(examples/)
--add_subdirectory(playground/)
++if (MIR_EGL_SUPPORTED)
++  add_subdirectory(playground/)
++endif()
  add_subdirectory(guides/)
  add_subdirectory(cmake/)
@@ -299,6 +310,7 @@
    pkg_check_modules(LIBEVDEV REQUIRED libevdev)
    include_directories(${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR})
    add_subdirectory(tests/)
++  add_subdirectory(benchmarks/)
    # There's no nice way to format this. Thanks CMake.
    mir_add_test(NAME LGPL-required
@@ -313,7 +325,6 @@
  endif ()
  enable_coverage_report(mirserver)
--include (cmake/ABICheck.cmake)
  add_custom_target(ptest
      COMMAND "${CMAKE_SOURCE_DIR}/tools/run_ctests.sh" "--cost-file" "${CMAKE_BINARY_DIR}/ptest_ctest_cost_data.txt" "sh ${CMAKE_BINARY_DIR}/discover_all_tests.sh" "--" "$$ARGS"
 === modified file 'benchmarks/frame-uniformity/CMakeLists.txt'
 --- benchmarks/frame-uniformity/CMakeLists.txt	2017-08-25 06:41:20 +0000
 +++ benchmarks/frame-uniformity/CMakeLists.txt	2017-10-27 17:26:09 +0000
@@ -28,8 +28,6 @@
    mirserver
    mirclient
    mirplatform
--
--  mir-test-assist
    # needed for fake_event_hub_server_configuration.h (which relies on private APIs)
    mir-test-framework-static
@@ -37,9 +35,5 @@
    # needed for vsync_simulating_graphics_platform.cpp
    mir-test-doubles-static
--  ${Boost_LIBRARIES}
--  ${GTEST_BOTH_LIBRARIES}
--  ${GMOCK_LIBRARY}
--  ${GMOCK_MAIN_LIBRARY}
    ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
+ )
 === removed file 'cmake/ABICheck.cmake'
 --- cmake/ABICheck.cmake	2017-05-08 03:04:26 +0000
 +++ cmake/ABICheck.cmake	1970-01-01 00:00:00 +0000
@@ -1,114 +0,0 @@
--cmake_minimum_required (VERSION 2.6)
--
--find_program(ABI_COMPLIANCE_CHECKER abi-compliance-checker)
--if (NOT ABI_COMPLIANCE_CHECKER)
--  message(WARNING "no ABI checks possible: abi-compliance-checker was not found")
--  return()
--endif()
--
--set(ENABLE_ABI_CHECK_TEST $ENV{MIR_ENABLE_ABI_CHECK_TEST})
--execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpmachine OUTPUT_VARIABLE ABI_CHECK_TARGET_MACH OUTPUT_STRIP_TRAILING_WHITESPACE)
--
--set(ABI_DUMPS_DIR "${CMAKE_BINARY_DIR}/abi_dumps/${ABI_CHECK_TARGET_MACH}")
--
--# Given a list of key value pairs such as "key1 value1 key2 value2...keyN valueN"
--# extract the value corresponding to the given key
--function(get_value_for_key a_list key value)
--  list(FIND a_list ${key} idx)
--  if (idx GREATER -1)
--    math(EXPR idx "${idx} + 1")
--    list(GET a_list ${idx} tmp_value)
--    set(${value} "${tmp_value}" PARENT_SCOPE)
--  endif()
--endfunction()
--
--# Makes a one-entry per line list of all include paths used
--# to compile the given library target
--function(get_includes libname output)
--  get_property(lib_includes TARGET ${libname} PROPERTY INCLUDE_DIRECTORIES)
--  list(REMOVE_DUPLICATES lib_includes)
--  string(REPLACE ";" "\n    " tmp_out "${lib_includes}")
--  set(${output} "${tmp_out}" PARENT_SCOPE)
--endfunction()
--
--# Creates the XML descriptor file that describes the given library target
--# suitable for abi-compliance-checker
--function(make_lib_descriptor name)
--  set(libname "mir${name}")
--
--  # Optional argument LIBRARY_HEADER - use the given header to describe
--  # the binary library instead of assuming its described by include/<name>
--  get_value_for_key("${ARGN}" "LIBRARY_HEADER" library_header)
--  if ("${library_header}" STREQUAL "")
--    set(LIB_DESC_HEADERS "${CMAKE_SOURCE_DIR}/include/${name}\n    ${private_headers}")
--  else()
--    set(LIB_DESC_HEADERS ${library_header})
--  endif()
--
--  # FIXME: Property "LOCATION" is now deprecated
--  if (NOT ${CMAKE_MAJOR_VERSION} LESS 3)
--    cmake_policy(SET CMP0026 OLD)
--  endif()
--  get_property(LIB_DESC_LIBS TARGET ${libname} PROPERTY LOCATION)
--
--  get_includes(${libname} LIB_DESC_INCLUDE_PATHS)
--  set(LIB_DESC_GCC_OPTS "${CMAKE_CXX_FLAGS}")
--
--  # Optional EXCLUDE_HEADERS - a list
--  # while attempting an abi dump
--  get_value_for_key("${ARGN}" "EXCLUDE_HEADERS" LIB_DESC_SKIP_HEADERS)
--
--  configure_file(${CMAKE_SOURCE_DIR}/tools/lib_descriptor.xml.skel ${libname}_desc.xml)
--endfunction()
--
--#These headers are not part of the libmirplatform ABI
--set(mirplatform-exclude-headers "${CMAKE_SOURCE_DIR}/include/platform/mir/input")
--
--make_lib_descriptor(core)
--make_lib_descriptor(client)
--make_lib_descriptor(server)
--make_lib_descriptor(common)
--make_lib_descriptor(cookie)
--make_lib_descriptor(platform EXCLUDE_HEADERS ${mirplatform-exclude-headers})
--if(MIR_BUILD_PLATFORM_MESA_KMS)
--make_lib_descriptor(clientplatformmesa LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/src/include/client/mir/client_platform_factory.h)
--make_lib_descriptor(platformgraphicsmesakms LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/include/platform/mir/graphics/platform.h)
--endif()
--make_lib_descriptor(platforminputevdev LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/include/platform/mir/input/)
--
--
--macro(_define_abi_dump_for libname)
--  set(ABI_DUMP_NAME ${ABI_DUMPS_DIR}/${libname}_next.abi.tar.gz)
--
--  add_custom_command(OUTPUT ${ABI_DUMP_NAME}
--    COMMAND abi-compliance-checker -gcc-path ${CMAKE_CXX_COMPILER} -l ${libname} -v1 next -dump-path ${ABI_DUMP_NAME} -dump-abi ${libname}_desc.xml
--    DEPENDS ${libname}
--  )
--  add_custom_target(abi-dump-${libname} DEPENDS ${ABI_DUMP_NAME})
--endmacro(_define_abi_dump_for)
--
--macro(_define_abi_check_for libname)
--  add_custom_target(abi-check-${libname}
--    COMMAND /bin/bash -c '${CMAKE_SOURCE_DIR}/tools/abi_check.sh ${libname} ${ABI_DUMPS_DIR} ${CMAKE_SOURCE_DIR}'
--    DEPENDS abi-dump-${libname}
--  )
--endmacro(_define_abi_check_for)
--
--set(the_libs mircore mirserver mirclient mircommon mirplatform mircookie mirplatforminputevdev)
--if(MIR_BUILD_PLATFORM_MESA_KMS)
--  set(the_libs ${the_libs} mirclientplatformmesa mirplatformgraphicsmesakms)
--endif()
--
--foreach(libname ${the_libs})
--  _define_abi_dump_for(${libname})
--  _define_abi_check_for(${libname})
--  list(APPEND abi-dump-list abi-dump-${libname})
--  list(APPEND abi-check-list abi-check-${libname})
--endforeach(libname)
--
--add_custom_target(abi-dump DEPENDS ${abi-dump-list})
--add_custom_target(abi-check DEPENDS ${abi-check-list})
--
--if (MIR_ENABLE_TESTS AND ENABLE_ABI_CHECK_TEST)
--  add_test(abi-compliance-check make abi-check)
--endif()
 === modified file 'cmake/FindGtestGmock.cmake'
 --- cmake/FindGtestGmock.cmake	2017-09-07 05:58:13 +0000
 +++ cmake/FindGtestGmock.cmake	2017-10-27 17:26:09 +0000
@@ -1,96 +1,60 @@
--include(ExternalProject)
  include(FindPackageHandleStandardArgs)
--#
--# When cross compiling MIR_CHROOT points to our chroot.
--# When not cross compiling, it should be blank to use the host system.
--#
--set(usr ${MIR_CHROOT}/usr)
--
--if (EXISTS ${usr}/src/googletest)
--  set (USING_GOOGLETEST_1_8 TRUE)
--  set (GTEST_INSTALL_DIR ${usr}/src/googletest/googletest/include)
--else()
--  set (GTEST_INSTALL_DIR ${usr}/src/gmock/gtest/include)
--endif()
--
--#gtest
--find_path(
--  GTEST_INCLUDE_DIR gtest/gtest.h
--  HINTS ${GTEST_INSTALL_DIR}
--)
--
--#gmock
--find_path(
--  GMOCK_INSTALL_DIR CMakeLists.txt
--  HINTS ${usr}/src/googletest ${usr}/src/gmock)
--if(${GMOCK_INSTALL_DIR} STREQUAL "GMOCK_INSTALL_DIR-NOTFOUND")
--    message(FATAL_ERROR "google-mock package not found")
--endif()
++find_package(GTest)
++
++if (NOT GTEST_FOUND)
++    include(ExternalProject)
++
++    find_path(GTEST_ROOT
++        NAMES CMakeLists.txt
++        PATHS /usr/src/gtest /usr/src/googletest/googletest/
++        DOC "Path to GTest CMake project")
++
++    ExternalProject_Add(GTest PREFIX ./gtest
++            SOURCE_DIR ${GTEST_ROOT}
++            CMAKE_ARGS
++                -DCMAKE_CXX_COMPILER_WORKS=1
++                -DCMAKE_CXX_FLAGS='${CMAKE_CXX_FLAGS}'
++                -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
++            INSTALL_COMMAND true)
++
++    ExternalProject_Get_Property(GTest binary_dir)
++
++    add_library(gtest UNKNOWN IMPORTED)
++    set_target_properties(gtest      PROPERTIES IMPORTED_LOCATION ${binary_dir}/libgtest.a)
++    add_dependencies(gtest GTest)
++    set(GTEST_LIBRARY "gtest")
++
++    add_library(gtest_main UNKNOWN IMPORTED)
++    set_target_properties(gtest_main PROPERTIES IMPORTED_LOCATION ${binary_dir}/libgtest_main.a)
++    add_dependencies(gtest_main GTest)
++    set(GTEST_MAIN_LIBRARY "gtest_main")
++
++    set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY})
++    find_path(GTEST_INCLUDE_DIRS NAMES gtest/gtest.h)
++    find_package_handle_standard_args(GTest GTEST_LIBRARY GTEST_BOTH_LIBRARIES GTEST_INCLUDE_DIRS)
++endif()
++
++find_file(GMOCK_SOURCE
++        NAMES gmock-all.cc
++        DOC "GMock source"
++        PATHS /usr/src/googletest/googlemock/src/ /usr/src/gmock/ /usr/src/gmock/src)
++
++message(STATUS "GMOCK_SOURCE=${GMOCK_SOURCE}")
  find_path(GMOCK_INCLUDE_DIR gmock/gmock.h)
--if (USING_GOOGLETEST_1_8)
--  set(GMOCK_BASE_BINARY_DIR ${CMAKE_BINARY_DIR}/gmock/libs)
--  set(GMOCK_BINARY_DIR ${GMOCK_BASE_BINARY_DIR}/googlemock)
--  set(GTEST_BINARY_DIR ${GMOCK_BINARY_DIR}/gtest)
--else()
--  set(GMOCK_BASE_BINARY_DIR ${CMAKE_BINARY_DIR}/gmock/libs)
--  set(GMOCK_BINARY_DIR ${GMOCK_BASE_BINARY_DIR})
--  set(GTEST_BINARY_DIR ${GMOCK_BINARY_DIR}/gtest)
--endif()
--
--set(GTEST_CXX_FLAGS "-fPIC -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64")
--if (cmake_build_type_lower MATCHES "threadsanitizer")
--  set(GTEST_CXX_FLAGS "${GTEST_CXX_FLAGS} -fsanitize=thread")
--elseif (cmake_build_type_lower MATCHES "ubsanitizer")
--  set(GTEST_CXX_FLAGS "${GTEST_CXX_FLAGS} -fsanitize=undefined")
--endif()
--
--set(GTEST_CMAKE_ARGS "-DCMAKE_CXX_FLAGS=${GTEST_CXX_FLAGS}")
--list(APPEND GTEST_CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
--list(APPEND GTEST_CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
--
--if (USING_GOOGLETEST_1_8)
--  list(APPEND GTEST_CMAKE_ARGS -DBUILD_GTEST=ON)
--endif()
--
--if (cmake_build_type_lower MATCHES "threadsanitizer")
--  #Skip compiler check, since if GCC is the compiler, we need to link against -ltsan
--  #explicitly; specifying additional linker flags doesn't seem possible for external projects
--  list(APPEND GTEST_CMAKE_ARGS -DCMAKE_CXX_COMPILER_WORKS=1)
--endif()
--if (${CMAKE_CROSSCOMPILING})
--  if(DEFINED MIR_CHROOT)
--    list(APPEND GTEST_CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_MODULE_PATH}/LinuxCrossCompile.cmake)
--  else()
--    list(APPEND GTEST_CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
--    list(APPEND GTEST_CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
--  endif()
--endif()
--
--ExternalProject_Add(
--    GMock
--    #where to build in source tree
--    PREFIX ${GMOCK_PREFIX}
--    #where the source is external to the project
--    SOURCE_DIR ${GMOCK_INSTALL_DIR}
--    #forward the compilers to the subproject so cross-arch builds work
--    CMAKE_ARGS ${GTEST_CMAKE_ARGS}
--    BINARY_DIR ${GMOCK_BASE_BINARY_DIR}
--
--    #we don't need to install, so skip
--    INSTALL_COMMAND ""
--)
--
--set(GMOCK_LIBRARY ${GMOCK_BINARY_DIR}/libgmock.a)
--set(GMOCK_MAIN_LIBRARY ${GMOCK_BINARY_DIR}/libgmock_main.a)
--set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARY} ${GMOCK_MAIN_LIBRARY})
--set(GTEST_LIBRARY ${GTEST_BINARY_DIR}/libgtest.a)
--set(GTEST_MAIN_LIBRARY ${GTEST_BINARY_DIR}/libgtest_main.a)
--set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY})
--set(GTEST_ALL_LIBRARIES ${GTEST_BOTH_LIBRARIES} ${GMOCK_BOTH_LIBRARIES})
--
--find_package_handle_standard_args(GTest  DEFAULT_MSG
--                                    GMOCK_INCLUDE_DIR
--                                    GTEST_INCLUDE_DIR)
++add_library(GMock STATIC ${GMOCK_SOURCE})
++
++if (EXISTS /usr/src/googletest/googlemock/src)
++    set_source_files_properties(${GMOCK_SOURCE} PROPERTIES COMPILE_FLAGS "-I/usr/src/googletest/googlemock")
++endif()
++
++if (EXISTS /usr/src/gmock/src)
++    set_source_files_properties(${GMOCK_SOURCE} PROPERTIES COMPILE_FLAGS "-I/usr/src/gmock")
++endif()
++
++find_package_handle_standard_args(GMock DEFAULT_MSG GMOCK_INCLUDE_DIR)
++
++set(GMOCK_LIBRARY GMock)
++set(GMOCK_LIBRARIES ${GTEST_BOTH_LIBRARIES} ${GMOCK_LIBRARY})
 === modified file 'debian/changelog'
 --- debian/changelog	2017-10-11 15:06:23 +0000
 +++ debian/changelog	2017-10-27 17:26:09 +0000
@@ -1,3 +1,32 @@
++mir (0.28.1) UNRELEASED; urgency=medium
++
++  * New upstream release 0.28.1(https://launchpad.net/mir/+milestone/0.28.1)
++    - ABI summary:
++      . mirclient ABI unchanged at 9
++      . miral ABI unchanged at 2
++      . mirserver ABI unchanged to 45
++      . mircommon ABI unchanged at 7
++      . mirplatform ABI unchanged at 61
++      . mirprotobuf ABI unchanged at 3
++      . mirplatformgraphics ABI unchanged at 13
++      . mirclientplatform ABI unchanged at 5
++      . mirinputplatform ABI unchanged at 7
++      . mircore ABI unchanged at 1
++    - Enhancements:
++      . Fix build (and add instructions) for Fedora
++      . Wayland support for keymaps
++      . Don't use Mir EGL if it isn't available.
++      . [miral-app, miral-desktop] Default to using SDL's Wayland support.
++      . Use system GMock detection (unless cross-compiling)
++    - Bugs fixed:
++      . Wayland demo client doesn't cross-compile. (LP: #1723971)
++      . mir fails to find drm.h. (LP: #1722147)
++      . Don't treat failing to bypass buffers as a fatal error. (LP: #1723235)
++      . Build process depends on Debian toolchain. (LP: #1724202)
++      . XWayland clients updates not causing redraw (LP: #1720223)
++
++ -- Alan Griffiths <alan@Octopull-desktop>  Tue, 17 Oct 2017 14:14:37 +0100
++
  mir (0.28.0+17.10.20171011.1-0ubuntu1) artful; urgency=medium
    * New upstream release 0.28.0(https://launchpad.net/mir/+milestone/0.28.0)
 === modified file 'debian/control'
 --- debian/control	2017-10-08 14:03:45 +0000
 +++ debian/control	2017-10-27 17:26:09 +0000
@@ -22,7 +22,6 @@
                 libgbm-dev,
                 libglm-dev,
                 libprotobuf-dev,
--               pkg-config,
                 libgoogle-glog-dev,
                 liblttng-ust-dev,
                 libxkbcommon-dev (>= 0.5),
@@ -36,7 +35,6 @@
                 valgrind [amd64 i386 armhf arm64],
                 libglib2.0-dev,
                 libfreetype6-dev,
--               abi-compliance-checker,
                 libevdev-dev,
                 libinput-dev (>= 0.21),
                 uuid-dev,
 === removed file 'doc/abi_compatibility_tools.md'
 --- doc/abi_compatibility_tools.md	2017-05-08 03:04:26 +0000
 +++ doc/abi_compatibility_tools.md	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
--Tracking ABI compatibility {#abi_compatibility_tools}
--================================
--
--A few make targets exist to help us track ABI compatibility across
--different Mir versions and ensure we increase the ABI version properly.
--These targets invoke the abi-compliance-checker tool for the actual ABI check.
--
--The targets are:
--
--* **make abi-check**
--
--  Compiles all the public libraries in the current tree and checks their ABI against the latest released archive version
--
--* **make abi-check-\<library>**
--
--  Compiles only the specified library in the current tree and checks its ABI against the latest released archive version
--
--  - *library* can be any of the public library targets such as mirclient, mirserver, mirplatform, mircommon, etc.
--
--Sample usage
--------------
--
--    $ bzr branch lp:mir && cd mir
--    $ debian/rules override_dh_auto_configure
--    $ cd <build-dir>
--    $ make abi-check
 === modified file 'doc/getting_and_using_mir.md'
 --- doc/getting_and_using_mir.md	2017-09-07 09:53:20 +0000
 +++ doc/getting_and_using_mir.md	2017-10-27 17:26:09 +0000
@@ -4,7 +4,10 @@
  Getting Mir examples
  --------------------
--You can install the Mir examples as follows:
++These instructions assume that you’re using Ubuntu 17.10 later. For
++earlier releases of Ubuntu or other distributions see \ref getting_involved_in_mir.
++
++You can install the Mir examples along with the Mir graphics drivers as follows:
      $ sudo apt install mir-demos qterminal
      $ sudo apt install mir-graphics-drivers-desktop qtubuntu-desktop
 === modified file 'doc/getting_involved_in_mir.md'
 --- doc/getting_involved_in_mir.md	2017-09-07 09:53:20 +0000
 +++ doc/getting_involved_in_mir.md	2017-10-27 17:26:09 +0000
@@ -9,26 +9,41 @@
  The Mir project is hosted on Launchpad: https://launchpad.net/mir
++
++Getting Mir source & dependencies
++---------------------------------
++###  On Ubuntu
++
++These instructions assume that you’re using Ubuntu 16.04LTS or later.
++
++You’ll need a few development tools installed:
++
++    $ sudo apt install devscripts equivs bzr
++
++With these installed you can checkout Mir and get the remaining dependencies:
++
++    $ bzr branch lp:mir
++    $ sudo mk-build-deps -i
++
++### On Fedora
++
++You’ll need some development tools and packages installed:
++
++    $ sudo dnf install bzr cmake gcc-c++ boost-devel mesa-libEGL-devel \
++    mesa-libGLES-devel glm-devel protobuf-lite-devel protobuf-compiler \
++    capnproto-devel capnproto glog-devel gflags-devel systemd-devel \
++    glib2-devel wayland-devel mesa-libgbm-devel libepoxy-devel nettle-devel \
++    libinput-devel libxml++-devel libuuid-devel libxkbcommon-devel \
++    freetype-devel lttng-ust-devel libatomic qterminal qt5-qtwayland \
++    python3-pillow libevdev-devel umockdev-devel gtest-devel gmock-devel
++
++With these installed you can checkout Mir:
++
++    $ bzr branch lp:mir
++
  Building Mir
  ------------
--These instructions assume that you’re using Ubuntu 16.04LTS or later, I’ve not
--earlier Ubuntu versions or other distributions.
--
--You’ll need a few development and utility packages installed, along with the
--Mir graphics drivers:
--
--    $ sudo apt install devscripts equivs bzr
--    $ sudo apt install mir-graphics-drivers-desktop
--
--If you’re working on a phone or tablet use mir-graphics-drivers-android in
--place of mir-graphics-drivers-desktop. (See \ref building_source_for_arm for
--more on this.)
--
--With these installed you can checkout and build Mir:
--
--    $ bzr branch lp:mir
--    $ sudo mk-build-deps -i
      $ mkdir mir/build
      $ cd  mir/build
      $ cmake ..
 === modified file 'examples/CMakeLists.txt'
 --- examples/CMakeLists.txt	2017-09-07 05:58:13 +0000
 +++ examples/CMakeLists.txt	2017-10-27 17:26:09 +0000
@@ -3,10 +3,7 @@
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -fno-strict-aliasing -Wextra")
--add_library(eglapp STATIC
--  eglapp.c
--  client_helpers.cpp
--)
++add_library(mirdraw STATIC graphics_utils.cpp)
  add_library(exampleserverconfig STATIC
    server_example_input_device_config.cpp
@@ -20,150 +17,26 @@
  target_link_libraries(exampleserverconfig mirserver)
--target_link_libraries(eglapp
--  mirclient
--  ${EGL_LIBRARIES}
--  ${GLESv2_LIBRARIES}
--  )
--
--mir_add_wrapped_executable(mir_demo_client_animated_cursor
--  animated_cursor_demo_client.c
--)
--target_link_libraries(mir_demo_client_animated_cursor
--  eglapp
--)
--mir_add_wrapped_executable(mir_demo_client_eglflash
--  eglflash.c
--)
--target_link_libraries(mir_demo_client_eglflash
--  eglapp
--)
--mir_add_wrapped_executable(mir_demo_client_egltriangle
--  egltriangle.c
--)
--target_link_libraries(mir_demo_client_egltriangle
--  eglapp
--)
--mir_add_wrapped_executable(mir_demo_client_target
--  target.c
--)
--target_link_libraries(mir_demo_client_target
--  eglapp
--)
--mir_add_wrapped_executable(mir_demo_client_pointer_confinement
--  pointer_confinement.c
--)
--target_link_libraries(mir_demo_client_pointer_confinement
--  eglapp
--)
--mir_add_wrapped_executable(mir_demo_client_camera
--  camera.c
--)
--target_link_libraries(mir_demo_client_camera
--  eglapp
--)
--mir_add_wrapped_executable(mir_demo_client_eglcounter
--  eglcounter.cpp
--)
--target_link_libraries(mir_demo_client_eglcounter
--  eglapp
--)
--mir_add_wrapped_executable(mir_demo_client_eglplasma
--  eglplasma.c
--)
--target_link_libraries(mir_demo_client_eglplasma
--  eglapp
--)
--mir_add_wrapped_executable(mir_demo_client_cursors
--  cursors_demo_client.c
--)
--target_link_libraries(mir_demo_client_cursors
--  eglapp
--)
--mir_add_wrapped_executable(mir_demo_client_eglstateswitcher
--  eglstateswitcher.c
--)
--target_link_libraries(mir_demo_client_eglstateswitcher
--  eglapp
--)
--
--mir_add_wrapped_executable(mir_demo_client_tooltip
--  tooltip.c
--)
--target_link_libraries(mir_demo_client_tooltip
--  eglapp
--  )
--
--mir_add_wrapped_executable(mir_demo_client_touch_validator
--  client_touch_validator.cpp
--)
--target_link_libraries(mir_demo_client_touch_validator
--  eglapp
--)
--
--mir_add_wrapped_executable(mir_demo_client_basic
--  basic.c
--  )
--
--mir_add_wrapped_executable(mir_demo_client_input_shapes
--  input_shapes.cpp
--  )
--target_link_libraries(mir_demo_client_input_shapes eglapp)
--
--target_link_libraries(mir_demo_client_basic
--  mirclient
--
--  ${Boost_LIBRARIES}
--  ${CMAKE_THREAD_LIBS_INIT}
--)
++mir_add_wrapped_executable(mir_demo_client_basic basic.c)
++target_link_libraries     (mir_demo_client_basic mirclient ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
  mir_add_wrapped_executable(mir_demo_client_release_at_exit release_at_exit.c)
--target_link_libraries(mir_demo_client_release_at_exit mirclient)
++target_link_libraries     (mir_demo_client_release_at_exit mirclient)
  mir_add_wrapped_executable(mir_demo_client_multiwin multiwin.c)
--target_link_libraries(mir_demo_client_multiwin mirclient)
++target_link_libraries     (mir_demo_client_multiwin mirclient)
  mir_add_wrapped_executable(mir_demo_client_fingerpaint fingerpaint.c)
--target_link_libraries(mir_demo_client_fingerpaint mirclient)
++target_link_libraries     (mir_demo_client_fingerpaint mirclient)
  mir_add_wrapped_executable(mir_demo_client_progressbar progressbar.c)
--target_link_libraries(mir_demo_client_progressbar mirclient)
--
--mir_add_wrapped_executable(mir_demo_client_display_config demo_client_display_config.c)
--target_link_libraries(mir_demo_client_display_config eglapp)
--
--mir_add_wrapped_executable(mir_demo_client_eglsquare eglsquare.cpp)
--target_link_libraries(mir_demo_client_eglsquare eglapp)
--
--if ("${CMAKE_CXX_COMPILER}" MATCHES "clang")
--  target_link_libraries(mir_demo_client_eglsquare atomic)
--endif()
--
--mir_add_wrapped_executable(mir_demo_client_flicker
--  flicker.c
--)
--
--target_link_libraries(mir_demo_client_flicker
--  mirclient
--
--  ${Boost_LIBRARIES}
--  ${CMAKE_THREAD_LIBS_INIT}
--)
--
--mir_add_wrapped_executable(mir_demo_client_scroll
--  scroll.cpp
--)
--
--target_link_libraries(mir_demo_client_scroll
--  eglapp
--  mirdraw
--  ${GLESv2_LIBRARIES}
--)
++target_link_libraries     (mir_demo_client_progressbar mirclient)
++
++mir_add_wrapped_executable(mir_demo_client_flicker flicker.c)
++target_link_libraries     (mir_demo_client_flicker mirclient ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
  mir_add_wrapped_executable(mir_demo_client_prompt_session prompt_session.c)
--target_link_libraries(mir_demo_client_prompt_session mirclient)
--
--add_library(mirdraw STATIC graphics_utils.cpp)
++target_link_libraries     (mir_demo_client_prompt_session mirclient)
  include_directories(
    ${PROJECT_SOURCE_DIR}/include/miral
@@ -238,51 +111,91 @@
    endif ()
  endif ()
--mir_add_wrapped_executable(mir_demo_client_multistream
--  multi_stream.cpp
--)
--
--target_link_libraries(mir_demo_client_multistream
--  mirclient
--  eglapp
--  ${Boost_LIBRARIES}
--)
--
--mir_add_wrapped_executable(mir_demo_client_render_surface
--  render_surface.cpp
--)
--
--target_link_libraries(mir_demo_client_render_surface
--  mirclient
--  eglapp
--)
--
--mir_add_wrapped_executable(mir_demo_client_prerendered_frames
--  prerendered_frames.c
--)
--
--target_link_libraries(mir_demo_client_prerendered_frames
--  mirclient
--  m
--)
--
--mir_add_wrapped_executable(mir_demo_client_chain_jumping_buffers
--  chain_jumping_buffers.c
--)
--
--target_link_libraries(mir_demo_client_chain_jumping_buffers
--  mirclient
--)
++mir_add_wrapped_executable(mir_demo_client_prerendered_frames prerendered_frames.c)
++target_link_libraries     (mir_demo_client_prerendered_frames mirclient m)
++
++mir_add_wrapped_executable(mir_demo_client_chain_jumping_buffers chain_jumping_buffers.c)
++target_link_libraries     (mir_demo_client_chain_jumping_buffers mirclient)
  include_directories(${MIR_GENERATED_INCLUDE_DIRECTORIES})
  mir_add_wrapped_executable(mir_demo_client_wayland wayland_client.c)
--target_link_libraries(mir_demo_client_wayland
--
--  ${WAYLAND_CLIENT_LIBRARIES}
--)
++target_link_libraries     (mir_demo_client_wayland ${WAYLAND_CLIENT_LDFLAGS} ${WAYLAND_CLIENT_LIBRARIES})
  mir_add_wrapped_executable(mir_demo_client_screencast screencast.cpp)
--
--target_link_libraries(mir_demo_client_screencast mirclient)
--
++target_link_libraries     (mir_demo_client_screencast mirclient)
++
++
++# The remaining examples are dependent on Mir EGL being supported.
++if (MIR_EGL_SUPPORTED)
++
++  add_library(eglapp STATIC
++    eglapp.c
++    client_helpers.cpp
++  )
++
++  target_link_libraries(eglapp
++    mirclient
++    ${EGL_LIBRARIES}
++    ${GLESv2_LIBRARIES}
++  )
++
++  mir_add_wrapped_executable(mir_demo_client_animated_cursor animated_cursor_demo_client.c)
++  target_link_libraries     (mir_demo_client_animated_cursor eglapp)
++
++  mir_add_wrapped_executable(mir_demo_client_eglflash eglflash.c)
++  target_link_libraries     (mir_demo_client_eglflash eglapp)
++
++  mir_add_wrapped_executable(mir_demo_client_egltriangle egltriangle.c)
++  target_link_libraries     (mir_demo_client_egltriangle eglapp)
++
++  mir_add_wrapped_executable(mir_demo_client_target target.c)
++  target_link_libraries     (mir_demo_client_target eglapp)
++
++  mir_add_wrapped_executable(mir_demo_client_pointer_confinement pointer_confinement.c)
++  target_link_libraries     (mir_demo_client_pointer_confinement eglapp)
++
++  mir_add_wrapped_executable(mir_demo_client_camera camera.c)
++  target_link_libraries     (mir_demo_client_camera eglapp)
++
++  mir_add_wrapped_executable(mir_demo_client_eglcounter eglcounter.cpp)
++  target_link_libraries     (mir_demo_client_eglcounter eglapp)
++
++  mir_add_wrapped_executable(mir_demo_client_eglplasma eglplasma.c)
++  target_link_libraries     (mir_demo_client_eglplasma eglapp)
++
++  mir_add_wrapped_executable(mir_demo_client_cursors cursors_demo_client.c)
++  target_link_libraries     (mir_demo_client_cursors eglapp)
++
++  mir_add_wrapped_executable(mir_demo_client_eglstateswitcher eglstateswitcher.c)
++  target_link_libraries     (mir_demo_client_eglstateswitcher eglapp)
++
++  mir_add_wrapped_executable(mir_demo_client_tooltip tooltip.c)
++  target_link_libraries     (mir_demo_client_tooltip eglapp)
++
++  mir_add_wrapped_executable(mir_demo_client_touch_validator client_touch_validator.cpp)
++  target_link_libraries     (mir_demo_client_touch_validator eglapp)
++
++  mir_add_wrapped_executable(mir_demo_client_display_config demo_client_display_config.c)
++  target_link_libraries     (mir_demo_client_display_config eglapp)
++
++  mir_add_wrapped_executable(mir_demo_client_eglsquare eglsquare.cpp)
++  target_link_libraries     (mir_demo_client_eglsquare eglapp)
++
++  if ("${CMAKE_CXX_COMPILER}" MATCHES "clang")
++    target_link_libraries   (mir_demo_client_eglsquare atomic)
++  endif()
++
++  mir_add_wrapped_executable(mir_demo_client_input_shapes input_shapes.cpp)
++  target_link_libraries     (mir_demo_client_input_shapes eglapp)
++
++  mir_add_wrapped_executable(mir_demo_client_scroll scroll.cpp)
++  target_link_libraries     (mir_demo_client_scroll eglapp mirdraw ${GLESv2_LIBRARIES})
++
++  mir_add_wrapped_executable(mir_demo_client_multistream multi_stream.cpp)
++  target_link_libraries     (mir_demo_client_multistream mirclient eglapp ${Boost_LIBRARIES})
++
++  mir_add_wrapped_executable(mir_demo_client_render_surface render_surface.cpp)
++  target_link_libraries     (mir_demo_client_render_surface mirclient eglapp)
++
++endif() # MIR_EGL_SUPPORTED
 === modified file 'examples/miral-kiosk/CMakeLists.txt'
 --- examples/miral-kiosk/CMakeLists.txt	2017-08-31 15:12:09 +0000
 +++ examples/miral-kiosk/CMakeLists.txt	2017-10-27 17:26:09 +0000
@@ -10,3 +10,8 @@
+ )
  target_link_libraries(miral-kiosk miral)
++
++# I'm not sure why this is needed in a chroot, but it's not worth finding out
++if(DEFINED MIR_CHROOT)
++    target_link_libraries(miral-kiosk EGL ${GLESv2_LIBRARIES})
++endif()
 === modified file 'examples/miral-shell/miral-app.sh'
 --- examples/miral-shell/miral-app.sh	2017-09-25 17:59:37 +0000
 +++ examples/miral-shell/miral-app.sh	2017-10-27 17:26:09 +0000
@@ -45,14 +45,20 @@
  if [ -e "${socket}" ]; then echo "Error: session endpoint '${socket}' already exists"; exit 1 ;fi
  if [ -e "${XDG_RUNTIME_DIR}/${wayland_display}" ]; then echo "Error: wayland endpoint '${wayland_display}' already exists"; exit 1 ;fi
++qt_qpa_platform=ubuntumirclient
  qtubuntu_desktop_installed=$(apt list qtubuntu-desktop 2>/dev/null | grep installed | wc -l)
--if [ "${qtubuntu_desktop_installed}" == "0" ]; then echo "Need qtubuntu-desktop - run \"sudo apt install qtubuntu-desktop\""; exit 1 ;fi
++if [ "${qtubuntu_desktop_installed}" == "0" ]
++then
++    echo "** Warning ** defaulting to Wayland backend for Qt"
++    echo "For the best experience install qtubuntu-desktop - run \"sudo apt install qtubuntu-desktop\""
++    qt_qpa_platform=wayland
++fi
  sh -c "${bindir}${miral_server} $* ${hostsocket} --file ${socket} --wayland-socket-name ${wayland_display} --desktop_file_hint=miral-shell.desktop"&
  while [ ! -e "${socket}" ]; do echo "waiting for ${socket}"; sleep 1 ;done
  unset QT_QPA_PLATFORMTHEME
--MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir WAYLAND_DISPLAY=${wayland_display} dbus-run-session -- ${launcher}
++MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=${qt_qpa_platform} SDL_VIDEODRIVER=wayland WAYLAND_DISPLAY=${wayland_display} dbus-run-session -- ${launcher}
  killall ${bindir}${miral_server}
 === modified file 'examples/miral-shell/miral-desktop.sh'
 --- examples/miral-shell/miral-desktop.sh	2017-09-19 08:52:48 +0000
 +++ examples/miral-shell/miral-desktop.sh	2017-10-27 17:26:09 +0000
@@ -37,8 +37,14 @@
  if [ -e "${socket}" ]; then echo "Error: session endpoint '${socket}' already exists"; exit 1 ;fi
  if [ -e "${XDG_RUNTIME_DIR}/${wayland_display}" ]; then echo "Error: wayland endpoint '${wayland_display}' already exists"; exit 1 ;fi
++qt_qpa_platform=ubuntumirclient
  qtubuntu_desktop_installed=$(apt list qtubuntu-desktop 2>/dev/null | grep installed | wc -l)
--if [ "${qtubuntu_desktop_installed}" == "0" ]; then echo "Need qtubuntu-desktop - run \"sudo apt install qtubuntu-desktop\""; exit 1 ;fi
++if [ "${qtubuntu_desktop_installed}" == "0" ]
++then
++    echo "** Warning ** defaulting to Wayland backend for Qt"
++    echo "For the best experience install qtubuntu-desktop - run \"sudo apt install qtubuntu-desktop\""
++    qt_qpa_platform=wayland
++fi
  sudo ls >> /dev/null
  oldvt=$(sudo fgconsole)
@@ -47,6 +53,6 @@
  while [ ! -e "${socket}" ]; do echo "waiting for ${socket}"; sleep 1 ;done
  unset QT_QPA_PLATFORMTHEME
--MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir WAYLAND_DISPLAY=${wayland_display} dbus-run-session -- ${launcher}
++MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=${qt_qpa_platform} SDL_VIDEODRIVER=wayland WAYLAND_DISPLAY=${wayland_display} dbus-run-session -- ${launcher}
  sudo killall ${bindir}${miral_server}
 === modified file 'examples/miral-shell/miral-run.sh'
 --- examples/miral-shell/miral-run.sh	2017-08-21 15:58:34 +0000
 +++ examples/miral-shell/miral-run.sh	2017-10-27 17:26:09 +0000
@@ -14,4 +14,15 @@
  then extras='--app-id com.canonical.miral.Terminal'
  fi
  unset QT_QPA_PLATFORMTHEME
--MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir "$@" ${extras}&
++
++qt_qpa_platform=ubuntumirclient
++qtubuntu_desktop_installed=$(apt list qtubuntu-desktop
++ 2>/dev/null | grep installed | wc -l)
++if [ "${qtubuntu_desktop_installed}" == "0" ]
++then
++    echo "** Warning ** defaulting to Wayland backend for Qt"
++    echo "For the best experience install qtubuntu-desktop - run \"sudo apt install qtubuntu-desktop\""
++    qt_qpa_platform=wayland
++fi
++
++MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=${qt_qpa_platform} SDL_VIDEODRIVER=wayland "$@" ${extras}&
 === modified file 'examples/miral-shell/miral-xrun.sh'
 --- examples/miral-shell/miral-xrun.sh	2017-09-29 16:19:42 +0000
 +++ examples/miral-shell/miral-xrun.sh	2017-10-27 17:26:09 +0000
@@ -41,7 +41,6 @@
    else
      echo "Error: Cannot detect Mir endpoint"; exit 1
    fi
--  MIR_SOCKET=${socket_value}
    x11_server_args=-rootless
  elif [ "${x11_server}" == "Xwayland" ];
  then
@@ -51,10 +50,15 @@
    if [ -e "${XDG_RUNTIME_DIR}/miral_wayland" ];
    then
      socket_value=miral_wayland
++  elif [ -e "${XDG_RUNTIME_DIR}/wayland-1" ]
++  then
++    socket_value=wayland-1
++  elif [ -e "${XDG_RUNTIME_DIR}/wayland-0" ]
++  then
++    socket_value=wayland-0
    else
      echo "Error: Cannot detect Mir-Wayland endpoint"; exit 1
    fi
--  WAYLAND_DISPLAY=${socket_value}
    x11_server_args=
  fi
@@ -64,6 +68,7 @@
      let port+=1
  done
--${x11_server} ${x11_server_args} :${port} & pid=$!
++MIR_SOCKET=${socket_value} WAYLAND_DISPLAY=${socket_value} ${x11_server} ${x11_server_args} :${port} & pid=$!
++while [ ! -e "/tmp/.X11-unix/X${port}" ]; do echo "waiting for DISPLAY=:${port}"; sleep 1 ;done
  DISPLAY=:${port} "$@"
  kill ${pid}
 === modified file 'examples/miral-shell/shell_main.cpp'
 --- examples/miral-shell/shell_main.cpp	2017-08-21 15:58:34 +0000
 +++ examples/miral-shell/shell_main.cpp	2017-10-27 17:26:09 +0000
@@ -83,7 +83,7 @@
+         {
              CommandLineOption{[&](std::string const& ) { },
                                "desktop_file_hint", "Ignored for Unity8 compatibility", "miral-shell.desktop"},
--            CursorTheme{"DMZ-White"},
++            CursorTheme{"default"},
              window_managers,
              display_configuration_options,
              launcher,
 === modified file 'examples/miral-shell/spinner/eglspinner.cpp'
 --- examples/miral-shell/spinner/eglspinner.cpp	2017-08-21 15:58:34 +0000
 +++ examples/miral-shell/spinner/eglspinner.cpp	2017-10-27 17:26:09 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright © 2013-2015 Canonical Ltd.
++ * Copyright © 2013-2017 Canonical Ltd.
+  *
   * This program is free software: you can redistribute it and/or modify
   * under the terms of the GNU General Public License version 2 or 3 as as
@@ -19,6 +19,14 @@
   *          Kevin DuBois <kevin.dubois@canonical.com>
   */
++// Ugly way to detect the Mir EGL patch to mesa
++// NB this has to be before any other includes
++#define MIR_EGL_PLATFORM
++#include <EGL/eglplatform.h>
++#ifndef MIR_CLIENT_API_VERSION
++#define MIR_EGL_UNAVAILABLE
++#endif
++
  #include "splash.h"
  #include <chrono>
@@ -143,7 +151,7 @@
      //1.) 0.0   - 0.6:   logo fades in fully
      //2.) 0.0   - 6.0:   logo does one full spin 360°
      //3.) 6.0   - 6.833: glow fades in fully, black-background fades out to 50%
--    //4.) 6.833 - 7.666: glow fades out fully, black-background fades out to 0%
++    //4.) 6.833 - 7.666: glow fades out fully, black-background fades out to 0%
      //5.) 7.666 - 8.266: logo fades out fully
      //8.266..:       now spinner can be closed as all its elements are faded out
@@ -221,11 +229,14 @@
      "}                                                    \n";
  std::atomic<bool> dying{false};
++
++#ifndef MIR_EGL_UNAVAILABLE
  void lifecycle_event_callback(MirConnection* /*connection*/, MirLifecycleState state, void* context)
+ {
      if (state == mir_lifecycle_connection_lost)
          static_cast<decltype(dying)*>(context)->store(true);
+ }
++#endif
+ }
  struct SpinnerSplash::Self
@@ -254,6 +265,7 @@
  void SpinnerSplash::operator()(MirConnection* const connection)
  try
+ {
++#ifndef MIR_EGL_UNAVAILABLE
      GLuint prog[2];
      GLuint texture[2];
      GLint vpos[2];
@@ -365,6 +377,9 @@
      glDeleteTextures(2, texture);
      g_timer_destroy (timer);
++#else
++    (void)connection;
++#endif
+ }
  catch (std::exception const& x)
+ {
 === modified file 'examples/miral-shell/titlebar_config.cpp'
 --- examples/miral-shell/titlebar_config.cpp	2017-08-21 15:58:34 +0000
 +++ examples/miral-shell/titlebar_config.cpp	2017-10-27 17:26:09 +0000
@@ -17,12 +17,30 @@
   */
  #include "titlebar_config.h"
++#include <unistd.h>
  #include <mutex>
  namespace
+ {
++auto default_font() -> std::string
++{
++    for (std::string const file : { "Ubuntu-B.ttf", "FreeSansBold.ttf" })
++    {
++        for (auto const path : { "/usr/share/fonts/truetype/ubuntu-font-family/",   // Ubuntu Ubuntu-B.ttf
++                                 "/usr/share/fonts/truetype/freefont/",             // Debian FreeSansBold.ttf
++                                 "/usr/share/fonts/gnu-free/"})                     // Fedora FreeSansBold.ttf
++        {
++            auto const full_path = path + file;
++            if (access(full_path.c_str(), R_OK) == 0)
++                return full_path;
++        }
++    }
++
++    return "/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-B.ttf";
++}
++
  std::mutex mutex;
--std::string font_file{"/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-B.ttf"};
++std::string font_file{default_font()};
+ }
  void titlebar::font_file(std::string const& font_file)
 === modified file 'include/core/mir/optional_value.h'
 --- include/core/mir/optional_value.h	2017-07-28 17:00:43 +0000
 +++ include/core/mir/optional_value.h	2017-10-27 17:26:09 +0000
@@ -59,6 +59,11 @@
          return std::move(value_);
+     }
++    operator bool() const
++    {
++        return is_set();
++    }
++
  private:
      void die_if_unset() const
+     {
 === modified file 'include/server/mir/server_action_queue.h'
 --- include/server/mir/server_action_queue.h	2017-07-28 17:00:43 +0000
 +++ include/server/mir/server_action_queue.h	2017-10-27 17:26:09 +0000
@@ -32,6 +32,16 @@
      virtual ~ServerActionQueue() = default;
      virtual void enqueue(void const* owner, ServerAction const& action) = 0;
++    /**
++     * Enqueue an action to be run, guaranteeing that it *will* be run.
++     *
++     * The action will be run even if the queue is not normally being drained
++     * (for example, if the main loop is suspended). If running on the queue is
++     * not possible, the action will be run on the caller's thread.
++     *
++     * \param [in]  action  Functor to invoke.
++     */
++    virtual void enqueue_with_guaranteed_execution(ServerAction const& action) = 0;
      virtual void pause_processing_for(void const* owner) = 0;
      virtual void resume_processing_for(void const* owner) = 0;
 === modified file 'include/server/mir/shell/persistent_surface_store.h'
 --- include/server/mir/shell/persistent_surface_store.h	2017-07-28 17:00:43 +0000
 +++ include/server/mir/shell/persistent_surface_store.h	2017-10-27 17:26:09 +0000
@@ -22,7 +22,7 @@
  #include <memory>
  #include <vector>
  #include <array>
--#include <uuid/uuid.h>
++#include <uuid.h>
  namespace mir
 === modified file 'src/CMakeLists.txt'
 --- src/CMakeLists.txt	2017-09-08 13:26:03 +0000
 +++ src/CMakeLists.txt	2017-10-27 17:26:09 +0000
@@ -18,7 +18,6 @@
  # Add the core and platform implementations before exposing any private APIs
  add_subdirectory(core)
  add_subdirectory(platforms/)
--add_subdirectory(miral/)
  # the src/include/... directories should be private to the implementation
  include_directories(${PROJECT_SOURCE_DIR}/src/include/common)
@@ -31,6 +30,7 @@
  add_subdirectory(platform/)
  add_subdirectory(server/)
++add_subdirectory(miral/)
  add_subdirectory(client/)
  add_subdirectory(utils/)
  add_subdirectory(renderer/)
@@ -54,6 +54,7 @@
  set(MIR_PLATFORM_REFERENCES ${MIR_PLATFORM_REFERENCES} PARENT_SCOPE)
  set(MIR_CLIENT_PLATFORM_PATH ${MIR_CLIENT_PLATFORM_PATH} PARENT_SCOPE)
  set(MIR_SERVER_PLATFORM_PATH ${MIR_SERVER_PLATFORM_PATH} PARENT_SCOPE)
++set(MIRSERVER_INCLUDE_DIRS ${MIRSERVER_INCLUDE_DIRS} PARENT_SCOPE)
  # We need the ABI versions in the tests
  set(MIR_SERVER_GRAPHICS_PLATFORM_ABI ${MIR_SERVER_GRAPHICS_PLATFORM_ABI} PARENT_SCOPE)
 === modified file 'src/capnproto/CMakeLists.txt'
 --- src/capnproto/CMakeLists.txt	2017-07-28 17:00:43 +0000
 +++ src/capnproto/CMakeLists.txt	2017-10-27 17:26:09 +0000
@@ -20,7 +20,12 @@
  capnp_generate_cpp(CAPNPROTO_INPUT_CONFIG_SRC CAPNPROTO_INPUT_CONFIG_HDRS mir_input_config.capnp)
  add_library(mircapnproto STATIC ${CAPNPROTO_EVENT_SRC} ${CAPNPROTO_INPUT_CONFIG_SRC})
--target_link_libraries(mircapnproto ${CAPNP_LIBRARIES_LITE})
++
++if (DEFINED CAPNP_LIBRARIES_LITE)
++  target_link_libraries(mircapnproto ${CAPNP_LIBRARIES_LITE})
++else()
++  target_link_libraries(mircapnproto $<TARGET_FILE:CapnProto::capnp> $<TARGET_FILE:CapnProto::kj>)
++endif()
  list(APPEND MIR_GENERATED_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR})
 === modified file 'src/include/server/mir/glib_main_loop.h'
 --- src/include/server/mir/glib_main_loop.h	2017-07-28 17:00:43 +0000
 +++ src/include/server/mir/glib_main_loop.h	2017-10-27 17:26:09 +0000
@@ -28,6 +28,7 @@
  #include <exception>
  #include <glib.h>
++#include <deque>
  namespace mir
+ {
@@ -76,6 +77,8 @@
      void unregister_fd_handler(void const* owner) override;
      void enqueue(void const* owner, ServerAction const& action) override;
++    void enqueue_with_guaranteed_execution(ServerAction const& action) override;
++
      void pause_processing_for(void const* owner) override;
      void resume_processing_for(void const* owner) override;
@@ -100,6 +103,8 @@
      detail::SignalSources signal_sources;
      std::mutex do_not_process_mutex;
      std::vector<void const*> do_not_process;
++    std::mutex run_on_halt_mutex;
++    std::deque<ServerAction> run_on_halt_queue;
      std::function<void()> before_iteration_hook;
      std::exception_ptr main_loop_exception;
  };
 === modified file 'src/miral/CMakeLists.txt'
 --- src/miral/CMakeLists.txt	2017-09-15 09:43:35 +0000
 +++ src/miral/CMakeLists.txt	2017-10-27 17:26:09 +0000
@@ -96,13 +96,18 @@
  # clang generates slightly different symbols (but we don't care)
  if (CMAKE_COMPILER_IS_GNUCXX)
--    add_custom_target(check-miral-symbols ALL
--            DEPENDS miral ${PROJECT_SOURCE_DIR}/debian/libmiral${MIRAL_ABI}.symbols
--            COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols
--            COMMAND dpkg-gensymbols -e${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libmiral.so.${MIRAL_ABI} -plibmiral${MIRAL_ABI} -v${MIRAL_VERSION} -O${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols
--            WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
--            VERBATIM
--    )
++    # Using dpkg-gensymbols only makes sense on Debian based distros
++    if (EXISTS /etc/debian_version)
++        find_program(MIR_DPKG_GENSYMBOLS dpkg-gensymbols)
++        if (MIR_DPKG_GENSYMBOLS)
++            add_custom_target(check-miral-symbols ALL
++                DEPENDS miral ${PROJECT_SOURCE_DIR}/debian/libmiral${MIRAL_ABI}.symbols
++                COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols
++                COMMAND dpkg-gensymbols -e${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libmiral.so.${MIRAL_ABI} -plibmiral${MIRAL_ABI} -v${MIRAL_VERSION} -O${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols
++                WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
++                VERBATIM)
++        endif()
++    endif()
  endif()
  set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
 === modified file 'src/miral/runner.cpp'
 --- src/miral/runner.cpp	2017-08-21 14:18:55 +0000
 +++ src/miral/runner.cpp	2017-10-27 17:26:09 +0000
@@ -48,7 +48,7 @@
      int const argc;
      char const** const argv;
      std::string const config_file;
--
++
      std::mutex mutex;
      std::function<void()> start_callback{[]{}};
      std::function<void()> stop_callback{[this]{ join_client_threads(weak_server.lock().get()); }};
@@ -103,7 +103,7 @@
          setenv("GDK_BACKEND", "mir", true);                 // configure GTK to use Mir
          setenv("QT_QPA_PLATFORM", "ubuntumirclient", true); // configure Qt to use Mir
          unsetenv("QT_QPA_PLATFORMTHEME");                   // Discourage Qt from unsupported theme
--        setenv("SDL_VIDEODRIVER", "mir", true);             // configure SDL to use Mir
++        setenv("SDL_VIDEODRIVER", "wayland", true);         // configure SDL to use Wayland
          // gnome-terminal is the (only known) special case
          char const* exec_args[] = { "gnome-terminal", "--app-id", "com.canonical.miral.Terminal", nullptr };
 === modified file 'src/platforms/eglstream-kms/server/display.cpp'
 --- src/platforms/eglstream-kms/server/display.cpp	2017-07-28 17:00:43 +0000
 +++ src/platforms/eglstream-kms/server/display.cpp	2017-10-27 17:26:09 +0000
@@ -34,7 +34,6 @@
  #include "mir/renderer/gl/render_target.h"
  #include "mir/renderer/gl/context.h"
--#include <drm/drm.h>
  #include <xf86drmMode.h>
  #include <sys/ioctl.h>
  #include <system_error>
 === modified file 'src/platforms/eglstream-kms/server/egl_output.cpp'
 --- src/platforms/eglstream-kms/server/egl_output.cpp	2017-07-28 17:00:43 +0000
 +++ src/platforms/eglstream-kms/server/egl_output.cpp	2017-10-27 17:26:09 +0000
@@ -23,7 +23,7 @@
  #include "kms-utils/kms_connector.h"
  #include <cstring>
--#include <drm/drm.h>
++#include <drm.h>
  #include <sys/ioctl.h>
  #include <vector>
  #include <boost/throw_exception.hpp>
 === modified file 'src/platforms/mesa/server/buffer_allocator.cpp'
 --- src/platforms/mesa/server/buffer_allocator.cpp	2017-09-27 20:44:14 +0000
 +++ src/platforms/mesa/server/buffer_allocator.cpp	2017-10-27 17:26:09 +0000
@@ -421,8 +421,6 @@
              if (egl_image == EGL_NO_IMAGE_KHR)
                  BOOST_THROW_EXCEPTION(mg::egl_error("Failed to create EGLImage"));
--
--            on_consumed();
+         }
          lock.unlock();
@@ -436,6 +434,7 @@
      void secure_for_render() override
+     {
++        on_consumed();
+     }
      std::shared_ptr<mir::graphics::NativeBuffer> native_buffer_handle() const override
@@ -537,7 +536,7 @@
      std::shared_ptr<mg::EGLExtensions> const extensions;
--    std::function<void()> on_consumed;
++    std::function<void()> const on_consumed;
  };
+ }
 === modified file 'src/platforms/mesa/server/kms/cursor.cpp'
 --- src/platforms/mesa/server/kms/cursor.cpp	2017-07-31 08:58:34 +0000
 +++ src/platforms/mesa/server/kms/cursor.cpp	2017-10-27 17:26:09 +0000
@@ -25,7 +25,6 @@
  #include "mir/graphics/cursor_image.h"
  #include <xf86drm.h>
--#include <drm/drm.h>
  #include <boost/exception/errinfo_errno.hpp>
 === modified file 'src/platforms/mesa/server/kms/display_buffer.cpp'
 --- src/platforms/mesa/server/kms/display_buffer.cpp	2017-07-28 17:00:43 +0000
 +++ src/platforms/mesa/server/kms/display_buffer.cpp	2017-10-27 17:26:09 +0000
@@ -32,7 +32,7 @@
  #include <EGL/eglext.h>
  #include MIR_SERVER_GL_H
  #include <GLES2/gl2ext.h>
--#include <drm/drm_fourcc.h>
++#include <drm_fourcc.h>
  #include <sstream>
  #include <stdexcept>
@@ -504,7 +504,7 @@
      make_current();
      listener->report_successful_egl_make_current_on_construction();
--
++
      glClear(GL_COLOR_BUFFER_BIT);
      surface.swap_buffers();
@@ -591,9 +591,7 @@
+         {
              auto bypass_buffer = (*bypass_it)->buffer();
              auto native = std::dynamic_pointer_cast<mgm::NativeBuffer>(bypass_buffer->native_buffer_handle());
--            if (!native)
--                BOOST_THROW_EXCEPTION(std::invalid_argument("could not convert NativeBuffer"));
--            if (native->flags & mir_buffer_flag_can_scanout &&
++            if (native && native->flags & mir_buffer_flag_can_scanout &&
                  bypass_buffer->size() == surface.size() &&
                  !needs_bounce_buffer(*outputs.front(), native->bo))
+             {
@@ -776,7 +774,7 @@
          visible_bypass_frame = scheduled_bypass_frame;
          scheduled_bypass_frame = nullptr;
--
++
          visible_composite_frame = std::move(scheduled_composite_frame);
          scheduled_composite_frame = nullptr;
+     }
 === modified file 'src/protobuf/symbols.map'
 --- src/protobuf/symbols.map	2017-05-25 08:58:03 +0000
 +++ src/protobuf/symbols.map	2017-10-27 17:26:09 +0000
@@ -1158,3 +1158,27 @@
      vtable?for?mir::protobuf::RequestWithAuthority;
    };
  } MIR_PROTOBUF_0.26;
++
++# When building with the Fedora 26 toolchain these are needed
++MIR_PROTOBUF_FEDORA {
++ global:
++  extern "C++" {
++    mir::protobuf::_Buffer_default_instance_;
++    mir::protobuf::_BufferRequest_default_instance_;
++    mir::protobuf::_BufferStream_default_instance_;
++    mir::protobuf::_BufferStreamId_default_instance_;
++    mir::protobuf::_Cookie_default_instance_;
++    mir::protobuf::_DisplayConfiguration_default_instance_;
++    mir::protobuf::_LifecycleEvent_default_instance_;
++    mir::protobuf::_ModuleProperties_default_instance_;
++    mir::protobuf::_PersistentSurfaceId_default_instance_;
++    mir::protobuf::_PingEvent_default_instance_;
++    mir::protobuf::_Platform_default_instance_;
++    mir::protobuf::_ScreencastId_default_instance_;
++    mir::protobuf::_StructuredError_default_instance_;
++    mir::protobuf::_SurfaceAspectRatio_default_instance_;
++    mir::protobuf::_SurfaceId_default_instance_;
++    mir::protobuf::_SurfaceSpecification_default_instance_;
++    mir::protobuf::_Rectangle_default_instance_;
++  };
++} MIR_PROTOBUF_0.27;
 === modified file 'src/server/CMakeLists.txt'
 --- src/server/CMakeLists.txt	2017-09-25 22:34:08 +0000
 +++ src/server/CMakeLists.txt	2017-10-27 17:26:09 +0000
@@ -125,6 +125,13 @@
    atomic
+ )
++target_include_directories(mirshell
++  PUBLIC
++    ${UUID_INCLUDE_DIRS}
++)
++
++set(MIRSERVER_INCLUDE_DIRS ${UUID_INCLUDE_DIRS} PARENT_SCOPE)
++
  install(TARGETS mirserver
    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ )
 === modified file 'src/server/frontend/wayland/wayland_connector.cpp'
 --- src/server/frontend/wayland/wayland_connector.cpp	2017-10-08 02:12:58 +0000
 +++ src/server/frontend/wayland/wayland_connector.cpp	2017-10-27 17:26:09 +0000
@@ -43,6 +43,11 @@
  #include "mir/client/event.h"
++#include "mir/input/device.h"
++#include "mir/input/mir_keyboard_config.h"
++#include "mir/input/input_device_hub.h"
++#include "mir/input/input_device_observer.h"
++
  #include <system_error>
  #include <sys/eventfd.h>
  #include <wayland-server-core.h>
@@ -75,6 +80,7 @@
  namespace ms = mir::scene;
  namespace geom = mir::geometry;
  namespace mcl = mir::client;
++namespace mi = mir::input;
  namespace mir
+ {
@@ -798,6 +804,7 @@
          wl_client* client,
          wl_resource* parent,
          uint32_t id,
++        mir::input::Keymap const& initial_keymap,
          std::function<void(WlKeyboard*)> const& on_destroy,
          std::shared_ptr<mir::Executor> const& executor)
          : Keyboard(client, parent, id),
@@ -811,19 +818,14 @@
          // TODO: We should really grab the keymap for the focused surface when
          // we receive focus.
--        xkb_rule_names default_rules;
--        memset(&default_rules, 0, sizeof(default_rules));
--
--        keymap = decltype(keymap){
--            xkb_keymap_new_from_names(
--                context.get(),
--                &default_rules,
--                XKB_KEYMAP_COMPILE_NO_FLAGS),
--            &xkb_keymap_unref};
--
--        state = decltype(state){
--            xkb_state_new(keymap.get()),
--            &xkb_state_unref};
++        // TODO: Maintain per-device keymaps, and send the appropriate map before
++        // sending an event from a keyboard with a different map.
++
++        /* The wayland::Keyboard constructor has already run, creating the keyboard
++         * resource. It is thus safe to send a keymap event to it; the client will receive
++         * the keyboard object before this event.
++         */
++        set_keymap(initial_keymap);
+     }
      ~WlKeyboard()
@@ -966,6 +968,38 @@
          state = decltype(state)(xkb_state_new(keymap.get()), &xkb_state_unref);
+     }
++    void set_keymap(mir::input::Keymap const& new_keymap)
++    {
++        xkb_rule_names const names = {
++            "evdev",
++            new_keymap.model.c_str(),
++            new_keymap.layout.c_str(),
++            new_keymap.variant.c_str(),
++            new_keymap.options.c_str()
++        };
++        keymap = decltype(keymap){
++            xkb_keymap_new_from_names(
++                context.get(),
++                &names,
++                XKB_KEYMAP_COMPILE_NO_FLAGS),
++            &xkb_keymap_unref};
++
++        // TODO: We might need to copy across the existing depressed keys?
++        state = decltype(state)(xkb_state_new(keymap.get()), &xkb_state_unref);
++
++        auto buffer = xkb_keymap_get_as_string(keymap.get(), XKB_KEYMAP_FORMAT_TEXT_V1);
++        auto length = strlen(buffer);
++
++        mir::AnonymousShmFile shm_buffer{length};
++        memcpy(shm_buffer.base_ptr(), buffer, length);
++
++        wl_keyboard_send_keymap(
++            resource,
++            WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,
++            shm_buffer.fd(),
++            length);
++    }
++
  private:
      std::unique_ptr<xkb_keymap, decltype(&xkb_keymap_unref)> keymap;
      std::unique_ptr<xkb_state, decltype(&xkb_state_unref)> state;
@@ -1320,8 +1354,20 @@
  class WlSeat
+ {
  public:
--    WlSeat(wl_display* display, std::shared_ptr<mir::Executor> const& executor)
--        : executor{executor},
++    WlSeat(
++        wl_display* display,
++        std::shared_ptr<mi::InputDeviceHub> const& input_hub,
++        std::shared_ptr<mir::Executor> const& executor)
++        : config_observer{
++              std::make_shared<ConfigObserver>(
++                  keymap,
++                  [this](mir::input::Keymap const& new_keymap)
++                  {
++                      keymap = new_keymap;
++
++                  })},
++          input_hub{input_hub},
++          executor{executor},
            global{wl_global_create(
                display,
                &wl_seat_interface,
@@ -1333,10 +1379,12 @@
+         {
              BOOST_THROW_EXCEPTION(std::runtime_error("Failed to export wl_seat interface"));
+         }
++        input_hub->add_observer(config_observer);
+     }
      ~WlSeat()
+     {
++        input_hub->remove_observer(config_observer);
          wl_global_destroy(global);
+     }
@@ -1350,9 +1398,38 @@
+     }
  private:
++    class ConfigObserver :  public mi::InputDeviceObserver
++    {
++    public:
++        ConfigObserver(
++            mir::input::Keymap const& keymap,
++            std::function<void(mir::input::Keymap const&)> const& on_keymap_commit)
++            : current_keymap{keymap},
++              on_keymap_commit{on_keymap_commit}
++        {
++        }
++
++        void device_added(std::shared_ptr<input::Device> const& device) override;
++        void device_changed(std::shared_ptr<input::Device> const& device) override;
++        void device_removed(std::shared_ptr<input::Device> const& device) override;
++        void changes_complete() override;
++
++    private:
++        mir::input::Keymap const& current_keymap;
++        mir::input::Keymap pending_keymap;
++        std::function<void(mir::input::Keymap const&)> const on_keymap_commit;
++    };
++
++    mir::input::Keymap keymap;
++    std::shared_ptr<ConfigObserver> const config_observer;
++
      std::unordered_map<wl_client*, InputCtx<WlPointer>> mutable pointer;
      std::unordered_map<wl_client*, InputCtx<WlKeyboard>> mutable keyboard;
      std::unordered_map<wl_client*, InputCtx<WlTouch>> mutable touch;
++
++    std::shared_ptr<mi::InputDeviceHub> const input_hub;
++
++
      std::shared_ptr<mir::Executor> const executor;
      static void bind(struct wl_client* client, void* data, uint32_t version, uint32_t id)
@@ -1413,6 +1490,7 @@
                  client,
                  resource,
                  id,
++                me->keymap,
                  [&input_ctx](WlKeyboard* listener)
+                 {
                      input_ctx.unregister_listener(listener);
@@ -1435,8 +1513,10 @@
                  },
                  me->executor});
+     }
--    static void release(struct wl_client* /*client*/, struct wl_resource* /*resource*/) {}
--
++    static void release(struct wl_client* /*client*/, struct wl_resource* us)
++    {
++        wl_resource_destroy(us);
++    }
      wl_global* const global;
      static struct wl_seat_interface const vtable;
@@ -1464,6 +1544,37 @@
      return touch[client];
+ }
++void WlSeat::ConfigObserver::device_added(std::shared_ptr<input::Device> const& device)
++{
++    if (auto keyboard_config = device->keyboard_configuration())
++    {
++        if (current_keymap != keyboard_config.value().device_keymap())
++        {
++            pending_keymap = keyboard_config.value().device_keymap();
++        }
++    }
++}
++
++void WlSeat::ConfigObserver::device_changed(std::shared_ptr<input::Device> const& device)
++{
++    if (auto keyboard_config = device->keyboard_configuration())
++    {
++        if (current_keymap != keyboard_config.value().device_keymap())
++        {
++            pending_keymap = keyboard_config.value().device_keymap();
++        }
++    }
++}
++
++void WlSeat::ConfigObserver::device_removed(std::shared_ptr<input::Device> const& /*device*/)
++{
++}
++
++void WlSeat::ConfigObserver::changes_complete()
++{
++    on_keymap_commit(pending_keymap);
++}
++
  void WaylandEventSink::send_buffer(BufferStreamId /*id*/, graphics::Buffer& /*buffer*/, graphics::BufferIpcMsgType)
+ {
+ }
@@ -2055,6 +2166,7 @@
      optional_value<std::string> const& display_name,
      std::shared_ptr<mf::Shell> const& shell,
      DisplayChanger& display_config,
++    std::shared_ptr<mi::InputDeviceHub> const& input_hub,
      std::shared_ptr<mg::GraphicBufferAllocator> const& allocator,
      bool arw_socket)
      : display{wl_display_create(), &cleanup_display},
@@ -2089,7 +2201,7 @@
          display.get(),
          executor,
          this->allocator);
--    seat_global = std::make_unique<mf::WlSeat>(display.get(), executor);
++    seat_global = std::make_unique<mf::WlSeat>(display.get(), input_hub, executor);
      output_manager = std::make_unique<mf::OutputManager>(
          display.get(),
          display_config);
 === modified file 'src/server/frontend/wayland/wayland_connector.h'
 --- src/server/frontend/wayland/wayland_connector.h	2017-09-15 16:34:13 +0000
 +++ src/server/frontend/wayland/wayland_connector.h	2017-10-27 17:26:09 +0000
@@ -29,7 +29,10 @@
  namespace mir
+ {
--
++namespace input
++{
++class InputDeviceHub;
++}
  namespace graphics
+ {
  class GraphicBufferAllocator;
@@ -54,6 +57,7 @@
          optional_value<std::string> const& display_name,
          std::shared_ptr<Shell> const& shell,
          DisplayChanger& display_config,
++        std::shared_ptr<input::InputDeviceHub> const& input_hub,
          std::shared_ptr<graphics::GraphicBufferAllocator> const& allocator,
          bool arw_socket);
 === modified file 'src/server/frontend/wayland/wayland_default_configuration.cpp'
 --- src/server/frontend/wayland/wayland_default_configuration.cpp	2017-09-15 16:34:13 +0000
 +++ src/server/frontend/wayland/wayland_default_configuration.cpp	2017-10-27 17:26:09 +0000
@@ -42,6 +42,7 @@
                  display_name,
                  the_frontend_shell(),
                  *the_frontend_display_changer(),
++                the_input_device_hub(),
                  the_buffer_allocator(),
                  arw_socket);
          });
 === modified file 'src/server/glib_main_loop.cpp'
 --- src/server/glib_main_loop.cpp	2017-07-28 17:00:43 +0000
 +++ src/server/glib_main_loop.cpp	2017-10-27 17:26:09 +0000
@@ -154,7 +154,19 @@
      detail::add_idle_gsource(main_context, G_PRIORITY_HIGH,
          [this]
+         {
--            running = false;
++            {
++                std::lock_guard<std::mutex> lock{run_on_halt_mutex};
++                running = false;
++            }
++            // We know any other thread sees running == false here, so don't need
++            // to lock run_on_halt_queue.
++            for (auto& action : run_on_halt_queue)
++            {
++                try { action(); }
++                catch (...) { handle_exception(std::current_exception()); }
++            }
++            run_on_halt_queue.clear();
++
              g_main_context_wakeup(main_context);
          });
+ }
@@ -246,6 +258,48 @@
          });
+ }
++
++void mir::GLibMainLoop::enqueue_with_guaranteed_execution(mir::ServerAction const& action)
++{
++    auto const action_with_exception_handling =
++        [this]
++        {
++            try
++            {
++                mir::ServerAction action;
++                {
++                    std::lock_guard<std::mutex> lock{run_on_halt_mutex};
++                    action = run_on_halt_queue.front();
++                    run_on_halt_queue.pop_front();
++                }
++                action();
++            }
++            catch (...)
++            {
++                handle_exception(std::current_exception());
++            }
++        };
++
++    {
++        std::lock_guard<std::mutex> lock{run_on_halt_mutex};
++
++        if (!running)
++        {
++            action();
++            return;
++        }
++        else
++        {
++            run_on_halt_queue.push_back(action);
++        }
++    }
++
++    detail::add_idle_gsource(
++        main_context,
++        G_PRIORITY_DEFAULT,
++        action_with_exception_handling);
++}
++
  void mir::GLibMainLoop::pause_processing_for(void const* owner)
+ {
      std::lock_guard<std::mutex> lock{do_not_process_mutex};
 === modified file 'src/server/input/default_input_device_hub.cpp'
 --- src/server/input/default_input_device_hub.cpp	2017-07-28 17:00:43 +0000
 +++ src/server/input/default_input_device_hub.cpp	2017-10-27 17:26:09 +0000
@@ -88,25 +88,26 @@
      auto observer = obs.lock();
      if (observer)
+     {
--        std::mutex mutex;
          std::condition_variable cv;
--        std::unique_lock<decltype(mutex)> lock{mutex};
--        bool removed{false};
++        std::atomic<bool> removed{false};
--        data->observer_queue->enqueue(
--            data.get(),
++        data->observer_queue->enqueue_with_guaranteed_execution(
              [&,this]
+             {
                  // Unless remove() is on the same thread as add() external synchronization would be needed
                  data->observers.remove(observer);
--                std::lock_guard<decltype(mutex)> lock{mutex};
++                // We do *not* take a lock and instead rely on removed being atomic,
++                // as enqueue_with_guaranteed_execution may run on our stack.
                  removed = true;
                  cv.notify_one();
              });
++        std::mutex mutex;
++        std::unique_lock<decltype(mutex)> lock{mutex};
++
          // Before returning wait for the remove - otherwise notifications can still happen
--        cv.wait(lock, [&] { return removed; });
++        cv.wait(lock, [&] { return removed.load(); });
+     }
+ }
 === modified file 'src/server/shell/default_persistent_surface_store.cpp'
 --- src/server/shell/default_persistent_surface_store.cpp	2017-08-14 02:48:54 +0000
 +++ src/server/shell/default_persistent_surface_store.cpp	2017-10-27 17:26:09 +0000
@@ -17,7 +17,7 @@
   */
  #include "default_persistent_surface_store.h"
--#include <uuid/uuid.h>
++#include <uuid.h>
  #include <algorithm>
  #include <unordered_map>
  #include <boost/throw_exception.hpp>
 === modified file 'src/utils/CMakeLists.txt'
 --- src/utils/CMakeLists.txt	2017-05-08 03:04:26 +0000
 +++ src/utils/CMakeLists.txt	2017-10-27 17:26:09 +0000
@@ -10,9 +10,11 @@
  mir_add_wrapped_executable(mirout out.c)
  target_link_libraries(mirout mirclient m)
++if (MIR_EGL_SUPPORTED)
  mir_add_wrapped_executable(mirvanity vanity.c)
  target_include_directories(mirvanity PRIVATE ${PROJECT_SOURCE_DIR}/examples)
  target_link_libraries(mirvanity eglapp)
++endif()
  mir_add_wrapped_executable(mirin in.cpp)
  target_link_libraries(mirin mirclient)
 === modified file 'src/utils/run.cpp'
 --- src/utils/run.cpp	2017-07-28 17:00:43 +0000
 +++ src/utils/run.cpp	2017-10-27 17:26:09 +0000
@@ -85,7 +85,7 @@
      setenv("GDK_BACKEND", "mir", true);                 // configure GTK to use Mir
      setenv("QT_QPA_PLATFORM", "ubuntumirclient", true); // configure Qt to use Mir
      unsetenv("QT_QPA_PLATFORMTHEME");                   // Discourage Qt from unsupported theme
--    setenv("SDL_VIDEODRIVER", "mir", true);             // configure SDL to use Mir
++    setenv("SDL_VIDEODRIVER", "wayland", true);         // configure SDL to use Wayland
      if (auto const client_platform = getenv("MIR_CLIENT_PLATFORM_PATH"))
          setenv("MIR_CLIENT_PLATFORM_PATH", canonicalize(client_platform).c_str(), true);
 === modified file 'tests/CMakeLists.txt'
 --- tests/CMakeLists.txt	2017-09-18 10:57:00 +0000
 +++ tests/CMakeLists.txt	2017-10-27 17:26:09 +0000
@@ -45,6 +45,7 @@
    ${PROJECT_SOURCE_DIR}/include/platform
    ${PROJECT_SOURCE_DIR}/include/miral
    ${PROJECT_SOURCE_DIR}/include/server
++  ${MIRSERVER_INCLUDE_DIRS}
    ${PROJECT_SOURCE_DIR}/include/client
    ${PROJECT_SOURCE_DIR}/include/common
    ${PROJECT_SOURCE_DIR}/include/test
@@ -109,9 +110,9 @@
    mir-test-doubles-platform-static
    ${Boost_LIBRARIES}
    ${GTEST_BOTH_LIBRARIES}
--  ${GMOCK_LIBRARY}
  PRIVATE
    ${GMOCK_MAIN_LIBRARY}
++  ${GMOCK_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
+ )
 === modified file 'tests/include/mir/test/doubles/triggered_main_loop.h'
 --- tests/include/mir/test/doubles/triggered_main_loop.h	2017-07-28 17:00:43 +0000
 +++ tests/include/mir/test/doubles/triggered_main_loop.h	2017-10-27 17:26:09 +0000
@@ -41,6 +41,7 @@
      void unregister_fd_handler(void const* owner) override;
      std::unique_ptr<mir::time::Alarm> create_alarm(callback const& call) override;
      void enqueue(void const* owner, ServerAction const& action) override;
++    void enqueue_with_guaranteed_execution(ServerAction const& action) override;
      void spawn(std::function<void()>&& work) override;
 === modified file 'tests/integration-tests/CMakeLists.txt'
 --- tests/integration-tests/CMakeLists.txt	2017-08-25 06:41:20 +0000
 +++ tests/integration-tests/CMakeLists.txt	2017-10-27 17:26:09 +0000
@@ -69,8 +69,7 @@
    ${Boost_LIBRARIES}
    ${GTEST_BOTH_LIBRARIES}
--  ${GMOCK_LIBRARY}
--  ${GMOCK_MAIN_LIBRARY}
++  ${GMOCK_LIBRARIES}
    # Mesa platform dependencies
    ${DRM_LDFLAGS} ${DRM_LIBRARIES}
    ${GBM_LDFLAGS} ${GBM_LIBRARIES}
 === modified file 'tests/mir_test_doubles/CMakeLists.txt'
 --- tests/mir_test_doubles/CMakeLists.txt	2017-08-25 06:41:20 +0000
 +++ tests/mir_test_doubles/CMakeLists.txt	2017-10-27 17:26:09 +0000
@@ -86,7 +86,7 @@
    mirserver
    ${Boost_LIBRARIES}
--  ${GMOCK_LIBRARY}
++  ${GMOCK_LIBRARIES}
    ${GMOCK_MAIN_LIBRARY}
    ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
+ )
@@ -104,7 +104,7 @@
    mir-test-doubles-platform-static
    -ldl
--  ${GMOCK_LIBRARY}
++  ${GMOCK_LIBRARIES}
    ${GMOCK_MAIN_LIBRARY}
    ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
+ )
 === modified file 'tests/mir_test_doubles/triggered_main_loop.cpp'
 --- tests/mir_test_doubles/triggered_main_loop.cpp	2017-07-28 17:00:43 +0000
 +++ tests/mir_test_doubles/triggered_main_loop.cpp	2017-10-27 17:26:09 +0000
@@ -81,6 +81,12 @@
      actions.push_back(action);
+ }
++void mtd::TriggeredMainLoop::enqueue_with_guaranteed_execution(ServerAction const& action)
++{
++    base::enqueue(nullptr, action);
++    actions.push_back(action);
++}
++
  void mtd::TriggeredMainLoop::trigger_server_actions()
+ {
      for (auto const& action : actions)
 === modified file 'tests/mir_test_framework/CMakeLists.txt'
 --- tests/mir_test_framework/CMakeLists.txt	2017-09-25 13:39:41 +0000
 +++ tests/mir_test_framework/CMakeLists.txt	2017-10-27 17:26:09 +0000
@@ -85,11 +85,11 @@
  target_link_libraries(mir-test-framework-static
++  mirserver
    mirclient
    ${Boost_LIBRARIES}
    ${GTEST_BOTH_LIBRARIES}
--  ${GMOCK_LIBRARY}
--  ${GMOCK_MAIN_LIBRARY}
++  ${GMOCK_LIBRARIES}
    ${UMOCKDEV_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
+ )
 === modified file 'tests/mir_test_framework/canonical_window_manager.cpp'
 --- tests/mir_test_framework/canonical_window_manager.cpp	2017-08-30 11:59:08 +0000
 +++ tests/mir_test_framework/canonical_window_manager.cpp	2017-10-27 17:26:09 +0000
@@ -24,7 +24,7 @@
  #include "mir/shell/surface_ready_observer.h"
  #include "mir/shell/display_layout.h"
--#include <uuid/uuid.h>
++#include <uuid.h>
  #include <linux/input.h>
  #include <csignal>
 === modified file 'tests/miral/drag_and_drop.cpp'
 --- tests/miral/drag_and_drop.cpp	2017-08-23 16:15:03 +0000
 +++ tests/miral/drag_and_drop.cpp	2017-10-27 17:26:09 +0000
@@ -41,7 +41,7 @@
  #include <gtest/gtest.h>
  #include <linux/input.h>
--#include <uuid/uuid.h>
++#include <uuid.h>
  #include <boost/throw_exception.hpp>
  #include <atomic>
 === modified file 'tests/performance-tests/CMakeLists.txt'
 --- tests/performance-tests/CMakeLists.txt	2017-09-18 10:57:00 +0000
 +++ tests/performance-tests/CMakeLists.txt	2017-10-27 17:26:09 +0000
@@ -28,8 +28,8 @@
    test_compositor.cpp
+ )
  target_link_libraries(mir_compositor_performance_test
++  mir_system_performance_test
    ${GTEST_BOTH_LIBRARIES}
--  mir_system_performance_test
+ )
  mir_add_wrapped_executable(mir_client_startup_performance_test
 === modified file 'tests/unit-tests/CMakeLists.txt'
 --- tests/unit-tests/CMakeLists.txt	2017-09-07 05:58:13 +0000
 +++ tests/unit-tests/CMakeLists.txt	2017-10-27 17:26:09 +0000
@@ -136,8 +136,7 @@
    ${PROTOBUF_LITE_LIBRARIES}
    ${GTEST_BOTH_LIBRARIES}
--  ${GMOCK_LIBRARY}
--  ${GMOCK_MAIN_LIBRARY}
++  ${GMOCK_LIBRARIES}
    ${Boost_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
+ )
@@ -176,8 +175,7 @@
    ${PROTOBUF_LITE_LIBRARIES}
    ${GTEST_BOTH_LIBRARIES}
--  ${GMOCK_LIBRARY}
--  ${GMOCK_MAIN_LIBRARY}
++  ${GMOCK_LIBRARIES}
    ${Boost_LIBRARIES}
    ${UMOCKDEV_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 === modified file 'tests/unit-tests/platforms/mesa/kms/test_cursor.cpp'
 --- tests/unit-tests/platforms/mesa/kms/test_cursor.cpp	2017-07-31 08:58:34 +0000
 +++ tests/unit-tests/platforms/mesa/kms/test_cursor.cpp	2017-10-27 17:26:09 +0000
@@ -24,7 +24,6 @@
  #include "mir/graphics/cursor_image.h"
  #include <xf86drm.h>
--#include <drm/drm.h>
  #include "mir/test/doubles/mock_gbm.h"
  #include "mir/test/doubles/mock_drm.h"
@@ -265,7 +264,7 @@
+     {
          return geom::Size{geom::Width{64}, geom::Height{64}};
+     }
--    geom::Displacement hotspot() const
++    geom::Displacement hotspot() const
+     {
          return geom::Displacement{0, 0};
+     }
@@ -425,7 +424,7 @@
          if (pixels[i] != 0x0)
              return false;
+     }
--    return true;
++    return true;
+ }
  TEST_F(MesaCursorTest, show_cursor_pads_missing_data)
@@ -680,7 +679,7 @@
      cursor.hide();
      cursor.move_to({17, 29});
--
++
      output_container.verify_and_clear_expectations();
+ }
@@ -772,7 +771,7 @@
      cursor.show(stub_image); // ensures initial_cursor_location
      static geom::Displacement hotspot_displacement{10, 10};
--
++
      static geom::Point const
          initial_cursor_location = {0, 0},
          cursor_location_1 = {20, 20},
@@ -788,8 +787,8 @@
              return hotspot_displacement;
+         }
      };
--
--
++
++
      EXPECT_CALL(mock_gbm, gbm_bo_write(_, _, _)).Times(AnyNumber());
      EXPECT_CALL(*output_container.outputs[0], set_cursor(_)).Times(AnyNumber());
 === modified file 'tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp'
 --- tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp	2017-08-25 06:41:20 +0000
 +++ tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp	2017-10-27 17:26:09 +0000
@@ -155,7 +155,7 @@
      auto edid_size = mir_output_get_edid_size(output);
      ASSERT_NE(nullptr, edid_start);
--    ASSERT_NE(0, edid_size);
++    ASSERT_NE(0u, edid_size);
      std::vector<uint8_t> host_edid(edid_start, edid_start+edid_size);
 === modified file 'tests/unit-tests/scene/test_mediating_display_changer.cpp'
 --- tests/unit-tests/scene/test_mediating_display_changer.cpp	2017-08-09 11:30:59 +0000
 +++ tests/unit-tests/scene/test_mediating_display_changer.cpp	2017-10-27 17:26:09 +0000
@@ -100,6 +100,10 @@
+     {
          action();
+     }
++    void enqueue_with_guaranteed_execution(mir::ServerAction const& action) override
++    {
++        action();
++    }
      void pause_processing_for(void const* /*owner*/) override {}
      void resume_processing_for(void const* /*owner*/) override {}
@@ -110,8 +114,10 @@
      MockServerActionQueue()
+     {
          ON_CALL(*this, enqueue(_, _)).WillByDefault(InvokeArgument<1>());
++        ON_CALL(*this, enqueue_with_guaranteed_execution(_)).WillByDefault(InvokeArgument<0>());
+     }
      MOCK_METHOD2(enqueue, void(void const*, mir::ServerAction const&));
++    MOCK_METHOD1(enqueue_with_guaranteed_execution, void(mir::ServerAction const&));
      MOCK_METHOD1(pause_processing_for, void(void const*));
      MOCK_METHOD1(resume_processing_for, void(void const*));
  };
 === modified file 'tests/unit-tests/test_glib_main_loop.cpp'
 --- tests/unit-tests/test_glib_main_loop.cpp	2017-07-28 17:00:43 +0000
 +++ tests/unit-tests/test_glib_main_loop.cpp	2017-10-27 17:26:09 +0000
@@ -833,6 +833,76 @@
          destroy_glib_main_loop);
+ }
++TEST_F(GLibMainLoopTest, enqueue_with_guaranteed_execution_executes_before_run)
++{
++    using namespace testing;
++
++    int num_actions{0};
++
++    ml.enqueue_with_guaranteed_execution(
++        [&num_actions]
++        {
++            ++num_actions;
++        });
++
++    EXPECT_THAT(num_actions, Eq(1));
++}
++
++TEST_F(GLibMainLoopTest, enqueue_with_guaranteed_execution_executes_after_stop)
++{
++    using namespace testing;
++
++    int num_actions{0};
++
++    ml.enqueue(
++        nullptr,
++        [this]()
++        {
++            ml.stop();
++        });
++
++    ml.run();
++
++    ml.enqueue_with_guaranteed_execution(
++        [&num_actions]
++        {
++            ++num_actions;
++        });
++
++    EXPECT_THAT(num_actions, Eq(1));
++}
++
++TEST_F(GLibMainLoopTest, enqueue_with_guaranteed_execution_executes_on_mainloop)
++{
++    using namespace testing;
++
++    mt::Signal loop_running;
++    mt::Signal loop_finished;
++
++    ml.enqueue(
++        nullptr,
++        [&loop_running]() { loop_running.raise(); });
++
++    mt::AutoJoinThread t{
++        [&]
++        {
++            ml.run();
++            loop_finished.raise();
++        }};
++
++    ASSERT_TRUE(loop_running.wait_for(std::chrono::seconds{5}));
++
++    ml.enqueue_with_guaranteed_execution(
++        [main_thread = std::this_thread::get_id()]()
++        {
++            EXPECT_THAT(std::this_thread::get_id(), Ne(main_thread));
++        });
++
++    ml.stop();
++
++    EXPECT_TRUE(loop_finished.wait_for(std::chrono::seconds{30}));
++}
++
  namespace
+ {
 === modified file 'tests/unit-tests/test_raii.cpp'
 --- tests/unit-tests/test_raii.cpp	2017-07-28 17:00:43 +0000
 +++ tests/unit-tests/test_raii.cpp	2017-10-27 17:26:09 +0000
@@ -21,6 +21,8 @@
  #include <gtest/gtest.h>
  #include <gmock/gmock.h>
++#include <functional>
++
  namespace
+ {
  struct RaiiTest : public ::testing::Test
 === removed file 'tools/abi_check.sh'
 --- tools/abi_check.sh	2017-05-08 03:04:26 +0000
 +++ tools/abi_check.sh	1970-01-01 00:00:00 +0000
@@ -1,315 +0,0 @@
--#!/bin/bash
--
--set -e
--
--declare -A abi_var_for=(\
--    ["mircore"]="MIRCORE_ABI" \
--    ["mirclient"]="MIRCLIENT_ABI" \
--    ["mircommon"]="MIRCOMMON_ABI" \
--    ["mirplatform"]="MIRPLATFORM_ABI" \
--    ["mirserver"]="MIRSERVER_ABI" \
--    ["mircookie"]="MIRCOOKIE_ABI" \
--    ["mirclientplatformmesa"]="MIR_CLIENT_PLATFORM_ABI" \
--    ["mirplatformgraphicsmesakms"]="MIR_SERVER_GRAPHICS_PLATFORM_ABI" \
--    ["mirplatforminputevdev"]="MIR_SERVER_INPUT_PLATFORM_ABI" )
--
--declare -A libtype=(\
--    ["mirclientplatformmesa"]="plugin-client" \
--    ["mirplatformgraphicsmesakms"]="plugin" \
--    ["mirplatforminputevdev"]="plugin" )
--
--declare -A package_name=(\
--    ["mirclientplatformmesa"]="mir-client-platform-mesa" \
--    ["mirplatformgraphicsmesakms"]="mir-platform-graphics-mesa-kms" \
--    ["mirplatforminputevdev"]="mir-platform-input-evdev" )
--
--declare -A libsoname=(\
--    ["mirclientplatformmesa"]="mir/client-platform/mesa" \
--    ["mirplatformgraphicsmesakms"]="mir/server-platform/graphics-mesa-kms" \
--    ["mirplatforminputevdev"]="mir/server-platform/input-evdev" )
--
--declare -A headers_for=(\
--    ["mirclientplatformmesa"]="src/include/client/mir/client_platform_factory.h" \
--    ["mirplatformgraphicsmesakms"]="mirplatform/mir/graphics/platform.h" \
--    ["mirplatforminputevdev"]="mirplatform/mir/input" )
--
--declare -A exclusions_for=(\
--    ["mirplatform"]="mir/input" \
--    ["mirserver"]="mir/input/input_device_hub.h" )
--
--function print_help_and_exit()
--{
--    local prog=$(basename $0)
--
--    local all_libs=${!abi_var_for[@]}
--    local all_libs=${all_libs// /|}
--    echo "Usage: $prog <libname> <abi_dump_dir> <source_dir>"
--    echo "Runs a full ABI check on the given library."
--    echo ""
--    echo "    libname=[${all_libs}]"
--    exit 0
--}
--
--function get_abi_number()
--{
--    local abi_var=${1}
--    local search_dir=${2}
--    grep -hR --include=CMakeLists.txt "set($abi_var [[:digit:]]\+)" ${search_dir}/src | grep -o '[[:digit:]]\+'
--}
--
--function is_plugin()
--{
--    local name=${1}
--    if [[ ${libtype[${name}]} == "plugin"* ]];
--    then
--        return 0
--    else
--        return 1
--    fi
--}
--
--function package_abi_for()
--{
--    local name=${1}
--    local pkg_name=lib${name}
--
--    if is_plugin ${name};
--    then
--        pkg_name=${package_name[${name}]}
--    fi
--
--    apt-cache show ${pkg_name}* | grep Package: | grep -o '[[:digit:]]\+' | sort -n -r | head -n 1
--}
--
--function needs_abi_check()
--{
--    local name=${1}
--    local source_dir=${2}
--    local abi_var=${abi_var_for[${name}]}
--
--    local old_abi=$(package_abi_for ${name})
--    local new_abi=$(get_abi_number ${abi_var} ${source_dir})
--    if [ -z "${old_abi}" ];
--    then
--        echo "Failed to find old ${abi_var}" >&2
--        exit 1
--    fi
--
--    if [ -z "${new_abi}" ];
--    then
--        echo "Failed to find new ${abi_var}" >&2
--        exit 1
--    fi
--    echo "Detected ${abi_var}_new=${new_abi}"
--    echo "Detected ${abi_var}_old=${old_abi}"
--
--    if [ "${old_abi}" == "${new_abi}" ];
--    then
--        return 0
--    else
--        return 1
--    fi
--}
--
--function prepare_pkg_dir()
--{
--    local pkg_dir=${1}
--
--    # "partial" is required by apt-get
--    mkdir -p ${pkg_dir}/partial
--}
--
--function package_name_for()
--{
--    local name=${1}
--    local pkg_name=lib${name}
--
--    if is_plugin ${name};
--    then
--        pkg_name=${package_name[${name}]}
--    fi
--
--    local abi_number=$(package_abi_for ${name})
--    echo ${pkg_name}${abi_number}
--}
--
--function header_packages_for()
--{
--    local name=${1}
--    local pkg=lib${name}-dev
--
--    if is_plugin ${name};
--    then
--        # Some plugin headers are defined in this package
--        pkg="libmirplatform-dev"
--    fi
--
--    # Only interested in other mir dev package deps
--    local dev_deps=$(apt-cache depends ${pkg} | grep Depends: | grep -o "\<libmir.*-dev\>"|  tr '\n' ' ')
--
--    # Workaround missing dependency
--    if [ ${name} == "mirserver" ] || [ ${name} == "mirplatforminputevdev" ];
--    then
--        dev_deps="${dev_deps} libmirclient-dev"
--    fi
--
--    echo "${pkg} ${dev_deps}"
--}
--
--function soname_for()
--{
--    local name=${1}
--    local pkg_dir=${2}
--    local arch=$(gcc -dumpmachine)
--    local abi_number=$(package_abi_for ${name})
--    local so_name=lib${name}
--
--    if is_plugin ${name};
--    then
--        so_name=${libsoname[${name}]}
--    fi
--
--    echo ${pkg_dir}/usr/lib/${arch}/${so_name}.so.${abi_number}
--}
--
--function download_packages()
--{
--    local name=${1}
--    local pkg_dir=${2}
--    local pkg_name=$(package_name_for ${name})
--    local header_pkgs=$(header_packages_for ${name})
--
--    echo "Downloading: ${pkg_name} ${header_pkgs} for ${name}"
--    apt-get -d -o Dir::Cache=${pkg_dir} -o Debug::NoLocking=1 install --reinstall -y ${pkg_name} ${header_pkgs}
--}
--
--function download_mir_source_into()
--{
--    local pkg_dir=${1}
--    pushd ${pkg_dir} > /dev/null
--
--    apt-get source --download-only mir
--    mkdir -p mirsource
--
--    local src_pkg=$(apt-cache showsrc mir | grep -o "mir.*orig.tar.gz" | head -n 1)
--    tar xf ${src_pkg} -C mirsource --strip-components 1
--
--    popd > /dev/null
--}
--
--function unpack_debs()
--{
--    local pkg_dir=${1}
--
--    for deb in ${pkg_dir}/archives/* ;
--    do
--        if [ ! -d ${deb} ] ; then
--            echo "unpacking: ${deb}"
--            dpkg -x ${deb} ${pkg_dir}
--        fi
--    done
--}
--
--function make_lib_descriptor()
--{
--    local name=${1}
--    local pkg_dir=${2}
--    local descriptor_file=${3}
--
--    local abi_number=$(package_abi_for ${name})
--    local lib=$(soname_for ${name} ${pkg_dir})
--
--    local lib_includes=
--    for path in $(ls ${pkg_dir}/usr/include);
--    do
--        lib_includes=${lib_includes}${pkg_dir}/usr/include/${path}"\n"
--    done
--
--    local lib_headers=${pkg_dir}/usr/include/${name}
--    local lib_skip_headers=
--    for path in ${exclusions_for[${name}]};
--    do
--        lib_skip_headers=${lib_excludes}${pkg_dir}/usr/include/${name}/${path}"\n"
--    done
--
--    if [ "${libtype[${name}]}" == "plugin-client" ];
--    then
--        download_mir_source_into ${pkg_dir}
--        lib_headers=${pkg_dir}/mirsource/${headers_for[${name}]}
--    elif [ "${libtype[${name}]}" == "plugin" ];
--    then
--        lib_headers=${pkg_dir}/usr/include/${headers_for[${name}]}
--    fi
--
--    cp ${SOURCE_DIR}/tools/lib_descriptor.xml.skel ${descriptor_file}
--    sed -i 's@${LIB_DESC_LIBS}@'${lib}'@g' ${descriptor_file}
--    sed -i 's@${LIB_DESC_HEADERS}@'${lib_headers}'@g' ${descriptor_file}
--    sed -i 's@${LIB_DESC_INCLUDE_PATHS}@'${lib_includes}'@g' ${descriptor_file}
--    sed -i 's/${LIB_DESC_GCC_OPTS}/-std=c++14/g' ${descriptor_file}
--    sed -i 's@${LIB_DESC_SKIP_HEADERS}@'${lib_skip_headers}'@g' ${descriptor_file}
--    sed -i 's/${LIB_DESC_DEFINES}//g' ${descriptor_file}
--}
--
--function dump_abi_for_prev_release()
--{
--    local name=${1}
--    local abi_dump_dir=${2}
--    local abi_dump=${3}
--    local pkg_dir=${abi_dump_dir}/prev-release-pkgs
--
--    if [ ! -s "${abi_dump}" ];
--    then
--        echo "Generating ${abi_dump}"
--        prepare_pkg_dir ${pkg_dir}
--        download_packages ${name} ${pkg_dir}
--        unpack_debs ${pkg_dir}
--
--        local descriptor_file=${pkg_dir}/${name}_desc.xml
--        make_lib_descriptor ${name} ${pkg_dir} ${descriptor_file}
--
--        abi-compliance-checker -gcc-path g++ -l ${name} -v1 previous -dump-path ${abi_dump} -dump-abi ${descriptor_file}
--    fi
--
--    if [ ! -s "${abi_dump}" ];
--    then
--        echo "Error: failed to generate abi dump for ${name}"
--        exit 1;
--    fi
--}
--
--function run_abi_check()
--{
--    local name=${1}
--    local old_dump=${2}
--    local new_dump=${3}
--    local skip_symbols_file=${4}
--
--    if [ -f ${skip_symbols_file} ];
--    then
--        local skip_symbols_opt="-skip-symbols ${skip_symbols_file}"
--    fi
--
--    echo "Running abi-compliance-checker for ${name}"
--    abi-compliance-checker -l ${NAME} -old "${old_dump}" -new "${new_dump}" ${skip_symbols_opt}
--}
--
--if [ $# -ne 3 ];
--then
--    print_help_and_exit
--fi
--
--NAME=${1}
--ABI_DUMP_DIR=${2}
--SOURCE_DIR=${3}
--
--OLD_ABI_DUMP_FILE=${ABI_DUMP_DIR}/${NAME}_prev.abi.tar.gz
--NEW_ABI_DUMP_FILE=${ABI_DUMP_DIR}/${NAME}_next.abi.tar.gz
--SKIP_SYMBOLS_FILE=${SOURCE_DIR}/tools/abi-check-${NAME}-skip-symbols
--
--if needs_abi_check ${NAME} ${SOURCE_DIR};
--then
--    dump_abi_for_prev_release ${NAME} ${ABI_DUMP_DIR} ${OLD_ABI_DUMP_FILE}
--    run_abi_check ${NAME} ${OLD_ABI_DUMP_FILE} ${NEW_ABI_DUMP_FILE} ${SKIP_SYMBOLS_FILE}
--else
--    echo "No need for abi-compliance-checker, ABI has already been bumped for ${NAME}"
--fi
 === modified file 'tools/setup-partial-armhf-chroot.sh'
 --- tools/setup-partial-armhf-chroot.sh	2017-05-08 03:04:26 +0000
 +++ tools/setup-partial-armhf-chroot.sh	2017-10-27 17:26:09 +0000
@@ -10,9 +10,9 @@
  usage() {
      echo "Usage: ${name} [options] mychroot-dir"
      echo "options:"
--    echo "	-a arch	Select architecture, i.e. armhf, arm64, ppc... Default is armhf"
--    echo "	-d dist	Select distribution, i.e. vivid, wily. Default is vivid"
--    echo "	-r rep	Select an additional repository for bootstrap. Default is none"
++    echo "  -a arch Select architecture, i.e. armhf, arm64, ppc... Default is armhf"
++    echo "  -d dist Select distribution, i.e. vivid, wily. Default is vivid"
++    echo "  -r rep  Select an additional repository for bootstrap. Default is none"
      echo
      echo "please supply at least a directory to create partial chroot in. (eg, ./setup-partial-armhf-chroot.sh mychroot-dir)"
+ }
@@ -39,7 +39,7 @@
              sources="$sources source$sourceid"
              ;;
          :)
--            echo "Option -$OPTARG requires an argument"
++            echo "Option -$OPTARG requires an argument"
              usage
              exit 1
              ;;
@@ -48,7 +48,7 @@
              exit 0
              ;;
          \?)
--            echo "Invalid option: -$OPTARG"
++            echo "Invalid option: -$OPTARG"
              usage
              exit 1
              ;;
@@ -66,7 +66,7 @@
  echo "creating phablet-compatible $arch partial chroot for mir compilation in directory ${directory}"
  if [ ! -d ${directory} ]; then
--    mkdir -p ${directory}
++    mkdir -p ${directory}
  fi
  DEBCONTROL=$(pwd)/../debian/control
@@ -83,7 +83,7 @@
  # dpkg-checkbuilddeps returns non-zero when dependencies are not met and the list is sent to stderr
  builddeps=$(dpkg-checkbuilddeps -a ${arch} --admindir=. ${DEBCONTROL} 2>&1 )
  if [ $? -eq 0 ] ; then
--    exit 0
++    exit 0
  fi
  echo "${builddeps}"
@@ -97,7 +97,6 @@
                                      -e 's/Unmet build dependencies://g' \
                                      -e 's/build-essential:native//g')
  builddeps=$(echo ${builddeps} | sed 's/([^)]*)//g')
--builddeps=$(echo ${builddeps} | sed -e 's/abi-compliance-checker//g')
  builddeps=$(echo ${builddeps} | sed -e 's/multistrap//g')
  case ${arch} in
@@ -143,7 +142,7 @@
  done
  # Fakeroot is required to stop the apt update command giving up
--fakeroot multistrap -f mstrap.conf
++fakeroot multistrap -f mstrap.conf
  rm -f var/cache/apt/archives/lock
@@ -163,4 +162,4 @@
      ln -sf $(pwd)$(readlink ${broken_symlink}) ${broken_symlink}
  done
--popd > /dev/null
++popd > /dev/null

Mir

Merge lp:~alan-griffiths/mir/0.28.1-to-ubuntu into lp:mir/ubuntu

Commit message

Description of the change

Preview Diff

Subscribers