Mir

Merge lp:mir/0.21 into lp:mir/ubuntu

0.21
Merge into ubuntu

Proposed by Alberto Aguirre on 2016-03-17

Status:	Merged
Approved by:	Alberto Aguirre on 2016-03-30
Approved revision:	3425
Merged at revision:	1271
Proposed branch:	lp:mir/0.21
Merge into:	lp:mir/ubuntu
Diff against target:	24669 lines (+11600/-4029) 355 files modified 3rd_party/CMakeLists.txt (+0/-2) 3rd_party/android-input/android/frameworks/base/include/androidfw/Input.h (+1/-0) 3rd_party/android-input/android/frameworks/base/services/input/Input.cpp (+19/-2) CMakeLists.txt (+18/-5) benchmarks/frame-uniformity/CMakeLists.txt (+6/-0) cmake/ABICheck.cmake (+31/-62) cmake/FindGtestGmock.cmake (+1/-1) cmake/FindLibHardware.cmake (+1/-1) cmake/MirCommon.cmake (+61/-14) debian/changelog (+63/-0) debian/control (+17/-5) debian/mir-android-diagnostics.install (+1/-0) debian/mir-client-platform-android5.install (+1/-1) debian/mir-client-platform-mesa5.install (+1/-1) debian/mir-demos.examples (+0/-7) debian/mir-test-tools.install (+2/-1) debian/mir-test-tools.lintian-overrides (+3/-0) debian/mir-utils.install (+1/-0) debian/rules (+16/-2) deploy-and-test.sh (+0/-26) doc/abi_compatibility_tools.md (+14/-70) doc/android_new_device_bringup.md (+35/-21) doc/avoid_deploy-and-test.md (+0/-29) doc/snappy_appliances.md (+0/-76) examples/CMakeLists.txt (+7/-23) examples/animated_cursor_demo_client.c (+28/-15) examples/camera.c (+541/-0) examples/client_helpers.h (+2/-2) examples/cursors_demo_client.c (+3/-2) examples/flicker.c (+17/-1) examples/mir_demo_server_loader.cpp (+14/-0) examples/render_surfaces.cpp (+4/-0) examples/render_to_fb.cpp (+7/-0) examples/scroll.cpp (+13/-0) examples/server_example.cpp (+24/-2) examples/server_example_test_client.cpp (+15/-2) examples/server_example_window_management.cpp (+20/-20) examples/xcursor_loader.cpp (+1/-1) include/client/mir_toolkit/client_types.h (+48/-0) include/client/mir_toolkit/events/event.h (+11/-11) include/client/mir_toolkit/events/input/input_event.h (+12/-10) include/client/mir_toolkit/events/input/keyboard_event.h (+1/-1) include/client/mir_toolkit/events/input/pointer_event.h (+1/-1) include/client/mir_toolkit/events/input/touch_event.h (+1/-1) include/client/mir_toolkit/events/input_configuration_event.h (+3/-3) include/client/mir_toolkit/events/keymap_event.h (+3/-3) include/client/mir_toolkit/events/orientation_event.h (+1/-1) include/client/mir_toolkit/events/prompt_session_event.h (+1/-1) include/client/mir_toolkit/events/resize_event.h (+2/-2) include/client/mir_toolkit/events/surface_event.h (+2/-2) include/client/mir_toolkit/mir_client_library.h (+2/-0) include/client/mir_toolkit/mir_connection.h (+47/-1) include/client/mir_toolkit/mir_cookie.h (+8/-4) include/client/mir_toolkit/mir_display_configuration.h (+386/-0) include/client/mir_toolkit/mir_input_device.h (+131/-1) include/client/mir_toolkit/mir_surface.h (+18/-7) include/client/mir_toolkit/version.h (+1/-1) include/common/mir/logging/logger.h (+9/-1) include/server/mir/input/input_device_hub.h (+2/-0) include/server/mir/input/input_manager.h (+3/-1) include/test/mir/test/display_config_matchers.h (+51/-22) include/test/mir/test/doubles/mock_input_device_hub.h (+0/-43) include/test/mir/test/doubles/stub_display_configuration.h (+4/-0) include/test/mir/test/doubles/stub_input_device.h (+82/-0) include/test/mir/test/wait_condition.h (+6/-0) include/test/mir_test_framework/declarative_placement_window_manage_policy.h (+2/-2) include/test/mir_test_framework/executable_path.h (+1/-1) include/test/mir_test_framework/fake_input_device.h (+4/-2) include/test/mir_test_framework/placement_applying_shell.h (+13/-0) playground/CMakeLists.txt (+4/-3) playground/mir_demo_client_prerendered_frames.c (+105/-36) snappy/CMakeLists.txt (+0/-57) snappy/copy-external-libs.sh (+0/-17) snappy/mir-demos.package.yaml.in (+0/-5) snappy/mir-run (+0/-14) snappy/mir.framework.in (+0/-2) snappy/mir.package.yaml.in (+0/-9) snappy/readme.md (+0/-3) src/CMakeLists.txt (+4/-4) src/client/CMakeLists.txt (+6/-0) src/client/buffer.cpp (+65/-3) src/client/buffer.h (+25/-2) src/client/buffer_factory.cpp (+79/-0) src/client/buffer_factory.h (+91/-0) src/client/buffer_stream.cpp (+36/-55) src/client/buffer_stream.h (+1/-1) src/client/buffer_vault.cpp (+17/-14) src/client/client_buffer_stream.h (+25/-2) src/client/connection_configuration.h (+2/-0) src/client/connection_surface_map.h (+7/-0) src/client/default_connection_configuration.cpp (+22/-6) src/client/default_connection_configuration.h (+2/-0) src/client/display_configuration.cpp (+31/-38) src/client/display_configuration.h (+6/-2) src/client/display_configuration_api.cpp (+327/-0) src/client/error_chain.cpp (+73/-0) src/client/error_chain.h (+54/-0) src/client/input/input_devices.cpp (+26/-8) src/client/lttng/CMakeLists.txt (+5/-0) src/client/mir_buffer_api.cpp (+146/-41) src/client/mir_connection.cpp (+186/-10) src/client/mir_connection.h (+41/-1) src/client/mir_connection_api.cpp (+42/-0) src/client/mir_input_device_api.cpp (+134/-0) src/client/mir_presentation_chain.h (+45/-0) src/client/mir_presentation_chain_api.cpp (+102/-30) src/client/mir_surface.cpp (+8/-4) src/client/mir_surface.h (+9/-1) src/client/mir_surface_api.cpp (+49/-2) src/client/no_tls_future-inl.h (+5/-1) src/client/presentation_chain.cpp (+12/-45) src/client/presentation_chain.h (+14/-27) src/client/protobuf_to_native_buffer.cpp (+50/-0) src/client/protobuf_to_native_buffer.h (+34/-0) src/client/rpc/make_rpc_channel.h (+11/-8) src/client/rpc/make_socket_rpc_channel.cpp (+13/-9) src/client/rpc/mir_protobuf_rpc_channel.cpp (+23/-5) src/client/rpc/mir_protobuf_rpc_channel.h (+3/-0) src/client/screencast_stream.cpp (+4/-13) src/client/screencast_stream.h (+1/-1) src/client/surface_map.cpp (+21/-0) src/client/surface_map.h (+4/-0) src/client/symbols.map (+60/-2) src/common/logging/logger.cpp (+3/-10) src/common/sharedlibrary/module_deleter.cpp (+0/-3) src/common/thread/thread_name.cpp (+0/-3) src/include/client/mir/client_buffer.h (+7/-0) src/include/client/mir/client_platform.h (+3/-1) src/include/client/mir/input/input_devices.h (+6/-2) src/include/client/mir_toolkit/mir_buffer.h (+41/-16) src/include/client/mir_toolkit/mir_presentation_chain.h (+51/-5) src/include/common/mir/protobuf/protocol_version.h (+1/-1) src/include/server/mir/default_server_configuration.h (+10/-2) src/include/server/mir/input/input_probe.h (+9/-3) src/include/server/mir/input/seat.h (+3/-3) src/include/server/mir/scene/surface_observers.h (+1/-0) src/include/server/mir/shell/basic_window_manager.h (+147/-292) src/include/server/mir/shell/canonical_window_manager.h (+30/-80) src/include/server/mir/shell/window_management_info.h (+103/-0) src/platform/options/default_configuration.cpp (+0/-7) src/platform/symbols.map (+7/-0) src/platforms/CMakeLists.txt (+2/-2) src/platforms/android/CMakeLists.txt (+3/-0) src/platforms/android/client/android_client_platform.cpp (+3/-6) src/platforms/android/client/android_client_platform.h (+1/-1) src/platforms/android/client/buffer.cpp (+19/-0) src/platforms/android/client/buffer.h (+4/-0) src/platforms/android/client/symbols.map (+1/-1) src/platforms/android/server/CMakeLists.txt (+2/-2) src/platforms/android/server/buffer.h (+0/-1) src/platforms/android/server/buffer_usage.h (+0/-40) src/platforms/android/server/framebuffers.cpp (+1/-1) src/platforms/android/server/gl_context.cpp (+1/-0) src/platforms/android/server/gralloc.h (+15/-13) src/platforms/android/server/gralloc_module.cpp (+18/-9) src/platforms/android/server/gralloc_module.h (+12/-10) src/platforms/android/server/graphic_buffer_allocator.cpp (+27/-36) src/platforms/android/server/graphic_buffer_allocator.h (+0/-55) src/platforms/android/server/hal_component_factory.cpp (+2/-2) src/platforms/android/server/hal_component_factory.h (+2/-2) src/platforms/android/server/platform.cpp (+2/-2) src/platforms/android/server/resource_factory.cpp (+0/-1) src/platforms/android/utils/CMakeLists.txt (+39/-11) src/platforms/android/utils/android_graphics_region_factory.cpp (+1/-1) src/platforms/android/utils/render_overlays.cpp (+7/-0) src/platforms/android/utils/test_android_hardware_sanity.cpp (+52/-19) src/platforms/common/client/mir/CMakeLists.txt (+1/-0) src/platforms/common/client/mir/aging_buffer.cpp (+0/-5) src/platforms/common/client/mir/aging_buffer.h (+4/-6) src/platforms/evdev/CMakeLists.txt (+8/-1) src/platforms/evdev/libinput_device.cpp (+39/-13) src/platforms/evdev/libinput_device.h (+2/-4) src/platforms/evdev/libinput_device_ptr.cpp (+2/-2) src/platforms/evdev/libinput_device_ptr.h (+1/-1) src/platforms/evdev/libinput_ptr.cpp (+9/-2) src/platforms/evdev/libinput_ptr.h (+2/-1) src/platforms/evdev/platform.cpp (+44/-98) src/platforms/evdev/platform.h (+6/-14) src/platforms/evdev/platform_factory.cpp (+1/-3) src/platforms/mesa/client/client_buffer.cpp (+20/-0) src/platforms/mesa/client/client_buffer.h (+4/-0) src/platforms/mesa/client/client_platform.cpp (+3/-6) src/platforms/mesa/client/client_platform.h (+1/-1) src/platforms/mesa/client/symbols.map (+1/-1) src/platforms/mesa/server/common/anonymous_shm_file.cpp (+1/-1) src/platforms/mesa/server/kms/display.cpp (+9/-3) src/platforms/mesa/server/kms/display.h (+2/-1) src/platforms/mesa/server/x11/input/input_device.cpp (+137/-1) src/platforms/mesa/server/x11/input/input_device.h (+14/-1) src/platforms/mesa/server/x11/input/input_platform.cpp (+164/-226) src/protobuf/mir_protobuf.proto (+6/-0) src/server/compositor/multi_monitor_arbiter.cpp (+1/-1) src/server/compositor/stream.cpp (+2/-1) src/server/default_server_configuration.cpp (+0/-5) src/server/frontend/CMakeLists.txt (+1/-1) src/server/frontend/authorizing_display_changer.cpp (+10/-17) src/server/frontend/authorizing_display_changer.h (+18/-7) src/server/frontend/default_configuration.cpp (+2/-1) src/server/frontend/default_ipc_factory.cpp (+14/-10) src/server/frontend/default_ipc_factory.h (+4/-1) src/server/frontend/protobuf_buffer_packer.cpp (+2/-0) src/server/frontend/session_mediator.cpp (+15/-1) src/server/frontend/session_mediator.h (+5/-1) src/server/graphics/default_configuration.cpp (+12/-2) src/server/graphics/nested/mir_client_host_connection.cpp (+191/-4) src/server/graphics/nested/mir_client_host_connection.h (+34/-3) src/server/input/basic_seat.cpp (+9/-10) src/server/input/basic_seat.h (+7/-6) src/server/input/default_configuration.cpp (+97/-40) src/server/input/default_device.cpp (+5/-4) src/server/input/default_device.h (+2/-2) src/server/input/default_input_device_hub.cpp (+21/-4) src/server/input/default_input_device_hub.h (+11/-2) src/server/input/default_input_manager.cpp (+8/-3) src/server/input/default_input_manager.h (+10/-3) src/server/input/input_probe.cpp (+68/-48) src/server/input/key_repeat_dispatcher.cpp (+34/-15) src/server/input/key_repeat_dispatcher.h (+7/-1) src/server/input/seat_input_device_tracker.cpp (+1/-0) src/server/report/lttng/CMakeLists.txt (+10/-1) src/server/scene/application_session.cpp (+22/-19) src/server/scene/application_session.h (+2/-0) src/server/scene/basic_surface.cpp (+14/-7) src/server/shell/CMakeLists.txt (+3/-1) src/server/shell/basic_window_manager.cpp (+311/-0) src/server/shell/canonical_window_manager.cpp (+90/-281) src/server/shell/window_management_info.cpp (+301/-0) src/server/symbols.map (+47/-0) src/utils/CMakeLists.txt (+3/-1) src/utils/in.cpp (+115/-0) tests/acceptance-tests/CMakeLists.txt (+3/-0) tests/acceptance-tests/test_client_cookie.cpp (+8/-5) tests/acceptance-tests/test_client_input.cpp (+114/-17) tests/acceptance-tests/test_client_logging.cpp (+102/-0) tests/acceptance-tests/test_client_scaling.cpp (+10/-6) tests/acceptance-tests/test_display_configuration.cpp (+15/-15) tests/acceptance-tests/test_latency.cpp (+49/-5) tests/acceptance-tests/test_nested_input.cpp (+58/-2) tests/acceptance-tests/test_nested_mir.cpp (+1/-1) tests/acceptance-tests/test_new_display_configuration.cpp (+766/-0) tests/acceptance-tests/test_prompt_session_client_api.cpp (+65/-1) tests/acceptance-tests/test_server_startup.cpp (+29/-0) tests/acceptance-tests/throwback/CMakeLists.txt (+3/-0) tests/acceptance-tests/throwback/test_client_cursor_api.cpp (+2/-2) tests/acceptance-tests/throwback/test_client_library_errors.cpp (+1/-1) tests/acceptance-tests/throwback/test_presentation_chain.cpp (+358/-0) tests/include/mir/test/doubles/fake_alarm_factory.h (+7/-30) tests/include/mir/test/doubles/mock_alloc_adaptor.h (+0/-45) tests/include/mir/test/doubles/mock_client_buffer.h (+56/-0) tests/include/mir/test/doubles/mock_input_seat.h (+3/-4) tests/include/mir/test/doubles/mock_libinput.h (+29/-1) tests/include/mir/test/doubles/mock_udev.h (+46/-0) tests/include/mir/test/doubles/mock_x11.h (+3/-0) tests/include/mir/test/doubles/null_client_buffer.h (+5/-0) tests/include/mir/test/doubles/stub_client_buffer.h (+5/-0) tests/include/mir/test/input_devices_matcher.h (+58/-0) tests/include/mir_test_framework/client_platform_factory.h (+20/-2) tests/include/mir_test_framework/fake_input_server_configuration.h (+2/-1) tests/include/mir_test_framework/libinput_environment.h (+91/-0) tests/include/mir_test_framework/stub_client_platform_factory.h (+1/-1) tests/include/mir_test_framework/stubbed_server_configuration.h (+1/-0) tests/include/mir_test_framework/testing_server_configuration.h (+1/-0) tests/integration-tests/CMakeLists.txt (+0/-4) tests/integration-tests/input/test_single_seat_setup.cpp (+54/-2) tests/integration-tests/test_buffer_scheduling.cpp (+28/-11) tests/mir_test/current_thread_name.cpp (+0/-3) tests/mir_test/display_config_matchers.cpp (+150/-62) tests/mir_test_doubles/CMakeLists.txt (+6/-0) tests/mir_test_doubles/fake_alarm_factory.cpp (+60/-15) tests/mir_test_doubles/mock_libinput.cpp (+276/-6) tests/mir_test_doubles/mock_udev.cpp (+53/-0) tests/mir_test_doubles/mock_x11.cpp (+25/-1) tests/mir_test_doubles/stub_display_configuration.cpp (+38/-9) tests/mir_test_doubles/test_protobuf_client.cpp (+2/-0) tests/mir_test_doubles/triggered_main_loop.cpp (+1/-0) tests/mir_test_framework/CMakeLists.txt (+9/-4) tests/mir_test_framework/declarative_placement_window_manage_policy.cpp (+1/-1) tests/mir_test_framework/executable_path.cpp (+6/-6) tests/mir_test_framework/fake_input_device_impl.cpp (+5/-0) tests/mir_test_framework/fake_input_device_impl.h (+1/-0) tests/mir_test_framework/fake_input_server_configuration.cpp (+4/-3) tests/mir_test_framework/libinput_environment.cpp (+125/-0) tests/mir_test_framework/placement_applying_shell.cpp (+20/-0) tests/mir_test_framework/stub_client_platform_factory.cpp (+2/-3) tests/mir_test_framework/stub_input_platform.cpp (+10/-1) tests/mir_test_framework/stubbed_server_configuration.cpp (+2/-0) tests/mir_test_framework/symbols-client.map (+1/-1) tests/mir_test_framework/testing-cursor-theme/CMakeLists.txt (+2/-0) tests/mir_test_framework/testing_server_options.cpp (+2/-0) tests/mir_test_framework/udev-recordings/CMakeLists.txt (+1/-1) tests/mir_test_framework/udev_environment.cpp (+1/-1) tests/performance-tests/test_glmark2-es2-mir.cpp (+94/-10) tests/umock-acceptance-tests/CMakeLists.txt (+1/-0) tests/unit-tests/CMakeLists.txt (+70/-6) tests/unit-tests/client/CMakeLists.txt (+1/-0) tests/unit-tests/client/android/test_egl_native_surface_interpreter.cpp (+14/-33) tests/unit-tests/client/mesa/test_native_surface.cpp (+2/-28) tests/unit-tests/client/test_aging_buffer.cpp (+20/-0) tests/unit-tests/client/test_buffer_vault.cpp (+36/-28) tests/unit-tests/client/test_client_buffer_depository.cpp (+14/-23) tests/unit-tests/client/test_client_buffer_stream.cpp (+18/-16) tests/unit-tests/client/test_client_mir_surface.cpp (+2/-2) tests/unit-tests/client/test_client_platform.cpp (+1/-1) tests/unit-tests/client/test_connection_resource_map.cpp (+21/-1) tests/unit-tests/client/test_mir_buffer.cpp (+200/-0) tests/unit-tests/client/test_mir_connection.cpp (+202/-5) tests/unit-tests/client/test_presentation_chain.cpp (+71/-16) tests/unit-tests/client/test_protobuf_rpc_channel.cpp (+16/-0) tests/unit-tests/client/test_stream_transport.cpp (+1/-1) tests/unit-tests/compositor/test_buffer_queue.cpp (+24/-8) tests/unit-tests/compositor/test_multi_monitor_arbiter.cpp (+55/-0) tests/unit-tests/dispatch/test_threaded_dispatcher.cpp (+1/-1) tests/unit-tests/frontend/CMakeLists.txt (+1/-1) tests/unit-tests/frontend/stress_protobuf_communicator.cpp (+2/-81) tests/unit-tests/frontend/test_authorizing_display_changer.cpp (+78/-34) tests/unit-tests/frontend/test_event_sender.cpp (+4/-25) tests/unit-tests/frontend/test_session_mediator.cpp (+56/-11) tests/unit-tests/graphics/CMakeLists.txt (+6/-1) tests/unit-tests/graphics/android/CMakeLists.txt (+3/-4) tests/unit-tests/graphics/android/test_buffer.cpp (+0/-2) tests/unit-tests/graphics/android/test_framebuffers.cpp (+22/-46) tests/unit-tests/graphics/android/test_gralloc.cpp (+51/-72) tests/unit-tests/graphics/android/test_graphic_buffer_allocator.cpp (+17/-27) tests/unit-tests/graphics/android/test_output_builder.cpp (+0/-14) tests/unit-tests/graphics/mesa/CMakeLists.txt (+1/-0) tests/unit-tests/graphics/mesa/common/CMakeLists.txt (+6/-1) tests/unit-tests/graphics/mesa/kms/CMakeLists.txt (+2/-1) tests/unit-tests/graphics/mesa/kms/test_display_configuration.cpp (+86/-5) tests/unit-tests/graphics/mesa/x11/CMakeLists.txt (+2/-1) tests/unit-tests/input/CMakeLists.txt (+9/-6) tests/unit-tests/input/android/CMakeLists.txt (+1/-0) tests/unit-tests/input/android/test_input_consumer.cpp (+253/-0) tests/unit-tests/input/evdev/test_evdev_device_detection.cpp (+26/-27) tests/unit-tests/input/evdev/test_evdev_input_platform.cpp (+36/-115) tests/unit-tests/input/evdev/test_libinput_device.cpp (+170/-395) tests/unit-tests/input/test_default_device.cpp (+5/-7) tests/unit-tests/input/test_default_input_device_hub.cpp (+31/-16) tests/unit-tests/input/test_default_input_manager.cpp (+2/-9) tests/unit-tests/input/test_input_platform_probing.cpp (+29/-11) tests/unit-tests/input/test_key_repeat_dispatcher.cpp (+60/-4) tests/unit-tests/input/test_x11_platform.cpp (+37/-1) tests/unit-tests/input/test_xcursor_loader.cpp (+1/-1) tests/unit-tests/input_recordings/quanta_touchscreen/device.prop (+0/-30) tests/unit-tests/scene/test_basic_surface.cpp (+96/-27) tests/unit-tests/test_mir_cookie.cpp (+50/-0) tests/unit-tests/test_module_deleter.cpp (+2/-2) tests/unit-tests/test_shared_library_prober.cpp (+1/-1) tools/abi-check-mirclient-skip-symbols (+0/-1) tools/abi-check-mircommon-skip-symbols (+6/-0) tools/abi-check-mirserver-skip-symbols (+9/-0) tools/abi_check.sh (+273/-43) tools/generate-abi-base-dump.sh (+0/-20) tools/lib_descriptor.xml.skel (+1/-0) tools/setup-partial-armhf-chroot.sh (+2/-1) tools/ubsan-suppressions (+2/-0)
To merge this branch:	bzr merge lp:mir/0.21
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Brandon Schaefer (community)			Approve on 2016-03-30
Daniel van Vugt		2016-03-17	Approve on 2016-03-30
Mir CI Bot	continuous-integration		Needs Fixing on 2016-03-30
Alan Griffiths			Approve on 2016-03-23
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2016-03-18
Review via email: mp+289443@code.launchpad.net

Commit message

Mir 0.21.0 release

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-03-17:

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-03-18:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-03-18:

debian/changelog:
  - 17 fixes listed but there are 27 in https://launchpad.net/mir/+milestone/0.21.0
  - some enhancements not mentioned
  - "No ABIs changed" could be expressed more simply

review: Needs Fixing

lp:mir/0.21 updated on 2016-03-18

3411. By Daniel van Vugt on 2016-03-18: Fix up debian/changelog

Revision history for this message

Daniel van Vugt (vanvugt) on 2016-03-18:

review: Abstain

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-03-18:

Are these not ABI breaks?

include/server/mir/scene/surface.h
include/server/mir/shell/surface_specification.h

review: Needs Information

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-03-18:

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-03-18:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2016-03-18:

> Are these not ABI breaks?
>
> include/server/mir/scene/surface.h
> include/server/mir/shell/surface_specification.h

Looks like it to me.

We ought to have detected this earlier.

review: Needs Fixing

lp:mir/0.21 updated on 2016-03-18

3412. By Alberto Aguirre on 2016-03-18: merge lp:~kdub/mir/unbreak-abi-0.21

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-03-18:

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

