lp:~alan-griffiths/mir/mir-on-mir-platform

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:mir

Alan Griffiths: Needs Fixing on 2017-06-21

Mir CI Bot: Needs Fixing (continuous-integration) on 2017-06-19

Diff: 1306 lines (+318/-225)

49 files modified

debian/control (+15/-0)
debian/mir-platform-graphics-mir13.install (+1/-0)
include/platform/mir/graphics/cursor.h (+0/-1)
include/platform/mir/graphics/gl_extensions_base.h (+3/-3)
include/platform/mir/graphics/platform.h (+14/-12)
include/platform/mir/graphics/surfaceless_egl_context.h (+3/-3)
include/test/mir/test/doubles/stub_cursor.h (+0/-1)
src/include/server/mir/default_server_configuration.h (+0/-1)
src/platform/graphics/CMakeLists.txt (+5/-1)
src/platform/graphics/gl_extensions_base.cpp (+3/-3)
src/platform/graphics/surfaceless_egl_context.cpp (+3/-3)
src/platform/symbols.map (+7/-0)
src/platforms/CMakeLists.txt (+1/-0)
src/platforms/eglstream-kms/server/platform_symbols.cpp (+2/-1)
src/platforms/mesa/server/kms/cursor.cpp (+0/-11)
src/platforms/mesa/server/kms/cursor.h (+0/-1)
src/platforms/mesa/server/kms/platform_symbols.cpp (+2/-1)
src/platforms/mesa/server/x11/graphics/graphics.cpp (+2/-1)
src/platforms/mir/CMakeLists.txt (+41/-0)
src/platforms/mir/cursor.cpp (+2/-8)
src/platforms/mir/cursor.h (+2/-4)
src/platforms/mir/display.cpp (+2/-2)
src/platforms/mir/platform.cpp (+134/-0)
src/platforms/mir/symbols.map.in (+20/-0)
src/server/CMakeLists.txt (+0/-1)
src/server/graphics/CMakeLists.txt (+0/-3)
src/server/graphics/default_configuration.cpp (+9/-74)
src/server/graphics/software_cursor.cpp (+0/-12)
src/server/graphics/software_cursor.h (+0/-1)
src/server/input/default_configuration.cpp (+0/-12)
src/server/symbols.map (+0/-1)
tests/acceptance-tests/test_nested_mir.cpp (+6/-13)
tests/include/mir/test/doubles/stub_host_connection.h (+7/-5)
tests/mir_test_framework/headless_nested_server_runner.cpp (+1/-1)
tests/mir_test_framework/platform_graphics_throw.cpp (+3/-2)
tests/mir_test_framework/stubbed_graphics_platform.cpp (+2/-1)
tests/unit-tests/graphics/test_software_cursor.cpp (+0/-19)
tests/unit-tests/input/CMakeLists.txt (+0/-1)
tests/unit-tests/platforms/mesa/kms/test_cursor.cpp (+1/-1)
tests/unit-tests/platforms/nested/CMakeLists.txt (+2/-0)
tests/unit-tests/platforms/nested/test_buffer.cpp (+5/-2)
tests/unit-tests/platforms/nested/test_host_buffer.cpp (+1/-1)
tests/unit-tests/platforms/nested/test_ipc_operations.cpp (+2/-2)
tests/unit-tests/platforms/nested/test_nested_cursor.cpp (+6/-6)
tests/unit-tests/platforms/nested/test_nested_display.cpp (+3/-3)
tests/unit-tests/platforms/nested/test_nested_display_buffer.cpp (+5/-5)
tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp (+1/-1)
tests/unit-tests/platforms/nested/test_nested_input_platform.cpp (+1/-1)
tools/update_package_abis.sh (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

4199. By Alan Griffiths on 2017-06-19

Fix some tests of mir-on-mir cursor

4198. By Alan Griffiths on 2017-06-19

Ensure nested tests use nested platform

4197. By Alan Griffiths on 2017-06-19

Better naming for Mir-on-Mir

4196. By Alan Griffiths on 2017-06-19

merge & fixup ~kdub/mir/real-nested-platform

4195. By Alan Griffiths on 2017-06-09

Enable nested platforms to pass through extensions. This enables EGL when Mir is nested on Mir-on-X (LP: #1696974). Fixes: https://bugs.launchpad.net/bugs/1696974.

Approved by mir-ci-bot, Alberto Aguirre.

4194. By Alan Griffiths on 2017-06-09

Remove the (now unused) GuestPlatform code.

Approved by mir-ci-bot, Alberto Aguirre.

4193. By Chris Halse Rogers on 2017-06-09

mesa-kms: Support hardware cursors in hybrid setups.

Approved by mir-ci-bot, Chris Halse Rogers, Alberto Aguirre.

4192. By Alan Griffiths on 2017-06-09

Fix CMakeLists.txt - Don't depend on conditionally non-existent targets.

Approved by mir-ci-bot, Alberto Aguirre.

4191. By Alan Griffiths on 2017-06-07

Update changelog to cover last few commits.

Approved by mir-ci-bot, Brandon Schaefer.

4190. By Andreas Pokorny on 2017-06-07

Make the SessionManager observerable via the SessionListener interface

This adds the capability to register interest in the information previously handed out only to the session listener and turns "the session listener" into one of many.
.

Approved by mir-ci-bot, Alan Griffiths.