review: Approve (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-03-21:

Nice work on the 'unbreak' effort.

Unfortunately I just noticed another one. The changelog incorrectly states:

mirclientplatform ABI unchanged at 4

but actually we did break it:

CMakeLists.txt:set(MIR_CLIENT_PLATFORM_ABI 5)

So either it's a serious break and needs unbreaking, or it's a break we can live with and just the changelog needs correcting.

review: Needs Fixing

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2016-03-21:

> but actually we did break it:
>
> CMakeLists.txt:set(MIR_CLIENT_PLATFORM_ABI 5)
>
> So either it's a serious break and needs unbreaking, or it's a break we can
> live with and just the changelog needs correcting.

That's not a client facing ABI, so we just need to update the changelog.

OTOH we clearly have a problem with our development process if we only spot this during the release.

lp:mir/0.21 updated on 2016-03-21

3413. By Alberto Aguirre on 2016-03-18

debian: mir-android-diagnostics arch list should match mir-platform-graphics-android8

Cherry picked from lp:mir r3410

3414. By Alberto Aguirre on 2016-03-21

changelog: mirclientplatform actually changed

3415. By Alberto Aguirre on 2016-03-21

fix ODR related build issues in xenial-armhf

Cherry picked from lp:mir r3413

3416. By Alberto Aguirre on 2016-03-21

disable tests that fail on silo builders due to kernel issue.

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-03-21:

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

review: Approve (continuous-integration)

lp:mir/0.21 updated on 2016-03-22

3417. By Daniel van Vugt on 2016-03-22: debian/changelog: Can't say "no ABI breaks" any more.

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-03-22:

Another weak, possibly unimportant ABI break. Although if this header is public it suggests some external project is using it (and will break):

include/test/mir_test_framework/fake_input_device.h :
> virtual void emit_device_removal() = 0;

It's near the start of the vtable too.

review: Needs Information

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-03-22:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-03-22:

Ignore that failure, it's happening on all branches right now.

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-03-23:

Also ignore my comment about mir_test_framework. That's just a bunch of OBJECT and STATIC libraries so no ABI concerns there.

review: Approve

lp:mir/0.21 updated on 2016-03-23

3418. By Daniel van Vugt on 2016-03-23: No change. Try again, Jenkins.

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-03-23:

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

review: Approve (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2016-03-23:

review: Approve

lp:mir/0.21 updated on 2016-03-23

3419. By Alberto Aguirre on 2016-03-23: Fix latest mirclient symbol stanza

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-03-23:

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

review: Approve (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-03-24:

r3419 has incorrectly renamed stanza 'MIR_CLIENT_9v20' to 'MIR_CLIENT_9v21'. It should only add a new stanza (new functions) or coalesce them all into a single one (on ABI break).

review: Needs Fixing

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-03-24:

Also, the preferred syntax (last time we discussed it anyway) for new stanzas is "MIR_CLIENT_0.21". The old stanzas need to stay unchanged of course.

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-03-24:

OK, that first comment is moot in the overall diff to lp:mir/0.20 - only the second one needs fixing still. The new stanza should be called MIR_CLIENT_0.21 (which is also what doc/dso_versioning_guide.md says).

lp:mir/0.21 updated on 2016-03-24

3420. By Daniel van Vugt on 2016-03-24: Corrected src/client/symbols.map naming

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-03-24:

And more errors found :S ...

src/platform/symbols.map: New symbol added to old stanza:

mir::udev::Context::ctx*;

src/server/symbols.map: Many new symbols added to old stanzas:

+ mir::shell::BasicWindowManager::active_display*;
+ mir::shell::BasicWindowManager::add_display*;
+ mir::shell::BasicWindowManager::add_session*;
+ mir::shell::BasicWindowManager::add_surface*;
+ mir::shell::BasicWindowManager::BasicWindowManager*;
...

review: Needs Fixing

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-03-24:

This is becoming a mess. Maybe we should fix up all the symbols.map mistakes on lp:mir first, and then port the corrections in here.

lp:mir/0.21 updated on 2016-03-24

3421. By Daniel van Vugt on 2016-03-24

Corrections to a couple of symbols.maps: New symbols go in new stanzas
when there is no ABI break.

The diff against lp:mir/0.20 is now cleaner and more obvious too.

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-03-24:

Fixed. But we should wait for the same corrections to land on lp:mir and ensure it's in sync with this one before proceeding.

review: Needs Information

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-03-24:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-03-24:

Just waiting on agreement from trunk now, so we don't diverge:
https://code.launchpad.net/~mir-team/mir/forward-port-0.21-symbols-corrections/+merge/290004

review: Needs Information

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-03-24:

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

review: Needs Fixing (continuous-integration)

lp:mir/0.21 updated on 2016-03-25

3422. By Alberto Aguirre on 2016-03-25: merge lp:mir/ubuntu

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-03-25:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-03-25:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-03-29:

Looks good now.

review: Approve

lp:mir/0.21 updated on 2016-03-29

3423. By Andreas Pokorny on 2016-03-29: disable key repeats on the mx4 touchscreen

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-03-29:

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

review: Needs Fixing (continuous-integration)

lp:mir/0.21 updated on 2016-03-30

3424. By Alberto Aguirre on 2016-03-29: Mention fix for lp:1549701 in changelog
3425. By Alberto Aguirre on 2016-03-30: "linux/input-event-codes.h" does not exist for older kernels

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-03-30:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-03-30:

Still seems OK although CI needs some TLC:

00:55:22 The following tests FAILED:
00:55:22 11 - mir_acceptance_tests (Failed)
00:55:22 13 - mir_acceptance_tests---MIR_SERVER_NBUFFERS=0--- (Failed)
00:55:22 17 - mir_integration_tests (Failed)

review: Approve

Revision history for this message

Brandon Schaefer (brandontschaefer) wrote on 2016-03-30:

Tested on krillin, good on this device!

review: Approve

Preview Diff

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

The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes:

Mir development team

 === modified file '3rd_party/CMakeLists.txt'
 --- 3rd_party/CMakeLists.txt	2016-01-29 08:18:22 +0000
 +++ 3rd_party/CMakeLists.txt	2016-03-30 00:11:41 +0000
@@ -8,8 +8,6 @@
+   )
  set(MIR_3RD_PARTY_INCLUDE_DIRECTORIES ${MIR_3RD_PARTY_INCLUDE_DIRECTORIES} PARENT_SCOPE)
--set(MIR_INPUT_ANDROID_COMPILE_FLAGS ${MIR_INPUT_ANDROID_COMPILE_FLAGS}
--  PARENT_SCOPE)
  include_directories(${PROJECT_SOURCE_DIR}/src/include/cookie)
  include_directories(${PROJECT_SOURCE_DIR}/src/include/common)
 === modified file '3rd_party/android-input/android/frameworks/base/include/androidfw/Input.h'
 --- 3rd_party/android-input/android/frameworks/base/include/androidfw/Input.h	2016-01-29 08:18:22 +0000
 +++ 3rd_party/android-input/android/frameworks/base/include/androidfw/Input.h	2016-03-30 00:11:41 +0000
@@ -554,6 +554,7 @@
+     }
  protected:
++    float getAccumulatedAxisValue(int32_t axis, size_t pointerIndex) const;
      int32_t mAction;
      int32_t mFlags;
      int32_t mEdgeFlags;
 === modified file '3rd_party/android-input/android/frameworks/base/services/input/Input.cpp'
 --- 3rd_party/android-input/android/frameworks/base/services/input/Input.cpp	2016-01-29 08:18:22 +0000
 +++ 3rd_party/android-input/android/frameworks/base/services/input/Input.cpp	2016-03-30 00:11:41 +0000
@@ -359,12 +359,29 @@
      return &mSamplePointerCoords[getHistorySize() * getPointerCount() + pointerIndex];
+ }
++float MotionEvent::getAccumulatedAxisValue(int32_t axis, size_t pointerIndex) const {
++    float acc = 0;
++    auto const pointerCount = getPointerCount();
++    for (size_t i = 0, num_entries = getHistorySize() + 1; i != num_entries; ++i)
++        acc += mSamplePointerCoords[i * pointerCount + pointerIndex].getAxisValue(axis);
++    return acc;
++}
++
  float MotionEvent::getRawAxisValue(int32_t axis, size_t pointerIndex) const {
--    return getRawPointerCoords(pointerIndex)->getAxisValue(axis);
++    switch (axis)
++    {
++    case AMOTION_EVENT_AXIS_RX:  // joystick rotation axis are abused as relative x and y
++    case AMOTION_EVENT_AXIS_RY:
++    case AMOTION_EVENT_AXIS_VSCROLL:
++    case AMOTION_EVENT_AXIS_HSCROLL:
++        return getAccumulatedAxisValue(axis, pointerIndex);
++    default:
++        return getRawPointerCoords(pointerIndex)->getAxisValue(axis);
++    }
+ }
  float MotionEvent::getAxisValue(int32_t axis, size_t pointerIndex) const {
--    float value = getRawPointerCoords(pointerIndex)->getAxisValue(axis);
++    float value = getRawAxisValue(axis, pointerIndex);
      switch (axis) {
      case AMOTION_EVENT_AXIS_X:
          return value + mXOffset;
 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2016-03-15 03:05:51 +0000
 +++ CMakeLists.txt	2016-03-30 00:11:41 +0000
@@ -28,12 +28,14 @@
  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
  set(MIR_VERSION_MAJOR 0)
--set(MIR_VERSION_MINOR 20)
--set(MIR_VERSION_PATCH 3)
++set(MIR_VERSION_MINOR 21)
++set(MIR_VERSION_PATCH 0)
  add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
  add_definitions(-DMIR_VERSION_MINOR=${MIR_VERSION_MINOR})
  add_definitions(-DMIR_VERSION_MICRO=${MIR_VERSION_PATCH})
++add_definitions(-D_GNU_SOURCE)
++add_definitions(-D_FILE_OFFSET_BITS=64)
  set(MIR_VERSION ${MIR_VERSION_MAJOR}.${MIR_VERSION_MINOR}.${MIR_VERSION_PATCH})
@@ -81,6 +83,11 @@
  if(MIR_LINK_TIME_OPTIMIZATION)
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")
++  if(${CMAKE_COMPILER_IS_GNUCXX})
++    set(CMAKE_NM "gcc-nm")
++    set(CMAKE_AR "gcc-ar")
++    set(CMAKE_RANLIB "gcc-ranlib")
++  endif()
  endif()
  string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower)
@@ -110,6 +117,7 @@
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=thread -fno-omit-frame-pointer")
    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fsanitize=thread")
    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=thread")
++  link_libraries(tsan) # Workaround for LP:1413474
  elseif(cmake_build_type_lower MATCHES "ubsanitizer")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined -fno-omit-frame-pointer")
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=undefined -fno-omit-frame-pointer")
@@ -163,6 +171,8 @@
  list(GET MIR_PLATFORM 0 MIR_TEST_PLATFORM)
++option(MIR_ENABLE_TESTS "Build tests" ON)
++
  foreach(platform IN LISTS MIR_PLATFORM)
    if (platform STREQUAL "mesa-kms")
      set(MIR_BUILD_PLATFORM_MESA_KMS TRUE)
@@ -214,7 +224,12 @@
  add_subdirectory(src/)
  include_directories(${MIR_GENERATED_INCLUDE_DIRECTORIES})
--option(MIR_ENABLE_TESTS "Build tests" ON)
++# This copy is used by users of mirplatforminputevdev
++if ("${LIBINPUT_VERSION}" VERSION_LESS "1.1")
++  add_definitions(-DMIR_LIBINPUT_HAS_ACCEL_PROFILE=0)
++else ()
++  add_definitions(-DMIR_LIBINPUT_HAS_ACCEL_PROFILE=1)
++endif ()
  add_subdirectory(benchmarks/)
  add_subdirectory(examples/)
@@ -244,8 +259,6 @@
  include (cmake/Doxygen.cmake)
  include (cmake/ABICheck.cmake)
--add_subdirectory(snappy)
--
  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	2016-01-29 08:18:22 +0000
 +++ benchmarks/frame-uniformity/CMakeLists.txt	2016-03-30 00:11:41 +0000
@@ -15,6 +15,12 @@
    ${PROJECT_SOURCE_DIR}/tests/include/
+ )
++# We use mir-test-{doubles,framework}, which builds differently based on
++# the primary test platform.
++if (MIR_TEST_PLATFORM STREQUAL "android")
++    add_definitions(-DANDROID)
++endif()
++
  mir_add_wrapped_executable(frame_uniformity_test_client NOINSTALL
    touch_measuring_client.cpp
    touch_producing_server.cpp
 === modified file 'cmake/ABICheck.cmake'
 --- cmake/ABICheck.cmake	2016-01-29 08:18:22 +0000
 +++ cmake/ABICheck.cmake	2016-03-30 00:11:41 +0000
@@ -1,33 +1,29 @@
  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_CHECK_BASE_DIR $ENV{MIR_ABI_CHECK_BASE_DIR})
--set(ABI_DUMP_PREBUILT_LIBDIR $ENV{MIR_ABI_DUMP_PREBUILT_LIBDIR})
--set(ENABLE_ABI_CHECK_TEST $ENV{MIR_ENABLE_ABI_CHECK_TEST})
--
--if ("${ABI_CHECK_BASE_DIR}" STREQUAL "")
--  set(ABI_CHECK_BASE_DIR ${CMAKE_BINARY_DIR}/mir-prev-release/obj-${ABI_CHECK_TARGET_MACH}/abi_dumps)
--endif()
--
--set(ABI_DUMPS_DIR_PREFIX "abi_dumps/${ABI_CHECK_TARGET_MACH}")
--
--function(get_value_for_arg alist name output)
--  list(FIND alist ${name} idx)
++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 alist ${idx} tmp_out)
--    set(${output} "${tmp_out}" PARENT_SCOPE)
++    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)
@@ -35,52 +31,44 @@
    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}")
--  list(FIND ARGN "INCLUDE_PRIVATE" include_private)
--  if (include_private GREATER -1)
--    set(private_headers "${CMAKE_SOURCE_DIR}/src/include/${name}")
--  endif()
--
--  get_value_for_arg("${ARGN}" "LIBRARY_HEADER" library_header)
++  # 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()
--  # TODO: Deprecate use of "LOCATION" (CMP0026) ...
--  if ("${ABI_DUMP_PREBUILT_LIBDIR}" STREQUAL "")
--    get_property(LIB_DESC_LIBS TARGET ${libname} PROPERTY LOCATION)
--  else()
--    get_property(liblocation TARGET ${libname} PROPERTY LOCATION)
--    get_filename_component(libfilename ${liblocation} NAME)
--    set(LIB_DESC_LIBS "${ABI_DUMP_PREBUILT_LIBDIR}/${libfilename}")
--  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}")
--  get_value_for_arg("${ARGN}" "EXCLUDE_HEADERS" LIB_DESC_SKIP_HEADERS)
++  # 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 libmircommon ABI
--set(mircommon-exclude-headers "${CMAKE_SOURCE_DIR}/src/include/common/mir/graphics/android\n    ${CMAKE_SOURCE_DIR}/src/include/common/mir/input\n    ${CMAKE_SOURCE_DIR}/src/include/common/mir/events")
--
  #These headers are not part of the libmirplatform ABI
  set(mirplatform-exclude-headers "${CMAKE_SOURCE_DIR}/include/platform/mir/input")
  make_lib_descriptor(client)
  make_lib_descriptor(server)
--make_lib_descriptor(common INCLUDE_PRIVATE EXCLUDE_HEADERS ${mircommon-exclude-headers})
++make_lib_descriptor(common)
  make_lib_descriptor(cookie)
--make_lib_descriptor(platform INCLUDE_PRIVATE EXCLUDE_HEADERS ${mirplatform-exclude-headers})
++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)
@@ -91,38 +79,21 @@
  endif()
  make_lib_descriptor(platforminputevdev LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/include/platform/mir/input/)
--add_custom_target(abi-release-dump
--  COMMAND /bin/sh -c '${CMAKE_SOURCE_DIR}/tools/generate-abi-base-dump.sh ${CMAKE_SOURCE_DIR}'
--)
--
--macro(_add_custom_abi_dump_command libname version)
--  set(ABI_DUMP_NAME ${ABI_DUMPS_DIR_PREFIX}/${libname}_${version}.abi.tar.gz)
--
--  if ("${ABI_DUMP_PREBUILT_LIBDIR}" STREQUAL "")
--    set(dump_depends ${libname})
--  else()
--    set(dump_depends "")
--  endif()
++
++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_C_COMPILER} -l ${libname} -v1 ${version} -dump-path ${ABI_DUMP_NAME} -dump-abi ${libname}_desc.xml
--    DEPENDS ${dump_depends}
++    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}
+   )
--endmacro(_add_custom_abi_dump_command)
--
--macro(_define_abi_dump_for libname)
--  _add_custom_abi_dump_command(${libname} next)
    add_custom_target(abi-dump-${libname} DEPENDS ${ABI_DUMP_NAME})
--  _add_custom_abi_dump_command(${libname} base)
--  add_custom_target(abi-dump-base-${libname} DEPENDS ${ABI_DUMP_NAME})
  endmacro(_define_abi_dump_for)
  macro(_define_abi_check_for libname)
--  set(OLD_ABI_DUMP "${ABI_CHECK_BASE_DIR}/${ABI_CHECK_TARGET_MACH}/${libname}_base.abi.tar.gz")
--  set(NEW_ABI_DUMP ${ABI_DUMPS_DIR_PREFIX}/${libname}_next.abi.tar.gz)
    add_custom_target(abi-check-${libname}
--    COMMAND /bin/bash -c '${CMAKE_SOURCE_DIR}/tools/run_abi_compliance_checker.sh ${libname} ${CMAKE_BINARY_DIR}/mir-prev-release ${CMAKE_SOURCE_DIR} ${OLD_ABI_DUMP} ${NEW_ABI_DUMP}'
--    DEPENDS abi-dump-${libname} abi-release-dump
++    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)
@@ -138,12 +109,10 @@
    _define_abi_dump_for(${libname})
    _define_abi_check_for(${libname})
    list(APPEND abi-dump-list abi-dump-${libname})
--  list(APPEND abi-dump-base-list abi-dump-base-${libname})
    list(APPEND abi-check-list abi-check-${libname})
  endforeach(libname)
  add_custom_target(abi-dump DEPENDS ${abi-dump-list})
--add_custom_target(abi-dump-base DEPENDS ${abi-dump-base-list})
  add_custom_target(abi-check DEPENDS ${abi-check-list})
  if (MIR_ENABLE_TESTS AND ENABLE_ABI_CHECK_TEST)
 === modified file 'cmake/FindGtestGmock.cmake'
 --- cmake/FindGtestGmock.cmake	2016-01-29 08:18:22 +0000
 +++ cmake/FindGtestGmock.cmake	2016-03-30 00:11:41 +0000
@@ -20,7 +20,7 @@
  set(GMOCK_BINARY_DIR ${CMAKE_BINARY_DIR}/${GMOCK_PREFIX}/libs)
  set(GTEST_BINARY_DIR ${GMOCK_BINARY_DIR}/gtest)
--set(GTEST_CXX_FLAGS "-fPIC")
++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")
 === modified file 'cmake/FindLibHardware.cmake'
 --- cmake/FindLibHardware.cmake	2016-01-29 04:07:19 +0000
 +++ cmake/FindLibHardware.cmake	2016-03-30 00:11:41 +0000
@@ -7,7 +7,7 @@
  INCLUDE(FindPackageHandleStandardArgs)
  find_package( PkgConfig )
--pkg_search_module(ANDROID_HEADERS REQUIRED android-headers-19 android-headers)
++pkg_search_module(ANDROID_HEADERS REQUIRED android-headers)
  set(LIBHARDWARE_INCLUDE_DIRS ${ANDROID_HEADERS_INCLUDE_DIRS})
  find_library(LIBHARDWARE_LIBRARY
 === modified file 'cmake/MirCommon.cmake'
 --- cmake/MirCommon.cmake	2016-02-12 04:02:11 +0000
 +++ cmake/MirCommon.cmake	2016-03-30 00:11:41 +0000
@@ -52,12 +52,17 @@
    set(${STR_VAR} "${tmp_str}" PARENT_SCOPE)
  endfunction()
--function (mir_discover_tests_internal EXECUTABLE DETECT_FD_LEAKS)
++function (mir_discover_tests_internal EXECUTABLE TEST_ENV_OPTIONS DETECT_FD_LEAKS )
    # Set vars
    set(test_cmd_no_memcheck "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${EXECUTABLE}")
    set(test_cmd "${test_cmd_no_memcheck}")
--  set(test_env ${ARGN})
--  set(test_name ${EXECUTABLE})
++  set(test_env ${ARGN} ${TEST_ENV_OPTIONS})
++
++  if (TEST_ENV_OPTIONS)
++      set(test_name ${EXECUTABLE}---${TEST_ENV_OPTIONS}---)
++  else()
++      set(test_name ${EXECUTABLE})
++  endif()
    set(test_no_memcheck_filter)
    set(test_exclusion_filter)
@@ -82,6 +87,11 @@
      set(test_exclusion_filter "${test_exclusion_filter}:ServerShutdown/OnSignalDeathTest.removes_endpoint/0")
    endif()
++  if(cmake_build_type_lower MATCHES "ubsanitizer")
++    list(APPEND test_env "UBSAN_OPTIONS=\"suppressions=${CMAKE_SOURCE_DIR}/tools/ubsan-suppressions print_stacktrace=1 die_after_fork=0\"")
++    set(test_exclusion_filter "${test_exclusion_filter}:*DeathTest*")
++  endif()
++
    if(SYSTEM_SUPPORTS_O_TMPFILE EQUAL 1)
        set(test_exclusion_filter "${test_exclusion_filter}:AnonymousShmFile.*:MesaBufferAllocatorTest.software_buffers_dont_bypass:MesaBufferAllocatorTest.creates_software_rendering_buffer")
    endif()
@@ -115,11 +125,15 @@
  endfunction ()
  function (mir_discover_tests EXECUTABLE)
--  mir_discover_tests_internal(${EXECUTABLE} FALSE ${ARGN})
++  mir_discover_tests_internal(${EXECUTABLE} "" FALSE ${ARGN})
  endfunction()
  function (mir_discover_tests_with_fd_leak_detection EXECUTABLE)
--  mir_discover_tests_internal(${EXECUTABLE} TRUE ${ARGN})
++  mir_discover_tests_internal(${EXECUTABLE} "" TRUE ${ARGN})
++endfunction()
++
++function (mir_discover_tests_with_fd_leak_detection_and_env EXECUTABLE TEST_ENV_OPTION)
++  mir_discover_tests_internal(${EXECUTABLE} ${TEST_ENV_OPTION} TRUE ${ARGN})
  endfunction()
  function (mir_add_memcheck_test)
@@ -145,11 +159,15 @@
    endif()
  endfunction()
--
  function (mir_precompiled_header TARGET HEADER)
    if (MIR_USE_PRECOMPILED_HEADERS)
--    get_property(TARGET_COMPILE_FLAGS TARGET ${TARGET} PROPERTY COMPILE_FLAGS)
++    get_filename_component(HEADER_NAME ${HEADER} NAME)
++
      get_property(TARGET_INCLUDE_DIRECTORIES TARGET ${TARGET} PROPERTY INCLUDE_DIRECTORIES)
++
++    set(TARGET_COMPILE_DEFINITIONS "$<TARGET_PROPERTY:${TARGET},COMPILE_DEFINITIONS>")
++    set(TARGET_COMPILE_DEFINITIONS "$<$<BOOL:${TARGET_COMPILE_DEFINITIONS}>:-D$<JOIN:${TARGET_COMPILE_DEFINITIONS},\n-D>\n>")
++
      foreach(dir ${TARGET_INCLUDE_DIRECTORIES})
        if (${dir} MATCHES "usr/include")
          set(TARGET_INCLUDE_DIRECTORIES_STRING "${TARGET_INCLUDE_DIRECTORIES_STRING} -isystem ${dir}")
@@ -169,15 +187,44 @@
+     #
      # I'm unaware of a less roundabout method of getting the *actual* build flags for a target.
      string(TOUPPER "${CMAKE_BUILD_TYPE}" UC_BUILD_TYPE)
--    separate_arguments(
--      PCH_CXX_FLAGS UNIX_COMMAND
--      "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${UC_BUILD_TYPE}} ${TARGET_COMPILE_FLAGS} ${TARGET_INCLUDE_DIRECTORIES_STRING}"
--    )
--
++
++    # Lllloook at you, haaacker. A pa-pa-pathetic creature of meat and bone.
++    #
++    # It appears that we can *only* get the COMPILE_DEFINITIONS as a generator expression.
++    # This wouldn't be so bad if http://www.kwwidgets.org/Bug/view.php?id=14353#c33712 didn't mean
++    # that you can't use generator expressions in custom commands.
++    #
++    # So!
++    # What we *can* do is generate a file with the contents of the generator expressions,
++    # then use gcc's @file mechanism...
++    set(FLAGS_FILE "${CMAKE_CURRENT_BINARY_DIR}/${HEADER_NAME}.compileflags")
++
++    file(
++      GENERATE
++      OUTPUT "${FLAGS_FILE}"
++      CONTENT "
++        ${CMAKE_CXX_FLAGS}
++        ${CMAKE_CXX_FLAGS_${UC_BUILD_TYPE}}
++        ${TARGET_INCLUDE_DIRECTORIES_STRING}
++        ${TARGET_COMPILE_DEFINITIONS}"
++    )
++
++    # HA HA!
++    #
++    # Of course, that has unescaped all the escaped \"s we have in the compile definitions.
++    # gcc treats the contents of @file exactly as if it came from the command line, so we need to
++    # re-escape them.
++    add_custom_command(
++      OUTPUT ${FLAGS_FILE}.processed
++      DEPENDS ${FLAGS_FILE}
++      # ESCAPE ALL THE THINGS!
++      COMMAND sh -c "sed s_\\\"_\\\\\\\\\\\"_g ${FLAGS_FILE} > ${FLAGS_FILE}.processed"
++      VERBATIM
++    )
      add_custom_command(
        OUTPUT ${TARGET}_precompiled.hpp.gch
--      DEPENDS ${HEADER}
--      COMMAND ${CMAKE_CXX_COMPILER} ${PCH_CXX_FLAGS} -x c++-header -c ${HEADER} -o ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_precompiled.hpp.gch
++      DEPENDS ${HEADER} ${FLAGS_FILE}.processed
++      COMMAND ${CMAKE_CXX_COMPILER} @${FLAGS_FILE}.processed -x c++-header -c ${HEADER} -o ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_precompiled.hpp.gch
+     )
      set_property(TARGET ${TARGET} APPEND_STRING PROPERTY COMPILE_FLAGS " -include ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_precompiled.hpp -Winvalid-pch ")
 === modified file 'debian/changelog'
 --- debian/changelog	2016-03-22 15:42:36 +0000
 +++ debian/changelog	2016-03-30 00:11:41 +0000
@@ -1,3 +1,66 @@
++mir (0.21.0-0ubuntu1) UNRELEASED; urgency=medium
++
++  * New upstream release 0.21.0 (https://launchpad.net/mir/+milestone/0.21.0)
++    - ABI summary:
++      . mirclient ABI unchanged at 9
++      . mirserver ABI unchanged at 38
++      . mircommon ABI unchanged at 5
++      . mirplatform ABI unchanged at 11
++      . mirprotobuf ABI unchanged at 3
++      . mirplatformgraphics ABI unchaged at 8
++      . mirclientplatform ABI bumped to 5
++      . mirinputplatform ABI unchanged at 5
++    - Enhancements:
++      . New display enumeration API
++      . Added Android diagnostic tests to assist during porting to
++        new devices
++      . Added mir_demo_client_camera: a Video4Linux2 client
++    - Bugs fixed:
++      . Sometimes devices don't suspend - display turns back on
++        immediately (LP: #1549701)
++      . Mir crashed with exception 'failed to add sync point to command
++        buffer' (LP: #1554635)
++      . Mouse cursor is unusably slow in Unity 8 with a 1000Hz mouse
++        (LP: #1539009)
++      . Packaged mir_unit_tests binary is not suitable for general use
++        (LP: #1547015)
++      . [regression] Mir stops receiving input after a pause/resume
++        cycle (LP: #1548989)
++      . NBS (--nbuffers=0) causes software clients to crash with
++        std::exception::what: Failed to mmap buffer 13, "Permission denied")
++        (LP: #1550432)
++      . Fullscreen clients freeze when using NBS with multiple monitors
++        (LP: #1551536)
++      . [ FAILED ] DisplayConfigurationTest.output_position_is_independent_of_
++        orientation (LP: #1552065)
++      . The server-side use of MIR_SOCKET is confusing (LP: #1290345)
++      . [regression] FTBFS with -DMIR_LINK_TIME_OPTIMIZATION=on
++        -Duse_debflags=on (LP: #1350343)
++      . Mir On X (mesa-x11) keeps receiving mouse movement events even
++        when not focused (LP: #1528110)
++      . x11 platform: mouse cursor moves strange (LP: #1546324)
++      . Cross compiling to wily/vivid doesn't work (LP: #1549152)
++      . Rendering stutters when a new client establishes a connection
++        (LP: #1549359)
++      . 'mir_demo_server --test-client' crashes (SIGSEGV) when client
++        dies (LP: #1555620)
++      . [testfail] CI failure: TestClientInput.client_input_config_request_
++        receives_all_attached_devices (LP: #1555708)
++      . [regression] Mir FTBFS when MIR_ENABLE_TESTS=no (LP: #1556080)
++      . Mir-on-X11 doesn't exit (until it gets an event) (LP: #1556210)
++      . InputPlatformProbe.x11_platform_found_and_used_when_display_connection_
++        works breaks with old input drivers present (LP: #1543049)
++      . [regression] MIR_CLIENT_PERF_REPORT is missing window/surface
++        names (LP: #1546933)
++      . Installed binaries fail to run with mir_demo_server --test-client XXXX
++        (LP: #1556160)
++      . mir_demo_server --test-client [mir_demo_client_scroll|
++        mir_demo_client_flicker] fails (LP: #1556205)
++      . The contents of debian/mir-demos.examples are out of date and useless
++        (LP: #1557446)
++
++ -- Alberto Aguirre <alberto.aguirre@canonical.com>  Thu, 17 Mar 2016 14:08:50 -0500
++
  mir (0.20.3+16.04.20160322-0ubuntu1) xenial; urgency=medium
    [ Alberto Aguirre ]
 === modified file 'debian/control'
 --- debian/control	2016-02-08 17:31:22 +0000
 +++ debian/control	2016-03-30 00:11:41 +0000
@@ -244,7 +244,7 @@
   Mir is a display server running on linux systems, with a focus on efficiency,
   robust operation and a well-defined driver model.
+  .
-- Contains demo applications (with source) that use the Mir display server
++ Contains demo applications that use the Mir display server
  Package: mir-utils
  Architecture: linux-any
@@ -275,6 +275,18 @@
+  .
   Contains a tool for stress testing the Mir display server
++Package: mir-android-diagnostics
++Architecture: i386 amd64 armhf
++Pre-Depends: ${misc:Pre-Depends}
++Depends: ${misc:Depends},
++         ${shlibs:Depends},
++Recommends: mir-demos,
++Description: Display Server for Ubuntu - android platform diagnostics utility
++ Mir is a display server running on linux systems, with a focus on efficiency,
++ robust operation and a well-defined driver model.
++ .
++ Contains a tool for checking the graphics components of android devices.
++
  Package: libmircommon5
  Section: libs
  Architecture: linux-any
@@ -345,7 +357,7 @@
   Contains the shared libraries required for the Mir server to interact with
   the input hardware using the evdev interface.
--Package: mir-client-platform-mesa4
++Package: mir-client-platform-mesa5
  Section: libs
  Architecture: linux-any
  Multi-Arch: same
@@ -373,7 +385,7 @@
   Contains header files required to use the platform specific capabilities of
   the Mir Mesa backend.
--Package: mir-client-platform-android4
++Package: mir-client-platform-android5
  Section: libs
  Architecture: i386 amd64 armhf
  Multi-Arch: same
@@ -395,7 +407,7 @@
  Depends: ${misc:Depends},
           mir-platform-graphics-mesa-kms8,
           mir-platform-graphics-mesa-x8,
--         mir-client-platform-mesa4,
++         mir-client-platform-mesa5,
           mir-platform-input-evdev5,
  Description: Display server for Ubuntu - desktop driver metapackage
   Mir is a display server running on linux systems, with a focus on efficiency,
@@ -411,7 +423,7 @@
  Pre-Depends: ${misc:Pre-Depends}
  Depends: ${misc:Depends},
           mir-platform-graphics-android8,
--         mir-client-platform-android4,
++         mir-client-platform-android5,
           mir-platform-input-evdev5,
  Description: Display server for Ubuntu - android driver metapackage
   Mir is a display server running on linux systems, with a focus on efficiency,
 === added file 'debian/mir-android-diagnostics.install'
 --- debian/mir-android-diagnostics.install	1970-01-01 00:00:00 +0000
 +++ debian/mir-android-diagnostics.install	2016-03-30 00:11:41 +0000
@@ -0,0 +1,1 @@
++usr/bin/mir_android_diagnostics
 === renamed file 'debian/mir-client-platform-android4.install' => 'debian/mir-client-platform-android5.install'
 --- debian/mir-client-platform-android4.install	2016-01-29 08:18:22 +0000
 +++ debian/mir-client-platform-android5.install	2016-03-30 00:11:41 +0000
@@ -1,1 +1,1 @@
--usr/lib/*/mir/client-platform/android.so.4
++usr/lib/*/mir/client-platform/android.so.5
 === renamed file 'debian/mir-client-platform-mesa4.install' => 'debian/mir-client-platform-mesa5.install'
 --- debian/mir-client-platform-mesa4.install	2016-01-29 08:18:22 +0000
 +++ debian/mir-client-platform-mesa5.install	2016-03-30 00:11:41 +0000
@@ -1,1 +1,1 @@
--usr/lib/*/mir/client-platform/mesa.so.4
++usr/lib/*/mir/client-platform/mesa.so.5
 === removed file 'debian/mir-demos.examples'
 --- debian/mir-demos.examples	2013-08-29 03:48:16 +0000
 +++ debian/mir-demos.examples	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
--examples/basic.c
--examples/scroll.cpp
--examples/flicker.c
--examples/README
--examples/graphics.h
--examples/mir_image.h
--examples/graphics_utils.cpp
 === modified file 'debian/mir-test-tools.install'
 --- debian/mir-test-tools.install	2016-01-29 08:18:22 +0000
 +++ debian/mir-test-tools.install	2016-03-30 00:11:41 +0000
@@ -1,5 +1,6 @@
  usr/bin/mir_stress
  usr/bin/mir_unit_tests*
++usr/bin/mir_umock_unit_tests
  usr/bin/mir_acceptance_tests
  usr/bin/mir_umock_acceptance_tests
  usr/bin/mir_integration_tests*
@@ -12,4 +13,4 @@
  usr/lib/*/mir/server-platform/graphics-throw.so
  usr/lib/*/mir/server-platform/input-stub.so
  usr/lib/*/mir/client-platform/dummy.so
--usr/share/udev_recordings
++usr/share/mir-test-data
 === modified file 'debian/mir-test-tools.lintian-overrides'
 --- debian/mir-test-tools.lintian-overrides	2013-06-24 16:59:17 +0000
 +++ debian/mir-test-tools.lintian-overrides	2016-03-30 00:11:41 +0000
@@ -1,2 +1,5 @@
++arch-dependent-file-in-usr-share
++binary-from-other-architecture
  package-name-doesnt-match-sonames
  shlib-without-versioned-soname
++unstripped-binary-or-object
 === modified file 'debian/mir-utils.install'
 --- debian/mir-utils.install	2015-06-12 07:37:21 +0000
 +++ debian/mir-utils.install	2016-03-30 00:11:41 +0000
@@ -1,4 +1,5 @@
  usr/bin/mirping
  usr/bin/mirout
++usr/bin/mirin
  usr/bin/mirscreencast
  usr/bin/mirbacklight
 === modified file 'debian/rules'
 --- debian/rules	2016-01-29 08:18:22 +0000
 +++ debian/rules	2016-03-30 00:11:41 +0000
@@ -20,7 +20,13 @@
  endif
  COMMON_CONFIGURE_OPTIONS = \
--  -DCMAKE_INSTALL_LIBEXECDIR="lib/$(DEB_HOST_MULTIARCH)/mir"
++  -DCMAKE_INSTALL_LIBEXECDIR="lib/$(DEB_HOST_MULTIARCH)/mir"\
++
++ifeq ($(filter noopt,$(DEB_BUILD_OPTIONS)),noopt)
++	COMMON_CONFIGURE_OPTIONS += -DMIR_LINK_TIME_OPTIMIZATION=OFF
++else
++	COMMON_CONFIGURE_OPTIONS += -DMIR_LINK_TIME_OPTIMIZATION=ON
++endif
  override_dh_auto_configure:
  ifeq ($(DEB_HOST_ARCH),armhf)
@@ -47,7 +53,7 @@
  # TODO: we'll use a symbol file once mir is abi stable
  override_dh_makeshlibs:
--	dh_makeshlibs -V
++	dh_makeshlibs -V -Nmir-test-tools
  override_dh_install:
  # Nothing outside Mir should link to libmirprotobuf directly.
@@ -56,3 +62,11 @@
  	-rm debian/tmp/usr/lib/*/libmirprotobuf.so
  	dh_install -p libmirplatform-dev -Xmesa --fail-missing
  	dh_install --remaining-packages --fail-missing -Xjquery.js
++
++# Don't try to strip libraries used as test data
++override_dh_strip:
++	dh_strip -Xmir-test-data
++
++# Don't try to find dependencies of libraries used as test data
++override_dh_shlibdeps:
++	dh_shlibdeps -Xmir-test-data
 === removed file 'deploy-and-test.sh'
 --- deploy-and-test.sh	2015-04-28 07:54:10 +0000
 +++ deploy-and-test.sh	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
--#!/bin/sh
--# WARNING: This script is slow. See: doc/avoid_deploy-and-test.md
--
--if [ ! -d build-android-arm ] ; then
--    echo "Built tree not found in $(pwd)/build-android-arm"
--    exit 1
--fi
--
--# Unpack umockdev requirements
--( cd build-android-arm ;
--  apt-get download umockdev:armhf libumockdev0:armhf ;
--  dpkg -x umockdev_*armhf*.deb . ;
--  dpkg -x libumockdev0_*armhf*.deb .
--)
--
--rundir=/home/phablet/mir/testing
--adb push build-android-arm/bin $rundir/bin
--adb push build-android-arm/lib $rundir/lib
--adb push build-android-arm/usr $rundir/usr
--
--libpath=$rundir/usr/lib/arm-linux-gnueabihf/:$rundir/lib
--run_with_env="LD_LIBRARY_PATH=$libpath $rundir/usr/bin/umockdev-run $rundir/bin/"
--
--adb shell "${run_with_env}mir_unit_tests"
--adb shell "${run_with_env}mir_integration_tests"
--adb shell "${run_with_env}mir_acceptance_tests"
 === modified file 'doc/abi_compatibility_tools.md'
 --- doc/abi_compatibility_tools.md	2014-10-02 13:04:47 +0000
 +++ doc/abi_compatibility_tools.md	2016-03-30 00:11:41 +0000
@@ -1,82 +1,26 @@
--Tools to track ABI compatibility {#abi_compatibility_tools}
++Tracking ABI compatibility {#abi_compatibility_tools}
  ================================
--We have created a few build targets to help us track ABI compatibility across
--different Mir versions and ensure we increase the ABI version properly. These
--target use the abi-compliance-checker tool to create and check the ABI dumps.
++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-dump** (or abi-dump-<library> for a specific library, e.g., abi-dump-mirclient)
--
--  Produces ABI dumps for the public versioned libraries shipped by Mir. The
--  resulting ABI dump for each library is saved as
--  <build-dir>/abi_dumps/<arch>/<libname>_next.abi.tar.gz.
--
--  By default, this target also builds the libraries needed for create the
--  requested ABI dumps. The environment variable `MIR_ABI_DUMP_PREBUILT_LIBDIR`
--  can be set **at configuration time** (i.e., when invoking cmake) to a path
--  containing pre-built libraries to use instead.
--
--  _N.B: the path set with MIR_ABI_DUMP_PREBUILT_LIBDIR is expected to contain
--  *.so files, not only *.so.X files._
--
--* **make abi-dump-base** (or abi-dump-base-<library> for a specific library,
--  e.g., abi-dump-base-mirclient)
--
--  Similar to make abi-dump, but saves the ABI dump as
--  <build-dir>/abi_dumps/<arch>/<libname>_base.abi.tar.gz (note the 'base' vs
--  'next' in the file name).
--
--* **make abi-check** (or abi-check-<library>, for a specific library)
--  e.g., abi-check-mirclient)
--
--  Produces ABI dumps (this target depends on the abi-dump target), and checks
--  them against a set of base ABI dumps. The base ABI dumps are assumed to be
--  located in <build-dir>/abi_dumps/<arch>/, i.e., where make abi-dump-base
--  would normally place the files.
--
--  The environment variable `MIR_ABI_CHECK_BASE_DIR` can be set **at
--  configuration time** (i.e., when invoking cmake) to set a different directory
--  for the base ABI dumps. The supplied directory must **not** contain the
--  <arch> portion of the path (e.g., just build_dir/abi_dumps, not
--  build_dir/abi_dumps/x86_64-linux-gnu).
--
--  Since this target depends on the abi-dump target, the
--  `MIR_ABI_DUMP_PREBUILT_LIBDIR` environment variable can be set to use
--  pre-built libraries instead of building them.
++* **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
  ------------
--A common scenario is to check the ABI of the development version against the
--latest archive version. This is one way to perform the check:
--
--### Step 1: Produce the ABI dumps for the installed version
--
--Start by download the source corresponding to the installed version:
--
--    $ apt-get source mir
--    $ cd mir-<version>
--
--At this point we can select whether to build the libraries from scratch:
--
++    $ bzr branch lp:mir && cd mir
      $ debian/rules override_dh_auto_configure
--
--... or to reuse the pre-built libraries, assuming they are installed (we
--need their -dev packages too!):
--
--    $ MIR_ABI_DUMP_PREBUILT_LIBDIR=/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH) debian/rules override_dh_auto_configure
--
--Now we can create the ABI dumps:
--
--    $ cd <build-dir> && make abi-dump-base
--
--This will create base ABI dump files which we can use in the next step.
--
--### Step 2: Check the ABI of the development version against the produced base ABI dumps
--
--    $ bzr branch lp:mir && cd mir
--    $ MIR_ABI_CHECK_BASE_DIR=/path/to/base/abi/dumps debian/rules override_dh_auto_configure
      $ cd <build-dir>
      $ make abi-check
 === modified file 'doc/android_new_device_bringup.md'
 --- doc/android_new_device_bringup.md	2015-07-16 07:03:19 +0000
 +++ doc/android_new_device_bringup.md	2016-03-30 00:11:41 +0000
@@ -7,42 +7,50 @@
  team diagnose and fix the issues that are seen.
  ##Mir Tests##
--The android platform of Mir has a variety of tests and tools that help the Mir
--team troubleshoot new devices. There are thousands of tests, but certain tests
--exercise the driver and have proven useful in diagnosing driver problems. These
--tests are available in the 'mir-test-tools' debian package.
++Mir has a test suite available in the package mir-test-tools that checks the
++operation of Mir.
++Mir also provides a test suite in mir-android-diagnostics that is helpful in
++checking how a new device will work with Mir.
++
++##Mir and libhybris##
++Vendor provided drivers are compiled against Android's bionic libc.
++Mir runs against glibc. To make the two libc's work together, Mir uses
++libhybris.
++
++libhybris has some internal tests (e.g., test_egl), but these are insufficient
++tests to see if mir will run on the device. The tests are aimed checking
++the operation of hybris on non-Mir graphics stacks. Furthermore, they test a
++more limited range of hardware module capabilities (e.g. they don't test HWC
++overlay capability)
  ###Mir Client Software Rendering###
--    mir_integration_tests --gtest-filter="AndroidHardwareSanity.client_can_draw_with_cpu"
++    mir_android_diagnostics --gtest_filter="AndroidMirDiagnostics.client_can_draw_with_cpu"
--This test checks that a buffer can travel from the server to the client accross
--the interprocess communication channel. It then renders some pixels using
--software and the server will check that the pixels are present in the buffer.
++This test checks that the CPU can render pixels using software
++and checks that the pixels can be read back.
  ###Mir Client OpenGLES 2.0 Rendering (Android EGLNativeWindowType test)###
--    mir_integration_tests --gtest-filter="AndroidHardwareSanity.client_can_draw_with_gpu"
++    mir_android_diagnostics --gtest_filter="AndroidMirDiagnostics.client_can_draw_with_gpu"
--This test checks that a buffer can travel from the server to the client accross
--the interprocess communication channel. It then renders some pixels using
--OpenGLES 2.0 and the server will check that the pixels are present in the
--buffer.
++This test checks that the GL api can be used to glClear() a buffer, and checks
++that the content is correct after render.
  ###Mir Display posting (HWC tests)###
--    mir_integration_tests --gtest-filter="AndroidHardwareSanity.display_can_post"
--    mir_integration_tests --gtest-filter="AndroidHardwareSanity.display_can_post_overlay"
++    mir_android_diagnostics --gtest_filter="AndroidMirDiagnostics.display_can_post"
++    mir_android_diagnostics --gtest_filter="AndroidMirDiagnostics.display_can_post_overlay"
  This test checks that the display can post content to the screen. It should
  flash the screen briefly and run without error. Since it is important that
  screen looks flawless, a visual inspection should also be perfomed using
--mir_demo_standalone_render_to_fb
++mir_demo_standalone_render_to_fb and mir_demo_standalone_render_overlays
  ###Mir GPU buffer allocations (gralloc tests)###
--    mir_integration_tests --gtest-filter="AndroidHardwareSanity.can_allocate_sw_buffer"
--    mir_integration_tests --gtest-filter="AndroidHardwareSanity.can_allocate_hw_buffer"
++    mir_android_diagnostics --gtest_filter="AndroidMirDiagnostics.can_allocate_sw_buffer"
++    mir_android_diagnostics --gtest_filter="AndroidMirDiagnostics.can_allocate_hw_buffer"
  This will test that Mir can access the gralloc module and allocate GPU buffers.
@@ -85,7 +93,7 @@
  and display to the screen.
  In one terminal, run
--    mir_proving_server
++    mir_demo_server
  and in another terminal, run
@@ -138,6 +146,12 @@
  MIR_SERVER_HWC_REPORT=log to the environment of the running server will give
  the hwc report on stdout.
++###Android platform quirks###
++If a driver has a bug that can be fixed, its best to fix the bug in the driver.
++However, if workarounds are needed due to source unavailability, they can be
++experimented with via quicks that can be activated via the command line.
++The list of quirks is printed with the --help flag on a mir_demo_server.
++
  ###Note on HWC versions###
  The "--hwc-report log" will log the HWC version at the beginning of the report,
   e.g.
@@ -149,8 +163,8 @@
      HWC version unknown (<version>)
  This means that Mir does not support the version of hwc on the device.
--As of Dec 2014, Mir supports the legacy FB module, as well as HWC versions
--1.0, 1.1, 1.2, and 1.3.
++As of Feb 2016, Mir supports the legacy FB module, as well as HWC versions
++1.0, 1.1, 1.2, 1.3, and 1.4.
  If you run
 === removed file 'doc/avoid_deploy-and-test.md'
 --- doc/avoid_deploy-and-test.md	2015-01-22 05:40:40 +0000
 +++ doc/avoid_deploy-and-test.md	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
--How to avoid deploy-and-test.sh
--===============================
--
--If you're running tests regularly from different branches on a remote
--Ubuntu touch device, you should avoid deploy-and-test.sh because it's very
--slow to complete. Particularly if you're making code changes and need to
--repeat the script each time. Instead, you can set up your device for rapid
--iteration like so:
--
--One-time setup
----------------
--   adb push ~/.ssh/id_rsa.pub /home/phablet/.ssh/authorized_keys
--   adb shell
--      chown phablet ~/.ssh
--      chmod -R go-w ~/.ssh
--      mkdir ~/testrundir
--      sudo start ssh
--      sudo mount -o remount,rw /
--      sudo apt-get install umockdev
--
--Now for each branch you want to deploy and test
-------------------------------------------------
--   device=<ip-or-hostname-of-your-device>
--   cd build-android-arm
--   rsync -avH lib bin phablet@$device:testrundir/
--   adb shell  (or ssh phablet@$device)
--      cd testrundir
--      umockdev-run bin/mir_unit-tests
--      ...
 === removed file 'doc/snappy_appliances.md'
 --- doc/snappy_appliances.md	2015-03-20 08:43:03 +0000
 +++ doc/snappy_appliances.md	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
--Mir As An Appliance
--===================
--
--How to build a Mir-based appliance/kiosk using Ubuntu Core and Snappy
--packaging.
--
--Selection of hardware
-----------------------
--
--Mir as an appliance presently supports Mesa/DRM drivers. So almost any
--hardware that supports Mir on Ubuntu desktop will suffice. Virtual machines
--are generally NOT supported by Mir yet. So cannot be used here.
--
--Your chosen machine must be plugged into ethernet by cable (wifi not
--supported), and that cable must be able to reach a DHCP server
--(e.g. a typical home router). For more details see:
--<https://bugs.launchpad.net/snappy-ubuntu/+bugs?field.tag=wontboot>
--
--Getting the operating system
------------------------------
--
--Ubuntu Core is a new product still and effectively pre-release. So you cannot
--download usable disk images yet. You need to make your own.
--
--1. Use an Ubuntu desktop running 15.04 or later.
--2. Install package: `ubuntu-device-flash`
--3. Make a disk image:
--
--        $ sudo ubuntu-device-flash core --enable-ssh -o mysnappy.img
--
--You now have a 20GB (by default) disk image to dump on your machine's drive.
--This part and variations on it are left as an exercise for the reader.
--
--Booting the operating system
------------------------------
--
--This can be troublesome. For known issues refer to:
--<https://bugs.launchpad.net/snappy-ubuntu/+bugs?field.tag=wontboot>
--
--Once booted you log in as user `ubuntu` with password `ubuntu`.
--
--Learn the basics of snappy
----------------------------
--
--If you haven't already, learn here: <https://developer.ubuntu.com/en/snappy/>
--
--Building snap packages of Mir
-------------------------------
--
--1. Build Mir per normal. But if you want the quickest result then try:
--
--        $ mkdir build
--        $ cd build
--        $ cmake .. -DMIR_ENABLE_TESTS=OFF -DMIR_PLATFORM=mesa
--        $ make -j8
--
--2. Build the .snap files:
--
--        $ make snap
--
--3. Copy the .snap files from the location displayed at the end of step 2.
--
--Running the mir/mir-demos snap packages
-----------------------------------------
--
--Once installed you will have two new snappy `/apps`: mir and mir-demos
--
--Presently only server and standalone binaries work. To run them with the
--full environment, libraries and drivers they require, use:
--
--    sudo /apps/bin/mir-run /apps/mir-demos/current/mir_proving_server
--    sudo /apps/bin/mir-run /apps/mir-demos/current/mir_demo_standalone_render_surfaces
--    etc
--
--Automatic setting of privileges to avoid "sudo" is not yet implemented.
--
 === modified file 'examples/CMakeLists.txt'
 --- examples/CMakeLists.txt	2016-01-29 08:18:22 +0000
 +++ examples/CMakeLists.txt	2016-03-30 00:11:41 +0000
@@ -41,8 +41,6 @@
    xcursor.h
+ )
--SET_SOURCE_FILES_PROPERTIES(xcursor.c PROPERTIES COMPILE_FLAGS -D_GNU_SOURCE)
--
  target_link_libraries(eglapp
    mirclient
    ${EGL_LIBRARIES}
@@ -73,6 +71,12 @@
  target_link_libraries(mir_demo_client_target
    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
+ )
@@ -225,15 +229,6 @@
  mir_add_wrapped_executable(mir_demo_server_minimal server_minimal.cpp)
  target_link_libraries(mir_demo_server_minimal mirserver)
--mir_add_wrapped_executable(mir_demo_standalone_render_overlays
--    render_overlays.cpp
--)
--
--target_link_libraries(mir_demo_standalone_render_overlays
--    mirserver
--    mircommon
--)
--
  if (MIR_ENABLE_TESTS)
    add_executable(mir_symbol_test
        uses_non_client_symbol.cpp
@@ -255,7 +250,7 @@
      COMMAND /bin/sh -c "(objdump -T mir_symbol_test | grep *UND* | grep mir | grep -v MIR_CLIENT)"
+   )
--  # We use a slightly weaker version of the test with clang as that generates spurious NEEDED
++  # We can't use this test with clang as that generates spurious NEEDED
    if (NOT "${CMAKE_CXX_COMPILER}" MATCHES "clang")
      # To see reasons for failure:  ctest -V -R Clients-only-use-client-ABI
      mir_add_test(NAME Clients-only-use-client-ABI
@@ -267,17 +262,6 @@
        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin
        COMMAND /bin/sh -c "(objdump -p mir_symbol_test | grep NEEDED | grep libmir | grep -v libmirclient)"
+     )
--  else()
--    # To see reasons for failure:  ctest -V -R Clients-only-use-client-ABI
--    mir_add_test(NAME Clients-only-use-client-ABI
--      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin
--      COMMAND /bin/sh -c "!(nm -u mir_demo_client* | grep -v @@MIR_CLIENT | grep @@MIR_)"
--    )
--    # Again, test the testcase...
--    mir_add_test(NAME Client-using-ABI-from-mircommon-fails-check
--      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin
--      COMMAND /bin/sh -c "(nm -u mir_symbol_test | grep -v @@MIR_CLIENT | grep @@MIR_)"
--    )
    endif ()
  endif ()
 === modified file 'examples/animated_cursor_demo_client.c'
 --- examples/animated_cursor_demo_client.c	2016-01-29 08:18:22 +0000
 +++ examples/animated_cursor_demo_client.c	2016-03-30 00:11:41 +0000
@@ -16,12 +16,11 @@
   * Author: Robert Carr <robert.carr@canonical.com>
   */
--#define _GNU_SOURCE // for nanosleep
--
  #include "eglapp.h"
  #include "mir_toolkit/mir_client_library.h"
++#include <math.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
@@ -33,19 +32,38 @@
  void animate_cursor(MirBufferStream *stream)
+ {
--    static double alpha = 0.0;
--    char fill_color = 0xff * alpha;
--
++    // mir_pixel_format_argb_8888 as set below
++    int const bpp = 4;
++    uint32_t const background = 0x00000000;
++    uint32_t const foreground = 0xffffffff;
++
      MirGraphicsRegion region;
      mir_buffer_stream_get_graphics_region(stream, &region);
--    memset(region.vaddr, fill_color, region.stride*region.height);
++    for (int y = 0; y < region.height; ++y)
++    {
++        for (int x = 0; x < region.width; ++x)
++        {
++            uint32_t* pixel = (uint32_t*)
++                              (region.vaddr + y * region.stride + x * bpp);
++            *pixel = background;
++        }
++    }
++
++    static float theta = 0.0f;
++    theta += 0.000234567f;
++
++    char* origin = region.vaddr + (region.height/2)*region.stride;
++
++    for (int x = 0; x < region.width; ++x)
++    {
++        int const magnitude = region.height / 3;
++        int y = magnitude * sinf(theta + x * 2 * M_PI / region.width);
++        uint32_t* pixel = (uint32_t*)(origin + x*bpp + y*region.stride);
++        *pixel = foreground;
++    }
      mir_buffer_stream_swap_buffers_sync(stream);
--    alpha += 0.01;
--    if (alpha >= 1.0)
--        alpha = 0.0;
--
+ }
  MirBufferStream* make_cursor_stream(MirConnection *connection, MirSurface *surface)
@@ -76,13 +94,8 @@
      MirBufferStream* stream = make_cursor_stream(mir_eglapp_native_connection(),
          mir_eglapp_native_surface());
--    struct timespec onehundred_millis = {
--        0, 100*1000000
--    };
--
      while (mir_eglapp_running())
+     {
--        nanosleep(&onehundred_millis, &onehundred_millis);
          animate_cursor(stream);
+     }
 === added file 'examples/camera.c'
 --- examples/camera.c	1970-01-01 00:00:00 +0000
 +++ examples/camera.c	2016-03-30 00:11:41 +0000
@@ -0,0 +1,541 @@
++/*
++ * Copyright © 2015-2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Author: Daniel van Vugt <daniel.van.vugt@canonical.com>
++ */
++
++#include "eglapp.h"
++#include <assert.h>
++#include <stdio.h>
++#include <math.h>
++#include <fcntl.h>
++#include <GLES2/gl2.h>
++#include <mir_toolkit/mir_surface.h>
++#include <pthread.h>
++#include <stdlib.h>
++#include <signal.h>
++#include <sys/ioctl.h>
++#include <sys/mman.h>
++#include <linux/videodev2.h>
++#include <unistd.h>
++#include <string.h>
++#include <errno.h>
++#include <poll.h>
++
++typedef struct
++{
++    pthread_mutex_t mutex;
++    bool resized;
++} State;
++
++enum CameraPref
++{
++    camera_pref_defaults,
++    camera_pref_speed,
++    camera_pref_resolution
++};
++
++typedef struct
++{
++    void *start;
++    size_t length;
++} Buffer;
++
++typedef struct
++{
++    int fd;
++    struct v4l2_pix_format pix;
++    unsigned buffers;
++    Buffer buffer[];
++} Camera;
++
++static GLuint load_shader(const char *src, GLenum type)
++{
++    GLuint shader = glCreateShader(type);
++    if (shader)
++    {
++        GLint compiled;
++        glShaderSource(shader, 1, &src, NULL);
++        glCompileShader(shader);
++        glGetShaderiv(shader, GL_COMPILE_STATUS, &compiled);
++        if (!compiled)
++        {
++            GLchar log[1024];
++            glGetShaderInfoLog(shader, sizeof log - 1, NULL, log);
++            log[sizeof log - 1] = '\0';
++            printf("load_shader compile failed: %s\n", log);
++            glDeleteShader(shader);
++            shader = 0;
++        }
++    }
++    return shader;
++}
++
++static void on_event(MirSurface *surface, const MirEvent *event, void *context)
++{
++    (void)surface;
++    State *state = (State*)context;
++
++    // FIXME: We presently need to know that events come in on a different
++    //        thread to main (LP: #1194384). When that's resolved, simple
++    //        single-threaded apps like this won't need pthread.
++    pthread_mutex_lock(&state->mutex);
++
++    switch (mir_event_get_type(event))
++    {
++    case mir_event_type_input:
++        break;
++    case mir_event_type_resize:
++        state->resized = true;
++        break;
++    case mir_event_type_close_surface:
++        // TODO: eglapp.h needs a quit() function or different behaviour of
++        //       mir_eglapp_shutdown().
++        raise(SIGTERM);  // handled by eglapp
++        break;
++    default:
++        break;
++    }
++
++    pthread_mutex_unlock(&state->mutex);
++}
++
++static void fourcc_string(__u32 x, char str[5])
++{
++    str[0] = (char)(x & 0xff);
++    str[1] = (char)(x >> 8 & 0xff);
++    str[2] = (char)(x >> 16 & 0xff);
++    str[3] = (char)(x >> 24);
++    str[4] = '\0';
++}
++
++static void close_camera(Camera *cam)
++{
++    if (!cam) return;
++
++    for (unsigned b = 0; b < cam->buffers; ++b)
++        if (cam->buffer[b].start)
++            munmap(cam->buffer[b].start, cam->buffer[b].length);
++    if (cam->fd >= 0)
++        close(cam->fd);
++    free(cam);
++}
++
++static Camera *open_camera(const char *path, enum CameraPref pref,
++                           unsigned nbuffers)
++{
++    Camera *cam = calloc(1, sizeof(*cam) + nbuffers*sizeof(cam->buffer[0]));
++    if (cam == NULL)
++    {
++        perror("malloc");
++        goto fail;
++    }
++
++    printf("Opening device: %s\n", path);
++    cam->fd = open(path, O_RDWR);
++    if (cam->fd < 0)
++    {
++        perror("open");
++        goto fail;
++    }
++
++    struct v4l2_capability cap;
++    int ret = ioctl(cam->fd, VIDIOC_QUERYCAP, &cap);
++    if (ret == 0)
++    {
++        printf("Driver:    %s\n", cap.driver);
++        printf("Card:      %s\n", cap.card);
++        printf("Bus:       %s\n", cap.bus_info);
++        printf("Capture:   %s\n",
++            cap.capabilities & V4L2_CAP_VIDEO_CAPTURE ? "Yes" : "No");
++        printf("Streaming: %s\n",
++            cap.capabilities & V4L2_CAP_STREAMING ? "Yes" : "No");
++
++    }
++
++    const unsigned required = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
++    if (ret || (cap.capabilities & required) != required)
++    {
++        fprintf(stderr, "Can't get sufficient capabilities\n");
++        goto fail;
++    }
++
++    struct v4l2_format format;
++    memset(&format, 0, sizeof(format));
++    format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
++    struct v4l2_pix_format *pix = &format.fmt.pix;
++    // Driver will choose the best match
++    if (pref == camera_pref_speed)
++    {
++        pix->width = 1;
++        pix->height = 1;
++    }
++    else if (pref == camera_pref_resolution)
++    {
++        pix->width = 9999;
++        pix->height = 9999;
++    }
++    // But we really only need it to honour these:
++    pix->pixelformat = V4L2_PIX_FMT_YUYV;
++    pix->field = V4L2_FIELD_NONE;
++    // Just try, best effort. This may fail.
++    if (ioctl(cam->fd, VIDIOC_S_FMT, &format) &&
++        ioctl(cam->fd, VIDIOC_G_FMT, &format))
++    {
++        perror("VIDIOC_[SG]_FMT");
++        goto fail;
++    }
++    char str[5];
++    fourcc_string(pix->pixelformat, str);
++    printf("Pixel format: %ux%u fmt %s, stride %u\n",
++        (unsigned)pix->width, (unsigned)pix->height,
++        str, (unsigned)pix->bytesperline);
++    cam->pix = *pix;
++
++    // Always choose the highest frame rate. Although what you will get
++    // depends on the resolution vs speed set above.
++    struct v4l2_streamparm parm;
++    memset(&parm, 0, sizeof(parm));
++    parm.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
++    parm.parm.capture.timeperframe.numerator = 1;
++    parm.parm.capture.timeperframe.denominator = 1000;
++    if (ioctl(cam->fd, VIDIOC_S_PARM, &parm))
++    {
++        fprintf(stderr, "Setting frame rate is not supported.\n");
++    }
++    else
++    {
++        unsigned hz = parm.parm.capture.timeperframe.denominator /
++                      parm.parm.capture.timeperframe.numerator;
++        printf("Maximum frame rate requested: %u Hz (may be less)\n", hz);
++    }
++
++    struct v4l2_requestbuffers req =
++    {
++        nbuffers,
++        V4L2_BUF_TYPE_VIDEO_CAPTURE,
++        V4L2_MEMORY_MMAP,
++        {0,0}
++    };
++    if (-1 == ioctl(cam->fd, VIDIOC_REQBUFS, &req))
++    {
++        perror("VIDIOC_REQBUFS");
++        goto fail;
++    }
++
++    cam->buffers = req.count;
++
++    for (unsigned b = 0; b < req.count; ++b)
++    {
++        struct v4l2_buffer buf;
++        memset(&buf, 0, sizeof(buf));
++        buf.index = b;
++        buf.type = req.type;
++        if (-1 == ioctl(cam->fd, VIDIOC_QUERYBUF, &buf))
++        {
++            perror("VIDIOC_QUERYBUF");
++            goto fail;
++        }
++        cam->buffer[b].length = buf.length;
++        cam->buffer[b].start = mmap(NULL, buf.length,
++                                PROT_READ | PROT_WRITE,
++                                MAP_SHARED,
++                                cam->fd, buf.m.offset);
++
++        if (MAP_FAILED == cam->buffer[b].start)
++        {
++            perror("mmap");
++            goto fail;
++        }
++    }
++
++    for (unsigned b = 0; b < req.count; ++b)
++    {
++        struct v4l2_buffer buf;
++        memset(&buf, 0, sizeof(buf));
++        buf.index = b;
++        buf.type = req.type;
++        buf.memory = V4L2_MEMORY_MMAP;
++        if (-1 == ioctl(cam->fd, VIDIOC_QBUF, &buf))
++        {
++            perror("VIDIOC_QBUF");
++            goto fail;
++        }
++    }
++
++    int type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
++    if (-1 == ioctl(cam->fd, VIDIOC_STREAMON, &type))
++    {
++        perror("VIDIOC_STREAMON");
++        goto fail;
++    }
++
++    return cam;
++fail:
++    close_camera(cam);
++    return NULL;
++}
++
++static bool frame_ready(Camera *cam)
++{
++    struct pollfd pollfd = {cam->fd, POLLIN, 0};
++    return poll(&pollfd, 1, 0) == 1 && (pollfd.revents & POLLIN);
++}
++
++static const Buffer *acquire_frame(Camera *cam)
++{
++    struct v4l2_buffer frame;
++    memset(&frame, 0, sizeof(frame));
++    frame.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
++    frame.memory = V4L2_MEMORY_MMAP;
++    if (ioctl(cam->fd, VIDIOC_DQBUF, &frame))
++    {
++        perror("VIDIOC_DQBUF");
++        return NULL;
++    }
++    return cam->buffer + frame.index;
++}
++
++static void release_frame(Camera *cam, const Buffer *buf)
++{
++    struct v4l2_buffer frame;
++    memset(&frame, 0, sizeof(frame));
++    frame.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
++    frame.memory = V4L2_MEMORY_MMAP;
++    frame.index = buf - cam->buffer;
++    if (ioctl(cam->fd, VIDIOC_QBUF, &frame))
++        perror("VIDIOC_QBUF");
++}
++
++int main(int argc, char *argv[])
++{
++    const char vshadersrc[] =
++        "attribute vec2 position;\n"
++        "attribute vec2 texcoord;\n"
++        "uniform mat4 projection;\n"
++        "varying vec2 v_texcoord;\n"
++        "\n"
++        "void main()\n"
++        "{\n"
++        "    gl_Position = projection *\n"
++        "                  vec4(position, 0.0, 1.0);\n"
++        "    v_texcoord = texcoord;\n"
++        "}\n";
++
++    const char raw_fshadersrc[] =
++        "precision mediump float;\n"
++        "varying vec2 v_texcoord;\n"
++        "uniform sampler2D texture;\n"
++        "\n"
++        "void main()\n"
++        "{\n"
++        "    vec4 f = texture2D(texture, v_texcoord);\n"
++        "    gl_FragColor = vec4(f.rgb, 1.0);\n"
++        "}\n";
++
++    const char * const yuyv_greyscale_fshadersrc = raw_fshadersrc;
++
++    // This is the Android YUV to RGB calculation.
++    // TODO: Vary the shader to match the camera's reported colour space
++    const char yuyv_quickcolour_fshadersrc[] =
++        "precision mediump float;\n"
++        "varying vec2 v_texcoord;\n"
++        "uniform sampler2D texture;\n"
++        "\n"
++        "void main()\n"
++        "{\n"
++        "    vec4 f = texture2D(texture, v_texcoord);\n"
++        "    float y = (f.r + f.b) / 2.0;\n"  // Y unsigned (from two pixels)
++        "    float u = f.g - 0.5;\n"       // U signed (same for both pixels)
++        "    float v = f.a - 0.5;\n"       // V signed (same for both pixels)
++        "    float r = clamp(y + 1.370705*v, 0.0, 1.0);\n"
++        "    float g = clamp(y - 0.698001*v - 0.337633*u, 0.0, 1.0);\n"
++        "    float b = clamp(y + 1.732446*u, 0.0, 1.0);\n"
++        "    gl_FragColor = vec4(r, g, b, 1.0);\n"
++        "}\n";
++
++    // TODO: Selectable between high-res grey vs half-res colour?
++    const char * const fshadersrc = yuyv_quickcolour_fshadersrc;
++
++    Camera *cam = open_camera("/dev/video0", camera_pref_resolution, 1);
++    if (!cam)
++    {
++        fprintf(stderr, "Failed to set up camera device\n");
++        return 0;
++    }
++
++    unsigned int win_width = cam->pix.width;
++    unsigned int win_height = cam->pix.height;
++    if (!mir_eglapp_init(argc, argv, &win_width, &win_height))
++        return 1;
++
++    GLuint vshader = load_shader(vshadersrc, GL_VERTEX_SHADER);
++    assert(vshader);
++    GLuint fshader = load_shader(fshadersrc, GL_FRAGMENT_SHADER);
++    assert(fshader);
++    GLuint prog = glCreateProgram();
++    assert(prog);
++    glAttachShader(prog, vshader);
++    glAttachShader(prog, fshader);
++    glLinkProgram(prog);
++
++    GLint linked;
++    glGetProgramiv(prog, GL_LINK_STATUS, &linked);
++    if (!linked)
++    {
++        GLchar log[1024];
++        glGetProgramInfoLog(prog, sizeof log - 1, NULL, log);
++        log[sizeof log - 1] = '\0';
++        printf("Link failed: %s\n", log);
++        return 2;
++    }
++
++    glUseProgram(prog);
++
++    const GLfloat camw = cam->pix.width, camh = cam->pix.height;
++    const GLfloat box[] =
++    { // position   texcoord
++        0.0f, camh, 0.0f, 1.0f,
++        camw, camh, 1.0f, 1.0f,
++        camw, 0.0f, 1.0f, 0.0f,
++        0.0f, 0.0f, 0.0f, 0.0f,
++    };
++    GLint position = glGetAttribLocation(prog, "position");
++    GLint texcoord = glGetAttribLocation(prog, "texcoord");
++    glVertexAttribPointer(position, 2, GL_FLOAT, GL_FALSE, 4*sizeof(GLfloat),
++                          box);
++    glVertexAttribPointer(texcoord, 2, GL_FLOAT, GL_FALSE, 4*sizeof(GLfloat),
++                          box+2);
++    glEnableVertexAttribArray(position);
++    glEnableVertexAttribArray(texcoord);
++
++    GLint projection = glGetUniformLocation(prog, "projection");
++
++    GLuint tex;
++    glGenTextures(1, &tex);
++    glBindTexture(GL_TEXTURE_2D, tex);
++    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
++    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
++    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
++    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
++
++    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
++    glViewport(0, 0, win_width, win_height);
++
++    State state =
++    {
++        PTHREAD_MUTEX_INITIALIZER,
++        true
++    };
++    MirSurface *surface = mir_eglapp_native_surface();
++    mir_surface_set_event_handler(surface, on_event, &state);
++
++    bool first_frame = true;
++    while (mir_eglapp_running())
++    {
++        bool wait_for_new_frame = true;
++        pthread_mutex_lock(&state.mutex);
++
++        if (state.resized)
++        {
++            // mir_eglapp_swap_buffers updates the viewport for us...
++            GLint viewport[4];
++            glGetIntegerv(GL_VIEWPORT, viewport);
++            GLfloat scalex = 2.0f / viewport[2];
++            GLfloat scaley = -2.0f / viewport[3];
++
++            // Expand image to fit:
++            GLfloat scalew = (GLfloat)viewport[2] / cam->pix.width;
++            GLfloat scaleh = (GLfloat)viewport[3] / cam->pix.height;
++
++            GLfloat scale;
++            GLfloat offsetx = -1.0f, offsety = 1.0f;
++            if (scalew <= scaleh)
++            {
++                scale = scalew;
++                offsety -= (GLfloat)(viewport[3] - scale*cam->pix.height) /
++                           viewport[3];
++            }
++            else
++            {
++                scale = scaleh;
++                offsetx += (GLfloat)(viewport[2] - scale*cam->pix.width) /
++                           viewport[2];
++            }
++
++            scalex *= scale;
++            scaley *= scale;
++
++            // TRANSPOSED projection matrix to convert from the Mir input
++            // rectangle {{0,0},{w,h}} to GL screen rectangle {{-1,1},{2,2}}.
++            GLfloat matrix[16] = {scalex, 0.0f,   0.0f, 0.0f,
++                                  0.0f,   scaley, 0.0f, 0.0f,
++                                  0.0f,   0.0f,   1.0f, 0.0f,
++                                  offsetx,offsety,0.0f, 1.0f};
++
++            // Note GL_FALSE: GLES does not support the transpose option
++            glUniformMatrix4fv(projection, 1, GL_FALSE, matrix);
++            state.resized = false;
++            wait_for_new_frame = first_frame;
++            first_frame = false;
++        }
++
++        if (wait_for_new_frame || frame_ready(cam))
++        {
++            const Buffer *buf = acquire_frame(cam);
++            if (cam->pix.pixelformat == V4L2_PIX_FMT_YUYV)
++            {
++                if (fshadersrc == yuyv_greyscale_fshadersrc)
++                {
++                    // Greyscale, full resolution:
++                    glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE_ALPHA,
++                                 cam->pix.width, cam->pix.height, 0,
++                                 GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE,
++                                 buf->start);
++                }
++                else if (fshadersrc == yuyv_quickcolour_fshadersrc)
++                {
++                    // Colour, half resolution:
++                    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
++                                 cam->pix.width/2, cam->pix.height, 0,
++                                 GL_RGBA, GL_UNSIGNED_BYTE,
++                                 buf->start);
++                }
++                // TODO: Colour, full resolution. But it will be slow :(
++            }
++            else
++            {
++                char str[5];
++                fourcc_string(cam->pix.pixelformat, str);
++                fprintf(stderr, "FIXME: Unsupported camera pixel format 0x%08lx: %s\n",
++                        (long)cam->pix.pixelformat, str);
++            }
++            release_frame(cam, buf);
++        }
++
++        glClear(GL_COLOR_BUFFER_BIT);
++        glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
++
++        pthread_mutex_unlock(&state.mutex);
++
++        mir_eglapp_swap_buffers();
++    }
++
++    mir_surface_set_event_handler(surface, NULL, NULL);
++    mir_eglapp_shutdown();
++    close_camera(cam);
++
++    return 0;
++}
 === modified file 'examples/client_helpers.h'
 --- examples/client_helpers.h	2016-01-29 08:18:22 +0000
 +++ examples/client_helpers.h	2016-03-30 00:11:41 +0000
@@ -16,8 +16,8 @@
   * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
   */
--#ifndef MIR_EXAMLPES_CLIENT_HELPERS_H_
--#define MIR_EXAMLPES_CLIENT_HELPERS_H_
++#ifndef MIR_EXAMPLES_CLIENT_HELPERS_H_
++#define MIR_EXAMPLES_CLIENT_HELPERS_H_
  #include "mir_toolkit/mir_client_library.h"
  #include <EGL/egl.h>
 === modified file 'examples/cursors_demo_client.c'
 --- examples/cursors_demo_client.c	2016-01-29 08:18:22 +0000
 +++ examples/cursors_demo_client.c	2016-03-30 00:11:41 +0000
@@ -16,6 +16,8 @@
   * Author: Robert Carr <robert.carr@canonical.com>
   */
++#define _BSD_SOURCE /* for usleep() */
++
  #include "mir_toolkit/mir_client_library.h"
  #include "eglapp.h"
@@ -26,7 +28,6 @@
  void configure_cursor(MirSurface *surface, unsigned int cursor_index)
+ {
      char const *const cursors[] = {
--        mir_arrow_cursor_name,
          mir_busy_cursor_name,
          mir_caret_cursor_name,
          mir_pointing_hand_cursor_name,
@@ -67,7 +68,7 @@
      while (mir_eglapp_running())
+     {
          configure_cursor(mir_eglapp_native_surface(), cursor_index++);
--        sleep(1);
++        usleep(100000);
+     }
      mir_eglapp_shutdown();
 === modified file 'examples/flicker.c'
 --- examples/flicker.c	2016-01-29 08:18:22 +0000
 +++ examples/flicker.c	2016-03-30 00:11:41 +0000
@@ -90,6 +90,18 @@
      };
+ }
++static volatile sig_atomic_t running = 1;
++
++static void shutdown(int signum)
++{
++    if (running)
++    {
++        running = 0;
++        printf("Signal %d received. Good night.\n", signum);
++    }
++}
++
++
  int main(int argc, char* argv[])
+ {
      MirConnection *connection = 0;
@@ -164,7 +176,11 @@
      int i=0;
      MirBufferStream *bs = mir_surface_get_buffer_stream(surface);
--    while (1)
++    signal(SIGINT, shutdown);
++    signal(SIGTERM, shutdown);
++    signal(SIGHUP, shutdown);
++
++    while (running)
+     {
          mir_buffer_stream_get_graphics_region(bs, &graphics_region);
          i++;
 === modified file 'examples/mir_demo_server_loader.cpp'
 --- examples/mir_demo_server_loader.cpp	2016-01-29 08:18:22 +0000
 +++ examples/mir_demo_server_loader.cpp	2016-03-30 00:11:41 +0000
@@ -19,11 +19,25 @@
  #include <dlfcn.h>
  #include <stdexcept>
  #include <iostream>
++#include <pthread.h>
  namespace
+ {
  const char* const library = "libmir_demo_server_loadable.so";
  const char* const entry = "main";
++
++// Work around gold (or gcc/libstdc++-4.9 bug, it's not yet clear) bug
++// https://sourceware.org/bugzilla/show_bug.cgi?id=16417 by ensuring the
++// executable links with libpthread.
++struct GoldBug16417Workaround
++{
++    GoldBug16417Workaround()
++    {
++        pthread_attr_t attr;
++        pthread_attr_init(&attr);
++        pthread_attr_destroy(&attr);
++    }
++} gold_bug_16417_workaround;
+ }
  int main(int argc, char const* argv[])
 === modified file 'examples/render_surfaces.cpp'
 --- examples/render_surfaces.cpp	2016-01-29 08:18:22 +0000
 +++ examples/render_surfaces.cpp	2016-03-30 00:11:41 +0000
@@ -317,6 +317,10 @@
          set_command_line(argc, argv);
          setenv("MIR_SERVER_NO_FILE", "", 1);
++        // If there's a server available, try connecting to it
++        if (auto const socket = getenv("MIR_SOCKET"))
++            setenv("MIR_SERVER_HOST_SOCKET", socket, 0);
++
          // Unless the compositor starts before we create the surfaces it won't respond to
          // the change notification that causes.
          callback_when_started(*this, [this] { create_surfaces(); });
 === modified file 'examples/render_to_fb.cpp'
 --- examples/render_to_fb.cpp	2016-01-29 08:18:22 +0000
 +++ examples/render_to_fb.cpp	2016-03-30 00:11:41 +0000
@@ -86,6 +86,13 @@
  int main(int argc, char const** argv)
  try
+ {
++    // We don't want to act as a server by providing an endpoint
++    setenv("MIR_SERVER_NO_FILE", "", 1);
++
++    // If there's a server available, try connecting to it
++    if (auto const socket = getenv("MIR_SOCKET"))
++        setenv("MIR_SERVER_HOST_SOCKET", socket, 0);
++
      mir::Server server;
      server.set_command_line(argc, argv);
      server.apply_settings();
 === modified file 'examples/scroll.cpp'
 --- examples/scroll.cpp	2016-01-29 08:18:22 +0000
 +++ examples/scroll.cpp	2016-03-30 00:11:41 +0000
@@ -122,6 +122,15 @@
      puts("Surface released");
+ }
++static void shutdown(int signum)
++{
++    // Exiting without closing surfaces and connection is impolite but should
++    // not kill the server. It actually did kill the server prior to -r 3385.
++    // Running this example in CI acts as a smoke test for that failure.
++    printf("Signal %d received. Good night.\n", signum);
++    exit(EXIT_SUCCESS);
++}
++
  int main(int argc, char* argv[])
+ {
      MirConnection *connection = 0;
@@ -152,6 +161,10 @@
      puts("Starting");
++    signal(SIGINT, shutdown);
++    signal(SIGTERM, shutdown);
++    signal(SIGHUP, shutdown);
++
      connection = mir_connect_sync(socket_file, __PRETTY_FUNCTION__);
      assert(connection != NULL);
      assert(mir_connection_is_valid(connection));
 === modified file 'examples/server_example.cpp'
 --- examples/server_example.cpp	2016-01-29 08:18:22 +0000
 +++ examples/server_example.cpp	2016-03-30 00:11:41 +0000
@@ -29,6 +29,7 @@
  #include "mir/server.h"
  #include "mir/main_loop.h"
++#include "mir/fd.h"
  #include "mir/report_exception.h"
  #include "mir/options/option.h"
@@ -43,6 +44,16 @@
  namespace
+ {
++auto connection(int fd) -> std::string
++{
++    char connect_string[64] = {0};
++    // We can't have both the server and the client owning the same fd, since
++    // that will result in a double-close(). We give the client a duplicate which
++    // the client can safely own (and should close when done).
++    sprintf(connect_string, "fd://%d", dup(fd));
++    return connect_string;
++}
++
  void add_launcher_option_to(mir::Server& server)
+ {
      static const char* const launch_child_opt = "launch-client";
@@ -54,8 +65,19 @@
          const auto options = server.get_options();
          if (options->is_set(launch_child_opt))
+         {
--            auto ignore = std::system((options->get<std::string>(launch_child_opt) + "&").c_str());
--            (void)(ignore);
++            auto const value = options->get<std::string>(launch_child_opt);
++
++            for (auto i = begin(value); i != end(value); )
++            {
++                auto const j = find(i, end(value), '&');
++
++                auto const cmd = "MIR_SOCKET=" + connection(server.open_client_socket()) + " " + std::string{i, j} + "&";
++
++                auto ignore = std::system(cmd.c_str());
++                (void)(ignore);
++
++                if ((i = j) != end(value)) ++i;
++            }
+         }
      });
+ }
 === modified file 'examples/server_example_test_client.cpp'
 --- examples/server_example_test_client.cpp	2016-01-29 08:18:22 +0000
 +++ examples/server_example_test_client.cpp	2016-03-30 00:11:41 +0000
@@ -17,9 +17,11 @@
   */
  #include "server_example_test_client.h"
++#include "mir/fd.h"
  #include "mir/server.h"
  #include "mir/main_loop.h"
  #include "mir/logging/logger.h"
++#include "mir/log.h"
  #include "mir/options/option.h"
  #include <csignal>
@@ -100,13 +102,24 @@
+         {
              context.test_failed = true;
++            auto const client_fd = server.open_client_socket();
++
              auto const pid = fork();
              if (pid == 0)
+             {
++                char connect_string[64] = {0};
++                // We can't have both the server and the client owning the same fd, since
++                // that will result in a double-close(). We give the client a duplicate which
++                // the client can safely own (and should close when done).
++                sprintf(connect_string, "fd://%d", dup(client_fd));
++
++                setenv("MIR_SOCKET", connect_string, 1);
++
                  auto const client = options->get<std::string>(test_client_opt);
--                execl(client.c_str(), client.c_str(), static_cast<char const*>(nullptr));
--                ml::log(ml::Severity::critical, "Failed to execute client", component);
++                execlp(client.c_str(), client.c_str(), static_cast<char const*>(nullptr));
++                log(logging::Severity::critical, "mir::examples",
++                    "Failed to execute client (%s) error: %s", client.c_str(), strerror(errno));
                  abort(); // If execl() returns then something is badly wrong
+             }
              else if (pid > 0)
 === modified file 'examples/server_example_window_management.cpp'
 --- examples/server_example_window_management.cpp	2016-01-29 08:18:22 +0000
 +++ examples/server_example_window_management.cpp	2016-03-30 00:11:41 +0000
@@ -58,14 +58,14 @@
      FullscreenWindowManagerPolicy(me::WindowManagerTools* const /*tools*/, std::shared_ptr<msh::DisplayLayout> const& display_layout) :
          display_layout{display_layout} {}
--    void handle_session_info_updated(SessionInfoMap& /*session_info*/, Rectangles const& /*displays*/) {}
++    void handle_session_info_updated(SessionInfoMap& /*session_info*/, Rectangles const& /*displays*/) override {}
--    void handle_displays_updated(SessionInfoMap& /*session_info*/, Rectangles const& /*displays*/) {}
++    void handle_displays_updated(SessionInfoMap& /*session_info*/, Rectangles const& /*displays*/) override {}
      auto handle_place_new_surface(
          std::shared_ptr<ms::Session> const& /*session*/,
          ms::SurfaceCreationParameters const& request_parameters)
--    -> ms::SurfaceCreationParameters
++    -> ms::SurfaceCreationParameters override
+     {
          auto placed_parameters = request_parameters;
@@ -78,29 +78,29 @@
      void handle_modify_surface(
          std::shared_ptr<ms::Session> const& /*session*/,
          std::shared_ptr<ms::Surface> const& /*surface*/,
--        msh::SurfaceSpecification const& /*modifications*/)
--    {
--    }
--
--    void handle_new_surface(std::shared_ptr<ms::Session> const& /*session*/, std::shared_ptr<ms::Surface> const& /*surface*/)
--    {
--    }
--
--    void handle_delete_surface(std::shared_ptr<ms::Session> const& session, std::weak_ptr<ms::Surface> const& surface)
++        msh::SurfaceSpecification const& /*modifications*/) override
++    {
++    }
++
++    void handle_new_surface(std::shared_ptr<ms::Session> const& /*session*/, std::shared_ptr<ms::Surface> const& /*surface*/) override
++    {
++    }
++
++    void handle_delete_surface(std::shared_ptr<ms::Session> const& session, std::weak_ptr<ms::Surface> const& surface) override
          { session->destroy_surface(surface); }
--    int handle_set_state(std::shared_ptr<ms::Surface> const& /*surface*/, MirSurfaceState value)
++    int handle_set_state(std::shared_ptr<ms::Surface> const& /*surface*/, MirSurfaceState value) override
          { return value; }
--    bool handle_keyboard_event(MirKeyboardEvent const* /*event*/) { return false; }
--
--    bool handle_touch_event(MirTouchEvent const* /*event*/) { return false; }
--
--    bool handle_pointer_event(MirPointerEvent const* /*event*/) { return false; }
++    bool handle_keyboard_event(MirKeyboardEvent const* /*event*/) override { return false; }
++
++    bool handle_touch_event(MirTouchEvent const* /*event*/) override { return false; }
++
++    bool handle_pointer_event(MirPointerEvent const* /*event*/) override { return false; }
      void handle_raise_surface(
          std::shared_ptr<ms::Session> const& /*session*/,
--        std::shared_ptr<ms::Surface> const& /*surface*/)
++        std::shared_ptr<ms::Surface> const& /*surface*/) override
+     {
+     }
@@ -108,7 +108,7 @@
          std::shared_ptr<ms::Session> const&,
          std::shared_ptr<ms::Surface> const&,
          SurfaceInfoMap&,
--        std::function<mf::SurfaceId(std::shared_ptr<ms::Session> const&, ms::SurfaceCreationParameters const&)> const&)
++        std::function<mf::SurfaceId(std::shared_ptr<ms::Session> const&, ms::SurfaceCreationParameters const&)> const&) override
+     {
+     }
  private:
 === modified file 'examples/xcursor_loader.cpp'
 --- examples/xcursor_loader.cpp	2016-01-29 08:18:22 +0000
 +++ examples/xcursor_loader.cpp	2016-03-30 00:11:41 +0000
@@ -27,7 +27,7 @@
  #include <mir_toolkit/cursors.h>
--// Unforunately this can not be compiled as C++...so we can not namespace
++// Unfortunately this can not be compiled as C++...so we can not namespace
  // these symbols. In order to differentiate from internal symbols
  //  we refer to them via their _ prefixed version, i.e. _XcursorImage
  extern "C"
 === modified file 'include/client/mir_toolkit/client_types.h'
 --- include/client/mir_toolkit/client_types.h	2016-01-29 08:18:22 +0000
 +++ include/client/mir_toolkit/client_types.h	2016-03-30 00:11:41 +0000
@@ -45,6 +45,15 @@
  typedef struct MirBufferStream MirBufferStream;
  typedef struct MirPersistentId MirPersistentId;
  typedef struct MirBlob MirBlob;
++typedef struct MirDisplayConfig MirDisplayConfig;
++
++/**
++ * Descriptor for an output connection.
++ *
++ *  Each MirOutput corresponds to a video output. This may be a physical connection on the system,
++ *  like HDMI or DisplayPort, or may be a virtual output such as a remote display or screencast display.
++ */
++typedef struct MirOutput MirOutput;
  /**
   * Returned by asynchronous functions. Must not be free'd by
@@ -272,6 +281,32 @@
      mir_display_output_type_edp
  } MirDisplayOutputType;
++typedef enum MirOutputType
++{
++    mir_output_type_unknown,
++    mir_output_type_vga,
++    mir_output_type_dvii,
++    mir_output_type_dvid,
++    mir_output_type_dvia,
++    mir_output_type_composite,
++    mir_output_type_svideo,
++    mir_output_type_lvds,
++    mir_output_type_component,
++    mir_output_type_ninepindin,
++    mir_output_type_displayport,
++    mir_output_type_hdmia,
++    mir_output_type_hdmib,
++    mir_output_type_tv,
++    mir_output_type_edp
++} MirOutputType;
++
++typedef enum MirOutputConnectionState
++{
++    mir_output_connection_state_disconnected = 0,
++    mir_output_connection_state_connected,
++    mir_output_connection_state_unknown
++} MirOutputConnectionState;
++
  typedef struct MirDisplayMode
+ {
      uint32_t vertical_resolution;
@@ -335,6 +370,9 @@
      unsigned int height;
  } MirRectangle;
++typedef struct MirInputConfig MirInputConfig;
++typedef struct MirInputDevice MirInputDevice;
++
  /**
   * MirScreencastParameters is the structure of required information that
   * you must provide to Mir in order to create a MirScreencast.
@@ -395,6 +433,16 @@
  typedef void (*mir_platform_operation_callback)(
      MirConnection* connection, MirPlatformMessage* reply, void* context);
++/**
++ * Callback called when a change of input devices has occurred
++ *   \param [in] connection   The connection associated with the input device
++ *                            change
++ *   \param [in,out] context  The context provided by client
++ */
++
++typedef void (*mir_input_config_callback)(
++    MirConnection* connection, void* context);
++
  #ifdef __cplusplus
+ }
  /**@}*/
 === modified file 'include/client/mir_toolkit/events/event.h'
 --- include/client/mir_toolkit/events/event.h	2016-01-29 08:18:22 +0000
 +++ include/client/mir_toolkit/events/event.h	2016-03-30 00:11:41 +0000
@@ -84,7 +84,7 @@
  extern "C" {
  #endif
--/*
++/**
   * Retrieves the type of a MirEvent. Now preferred over direct access to ev->type.
   * In particular ev->type will never be mir_event_type_input and mir_event_get_type
   * is the only way to ensure mir_event_get_input_event will succeed.
@@ -94,7 +94,7 @@
   */
  MirEventType mir_event_get_type(MirEvent const* ev);
--/*
++/**
   * Retrieve the MirInputEvent associated with a MirEvent of
   * type mir_event_type_input. See <mir_toolkit/events/input/input_event.h>
   * for accessors.
@@ -104,7 +104,7 @@
   */
  MirInputEvent const* mir_event_get_input_event(MirEvent const* ev);
--/*
++/**
   * Retrieve the MirSurfaceEvent associated with a MirEvent of
   * type mir_event_type_surface. See <mir_toolkit/events/surface_event.h>
   * for accessors.
@@ -114,7 +114,7 @@
   */
  MirSurfaceEvent const* mir_event_get_surface_event(MirEvent const* ev);
--/*
++/**
   * Retrieve the MirResizeEvent associated with a MirEvent of
   * type mir_event_type_resize. See <mir_toolkits/events/resize_event.h>
   * for accessors.
@@ -124,7 +124,7 @@
   */
  MirResizeEvent const* mir_event_get_resize_event(MirEvent const* ev);
--/*
++/**
   * Retrieve the MirPromptSessionEvent associated with a MirEvent of
   * type mir_event_type_prompt_session_state_change. See <mir_toolkits/events/prompt_session_event.h>
   * for accessors.
@@ -134,7 +134,7 @@
   */
  MirPromptSessionEvent const* mir_event_get_prompt_session_event(MirEvent const* ev);
--/*
++/**
   * Retrieve the MirOrientationEvent associated with a MirEvent of
   * type mir_event_type_orientation. See <mir_toolkit/events/orientation_event.h>
   * for accessors.
@@ -144,7 +144,7 @@
   */
  MirOrientationEvent const* mir_event_get_orientation_event(MirEvent const* ev);
--/*
++/**
   * Retrieve the MirCloseSurfaceEvent associated with a MirEvent of
   * type mir_event_type_close_surface. The event is a request to close
   * the surface it is delivered to and has no accessors.
@@ -160,7 +160,7 @@
  __attribute__ ((deprecated))
  MirCloseSurfaceEvent const* mir_event_get_close_surface_event(MirEvent const* ev);
--/*
++/**
   * Retrieve the MirKeymapEvent associated with a MirEvent of
   * type mir_event_type_keymap. The event signifies that the keymap
   * applied for the relevant surface has changed.
@@ -170,7 +170,7 @@
   */
  MirKeymapEvent const* mir_event_get_keymap_event(MirEvent const* ev);
--/*
++/**
   * Retrieve the MirInputConfiguration associated with a MirEvent of
   * type mir_event_type_input_configuration. The event signifies that the
   * input device configuration has changed.
@@ -213,7 +213,7 @@
+  *
   */
--/*
++/**
   * Reference this MirEvent and return a pointer to the
   * newly referenced instance
+  *
@@ -222,7 +222,7 @@
   */
  MirEvent const* mir_event_ref(MirEvent const* ev) __attribute__((warn_unused_result));
--/*
++/**
   * Release a reference to a MirEvent.
+  *
   * \param[in] The event to un-reference
 === modified file 'include/client/mir_toolkit/events/input/input_event.h'
 --- include/client/mir_toolkit/events/input/input_event.h	2016-01-29 08:18:22 +0000
 +++ include/client/mir_toolkit/events/input/input_event.h	2016-03-30 00:11:41 +0000
@@ -82,7 +82,7 @@
  extern "C" {
  #endif
--/*
++/**
   * Retrieves the device id responsible for generating an input event.
+  *
   * \param [in] event The input event
@@ -90,23 +90,23 @@
   */
  MirInputDeviceId mir_input_event_get_device_id(MirInputEvent const* ev);
--/*
-- * Retrieve the time at which an input event occured.
++/**
++ * Retrieve the time at which an input event occurred.
+  *
   * \param [in] event The input event
   * \return           A timestamp in nanoseconds-since-epoch
   */
  int64_t mir_input_event_get_event_time(MirInputEvent const* ev);
--/*
-- * Retrieve the type of an input event (e.g. key, touch...)
++/**
++ * Retrieve the type of an input event. E.g. key, touch...
+  *
   * \param [in] event The input event
   * \return           The input event type
   */
  MirInputEventType mir_input_event_get_type(MirInputEvent const* ev);
--/*
++/**
   * Retrieve the MirKeyboardEvent associated with a given input event.
+  *
   * \param[in] event The input event
@@ -115,7 +115,7 @@
   */
  MirKeyboardEvent const* mir_input_event_get_keyboard_event(MirInputEvent const* ev);
--/*
++/**
   * Retrieve the MirTouchEvent associated with a given input event.
+  *
   * \param[in] event The input event
@@ -124,7 +124,7 @@
   */
  MirTouchEvent const* mir_input_event_get_touch_event(MirInputEvent const* ev);
--/*
++/**
   * Retrieve the MirPointerEvent associated with a given input event.
+  *
   * \param[in] event The input event
@@ -133,14 +133,16 @@
   */
  MirPointerEvent const* mir_input_event_get_pointer_event(MirInputEvent const* ev);
--/* Query if an input event contains a cookie
++/**
++ * Query if an input event contains a cookie
+  *
   * \params[in] ev The input event
   * \return        True if the input event contains a cookie
   */
  bool mir_input_event_has_cookie(MirInputEvent const* ev);
--/* Returns the cookie associated with an input event.
++/**
++ * Returns the cookie associated with an input event.
+  *
   * \pre The input event must have a MirCookie
   * \params[in] ev An input event
 === modified file 'include/client/mir_toolkit/events/input/keyboard_event.h'
 --- include/client/mir_toolkit/events/input/keyboard_event.h	2016-01-29 08:18:22 +0000
 +++ include/client/mir_toolkit/events/input/keyboard_event.h	2016-03-30 00:11:41 +0000
@@ -87,7 +87,7 @@
   */
  MirInputEventModifiers mir_keyboard_event_modifiers(MirKeyboardEvent const* event);
--/*
++/**
   * Retrieve the corresponding input event.
+  *
   * \param [in] event The keyboard event
 === modified file 'include/client/mir_toolkit/events/input/pointer_event.h'
 --- include/client/mir_toolkit/events/input/pointer_event.h	2016-02-24 13:04:14 +0000
 +++ include/client/mir_toolkit/events/input/pointer_event.h	2016-03-30 00:11:41 +0000
@@ -130,7 +130,7 @@
  float mir_pointer_event_axis_value(MirPointerEvent const* event,
      MirPointerAxis axis);
--/*
++/**
   * Retrieve the corresponding input event.
+  *
   * \param [in] event The pointer event
 === modified file 'include/client/mir_toolkit/events/input/touch_event.h'
 --- include/client/mir_toolkit/events/input/touch_event.h	2016-01-29 08:18:22 +0000
 +++ include/client/mir_toolkit/events/input/touch_event.h	2016-03-30 00:11:41 +0000
@@ -141,7 +141,7 @@
  float mir_touch_event_axis_value(MirTouchEvent const* event,
      size_t touch_index, MirTouchAxis axis);
--/*
++/**
   * Retrieve the corresponding input event.
+  *
   * \param [in] event The touch event
 === modified file 'include/client/mir_toolkit/events/input_configuration_event.h'
 --- include/client/mir_toolkit/events/input_configuration_event.h	2015-05-19 21:34:34 +0000
 +++ include/client/mir_toolkit/events/input_configuration_event.h	2016-03-30 00:11:41 +0000
@@ -46,7 +46,7 @@
      mir_input_configuration_action_device_reset
  } MirInputConfigurationAction;
--/*
++/**
   * Retrieve the input configuration action which occurred.
+  *
   * \param[in] ev The input configuration event
@@ -54,7 +54,7 @@
   */
  MirInputConfigurationAction mir_input_configuration_event_get_action(MirInputConfigurationEvent const* ev);
--/*
++/**
   * Retreive the time associated with a MirInputConfiguration event
   * \param[in] ev The input configuration event
@@ -62,7 +62,7 @@
   */
  int64_t mir_input_configuration_event_get_time(MirInputConfigurationEvent const* ev);
--/*
++/**
   * Retreive the device id associated with a MirInputConfiguration event
   * \param[in] ev The input configuration event
 === modified file 'include/client/mir_toolkit/events/keymap_event.h'
 --- include/client/mir_toolkit/events/keymap_event.h	2016-01-22 17:12:31 +0000
 +++ include/client/mir_toolkit/events/keymap_event.h	2016-03-30 00:11:41 +0000
@@ -31,7 +31,7 @@
  extern "C" {
  #endif
--/*
++/**
   * Retrieve the new keymap reported by this MirKeymapEvent
+  *
   * \deprecated keymap credentials are no longer available use
@@ -44,7 +44,7 @@
                                  struct xkb_rule_names* names)
      __attribute__ ((deprecated));
--/*
++/**
   * Retrieve the new keymap reported by this MirKeymapEvent
+  *
   * The keymap buffer is only valid while the MirKeymapEvent is valid.
@@ -56,7 +56,7 @@
  void mir_keymap_event_get_keymap_buffer(MirKeymapEvent const* ev,
                                          char const** buffer, size_t *length);
--/*
++/**
   * Retrieve the device id the keymap reported by this MirKeymapEvent applies to
+  *
   * \param[in] ev The keymap event
 === modified file 'include/client/mir_toolkit/events/orientation_event.h'
 --- include/client/mir_toolkit/events/orientation_event.h	2014-12-09 00:43:43 +0000
 +++ include/client/mir_toolkit/events/orientation_event.h	2016-03-30 00:11:41 +0000
@@ -29,7 +29,7 @@
  extern "C" {
  #endif
--/*
++/**
   * Retrieve the new orientation reported by this MirOrientationEvent
+  *
   * \param[in] ev The orientation event
 === modified file 'include/client/mir_toolkit/events/prompt_session_event.h'
 --- include/client/mir_toolkit/events/prompt_session_event.h	2014-12-11 17:49:31 +0000
 +++ include/client/mir_toolkit/events/prompt_session_event.h	2016-03-30 00:11:41 +0000
@@ -29,7 +29,7 @@
  extern "C" {
  #endif
--/*
++/**
   * Retrieve the new prompt session state reported by a given MirPromptSessionEvent
+  *
   * \param [in] event The prompt session event
 === modified file 'include/client/mir_toolkit/events/resize_event.h'
 --- include/client/mir_toolkit/events/resize_event.h	2014-12-11 17:49:31 +0000
 +++ include/client/mir_toolkit/events/resize_event.h	2016-03-30 00:11:41 +0000
@@ -29,7 +29,7 @@
  extern "C" {
  #endif
--/*
++/**
   * Retrieve the new width reported by a given MirResizeEvent
+  *
   * \param[in] ev The resize event
@@ -37,7 +37,7 @@
   */
  int mir_resize_event_get_width(MirResizeEvent const* ev);
--/*
++/**
   * Retrieve the new height reported by a given MirResizeEvent
+  *
   * \param[in] ev The resize event
 === modified file 'include/client/mir_toolkit/events/surface_event.h'
 --- include/client/mir_toolkit/events/surface_event.h	2014-12-09 00:43:43 +0000
 +++ include/client/mir_toolkit/events/surface_event.h	2016-03-30 00:11:41 +0000
@@ -29,7 +29,7 @@
  extern "C" {
  #endif
--/*
++/**
   * Retrieve the attribute index configured with a given MirSurfaceEvent
+  *
   * \param [in] Event The event
@@ -37,7 +37,7 @@
   */
  MirSurfaceAttrib mir_surface_event_get_attribute(MirSurfaceEvent const* ev);
--/*
++/**
   * Retrieve the new value of the associated attribute for a given MirSurfaceEvent
+  *
   * \param [in] Event The event
 === modified file 'include/client/mir_toolkit/mir_client_library.h'
 --- include/client/mir_toolkit/mir_client_library.h	2016-01-22 05:26:25 +0000
 +++ include/client/mir_toolkit/mir_client_library.h	2016-03-30 00:11:41 +0000
@@ -26,5 +26,7 @@
  #include <mir_toolkit/mir_platform_message.h>
  #include <mir_toolkit/cursors.h>
  #include <mir_toolkit/mir_cookie.h>
++#include <mir_toolkit/mir_display_configuration.h>
++#include <mir_toolkit/mir_input_device.h>
  #endif /* MIR_CLIENT_LIBRARY_H */
 === modified file 'include/client/mir_toolkit/mir_connection.h'
 --- include/client/mir_toolkit/mir_connection.h	2016-01-29 08:18:22 +0000
 +++ include/client/mir_toolkit/mir_connection.h	2016-03-30 00:11:41 +0000
@@ -145,6 +145,9 @@
  /**
   * Query the display
++ *
++ *   \deprecated  Use mir_connection_create_display_configuration() instead.
++ *
   *   \warning return value must be destroyed via mir_display_config_destroy()
   *   \warning may return null if connection is invalid
   *   \param [in]  connection        The connection
@@ -153,9 +156,20 @@
  MirDisplayConfiguration* mir_connection_create_display_config(MirConnection *connection);
  /**
++ * Query the display
++ *
++ * \pre mir_connection_is_valid(connection) == true
++ * \warning return value must be destroyed via mir_display_config_release()
++ *
++ * \param [in]  connection        The connection
++ * \return                        structure that describes the display configuration
++ */
++MirDisplayConfig* mir_connection_create_display_configuration(MirConnection* connection);
++
++/**
   * Register a callback to be called when the hardware display configuration changes
+  *
-- * Once a change has occurred, you can use mir_connection_create_display_config to see
++ * Once a change has occurred, you can use mir_connection_create_display_configuration to see
   * the new configuration.
+  *
   *   \param [in] connection  The connection
@@ -266,6 +280,38 @@
      MirPlatformMessage const* request,
      mir_platform_operation_callback callback, void* context);
++/**
++ * Create a snapshot of the attached input devices and device configurations.
++ * \warning return value must be destroyed via mir_input_config_destroy()
++ * \warning may return null if connection is invalid
++ * \param [in]  connection        The connection
++ * \return      structure that describes the input configuration
++ */
++MirInputConfig* mir_connection_create_input_config(MirConnection *connection);
++
++/**
++ * Release this snapshot of the input configuration.
++ * This invalidates any pointers retrieved from this structure.
++ *
++ * \param [in] devices  The input configuration
++ */
++void mir_input_config_destroy(MirInputConfig const* config);
++
++/**
++ * Register a callback to be called when the input devices change.
++ *
++ * Once a change has occurred, you can use mir_connection_create_input_config
++ * to get an updated snapshot of the input device configuration.
++ *
++ * \param [in] connection  The connection
++ * \param [in] callback    The function to be called when a change occurs
++ * \param [in,out] context User data passed to the callback function
++ */
++void mir_connection_set_input_config_change_callback(
++    MirConnection* connection,
++    mir_input_config_callback callback, void* context);
++
++
  #ifdef __cplusplus
+ }
  /**@}*/
 === modified file 'include/client/mir_toolkit/mir_cookie.h'
 --- include/client/mir_toolkit/mir_cookie.h	2016-01-25 13:41:23 +0000
 +++ include/client/mir_toolkit/mir_cookie.h	2016-03-30 00:11:41 +0000
@@ -29,14 +29,16 @@
  extern "C" {
  #endif
--/* Queries the size needed to serialize a given cookie
++/**
++ * Queries the size needed to serialize a given cookie
+  *
   * \params[in] cookie A cookie instance
   * \return            The size of the serialized representation of the given cookie
   */
  size_t mir_cookie_buffer_size(MirCookie const* cookie);
--/* Serializes a cookie into the given buffer
++/**
++ * Serializes a cookie into the given buffer
+  *
   * \pre The size must be equal to mir_cookie_size
   * \params[in] cookie A cookie instance
@@ -46,7 +48,8 @@
   */
  void mir_cookie_to_buffer(MirCookie const* cookie, void* buffer, size_t size);
--/* Create a cookie from a serialized representation
++/**
++ * Create a cookie from a serialized representation
+  *
   * \params[in] buffer The buffer containing a serialized cookie.
   *                    The buffer may be freed immediately after this call.
@@ -57,7 +60,8 @@
   */
  MirCookie const* mir_cookie_from_buffer(void const* buffer, size_t size);
--/* Release the MirCookie
++/**
++ * Release the MirCookie
+  *
   * \params[in] cookie The cookie to release
   */
 === added file 'include/client/mir_toolkit/mir_display_configuration.h'
 --- include/client/mir_toolkit/mir_display_configuration.h	1970-01-01 00:00:00 +0000
 +++ include/client/mir_toolkit/mir_display_configuration.h	2016-03-30 00:11:41 +0000
@@ -0,0 +1,386 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
++ */
++
++#ifndef MIR_TOOLKIT_MIR_DISPLAY_CONFIGURATION_H_
++#define MIR_TOOLKIT_MIR_DISPLAY_CONFIGURATION_H_
++
++#include "client_types.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/**
++ * \addtogroup mir_toolkit
++ * @{
++ */
++
++/**
++ * A descriptor for a display mode.
++ *
++ * A display mode contains all the information necessary to drive a display.  It
++ * includes resolution and refresh rate, but also pixel clock, vsync and hsync
++ * timings, and so on.
++ */
++typedef struct MirOutputMode MirOutputMode;
++
++/**
++ * Release resources associated with a MirDisplayConfig handle.
++ *
++ * \param [in]  config              The handle to release
++ */
++void mir_display_config_release(MirDisplayConfig* config);
++
++/**
++ * Get the maximum possible number of simultaneously active outputs this system
++ * supports.
++ *
++ * \note There may be restrictions on the configuration required to achieve this
++ * many active outputs. Typically the achievable number of simultaneously active
++ * outputs is lower than this number.
++ *
++ * \param [in]  config    The configuration to query
++ * \returns      The maximum number of simultaneously active outputs
++ *               supportable at this time.
++ */
++int mir_display_config_get_max_simultaneous_outputs(
++    MirDisplayConfig const* config);
++
++/**
++ * Get the number of outputs available in this display configuration.
++ *
++ * This returns the total number of outputs the system has. This includes both
++ * enabled and disabled output connections, and is typically larger than the
++ * value returned from mir_display_config_get_max_simultaneous_outputs().
++ *
++ * Typically this will be constant over the lifetime of a client as devices
++ * usually do not gain extra physical ports at runtime. However, hotpluggable
++ * display devices exist and the number of virtual outputs may change at
++ * runtime, so this should always be called to determine the number of outputs
++ * to iterate over.
++ *
++ * \param [in]  config    The configuration to query
++ * \returns      The number of outputs available in this configuration.
++ */
++int mir_display_config_get_num_outputs(MirDisplayConfig const* config);
++
++/**
++ * Get a read-only handle to the index 'th output of this configuration
++ *
++ * \note The MirOutput handle is only valid while config is valid.
++ * \pre 0 <= index < mir_display_config_get_num_outputs(config)
++ * \param [in]  config  The configuration to query
++ * \param [in]  index   The index of the output to get
++ * \returns     A read-only handle to a MirOutput within config which is valid
++ *              until mir_display_config_release(config) is called.
++ */
++MirOutput const* mir_display_config_get_output(MirDisplayConfig const* config,
++    size_t index);
++
++/**
++ * Get the number of modes in the supported mode list of this output.
++ *
++ * The list of supported modes is retrieved from the hardware, possibly modified
++ * by any applicable quirk tables, and may not be exhaustive.
++ *
++ * \param [in]  output  The MirOutput to query
++ * \returns     The number of modes in the supported mode list of output.
++ */
++int mir_output_get_num_modes(MirOutput const* output);
++
++/**
++ * Get a handle for a mode descriptor from the list of supported modes.
++ *
++ * The list of supported modes is retrieved from the hardware, possibly modified
++ * by any applicable quirk tables, and may not be exhaustive.
++ *
++ * \pre 0 <= index < mir_output_get_num_modes(output)
++ * \note    The handle remains valid as long as output is valid.
++ *
++ * \param [in]  output  The MirOutput to query
++ * \param [in]  index   The index of the mode to retrieve.
++ * \returns     A handle for a description of the supported mode. This is valid
++ *              for as long as output is valid. The return value is never null.
++ */
++MirOutputMode const* mir_output_get_mode(MirOutput const* output, size_t index);
++
++/**
++ * Get a handle to the output's preferred mode.
++ *
++ * This is provided by the output itself. For modern displays (LCD, OLED, etc)
++ * it is typically a mode with the native resolution.
++ *
++ * An output may not have a preferred mode, in which case this call will return
++ * NULL.
++ *
++ * \note    The handle remains valid as long as output is valid.
++ *
++ * \param [in]  output  The MirOutput to query
++ * \returns     A handle for a description of the supported mode. This is valid
++ *              for as long as output is valid. If the output does not have a
++ *              preferred mode, it returns NULL.
++ */
++MirOutputMode const* mir_output_get_preferred_mode(MirOutput const* output);
++
++/**
++ * Get a handle to the output's current mode.
++ *
++ * An output may not have a current mode (for example, if it is disabled), in
++ * which case this call will return NULL.
++ *
++ * \note    The handle remains valid as long as output is valid.
++ *
++ * \param [in]  output  The MirOutput to query
++ * \returns     A handle for a description of the supported mode. This is valid
++ *              for as long as output is valid. If the output does not have a
++ *              current mode, it returns NULL.
++ */
++MirOutputMode const* mir_output_get_current_mode(MirOutput const* output);
++
++/**
++ * Get the number of pixel formats supported by this output
++ *
++ * \param [in]  output  The MirOutput to query
++ * \returns     The number of pixel formats for output.
++ */
++int mir_output_get_num_pixel_formats(MirOutput const* output);
++
++/**
++ * Get a pixel format from the list of supported formats
++ *
++ * \pre 0 <= index < mir_output_get_num_pixel_formats(output)
++ *
++ * \param [in] output  The MirOutput to query
++ * \param [in] index   The index of the format to query
++ * \returns    The index 'th supported pixel format.
++ */
++MirPixelFormat mir_output_get_pixel_format(MirOutput const* output,
++    size_t index);
++
++/**
++ * Get the current pixel format.
++ *
++ * \param [in]  output  The MirOutput to query
++ * \returns     The current pixel format. This may be mir_pixel_format_invalid
++ *              (for example, if the output is not currently enabled).
++ */
++MirPixelFormat mir_output_get_current_pixel_format(MirOutput const* output);
++
++/**
++ * Set the output format
++ *
++ * \param [in]  output  The MirOutput to modify
++ * \param [in]  format  The MirPixelFormat to set
++ */
++void mir_output_set_pixel_format(MirOutput* output, MirPixelFormat format);
++
++/**
++ * Get the ID of an output
++ *
++ * This can be used to refer to the output in other parts of the API, such as
++ * mir_surface_spec_set_fullscreen_on_output().
++ *
++ * \param [in]  output  The MirOutput to query.
++ * \returns     The ID of output, which may be used to refer to it in other
++ *              parts of the API.
++ */
++int mir_output_get_id(MirOutput const* output);
++
++/**
++ * Get the physical connection type of an output.
++ *
++ * This is a best-effort determination, and may be incorrect.
++ *
++ * \param [in]  output  The MirOutput to query
++ * \returns     The type of the display connection, or mir_output_type_unknown
++ *              if it cannot be determined.
++ */
++MirOutputType mir_output_get_type(MirOutput const* output);
++
++/**
++ * Get the x coordinate of the top-left point of the output in the virtual
++ * display space.
++ *
++ * Outputs can be thought of as viewports into a virtual display space. They may
++ * freely overlap, coincide, or be disjoint as desired.
++ *
++ * Output orientation changes the orientation of the output rectangle in virtual
++ * display space, but does not change its top-left corner.
++ *
++ * \param [in]  output  The MirOutput to query
++ * \returns     The x coordinate of the top-left point of the output in the
++ *              virtual display space.
++ */
++int mir_output_get_position_x(MirOutput const* output);
++
++/**
++ * Get the y coordinate of the top-left point of the output in the virtual
++ * display space.
++ *
++ * Outputs can be thought of as viewports into a virtual display space. They may
++ * freely overlap, coincide, or be disjoint as desired.
++ *
++ * Output orientation changes the orientation of the output rectangle in virtual
++ * display space, but does not change its top-left corner.
++ *
++ * \param [in]  output  The MirOutput to query
++ * \returns     The y coordinate of the top-left point of the output in the
++ *              virtual display space.
++ */
++int mir_output_get_position_y(MirOutput const* output);
++
++/**
++ * Get whether there is a display physically connected to the output.
++ *
++ * This gives a best-effort determination of whether or not enabling this output
++ * will result in an image being displayed to the user.
++ *
++ * The accuracy of this determination varies with connection type - for example,
++ * for DisplayPort and HDMI connections a return value of
++ * mir_output_connection_state_connected is usually a reliable indicator that
++ * there is a powered-on display connected.
++ *
++ * VGA and DVI connectors can usually determine whether or not there is a
++ * physically connected display, but cannot distinguish between a powered or
++ * unpowered display.
++ *
++ * It is not always possible to determine whether or not there is a display
++ * connected; in such cases mir_output_connection_state_unknown is returned.
++ *
++ * \param [in]  output  The MirOutput to query
++ * \returns     Whether there is a display connected to this output.
++ */
++MirOutputConnectionState mir_output_get_connection_state(
++    MirOutput const* output);
++
++/**
++ * Get whether this output is enabled in the current configuration.
++ *
++ * \param [in]  output  the MirOutput to query
++ * \returns     Whether the output is enabled.
++ */
++bool mir_output_is_enabled(MirOutput const* output);
++
++/**
++ * Get the physical width of the connected display, in millimetres.
++ *
++ * A best-effort report of the physical width of the display connected to this
++ * output. This is retrieved from the display hardware, possibly modified by any
++ * applicable quirk tables.
++ *
++ * Where this information is unavailable or inapplicable (for example,
++ * projectors), 0 is returned.
++ *
++ * \param [in]  output  the MirOutput to query
++ * \returns     Physical width of the connected display, in mm.
++ */
++int mir_output_get_physical_width_mm(MirOutput const* output);
++
++/**
++ * Get the physical height of the connected display, in millimetres.
++ *
++ * A best-effort report of the physical height of the display connected to this
++ * output. This is retrieved from the display hardware, possibly modified by any
++ * applicable quirk tables.
++ *
++ * Where this information is unavailable or inapplicable (for example,
++ * projectors), 0 is returned.
++ *
++ * \param [in]  output  the MirOutput to query
++ * \returns     Physical height of the connected display, in mm.
++ */
++int mir_output_get_physical_height_mm(MirOutput const* output);
++
++/**
++ * Get the power state of a connected display.
++ *
++ * It is undefined which power state is returned for an output which is not
++ * connected.
++ *
++ * \param [in]  output  The MirOutput to query
++ * \returns     The power state of the display connected to output.
++ */
++MirPowerMode mir_output_get_power_mode(MirOutput const* output);
++
++/**
++ * Get the orientation of a display.
++ *
++ * \param [in]  output  The MirOutput to query
++ * \returns     The orientation of output
++ */
++MirOrientation mir_output_get_orientation(MirOutput const* output);
++
++/**
++ * Get the scale-factor of a display
++ *
++ * The scale-factor specifies the conversion between logical pixels and physical pixels on this output.
++ *
++ * A surface with dimensions 200×100 on an output with scale-factor 2.0 will display 400x200 pixels
++ * on this output, will display 300x150 pixels on an output with scale-factor 1.5, and so on.
++ *
++ * Where this calculation would result in a fractional number of pixels the floor is used, so a surface with
++ * dimensions 101x100 on an output with scale-factor of 1.5 will display 151x150 pixels, not 152x150.
++ *
++ * \param [in]  output  The MirOutput to query
++ * \returns     The scale-factor of this monitor
++ */
++float mir_output_get_scale_factor(MirOutput const* output);
++
++/**
++ * Get the form-factor of a connected output.
++ *
++ * This call succeeds even if the output is not connected, but may return nonsense values.
++ *
++ * \param [in]  output  The MirOutput to query
++ * \returns     The form factor of this output
++ */
++MirFormFactor mir_output_get_form_factor(MirOutput const* output);
++
++/**
++ * Get the width, in pixels, of a MirOutputMode
++ *
++ * \note    This is unaffected by the orientation of the output
++ *
++ * \param [in] mode    The MirOutputMode to query
++ * \returns     The width, in pixels, of mode.
++ */
++int mir_output_mode_get_width(MirOutputMode const* mode);
++
++/** Get the height, in pixels, of a MirOutputMode
++ *
++ * \note    This is unaffected by the orientation of the output
++ *
++ * \param [in] mode    The MirOutputMode to query
++ * \returns     The height, in pixels, of mode.
++ */
++int mir_output_mode_get_height(MirOutputMode const* mode);
++
++/** Get the refresh rate, in Hz, of a MirOutputMode
++ *
++ * \param [in]  mode    The MirOutputMode to query
++ * \returns     The refresh rate, in Hz, of mode
++ */
++double mir_output_mode_get_refresh_rate(MirOutputMode const* mode);
++
++/**@}*/
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif //MIR_TOOLKIT_MIR_DISPLAY_CONFIGURATION_H_
 === modified file 'include/client/mir_toolkit/mir_input_device.h'
 --- include/client/mir_toolkit/mir_input_device.h	2016-01-29 08:18:22 +0000
 +++ include/client/mir_toolkit/mir_input_device.h	2016-03-30 00:11:41 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright © 2015 Canonical Ltd.
++ * Copyright © 2015-2016 Canonical Ltd.
+  *
   * This program is free software: you can redistribute it and/or modify it
   * under the terms of the GNU Lesser General Public License version 3,
@@ -18,6 +18,8 @@
  #ifndef MIR_TOOLKIT_MIR_INPUT_DEVICE_H_
  #define MIR_TOOLKIT_MIR_INPUT_DEVICE_H_
++#include "mir_toolkit/client_types.h"
++
  /**
   * \addtogroup mir_toolkit
   * @{
@@ -64,6 +66,134 @@
  } MirTouchpadScrollMode;
  typedef unsigned int MirTouchpadScrollModes;
++enum MirInputDeviceCapability
++{
++    mir_input_device_capability_none        = 0,
++    mir_input_device_capability_pointer     = 1<<1,
++    mir_input_device_capability_keyboard    = 1<<2,
++    mir_input_device_capability_touchpad    = 1<<3,
++    mir_input_device_capability_touchscreen = 1<<4,
++    mir_input_device_capability_gamepad     = 1<<5,
++    mir_input_device_capability_joystick    = 1<<6,
++    mir_input_device_capability_switch      = 1<<7,
++    mir_input_device_capability_multitouch  = 1<<8,  //! capable to detect multiple contacts
++    mir_input_device_capability_alpha_numeric = 1<<9 //! offers enough keys for text entry
++};
++typedef unsigned int MirInputDeviceCapabilities;
++
++/**
++ * Retrieve the number of available input devices.
++ *
++ * \param [in] config   The input configuration snapshot
++ *
++ * \return              Number of input devices
++ */
++size_t mir_input_config_device_count(MirInputConfig const* config);
++
++/**
++ * Retrieve the input device at given \a index.
++ *
++ * The pointer returned stays valid until mir_input_config_destroy
++ * is called with \a config.
++ *
++ * \param [in] config   The input configuration snapshot
++ * \param [in] index    The index of the input device to return.
++ * \return              input device
++ */
++MirInputDevice const* mir_input_config_get_device(
++    MirInputConfig const* config,
++    size_t index);
++
++/**
++ * Retrieve the input device by \a id.
++ *
++ * The MirInputDevice returned stays valid until mir_input_config_destroy
++ * is called with \a config. If no device with the given \a id is found
++ * NULL will be returned.
++ *
++ * \param [in] config   The input configuration snapshot
++ * \param [in] id       The input device id to search for
++ *
++ * \return              input device
++ */
++MirInputDevice const* mir_input_config_get_device_by_id(
++    MirInputConfig const* config,
++    MirInputDeviceId id);
++
++/**
++ * Retrieve the input device at given \a index.
++ *
++ * The pointer returned stays valid until mir_input_config_destroy
++ * is called with \a config.
++ *
++ * \param [in] config   The input configuration snapshot
++ * \param [in] index    The index of the input device to return.
++ * \return              input device
++ */
++MirInputDevice* mir_input_config_get_mutable_device(
++    MirInputConfig* config,
++    size_t index);
++
++/**
++ * Retrieve the input device by \a id.
++ *
++ * The MirInputDevice returned stays valid until mir_input_config_destroy
++ * is called with \a config. If no device with the given \a id is found
++ * NULL will be returned.
++ *
++ * \param [in] config   The input configuration snapshot
++ * \param [in] id       The input device id to search for
++ *
++ * \return              input device
++ */
++MirInputDevice* mir_input_config_get_mutable_device_by_id(
++    MirInputConfig* config,
++    MirInputDeviceId id);
++
++/**
++ * Retrieve the capabilities of the input device at the given index.
++ *
++ * \param [in] device   The input device
++ *
++ * \return              The capability flags of the input device
++ */
++MirInputDeviceCapabilities mir_input_device_get_capabilities(
++    MirInputDevice const* device);
++
++/**
++ * Retrieve the device id of the input device.
++ * The device id is a unique integer value, only valid while the device is
++ * attached. The device id matches the device id attached every input event.
++ *
++ * \param [in] device   The input device
++ *
++ * \return              The device id of the input device
++ */
++MirInputDeviceId mir_input_device_get_id(MirInputDevice const* device);
++
++/**
++ * Retrieve the name of the input device.
++ * The string pointed to will be valid as long as MirInputDevice is valid.
++ * The name may be empty but never NULL.
++ *
++ * \param [in] device   The input device
++ *
++ * \return              The name of the input device
++ */
++char const* mir_input_device_get_name(MirInputDevice const* device);
++
++/**
++ * Retrieve the unique id of the input device.
++ * The string pointed to will be valid as long as \a device is valid.
++ * The value of the unique id of a given device should be valid across mir
++ * connections session and servers of the same version.
++ *
++ * \param [in] device   The input device
++ *
++ * \return              The unique id of the input device
++ */
++char const* mir_input_device_get_unique_id(MirInputDevice const* device);
++
  #ifdef __cplusplus
+ }
  #endif
 === modified file 'include/client/mir_toolkit/mir_surface.h'
 --- include/client/mir_toolkit/mir_surface.h	2016-01-29 08:18:22 +0000
 +++ include/client/mir_toolkit/mir_surface.h	2016-03-30 00:11:41 +0000
@@ -494,6 +494,17 @@
                                        MirRectangle const *rectangles,
                                        size_t n_rects);
++/**
++ * Set the event handler to be called when events arrive for a surface.
++ *   \warning event_handler could be called from another thread. You must do
++ *            any locking appropriate to protect your data accessed in the
++ *            callback. There is also a chance that different events will be
++ *            called back in different threads, for the same surface,
++ *            simultaneously.
++ * \param [in] spec       The spec to accumulate the request in.
++ * \param [in] callback   The callback function
++ * \param [in] context    Additional argument to be passed to callback
++ */
  void mir_surface_spec_set_event_handler(
      MirSurfaceSpec* spec,
      mir_surface_event_callback callback,
@@ -766,13 +777,13 @@
   */
  MirPersistentId* mir_persistent_id_from_string(char const* string_representation);
--/*
--* Attempts to raise the surface to the front.
--*
--* \param [in] surface The surface to raise
--* \param [in] cookie  A cookie instance obtained from an input event.
--*                     An invalid cookie will terminate the client connection.
--*/
++/**
++ * Attempts to raise the surface to the front.
++ *
++ * \param [in] surface The surface to raise
++ * \param [in] cookie  A cookie instance obtained from an input event.
++ *                     An invalid cookie will terminate the client connection.
++ */
  void mir_surface_raise(MirSurface* surface, MirCookie const* cookie);
  #ifdef __cplusplus
 === modified file 'include/client/mir_toolkit/version.h'
 --- include/client/mir_toolkit/version.h	2016-01-29 08:18:22 +0000
 +++ include/client/mir_toolkit/version.h	2016-03-30 00:11:41 +0000
@@ -43,7 +43,7 @@
+  *
   * See also: http://semver.org/
   */
--#define MIR_CLIENT_MINOR_VERSION (2)
++#define MIR_CLIENT_MINOR_VERSION (3)
  /**
   * MIR_CLIENT_MICRO_VERSION
 === modified file 'include/common/mir/logging/logger.h'
 --- include/common/mir/logging/logger.h	2016-01-29 08:18:22 +0000
 +++ include/common/mir/logging/logger.h	2016-03-30 00:11:41 +0000
@@ -45,7 +45,15 @@
                       const std::string& message,
                       const std::string& component) = 0;
--    virtual void log(char const* component, Severity severity, char const* format, ...);
++    /*
++     * Those playing at home may wonder why we're saying the 4th argument is the format string,
++     * when it's the 3rd argument in the signature.
++     *
++     * The answer, of course, is that the attribute doesn't know about the implicit
++     * 'this' first parameter of C++!
++     */
++    virtual void log(char const* component, Severity severity, char const* format, ...)
++         __attribute__ ((format (printf, 4, 5)));
  protected:
      Logger() {}
 === modified file 'include/server/mir/input/input_device_hub.h'
 --- include/server/mir/input/input_device_hub.h	2015-05-19 21:34:34 +0000
 +++ include/server/mir/input/input_device_hub.h	2016-03-30 00:11:41 +0000
@@ -25,6 +25,7 @@
+ {
  namespace input
+ {
++class Device;
  class InputDeviceInfo;
  class InputDeviceObserver;
@@ -36,6 +37,7 @@
      virtual void add_observer(std::shared_ptr<InputDeviceObserver> const&) = 0;
      virtual void remove_observer(std::weak_ptr<InputDeviceObserver> const&) = 0;
++    virtual void for_each_input_device(std::function<void(Device const& device)> const& callback) = 0;
      InputDeviceHub(InputDeviceHub const&) = delete;
      InputDeviceHub& operator=(InputDeviceHub const&) = delete;
 === modified file 'include/server/mir/input/input_manager.h'
 --- include/server/mir/input/input_manager.h	2015-06-17 05:20:42 +0000
 +++ include/server/mir/input/input_manager.h	2016-03-30 00:11:41 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright © 2012 Canonical Ltd.
++ * Copyright © 2012, 2016 Canonical Ltd.
+  *
   * This program is free software: you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 3,
@@ -32,6 +32,8 @@
  class InputManager
+ {
  public:
++    // TODO Remove add_platform() when we next break mirserver ABI
++    __attribute__ ((deprecated))
      virtual void add_platform(std::shared_ptr<Platform> const& platform) = 0;
      virtual void start() = 0;
      virtual void stop() = 0;
 === modified file 'include/test/mir/test/display_config_matchers.h'
 --- include/test/mir/test/display_config_matchers.h	2016-01-29 08:18:22 +0000
 +++ include/test/mir/test/display_config_matchers.h	2016-03-30 00:11:41 +0000
@@ -54,31 +54,60 @@
  namespace test
+ {
--bool compare_display_configurations(graphics::DisplayConfiguration const& display_config1,
--                                    graphics::DisplayConfiguration const& display_config2);
--
--bool compare_display_configurations(MirDisplayConfiguration const& client_config,
--                                    graphics::DisplayConfiguration const& display_config);
--
--bool compare_display_configurations(protobuf::DisplayConfiguration const& protobuf_config,
--                                    graphics::DisplayConfiguration const& display_config);
--
--bool compare_display_configurations(MirDisplayConfiguration const* client_config1,
--                                    MirDisplayConfiguration const* client_config2);
--
--bool compare_display_configurations(MirDisplayConfiguration const& client_config,
--                                    protobuf::DisplayConfiguration const& protobuf_config);
--
--bool compare_display_configurations(graphics::DisplayConfiguration const& display_config1,
--                                    MirDisplayConfiguration const* display_config2);
--
--
--bool compare_display_configurations(MirDisplayConfiguration const* display_config2,
--                                    graphics::DisplayConfiguration const& display_config1);
++bool compare_display_configurations(
++    testing::MatchResultListener* listener,
++    graphics::DisplayConfiguration const& display_config1,
++    graphics::DisplayConfiguration const& display_config2);
++
++bool compare_display_configurations(
++    testing::MatchResultListener* listener,
++    MirDisplayConfiguration const& client_config,
++    graphics::DisplayConfiguration const& display_config);
++
++bool compare_display_configurations(
++    testing::MatchResultListener* listener,
++    protobuf::DisplayConfiguration const& protobuf_config,
++    graphics::DisplayConfiguration const& display_config);
++
++bool compare_display_configurations(
++    testing::MatchResultListener* listener,
++    MirDisplayConfiguration const* client_config1,
++    MirDisplayConfiguration const* client_config2);
++
++bool compare_display_configurations(
++    testing::MatchResultListener* listener,
++    MirDisplayConfiguration const& client_config,
++    protobuf::DisplayConfiguration const& protobuf_config);
++
++bool compare_display_configurations(
++    testing::MatchResultListener* listener,
++    graphics::DisplayConfiguration const& display_config1,
++    MirDisplayConfiguration const* display_config2);
++
++
++bool compare_display_configurations(
++    testing::MatchResultListener* listener,
++    MirDisplayConfiguration const* display_config2,
++    graphics::DisplayConfiguration const& display_config1);
++
++bool compare_display_configurations(
++    testing::MatchResultListener* listener,
++    MirDisplayConfig const* client_config,
++    graphics::DisplayConfiguration const& server_config);
++
++bool compare_display_configurations(
++    testing::MatchResultListener* listener,
++    graphics::DisplayConfiguration const& server_config,
++    MirDisplayConfig const* client_config);
++
++bool compare_display_configurations(
++    testing::MatchResultListener* listener,
++    MirDisplayConfig const* config1,
++    MirDisplayConfig const* config2);
  MATCHER_P(DisplayConfigMatches, config, "")
+ {
--    return compare_display_configurations(arg, config);
++    return compare_display_configurations(result_listener, arg, config);
+ }
+ }
 === added file 'include/test/mir/test/doubles/mock_input_device_hub.h'
 --- include/test/mir/test/doubles/mock_input_device_hub.h	1970-01-01 00:00:00 +0000
 +++ include/test/mir/test/doubles/mock_input_device_hub.h	2016-03-30 00:11:41 +0000
@@ -0,0 +1,43 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>
++ */
++
++#ifndef MIR_TEST_DOUBLES_MOCK_INPUT_DEVICE_HUB_H_
++#define MIR_TEST_DOUBLES_MOCK_INPUT_DEVICE_HUB_H_
++
++#include "mir/input/input_device_hub.h"
++
++namespace mir
++{
++namespace test
++{
++namespace doubles
++{
++
++struct MockInputDeviceHub : input::InputDeviceHub
++{
++    MOCK_METHOD1(add_observer, void(std::shared_ptr<input::InputDeviceObserver> const&));
++    MOCK_METHOD1(remove_observer, void(std::weak_ptr<input::InputDeviceObserver> const&));
++    MOCK_METHOD1(for_each_input_device, void(std::function<void(input::Device const&)> const&));
++
++};
++
++}
++}
++}
++
++#endif
 === removed file 'include/test/mir/test/doubles/mock_input_device_hub.h'
 --- include/test/mir/test/doubles/mock_input_device_hub.h	2016-03-02 13:21:10 +0000
 +++ include/test/mir/test/doubles/mock_input_device_hub.h	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
--/*
-- * Copyright © 2016 Canonical Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3,
-- * as published by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>
-- */
--
--#ifndef MIR_TEST_DOUBLES_MOCK_INPUT_DEVICE_HUB_H_
--#define MIR_TEST_DOUBLES_MOCK_INPUT_DEVICE_HUB_H_
--
--#include "mir/input/input_device_hub.h"
--
--namespace mir
--{
--namespace test
--{
--namespace doubles
--{
--
--struct MockInputDeviceHub : input::InputDeviceHub
--{
--    MOCK_METHOD1(add_observer, void(std::shared_ptr<input::InputDeviceObserver> const&));
--    MOCK_METHOD1(remove_observer, void(std::weak_ptr<input::InputDeviceObserver> const&));
--    MOCK_METHOD1(for_each_input_device, void(std::function<void(std::shared_ptr<input::Device>const&)> const&));
--
--};
--
--}
--}
--}
--
--#endif
 === modified file 'include/test/mir/test/doubles/stub_display_configuration.h'
 --- include/test/mir/test/doubles/stub_display_configuration.h	2016-01-29 08:18:22 +0000
 +++ include/test/mir/test/doubles/stub_display_configuration.h	2016-03-30 00:11:41 +0000
@@ -22,6 +22,7 @@
  #include "mir/graphics/display_configuration.h"
  #include <vector>
++#include <mir_toolkit/client_types.h>
  namespace mir
+ {
@@ -37,6 +38,9 @@
      StubDisplayConfigurationOutput(graphics::DisplayConfigurationOutputId id,
          geometry::Size px_size, geometry::Size mm_size, MirPixelFormat format, double vrefresh, bool connected);
++
++    StubDisplayConfigurationOutput(graphics::DisplayConfigurationOutputId id,
++        std::vector<graphics::DisplayConfigurationMode> modes, std::vector<MirPixelFormat> formats);
  };
  class StubDisplayConfig : public graphics::DisplayConfiguration
 === added file 'include/test/mir/test/doubles/stub_input_device.h'
 --- include/test/mir/test/doubles/stub_input_device.h	1970-01-01 00:00:00 +0000
 +++ include/test/mir/test/doubles/stub_input_device.h	2016-03-30 00:11:41 +0000
@@ -0,0 +1,82 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>
++ */
++
++#ifndef MIR_TEST_DOUBLES_STUB_INPUT_DEVICE_H_
++#define MIR_TEST_DOUBLES_STUB_INPUT_DEVICE_H_
++
++#include "mir/input/device.h"
++#include "mir/input/device_capability.h"
++#include "mir/input/pointer_configuration.h"
++#include "mir/input/touchpad_configuration.h"
++#include "mir/optional_value.h"
++
++namespace mir
++{
++namespace test
++{
++namespace doubles
++{
++
++struct StubDevice : input::Device
++{
++    StubDevice(MirInputDeviceId id, input::DeviceCapabilities caps, std::string const& name, std::string const& unique_id)
++        : device_id(id), device_capabilities(caps), device_name(name), device_unique_id(unique_id) {}
++
++    MirInputDeviceId id() const override
++    {
++        return device_id;
++    }
++    input::DeviceCapabilities capabilities() const override
++    {
++        return device_capabilities;
++    }
++    std::string name() const override
++    {
++        return device_name;
++    }
++    std::string unique_id() const override
++    {
++        return device_unique_id;
++    }
++    mir::optional_value<input::PointerConfiguration> pointer_configuration() const override
++    {
++        return {};
++    }
++    void apply_pointer_configuration(input::PointerConfiguration const&) override
++    {
++    }
++
++    mir::optional_value<input::TouchpadConfiguration> touchpad_configuration() const override
++    {
++        return {};
++    }
++    void apply_touchpad_configuration(input::TouchpadConfiguration const&) override
++    {
++    }
++
++    MirInputDeviceId device_id;
++    input::DeviceCapabilities device_capabilities;
++    std::string device_name;
++    std::string device_unique_id;
++};
++
++}
++}
++}
++#endif
++
 === modified file 'include/test/mir/test/wait_condition.h'
 --- include/test/mir/test/wait_condition.h	2016-01-29 08:18:22 +0000
 +++ include/test/mir/test/wait_condition.h	2016-03-30 00:11:41 +0000
@@ -58,6 +58,12 @@
          return woken_;
+     }
++    void reset()
++    {
++        std::lock_guard<std::mutex> ul(guard);
++        woken_ = false;
++    }
++
      std::mutex guard;
      std::condition_variable condition;
      bool woken_;
 === modified file 'include/test/mir_test_framework/declarative_placement_window_manage_policy.h'
 --- include/test/mir_test_framework/declarative_placement_window_manage_policy.h	2016-01-29 08:18:22 +0000
 +++ include/test/mir_test_framework/declarative_placement_window_manage_policy.h	2016-03-30 00:11:41 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright © 2014 Canonical Ltd.
++ * Copyright © 2014-2016 Canonical Ltd.
+  *
   * This program is free software: you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 3,
@@ -38,7 +38,7 @@
+ {
  public:
      DeclarativePlacementWindowManagerPolicy(
--        Tools* const tools,
++        mir::shell::WindowManagerTools* const tools,
          SurfaceGeometries const& positions_by_name,
          std::shared_ptr<mir::shell::DisplayLayout> const& display_layout);
 === modified file 'include/test/mir_test_framework/executable_path.h'
 --- include/test/mir_test_framework/executable_path.h	2016-01-29 08:18:22 +0000
 +++ include/test/mir_test_framework/executable_path.h	2016-03-30 00:11:41 +0000
@@ -27,7 +27,7 @@
  std::string library_path();
  std::string server_platform_path();
--std::string udev_recordings_path();
++std::string test_data_path();
  std::string server_platform(std::string const& name);
  std::string server_input_platform(std::string const& name);
  std::string client_platform(std::string const& name);
 === modified file 'include/test/mir_test_framework/fake_input_device.h'
 --- include/test/mir_test_framework/fake_input_device.h	2016-01-29 08:18:22 +0000
 +++ include/test/mir_test_framework/fake_input_device.h	2016-03-30 00:11:41 +0000
@@ -30,8 +30,8 @@
+ {
  public:
      /**
--     * Valid value range of simulated touch coordinates. The simulated coordinates will be remapped to the
--     * the coorindates of the given input sink.
++     * Valid value range of simulated touch coordinates. The simulated coordinates will be remapped to
++     * the coordinates of the given input sink.
       * \{
       */
      static const int maximum_touch_axis_value = 0xFFFF;
@@ -41,6 +41,8 @@
      FakeInputDevice() = default;
      virtual ~FakeInputDevice() = default;
++
++    virtual void emit_device_removal() = 0;
      virtual void emit_runtime_error() = 0;
      virtual void emit_event(synthesis::KeyParameters const& key) = 0;
      virtual void emit_event(synthesis::ButtonParameters const& button) = 0;
 === modified file 'include/test/mir_test_framework/placement_applying_shell.h'
 --- include/test/mir_test_framework/placement_applying_shell.h	2016-01-29 08:18:22 +0000
 +++ include/test/mir_test_framework/placement_applying_shell.h	2016-03-30 00:11:41 +0000
@@ -29,6 +29,8 @@
  #include <vector>
  #include <string>
  #include <map>
++#include <mutex>
++#include <condition_variable>
  namespace mir_test_framework
+ {
@@ -42,13 +44,24 @@
          ClientInputRegions const& client_input_regions,
          ClientPositions const& client_positions);
++    ~PlacementApplyingShell();
      mir::frontend::SurfaceId create_surface(
          std::shared_ptr<mir::scene::Session> const& session,
          mir::scene::SurfaceCreationParameters const& params,
          std::shared_ptr<mir::frontend::EventSink> const& sink) override;
++
++    void modify_surface(
++        std::shared_ptr<mir::scene::Session> const& session,
++        std::shared_ptr<mir::scene::Surface> const& surface,
++        mir::shell::SurfaceSpecification const& modifications) override;
++
++    bool wait_for_modify_surface(std::chrono::seconds timeout);
  private:
      ClientInputRegions const& client_input_regions;
      ClientPositions const& client_positions;
++    std::mutex mutex;
++    std::condition_variable cv;
++    bool modified {false};
  };
+ }
 === modified file 'playground/CMakeLists.txt'
 --- playground/CMakeLists.txt	2016-01-29 15:44:15 +0000
 +++ playground/CMakeLists.txt	2016-03-30 00:11:41 +0000
@@ -20,10 +20,11 @@
  add_subdirectory(demo-shell/)
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
--mir_add_wrapped_executable(mir_demo_prerendered_frames
--    mir_demo_prerendered_frames.c
++mir_add_wrapped_executable(mir_demo_client_prerendered_frames
++    mir_demo_client_prerendered_frames.c
+ )
--target_link_libraries(mir_demo_prerendered_frames
++target_link_libraries(mir_demo_client_prerendered_frames
      mirclient
++    m
+ )
 === renamed file 'playground/mir_demo_prerendered_frames.c' => 'playground/mir_demo_client_prerendered_frames.c'
 --- playground/mir_demo_prerendered_frames.c	2016-02-04 18:15:50 +0000
 +++ playground/mir_demo_client_prerendered_frames.c	2016-03-30 00:11:41 +0000
@@ -22,29 +22,45 @@
  #include <mir_toolkit/mir_surface.h>
  #include <mir_toolkit/mir_presentation_chain.h>
  #include <mir_toolkit/mir_buffer.h>
++#include <mir_toolkit/version.h>
  #include <sys/types.h>
  #include <signal.h>
  #include <string.h>
  #include <pthread.h>
--
--void fill_buffer(MirBuffer* buffer, int shade, int min, int max)
--{
--    unsigned char val = (unsigned char) (((float) shade / (max-min)) + min) * 0xFF;
--
--    MirGraphicsRegion* region = mir_buffer_acquire_region(buffer, mir_read_write);
--    if (!region)
++#include <math.h>
++#include <stdlib.h>
++#include <getopt.h>
++
++float distance(int x0, int y0, int x1, int y1)
++{
++    float dx = x1 - x0;
++    float dy = y1 - y0;
++    return sqrt((dx * dx +  dy * dy));
++}
++
++void fill_buffer_with_centered_circle_abgr(
++    MirBuffer* buffer, float radius, unsigned int fg, unsigned int bg)
++{
++    MirGraphicsRegion region = mir_buffer_get_graphics_region(buffer, mir_read_write);
++    if ((!region.vaddr) || (region.pixel_format != mir_pixel_format_abgr_8888))
          return;
--
--    unsigned char* px = (unsigned char*) region->vaddr;
--    for(int i = 0; i < region->height; i++)
++    int const center_x = region.width / 2;
++    int const center_y = region.height / 2;
++    unsigned char* vaddr = (unsigned char*) region.vaddr;
++    for(int i = 0; i < region.height; i++)
+     {
--        px += region->stride;
--        for(int j = 0; j < region->width; j++)
++        unsigned int* pixel = (unsigned int*) vaddr;
++        for(int j = 0; j < region.width ; j++)
+         {
--            px[j] = val;
++            int const centered_i = i - center_y;
++            int const centered_j = j - center_x;
++            if (distance(0,0, centered_i, centered_j) > radius)
++                pixel[j] = bg;
++            else
++                pixel[j] = fg;
+         }
++        vaddr += region.stride;
+     }
--    mir_buffer_release_region(region);
+ }
  typedef struct SubmissionInfo
@@ -55,9 +71,9 @@
      pthread_cond_t cv;
  } SubmissionInfo;
--static void available_callback(MirPresentationChain* stream, MirBuffer* buffer, void* client_context)
++static void available_callback(MirPresentationChain* chain, MirBuffer* buffer, void* client_context)
+ {
--    (void) stream;
++    (void)chain;
      SubmissionInfo* info = (SubmissionInfo*) client_context;
      pthread_mutex_lock(&info->lock);
      info->available = 1;
@@ -75,35 +91,82 @@
  int main(int argc, char** argv)
+ {
--    (void) argc;
--    (void) argv;
++    static char const *socket_file = NULL;
++    int arg = -1;
++    int width = 400;
++    int height = 400;
++    while ((arg = getopt (argc, argv, "m:s:h:")) != -1)
++    {
++        switch (arg)
++        {
++        case 'm':
++            socket_file = optarg;
++            break;
++        case 's':
++        {
++            unsigned int w, h;
++            if (sscanf(optarg, "%ux%u", &w, &h) == 2)
++            {
++                width = w;
++                height = h;
++            }
++            else
++            {
++                printf("Invalid size: %s, using default size\n", optarg);
++            }
++            break;
++        }
++        case 'h':
++        case '?':
++        default:
++            puts(argv[0]);
++            printf("Usage:\n");
++            printf("    -m <Mir server socket>\n");
++            printf("    -s WIDTHxHEIGHT of window\n");
++            printf("    -h help dialog\n");
++            return -1;
++        }
++    }
      signal(SIGTERM, shutdown);
      signal(SIGINT, shutdown);
--    int width = 20;
--    int height = 25;
++    int displacement_x = 0;
++    int displacement_y = 0;
++    unsigned int fg = 0xFF1448DD;
++    unsigned int bg = 0xFF6F2177;
      MirPixelFormat format = mir_pixel_format_abgr_8888;
--    MirConnection* connection = mir_connect_sync(NULL, "prerendered_frames");
--
--    MirSurfaceSpec* spec =
--        mir_connection_create_spec_for_normal_surface(connection, width, height, format);
--    MirSurface* surface = mir_surface_create_sync(spec);
--    mir_surface_spec_release(spec);
++    MirConnection* connection = mir_connect_sync(socket_file, "prerendered_frames");
++    if (!mir_connection_is_valid(connection))
++    {
++        printf("could not connect to server file at: %s\n", socket_file);
++        return -1;
++    }
      MirPresentationChain* chain =  mir_connection_create_presentation_chain_sync(connection);
      if (!mir_presentation_chain_is_valid(chain))
++    {
++        printf("could not create MirPresentationChain\n");
++
++// TODO this is a frig to pass smoke tests until we support NBS by default
++#if (MIR_CLIENT_VERSION <= MIR_VERSION_NUMBER(3, 3, 0))
++        printf("This is currently an unreleased API - likely server support is switched off\n");
++        return 0;
++#else
          return -1;
++#endif
++    }
++
++    MirSurfaceSpec* spec = mir_connection_create_spec_for_normal_surface(connection, width, height, format);
++    MirSurface* surface = mir_surface_create_sync(spec);
++    mir_surface_spec_release(spec);
      //reassociate for advanced control
--    MirBufferStreamInfo info;
--    info.displacement_x = 0;
--    info.displacement_y = 0;
--    //will make this a union.
--    info.stream = (MirBufferStream*) chain;
      spec = mir_create_surface_spec(connection);
--    mir_surface_spec_set_streams(spec, &info, 1);
++    mir_surface_spec_add_presentation_chain(
++        spec, width, height, displacement_x, displacement_y, chain);
++    mir_surface_apply_spec(surface, spec);
      mir_surface_spec_release(spec);
      int num_prerendered_frames = 20;
@@ -123,11 +186,16 @@
          pthread_mutex_lock(&buffer_available[i].lock);
          while(!buffer_available[i].buffer)
              pthread_cond_wait(&buffer_available[i].cv, &buffer_available[i].lock);
--        fill_buffer(buffer_available[i].buffer, i, 0, num_prerendered_frames);
++
++        float max_radius = distance(0, 0, width, height) / 2.0f;
++        float radius_i = ((float) i + 1) / num_prerendered_frames * max_radius;
++        fill_buffer_with_centered_circle_abgr(buffer_available[i].buffer, radius_i, fg, bg);
++
          pthread_mutex_unlock(&buffer_available[i].lock);
+     }
      int i = 0;
++    int inc = -1;
      while (rendering)
+     {
          MirBuffer* b;
@@ -138,10 +206,11 @@
          b = buffer_available[i].buffer;
          pthread_mutex_unlock(&buffer_available[i].lock);
--        if (!mir_presentation_chain_submit_buffer(chain, b))
--            rendering = false;
++        mir_presentation_chain_submit_buffer(chain, b);
--        i = (i + 1) % num_prerendered_frames;
++        if ((i == num_prerendered_frames - 1) || (i == 0))
++            inc *= -1;
++        i = i + inc;
+     }
      for (i = 0u; i < num_prerendered_frames; i++)
 === removed directory 'snappy'
 === removed file 'snappy/CMakeLists.txt'
 --- snappy/CMakeLists.txt	2015-03-23 04:13:45 +0000
 +++ snappy/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
--set(MIR_PKG_ARCH ${CMAKE_SYSTEM_PROCESSOR})
--# FIXME: This is blank on armhf cross-compiles. But don't care right now.
--if ("${MIR_PKG_ARCH}" STREQUAL x86_64)
--  set(MIR_PKG_ARCH amd64)
--endif()
--
--configure_file(mir.package.yaml.in mir.package.yaml)
--configure_file(mir.framework.in mir.framework)
--configure_file(mir-demos.package.yaml.in mir-demos.package.yaml)
--
--set(ARCH_LIB_DIR /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE})
--set(MIR_IMAGE ${CMAKE_BINARY_DIR}/mir-image)
--set(MIR_DEMOS_IMAGE ${CMAKE_BINARY_DIR}/mir-demos-image)
--
--add_custom_target(snap
--  # Create a clean stripped install tree
--  COMMAND rm -rf ${MIR_IMAGE} ${MIR_DEMOS_IMAGE}
--  COMMAND make -j8 -C ${CMAKE_BINARY_DIR} DESTDIR=${MIR_IMAGE} install/strip
--
--  COMMAND mv -f ${MIR_IMAGE}/${CMAKE_INSTALL_PREFIX}/lib ${MIR_IMAGE}/
--  COMMAND mv -f ${MIR_IMAGE}/${CMAKE_INSTALL_PREFIX}/bin ${MIR_DEMOS_IMAGE}/
--
--  COMMAND mkdir ${MIR_IMAGE}/meta
--  COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/mir.package.yaml ${MIR_IMAGE}/meta/package.yaml
--  COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/mir.framework ${MIR_IMAGE}/meta/
--  COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/readme.md ${MIR_IMAGE}/meta/
--  COMMAND mkdir ${MIR_IMAGE}/bin
--  COMMAND cp -p ${CMAKE_CURRENT_SOURCE_DIR}/mir-run ${MIR_IMAGE}/bin/
--
--  COMMAND mkdir -p ${MIR_DEMOS_IMAGE}/meta
--  COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/mir-demos.package.yaml ${MIR_DEMOS_IMAGE}/meta/package.yaml
--  COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/readme.md ${MIR_DEMOS_IMAGE}/meta/
--
--  # Remove bits of Mir we don't need
--  COMMAND rm -rf ${MIR_IMAGE}/${CMAKE_INSTALL_PREFIX}
--
--  # Copy in the DRM libraries needed by Mesa
--  COMMAND cp -vdp ${ARCH_LIB_DIR}/libdrm_*.so* ${MIR_IMAGE}/lib/
--
--  # Search all the binaries and copy more libraries they need
--  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/copy-external-libs.sh ${MIR_IMAGE}/lib/ ${MIR_DEMOS_IMAGE}/bin/* ${MIR_IMAGE}/lib/*
--
--  # Copy in the Mesa DRI drivers
--  COMMAND cp -Rdvp ${ARCH_LIB_DIR}/dri ${MIR_IMAGE}/
--
--  # Remove duplicate libs already built-in to Ubuntu Core
--  COMMAND rm -f ${MIR_IMAGE}/lib/libboost_program_options.so.1.55.0
--  COMMAND rm -f ${MIR_IMAGE}/lib/libstdc++.so.6
--  COMMAND rm -f ${MIR_IMAGE}/lib/libfreetype.so.6
--  COMMAND rm -f ${MIR_IMAGE}/lib/libunwind.so.8
--  COMMAND rm -f ${MIR_IMAGE}/lib/libffi.so.6
--
--  COMMAND snappy build ${MIR_IMAGE}
--  COMMAND snappy build ${MIR_DEMOS_IMAGE}
--  COMMAND ls -l ${CMAKE_CURRENT_BINARY_DIR}/*.snap
--)
--
 === removed file 'snappy/copy-external-libs.sh'
 --- snappy/copy-external-libs.sh	2015-03-20 09:22:35 +0000
 +++ snappy/copy-external-libs.sh	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
--#!/bin/sh
--
--dest=$1
--shift
--paths=$*
--externs=`ldd $paths |
--    awk '/.* => \/usr\/lib\// {print $3;}' |
--    sort |
--    grep -v libmir |
--    uniq`
--
--echo "External libs:"
--echo "~~~~~~~~~~~~~~~~~~~~"
--ls $externs
--echo "~~~~~~~~~~~~~~~~~~~~"
--
--cp $externs $dest
 === removed file 'snappy/mir-demos.package.yaml.in'
 --- snappy/mir-demos.package.yaml.in	2015-03-18 09:46:40 +0000
 +++ snappy/mir-demos.package.yaml.in	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
--name: mir-demos
--version: @MIR_VERSION@
--architecture: @MIR_PKG_ARCH@
--# frameworks: mir  # FIXME: LP: #1433489
--
 === removed file 'snappy/mir-run'
 --- snappy/mir-run	2015-03-18 09:46:40 +0000
 +++ snappy/mir-run	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
--#!/bin/sh
--
--MIR_DIR=$SNAP_APP_PATH
--if [ -z "$MIR_DIR" ] ; then
--        MIR_DIR=/apps/mir/current
--fi
--export MIR_DIR
--
--export LIBGL_DRIVERS_PATH=$MIR_DIR/dri
--export MIR_SERVER_PLATFORM_PATH=$MIR_DIR/lib/mir/server-platform
--export MIR_CLIENT_PLATFORM_PATH=$MIR_DIR/lib/mir/client-platform
--export LD_LIBRARY_PATH=$MIR_DIR/lib
--
--exec $*
 === removed file 'snappy/mir.framework.in'
 --- snappy/mir.framework.in	2015-03-18 08:42:06 +0000
 +++ snappy/mir.framework.in	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
--Base-Name: mir
--Base-Version: 0
 === removed file 'snappy/mir.package.yaml.in'
 --- snappy/mir.package.yaml.in	2015-03-18 09:46:40 +0000
 +++ snappy/mir.package.yaml.in	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
--name: mir
--version: @MIR_VERSION@
--architecture: @MIR_PKG_ARCH@
--type: framework
--integration:
--  framework:
--    framework: meta/mir.framework
--  mir-run:
--    bin-path: bin/mir-run
 === removed file 'snappy/readme.md'
 --- snappy/readme.md	2015-03-20 09:43:39 +0000
 +++ snappy/readme.md	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
--Mir
--
--This is an experimental Mir package.
 === modified file 'src/CMakeLists.txt'
 --- src/CMakeLists.txt	2016-01-29 08:18:22 +0000
 +++ src/CMakeLists.txt	2016-03-30 00:11:41 +0000
@@ -28,10 +28,10 @@
  add_subdirectory(gl/)
  add_executable(wrapper wrapper.c)
--set_property(TARGET wrapper
--             APPEND_STRING PROPERTY COMPILE_FLAGS " -DEXECUTABLE_FORMAT=\\\"%s.bin\\\"")
--set_property(TARGET wrapper
--             APPEND_STRING PROPERTY COMPILE_FLAGS " -D_DEFAULT_SOURCE -D_BSD_SOURCE")
++target_compile_definitions(wrapper PUBLIC
++    EXECUTABLE_FORMAT=\"%s.bin\"
++    _DEFAULT_SOURCE
++    _BSD_SOURCE)
  set(
    MIR_GENERATED_INCLUDE_DIRECTORIES
 === modified file 'src/client/CMakeLists.txt'
 --- src/client/CMakeLists.txt	2016-02-12 04:02:11 +0000
 +++ src/client/CMakeLists.txt	2016-03-30 00:11:41 +0000
@@ -52,6 +52,7 @@
    mir_cookie.cpp
    mir_connection.cpp
    mir_connection_api.cpp
++  mir_input_device_api.cpp
    mir_wait_handle.cpp
    mir_wait_api.cpp
    mir_surface.cpp
@@ -76,12 +77,17 @@
    buffer_vault.cpp
    mir_buffer_stream_api.cpp
    error_stream.cpp
++  error_chain.cpp
    buffer.cpp
    presentation_chain.cpp
    mir_presentation_chain_api.cpp
    mir_buffer_api.cpp
++  display_configuration_api.cpp
++  protobuf_to_native_buffer.cpp
++  buffer_factory.cpp
    ${MIR_CLIENT_SOURCES}
    ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/events/surface_output_event.h
++  ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/mir_display_configuration.h
+ )
  # Ensure protobuf C++ headers have been produced before
 === modified file 'src/client/buffer.cpp'
 --- src/client/buffer.cpp	2016-02-10 18:44:17 +0000
 +++ src/client/buffer.cpp	2016-03-30 00:11:41 +0000
@@ -16,6 +16,7 @@
   * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
   */
++#include "mir/client_buffer.h"
  #include "buffer.h"
  #include <boost/throw_exception.hpp>
@@ -24,12 +25,16 @@
  mcl::Buffer::Buffer(
      mir_buffer_callback cb, void* context,
      int buffer_id,
--    std::shared_ptr<ClientBuffer> const& buffer) :
++    std::shared_ptr<ClientBuffer> const& buffer,
++    MirPresentationChain* chain,
++    MirBufferUsage usage) :
      cb(cb),
      cb_context(context),
      buffer_id(buffer_id),
      buffer(buffer),
--    owned(true)
++    owned(true),
++    chain(chain),
++    usage(usage)
+ {
      cb(nullptr, reinterpret_cast<MirBuffer*>(this), cb_context);
+ }
@@ -41,16 +46,73 @@
  void mcl::Buffer::submitted()
+ {
++    std::lock_guard<decltype(mutex)> lk(mutex);
      if (!owned)
          BOOST_THROW_EXCEPTION(std::logic_error("cannot submit unowned buffer"));
++    mapped_region.reset();
      owned = false;
+ }
--void mcl::Buffer::received()
++void mcl::Buffer::received(MirBufferPackage const& update_package)
+ {
++    std::lock_guard<decltype(mutex)> lk(mutex);
      if (!owned)
+     {
          owned = true;
++        buffer->update_from(update_package);
          cb(nullptr, reinterpret_cast<MirBuffer*>(this), cb_context);
+     }
+ }
++
++MirGraphicsRegion mcl::Buffer::map_region()
++{
++    std::lock_guard<decltype(mutex)> lk(mutex);
++    mapped_region = buffer->secure_for_cpu_write();
++    return MirGraphicsRegion {
++        mapped_region->width.as_int(),
++        mapped_region->height.as_int(),
++        mapped_region->stride.as_int(),
++        mapped_region->format,
++        mapped_region->vaddr.get()
++    };
++}
++
++MirNativeBuffer* mcl::Buffer::as_mir_native_buffer() const
++{
++    return buffer->as_mir_native_buffer();
++}
++
++void mcl::Buffer::set_fence(MirNativeFence* native_fence, MirBufferAccess access)
++{
++    buffer->set_fence(native_fence, access);
++}
++
++MirNativeFence* mcl::Buffer::get_fence() const
++{
++    return buffer->get_fence();
++}
++
++bool mcl::Buffer::wait_fence(MirBufferAccess access, std::chrono::nanoseconds timeout)
++{
++    return buffer->wait_fence(access, timeout);
++}
++
++MirPresentationChain* mcl::Buffer::allocating_chain() const
++{
++    return chain;
++}
++
++MirBufferUsage mcl::Buffer::buffer_usage() const
++{
++    return usage;
++}
++
++MirPixelFormat mcl::Buffer::pixel_format() const
++{
++    return buffer->pixel_format();
++}
++
++mir::geometry::Size mcl::Buffer::size() const
++{
++    return buffer->size();
++}
 === modified file 'src/client/buffer.h'
 --- src/client/buffer.h	2016-02-11 03:04:05 +0000
 +++ src/client/buffer.h	2016-03-30 00:11:41 +0000
@@ -21,12 +21,15 @@
  #include "mir_toolkit/mir_buffer.h"
  #include <memory>
++#include <chrono>
++#include <mutex>
  namespace mir
+ {
  namespace client
+ {
  class ClientBuffer;
++class MemoryRegion;
  //this is the type backing MirBuffer*
  class Buffer
+ {
@@ -34,17 +37,37 @@
      Buffer(
          mir_buffer_callback cb, void* context,
          int buffer_id,
--        std::shared_ptr<ClientBuffer> const& buffer);
++        std::shared_ptr<ClientBuffer> const& buffer,
++        MirPresentationChain* chain,
++        MirBufferUsage usage);
      int rpc_id() const;
      void submitted();
--    void received();
++    void received(MirBufferPackage const& update_message);
++
++    MirNativeBuffer* as_mir_native_buffer() const;
++    MirGraphicsRegion map_region();
++
++    void set_fence(MirNativeFence*, MirBufferAccess);
++    MirNativeFence* get_fence() const;
++    bool wait_fence(MirBufferAccess, std::chrono::nanoseconds);
++
++    MirBufferUsage buffer_usage() const;
++    MirPixelFormat pixel_format() const;
++    geometry::Size size() const;
++
++    MirPresentationChain* allocating_chain() const;
  private:
      mir_buffer_callback cb;
      void* cb_context;
      int const buffer_id;
      std::shared_ptr<ClientBuffer> buffer;
++
++    std::mutex mutex;
      bool owned;
++    std::shared_ptr<MemoryRegion> mapped_region;
++    MirPresentationChain* const chain;
++    MirBufferUsage const usage;
  };
+ }
+ }
 === added file 'src/client/buffer_factory.cpp'
 --- src/client/buffer_factory.cpp	1970-01-01 00:00:00 +0000
 +++ src/client/buffer_factory.cpp	2016-03-30 00:11:41 +0000
@@ -0,0 +1,79 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
++ */
++
++#include "mir/client_buffer_factory.h"
++#include "buffer_factory.h"
++#include <algorithm>
++#include <boost/throw_exception.hpp>
++#include "protobuf_to_native_buffer.h"
++
++namespace mcl = mir::client;
++namespace geom = mir::geometry;
++
++mcl::BufferFactory::AllocationRequest::AllocationRequest(
++    std::shared_ptr<mcl::ClientBufferFactory> const& native_buffer_factory,
++    MirPresentationChain* chain,
++    geom::Size size, MirPixelFormat format, MirBufferUsage usage,
++    mir_buffer_callback cb, void* cb_context) :
++    native_buffer_factory(native_buffer_factory),
++    chain(chain),
++    size(size),
++    format(format),
++    usage(usage),
++    cb(cb),
++    cb_context(cb_context)
++{
++}
++
++void mcl::BufferFactory::expect_buffer(
++    std::shared_ptr<mcl::ClientBufferFactory> const& factory,
++    MirPresentationChain* chain,
++    geometry::Size size,
++    MirPixelFormat format,
++    MirBufferUsage usage,
++    mir_buffer_callback cb,
++    void* cb_context)
++{
++    std::lock_guard<decltype(mutex)> lk(mutex);
++    allocation_requests.emplace_back(
++        std::make_unique<AllocationRequest>(factory, chain, size, format, usage, cb, cb_context));
++}
++
++std::unique_ptr<mcl::Buffer> mcl::BufferFactory::generate_buffer(mir::protobuf::Buffer const& buffer)
++{
++    std::lock_guard<decltype(mutex)> lk(mutex);
++    auto request_it = std::find_if(allocation_requests.begin(), allocation_requests.end(),
++        [&buffer](std::unique_ptr<AllocationRequest> const& it)
++        {
++            return geom::Size{buffer.width(), buffer.height()} == it->size;
++        });
++
++    if (request_it == allocation_requests.end())
++        BOOST_THROW_EXCEPTION(std::logic_error("unrequested buffer received"));
++
++    auto b = std::make_unique<Buffer>(
++        (*request_it)->cb, (*request_it)->cb_context,
++        buffer.buffer_id(),
++        (*request_it)->native_buffer_factory->create_buffer(
++            mcl::protobuf_to_native_buffer(buffer),
++            (*request_it)->size, (*request_it)->format),
++            (*request_it)->chain, (*request_it)->usage);
++
++    allocation_requests.erase(request_it);
++    return std::move(b);
++}
 === added file 'src/client/buffer_factory.h'
 --- src/client/buffer_factory.h	1970-01-01 00:00:00 +0000
 +++ src/client/buffer_factory.h	2016-03-30 00:11:41 +0000
@@ -0,0 +1,91 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
++ */
++
++#ifndef MIR_CLIENT_MIR_BUFFER_FACTORY_H
++#define MIR_CLIENT_MIR_BUFFER_FACTORY_H
++
++#include "mir/geometry/size.h"
++#include "mir_protobuf.pb.h"
++#include "buffer.h"
++#include <mutex>
++#include <memory>
++
++namespace mir
++{
++namespace client
++{
++class ClientBufferFactory;
++class AsyncBufferFactory
++{
++public:
++    virtual ~AsyncBufferFactory() = default;
++    AsyncBufferFactory() = default;
++
++    virtual std::unique_ptr<Buffer> generate_buffer(mir::protobuf::Buffer const& buffer) = 0;
++    virtual void expect_buffer(
++        std::shared_ptr<ClientBufferFactory> const& native_buffer_factory,
++        MirPresentationChain* chain,
++        geometry::Size size,
++        MirPixelFormat format,
++        MirBufferUsage usage,
++        mir_buffer_callback cb,
++        void* cb_context) = 0;
++private:
++    AsyncBufferFactory(AsyncBufferFactory const&) = delete;
++    AsyncBufferFactory& operator=(AsyncBufferFactory const&) = delete;
++};
++
++class BufferFactory : public AsyncBufferFactory
++{
++public:
++    std::unique_ptr<Buffer> generate_buffer(mir::protobuf::Buffer const& buffer) override;
++    void expect_buffer(
++        std::shared_ptr<ClientBufferFactory> const& native_buffer_factory,
++        MirPresentationChain* chain,
++        geometry::Size size,
++        MirPixelFormat format,
++        MirBufferUsage usage,
++        mir_buffer_callback cb,
++        void* cb_context) override;
++
++private:
++    std::mutex mutex;
++    struct AllocationRequest
++    {
++        AllocationRequest(
++            std::shared_ptr<ClientBufferFactory> const& native_buffer_factory,
++            MirPresentationChain* chain,
++            geometry::Size size,
++            MirPixelFormat format,
++            MirBufferUsage usage,
++            mir_buffer_callback cb,
++            void* cb_context);
++
++        std::shared_ptr<ClientBufferFactory> const native_buffer_factory;
++        MirPresentationChain* chain;
++        geometry::Size size;
++        MirPixelFormat format;
++        MirBufferUsage usage;
++        mir_buffer_callback cb;
++        void* cb_context;
++    };
++    std::vector<std::unique_ptr<AllocationRequest>> allocation_requests;
++};
++}
++}
++#endif /* MIR_CLIENT_MIR_BUFFER_FACTORY_H_ */
 === modified file 'src/client/buffer_stream.cpp'
 --- src/client/buffer_stream.cpp	2016-01-29 15:44:15 +0000
 +++ src/client/buffer_stream.cpp	2016-03-30 00:11:41 +0000
@@ -26,6 +26,7 @@
  #include "rpc/mir_display_server.h"
  #include "mir_protobuf.pb.h"
  #include "buffer_vault.h"
++#include "protobuf_to_native_buffer.h"
  #include "mir/log.h"
  #include "mir/client_platform.h"
@@ -73,42 +74,6 @@
  namespace
+ {
--void populate_buffer_package(
--    MirBufferPackage& buffer_package,
--    mir::protobuf::Buffer const& protobuf_buffer)
--{
--    if (!protobuf_buffer.has_error())
--    {
--        buffer_package.data_items = protobuf_buffer.data_size();
--        for (int i = 0; i != protobuf_buffer.data_size(); ++i)
--        {
--            buffer_package.data[i] = protobuf_buffer.data(i);
--        }
--
--        buffer_package.fd_items = protobuf_buffer.fd_size();
--
--        for (int i = 0; i != protobuf_buffer.fd_size(); ++i)
--        {
--            buffer_package.fd[i] = protobuf_buffer.fd(i);
--        }
--
--        buffer_package.stride = protobuf_buffer.stride();
--        buffer_package.flags = protobuf_buffer.flags();
--        buffer_package.width = protobuf_buffer.width();
--        buffer_package.height = protobuf_buffer.height();
--    }
--    else
--    {
--        buffer_package.data_items = 0;
--        buffer_package.fd_items = 0;
--        buffer_package.stride = 0;
--        buffer_package.flags = 0;
--        buffer_package.width = 0;
--        buffer_package.height = 0;
--    }
--}
--
--
  struct ExchangeSemantics : mcl::ServerBufferSemantics
+ {
      ExchangeSemantics(
@@ -118,9 +83,9 @@
          wrapped{factory, max_buffers},
          display_server(server)
+     {
--        auto buffer_package = std::make_shared<MirBufferPackage>();
--        populate_buffer_package(*buffer_package, first_buffer);
--        wrapped.deposit_package(buffer_package, first_buffer.buffer_id(), first_size, first_pf);
++        wrapped.deposit_package(
++            mcl::protobuf_to_native_buffer(first_buffer),
++            first_buffer.buffer_id(), first_size, first_pf);
+     }
      void deposit(mp::Buffer const& buffer, geom::Size size, MirPixelFormat pf) override
@@ -128,9 +93,9 @@
          std::unique_lock<std::mutex> lock(mutex);
          if (on_incoming_buffer)
+         {
--            auto buffer_package = std::make_shared<MirBufferPackage>();
--            populate_buffer_package(*buffer_package, buffer);
--            wrapped.deposit_package(buffer_package, buffer.buffer_id(), size, pf);
++            wrapped.deposit_package(
++                mcl::protobuf_to_native_buffer(buffer),
++                buffer.buffer_id(), size, pf);
              if (on_incoming_buffer)
+             {
                  on_incoming_buffer();
@@ -186,9 +151,9 @@
+         }
          else
+         {
--            auto buffer_package = std::make_shared<MirBufferPackage>();
--            populate_buffer_package(*buffer_package, incoming_buffers.front());
--            wrapped.deposit_package(buffer_package, incoming_buffers.front().buffer_id(), sz, pf);
++            wrapped.deposit_package(
++                mcl::protobuf_to_native_buffer(incoming_buffers.front()),
++                incoming_buffers.front().buffer_id(), sz, pf);
              incoming_buffers.pop();
              done();
+         }
@@ -261,8 +226,11 @@
          buf_params->set_height(size.height.as_int());
          buf_params->set_pixel_format(format);
          buf_params->set_buffer_usage(usage);
--        server.allocate_buffers(&request, &protobuf_void,
--            google::protobuf::NewCallback(google::protobuf::DoNothing));
++
++        //note, NewCallback will trigger on exception, deleting this object there
++        auto protobuf_void = new mp::Void;
++        server.allocate_buffers(&request,  protobuf_void,
++            google::protobuf::NewCallback(Requests::ignore_response, protobuf_void));
+     }
      void free_buffer(int buffer_id) override
@@ -270,8 +238,11 @@
          mp::BufferRelease request;
          request.mutable_id()->set_value(stream_id);
          request.add_buffers()->set_buffer_id(buffer_id);
--        server.release_buffers(&request, &protobuf_void,
--            google::protobuf::NewCallback(google::protobuf::DoNothing));
++
++        //note, NewCallback will trigger on exception, deleting this object there
++        auto protobuf_void = new mp::Void;
++        server.release_buffers(&request, protobuf_void,
++            google::protobuf::NewCallback(Requests::ignore_response, protobuf_void));
+     }
      void submit_buffer(int id, mcl::ClientBuffer&) override
@@ -279,8 +250,16 @@
          mp::BufferRequest request;
          request.mutable_id()->set_value(stream_id);
          request.mutable_buffer()->set_buffer_id(id);
--        server.submit_buffer(&request, &protobuf_void,
--            google::protobuf::NewCallback(google::protobuf::DoNothing));
++
++        //note, NewCallback will trigger on exception, deleting this object there
++        auto protobuf_void = new mp::Void;
++        server.submit_buffer(&request, protobuf_void,
++            google::protobuf::NewCallback(Requests::ignore_response, protobuf_void));
++    }
++
++    static void ignore_response(mp::Void* void_response)
++    {
++        delete void_response;
+     }
  private:
@@ -425,10 +404,12 @@
+         }
          else
+         {
++            cached_buffer_size = ideal_buffer_size;
              buffer_depository = std::make_unique<NewBufferSemantics>(
                  client_platform->create_buffer_factory(),
                  std::make_shared<Requests>(display_server, protobuf_bs->id().value()),
--                ideal_buffer_size, static_cast<MirPixelFormat>(protobuf_bs->pixel_format()), 0, nbuffers);
++                ideal_buffer_size, static_cast<MirPixelFormat>(protobuf_bs->pixel_format()),
++                protobuf_bs->buffer_usage(), nbuffers);
+         }
@@ -552,8 +533,9 @@
  MirWaitHandle* mcl::BufferStream::next_buffer(std::function<void()> const& done)
+ {
++    auto id = buffer_depository->current_buffer_id();
      std::unique_lock<decltype(mutex)> lock(mutex);
--    perf_report->end_frame(buffer_depository->current_buffer_id());
++    perf_report->end_frame(id);
      secured_region.reset();
@@ -572,7 +554,7 @@
  EGLNativeWindowType mcl::BufferStream::egl_native_window()
+ {
      std::unique_lock<decltype(mutex)> lock(mutex);
--    return *egl_native_window_;
++    return static_cast<EGLNativeWindowType>(egl_native_window_.get());
+ }
  void mcl::BufferStream::release_cpu_region()
@@ -633,7 +615,6 @@
  uint32_t mcl::BufferStream::get_current_buffer_id()
+ {
--    std::unique_lock<decltype(mutex)> lock(mutex);
      return buffer_depository->current_buffer_id();
+ }
 === modified file 'src/client/buffer_stream.h'
 --- src/client/buffer_stream.h	2016-01-29 15:44:15 +0000
 +++ src/client/buffer_stream.h	2016-03-30 00:11:41 +0000
@@ -147,7 +147,7 @@
      float scale_;
      std::shared_ptr<mir::client::PerfReport> const perf_report;
--    std::shared_ptr<EGLNativeWindowType> egl_native_window_;
++    std::shared_ptr<void> egl_native_window_;
      MirWaitHandle interval_wait_handle;
      std::unique_ptr<mir::protobuf::Void> protobuf_void;
 === modified file 'src/client/buffer_vault.cpp'
 --- src/client/buffer_vault.cpp	2016-01-29 08:18:22 +0000
 +++ src/client/buffer_vault.cpp	2016-03-30 00:11:41 +0000
@@ -20,6 +20,7 @@
  #include "mir/client_buffer.h"
  #include "buffer_vault.h"
  #include "mir_protobuf.pb.h"
++#include "protobuf_to_native_buffer.h"
  #include <algorithm>
  #include <boost/throw_exception.hpp>
@@ -118,31 +119,33 @@
  void mcl::BufferVault::wire_transfer_inbound(mp::Buffer const& protobuf_buffer)
+ {
--    auto package = std::make_shared<MirBufferPackage>();
--    package->data_items = protobuf_buffer.data_size();
--    package->fd_items = protobuf_buffer.fd_size();
--    for (int i = 0; i != protobuf_buffer.data_size(); ++i)
--        package->data[i] = protobuf_buffer.data(i);
--    for (int i = 0; i != protobuf_buffer.fd_size(); ++i)
--        package->fd[i] = protobuf_buffer.fd(i);
--    package->stride = protobuf_buffer.stride();
--    package->flags = protobuf_buffer.flags();
--    package->width = protobuf_buffer.width();
--    package->height = protobuf_buffer.height();
++    std::shared_ptr<MirBufferPackage> package = mcl::protobuf_to_native_buffer(protobuf_buffer);
      std::unique_lock<std::mutex> lk(mutex);
      auto it = buffers.find(protobuf_buffer.buffer_id());
      if (it == buffers.end())
+     {
--        auto buffer = factory->create_buffer(package, geom::Size{package->width, package->height}, format);
--        buffers[protobuf_buffer.buffer_id()] = BufferEntry{ buffer, Owner::Self };
++        geom::Size sz{package->width, package->height};
++        if (sz != size)
++        {
++            lk.unlock();
++            server_requests->free_buffer(protobuf_buffer.buffer_id());
++            for (int i = 0; i != package->fd_items; ++i)
++                close(package->fd[i]);
++
++            server_requests->allocate_buffer(size, format, usage);
++            return;
++        }
++
++        buffers[protobuf_buffer.buffer_id()] =
++            BufferEntry{ factory->create_buffer(package, sz, format), Owner::Self };
+     }
      else
+     {
++        it->second.buffer->update_from(*package);
          if (size == it->second.buffer->size())
+         {
              it->second.owner = Owner::Self;
--            it->second.buffer->update_from(*package);
+         }
          else
+         {
 === modified file 'src/client/client_buffer_stream.h'
 --- src/client/client_buffer_stream.h	2016-02-12 04:02:11 +0000
 +++ src/client/client_buffer_stream.h	2016-03-30 00:11:41 +0000
@@ -27,10 +27,33 @@
  #include "mir_toolkit/mir_native_buffer.h"
  #include "mir_wait_handle.h"
--#include <EGL/eglplatform.h>
--
  #include <memory>
  #include <functional>
++#include <EGL/eglplatform.h>
++
++/*
++ * ClientBufferStream::egl_native_window() returns EGLNativeWindowType.
++ *
++ * EGLNativeWindowType is an EGL platform-specific type that is typically a
++ * (possibly slightly obfuscated) pointer. This makes our client module ABI
++ * technically EGL-platform dependent, which is awkward because we support
++ * multiple EGL platforms.
++ *
++ * On both the Mesa and the Android EGL platforms EGLNativeWindow is a
++ * pointer or a uintptr_t.
++ *
++ * In practise EGLNativeWindowType is always a typedef to a pointer-ish, but
++ * for paranoia's sake make sure the build will fail if we ever encounter a
++ * strange EGL platform where this isn't the case.
++ */
++#include <type_traits>
++static_assert(
++    sizeof(EGLNativeWindowType) == sizeof(void*) &&
++    std::is_pod<EGLNativeWindowType>::value,
++    "The ClientBufferStream requires that EGLNativeWindowType be no-op convertible to void*");
++
++#undef EGLNativeWindowType
++#define EGLNativeWindowType void*
  namespace mir
+ {
 === modified file 'src/client/connection_configuration.h'
 --- src/client/connection_configuration.h	2016-01-29 08:18:22 +0000
 +++ src/client/connection_configuration.h	2016-03-30 00:11:41 +0000
@@ -52,6 +52,7 @@
  class DisplayConfiguration;
  class EventSink;
  class EventHandlerRegister;
++class AsyncBufferFactory;
  class ConnectionConfiguration
+ {
@@ -69,6 +70,7 @@
      virtual std::shared_ptr<PingHandler> the_ping_handler() = 0;
      virtual std::shared_ptr<EventSink> the_event_sink() = 0;
      virtual std::shared_ptr<EventHandlerRegister> the_event_handler_register() = 0;
++    virtual std::shared_ptr<mir::client::AsyncBufferFactory> the_buffer_factory() = 0;
  protected:
      ConnectionConfiguration() = default;
 === modified file 'src/client/connection_surface_map.h'
 --- src/client/connection_surface_map.h	2016-02-12 04:02:11 +0000
 +++ src/client/connection_surface_map.h	2016-03-30 00:11:41 +0000
@@ -28,6 +28,7 @@
+ {
  namespace client
+ {
++class Buffer;
  class PresentationChain;
  class ConnectionSurfaceMap : public SurfaceMap
+ {
@@ -42,10 +43,16 @@
      void insert(frontend::BufferStreamId stream_id, std::shared_ptr<BufferReceiver> const& stream);
      void erase(frontend::BufferStreamId surface_id);
++    //TODO: should have a mf::BufferID
++    void insert(int buffer_id, std::shared_ptr<Buffer> const& buffer) override;
++    void erase(int buffer_id) override;
++    std::shared_ptr<Buffer> buffer(int buffer_id) const override;
++
  private:
      std::shared_timed_mutex mutable guard;
      std::unordered_map<frontend::SurfaceId, std::shared_ptr<MirSurface>> surfaces;
      std::unordered_map<frontend::BufferStreamId, std::shared_ptr<BufferReceiver>> streams;
++    std::unordered_map<int, std::shared_ptr<Buffer>> buffers;
  };
+ }
 === modified file 'src/client/default_connection_configuration.cpp'
 --- src/client/default_connection_configuration.cpp	2016-01-29 08:18:22 +0000
 +++ src/client/default_connection_configuration.cpp	2016-03-30 00:11:41 +0000
@@ -21,7 +21,7 @@
  #include "display_configuration.h"
  #include "rpc/make_rpc_channel.h"
  #include "rpc/null_rpc_report.h"
--#include "mir/logging/dumb_console_logger.h"
++#include "mir/logging/logger.h"
  #include "mir/input/input_platform.h"
  #include "mir/input/input_devices.h"
  #include "mir/input/null_input_receiver_report.h"
@@ -37,6 +37,7 @@
  #include "mir/client_platform_factory.h"
  #include "probing_client_platform_factory.h"
  #include "mir_event_distributor.h"
++#include "buffer_factory.h"
  namespace mcl = mir::client;
@@ -69,18 +70,24 @@
          [this]
+         {
              return mcl::rpc::make_rpc_channel(
--                the_socket_file(), the_surface_map(), the_display_configuration(), the_input_devices(), the_rpc_report(), the_lifecycle_control(), the_ping_handler(), the_event_sink());
++                the_socket_file(), the_surface_map(), the_buffer_factory(),
++                the_display_configuration(), the_input_devices(), the_rpc_report(),
++                the_lifecycle_control(), the_ping_handler(), the_event_sink());
          });
+ }
  std::shared_ptr<mir::logging::Logger>
  mcl::DefaultConnectionConfiguration::the_logger()
+ {
--    return logger(
--        []
++    class ProxyLogger : public mir::logging::Logger
++    {
++        void log(mir::logging::Severity severity, const std::string& message, const std::string& component) override
+         {
--            return std::make_shared<mir::logging::DumbConsoleLogger>();
--        });
++            mir::logging::log(severity, message, component);
++        }
++    };
++
++    return logger([]{ return std::make_shared<ProxyLogger>(); });
+ }
  std::shared_ptr<mcl::ClientPlatformFactory>
@@ -228,3 +235,12 @@
                  return std::make_shared<mir::logging::NullSharedLibraryProberReport>();
          });
+ }
++
++std::shared_ptr<mir::client::AsyncBufferFactory> mir::client::DefaultConnectionConfiguration::the_buffer_factory()
++{
++    return async_buffer_factory(
++        [this] () -> std::shared_ptr<mir::client::AsyncBufferFactory>
++        {
++            return std::make_shared<mir::client::BufferFactory>();
++        });
++}
 === modified file 'src/client/default_connection_configuration.h'
 --- src/client/default_connection_configuration.h	2016-01-29 08:18:22 +0000
 +++ src/client/default_connection_configuration.h	2016-03-30 00:11:41 +0000
@@ -62,6 +62,7 @@
      std::shared_ptr<EventSink> the_event_sink() override;
      std::shared_ptr<EventHandlerRegister> the_event_handler_register() override;
      std::shared_ptr<mir::SharedLibraryProberReport> the_shared_library_prober_report();
++    std::shared_ptr<mir::client::AsyncBufferFactory> the_buffer_factory() override;
      virtual std::string the_socket_file();
      virtual std::shared_ptr<rpc::RpcReport> the_rpc_report();
@@ -82,6 +83,7 @@
      CachedPtr<rpc::RpcReport> rpc_report;
      CachedPtr<input::receiver::InputReceiverReport> input_receiver_report;
      CachedPtr<mir::SharedLibraryProberReport>  shared_library_prober_report;
++    CachedPtr<mir::client::AsyncBufferFactory> async_buffer_factory;
  private:
      std::string const socket_file;
 === modified file 'src/client/display_configuration.cpp'
 --- src/client/display_configuration.cpp	2016-01-29 08:18:22 +0000
 +++ src/client/display_configuration.cpp	2016-03-30 00:11:41 +0000
@@ -53,6 +53,13 @@
      output_formats = new MirPixelFormat[num_formats];
+ }
++mcl::DisplayOutput::DisplayOutput(DisplayOutput&& rhs)
++{
++    std::memcpy(this, &rhs, sizeof(*this));
++    rhs.modes = nullptr;
++    rhs.output_formats = nullptr;
++}
++
  mcl::DisplayOutput::~DisplayOutput()
+ {
      delete[] modes;
@@ -74,6 +81,8 @@
      output.output_id = msg.output_id();
      output.type = static_cast<MirDisplayOutputType>(msg.type());
++    output.num_modes = msg.mode_size();
++    output.modes = new MirDisplayMode[output.num_modes];
      for (auto i = 0u; i < output.num_modes; i++)
+     {
          auto mode = msg.mode(i);
@@ -84,6 +93,8 @@
      output.preferred_mode = msg.preferred_mode();
      output.current_mode = msg.current_mode();
++    output.num_output_formats = msg.pixel_format_size();
++    output.output_formats = new MirPixelFormat[output.num_output_formats];
      for (auto i = 0u; i < output.num_output_formats; i++)
+     {
          output.output_formats[i] = static_cast<MirPixelFormat>(msg.pixel_format(i));
@@ -113,25 +124,8 @@
  void mcl::DisplayConfiguration::set_configuration(mp::DisplayConfiguration const& msg)
+ {
--    std::lock_guard<std::mutex> lk(guard);
--
--    cards.clear();
--    for (auto i = 0; i < msg.display_card_size(); i++)
--    {
--        auto const& msg_card = msg.display_card(i);
--        MirDisplayCard card;

Mir

Merge lp:mir/0.21 into lp:mir/ubuntu

Commit message

Description of the change

Preview Diff

Subscribers