Mir

Merge lp://qastaging/~albaguirre/mir/silo-virtual-output into lp://qastaging/mir/ubuntu

Proposed by Alberto Aguirre
Status: Work in progress
Proposed branch: lp://qastaging/~albaguirre/mir/silo-virtual-output
Merge into: lp://qastaging/mir/ubuntu
Diff against target: 3018 lines (+1119/-388)
70 files modified
CMakeLists.txt (+11/-1)
cmake/FindLibHardware.cmake (+1/-1)
cmake/MirCommon.cmake (+10/-12)
debian/changelog (+92/-42)
debian/control (+8/-8)
debian/libmirserver38.install (+1/-1)
debian/mir-platform-graphics-android8.install (+1/-1)
debian/mir-platform-graphics-mesa-kms8.install (+1/-1)
debian/mir-platform-graphics-mesa-x8.install (+1/-1)
examples/eglapp.c (+5/-1)
include/platform/mir/graphics/display.h (+7/-0)
include/platform/mir/graphics/virtual_output.h (+61/-0)
include/test/mir/test/doubles/null_display.h (+5/-0)
src/client/probing_client_platform_factory.cpp (+24/-23)
src/common/logging/dumb_console_logger.cpp (+2/-2)
src/common/sharedlibrary/CMakeLists.txt (+1/-1)
src/common/sharedlibrary/shared_library_prober.cpp (+20/-5)
src/common/symbols.map (+7/-0)
src/include/common/mir/protobuf/protocol_version.h (+10/-12)
src/include/common/mir/shared_library_prober.h (+8/-0)
src/include/server/mir/input/input_region.h (+2/-0)
src/include/server/mir/scene/legacy_scene_change_notification.h (+8/-1)
src/platform/graphics/display_configuration.cpp (+1/-1)
src/platforms/CMakeLists.txt (+2/-2)
src/platforms/android/common/syncfence.cpp (+1/-1)
src/platforms/android/server/CMakeLists.txt (+1/-0)
src/platforms/android/server/display.cpp (+20/-2)
src/platforms/android/server/display.h (+1/-0)
src/platforms/android/server/display_configuration.cpp (+75/-2)
src/platforms/android/server/display_configuration.h (+11/-1)
src/platforms/android/server/virtual_output.cpp (+43/-0)
src/platforms/android/server/virtual_output.h (+50/-0)
src/platforms/mesa/server/kms/display.cpp (+6/-0)
src/platforms/mesa/server/kms/display.h (+1/-0)
src/platforms/mesa/server/x11/graphics/display.cpp (+6/-0)
src/platforms/mesa/server/x11/graphics/display.h (+1/-0)
src/server/CMakeLists.txt (+1/-1)
src/server/compositor/compositing_screencast.cpp (+35/-4)
src/server/compositor/multi_threaded_compositor.cpp (+106/-81)
src/server/compositor/multi_threaded_compositor.h (+2/-0)
src/server/frontend/socket_connection.cpp (+5/-7)
src/server/graphics/nested/display.cpp (+27/-2)
src/server/graphics/nested/display.h (+4/-0)
src/server/graphics/offscreen/display.cpp (+6/-0)
src/server/graphics/offscreen/display.h (+1/-0)
src/server/input/default_configuration.cpp (+1/-1)
src/server/input/default_input_manager.cpp (+12/-4)
src/server/input/display_input_region.cpp (+4/-27)
src/server/input/display_input_region.h (+8/-8)
src/server/scene/default_configuration.cpp (+2/-1)
src/server/scene/legacy_scene_change_notification.cpp (+62/-5)
src/server/scene/mediating_display_changer.cpp (+20/-2)
src/server/scene/mediating_display_changer.h (+9/-1)
src/server/symbols.map (+1/-1)
tests/acceptance-tests/test_client_library.cpp (+6/-7)
tests/acceptance-tests/test_nested_mir.cpp (+48/-48)
tests/acceptance-tests/throwback/test_client_cursor_api.cpp (+9/-4)
tests/include/mir/test/doubles/mock_display.h (+2/-0)
tests/include/mir/test/doubles/mock_input_region.h (+1/-0)
tests/integration-tests/input/test_single_seat_setup.cpp (+1/-0)
tests/integration-tests/test_surface_stack_with_compositor.cpp (+1/-1)
tests/mir_test_framework/stubbed_graphics_platform.cpp (+4/-0)
tests/unit-tests/compositor/test_compositing_screencast.cpp (+90/-28)
tests/unit-tests/compositor/test_multi_threaded_compositor.cpp (+2/-11)
tests/unit-tests/graphics/android/test_display.cpp (+41/-5)
tests/unit-tests/graphics/nested/test_nested_display.cpp (+44/-0)
tests/unit-tests/graphics/test_display_configuration.cpp (+11/-0)
tests/unit-tests/input/test_default_input_device_hub.cpp (+1/-0)
tests/unit-tests/input/test_display_input_region.cpp (+8/-14)
tests/unit-tests/scene/test_mediating_display_changer.cpp (+39/-3)
To merge this branch: bzr merge lp://qastaging/~albaguirre/mir/silo-virtual-output
Reviewer Review Type Date Requested Status
Daniel van Vugt Disapprove
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+284967@code.qastaging.launchpad.net

Commit message

DO NOT MERGE.... just a test for the virtual output

Description of the change

DO NOT MERGE.... just a test for the virtual output

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3292
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/128/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5794
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4701
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5750
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/382
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-amd64-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-amd64-ci/16/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-i386-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-i386-ci/16/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5747
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5747/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/8157
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27295
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/378
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/378/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/232
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27297

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

review: Approve (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Do not merge, obviously. Aside from anything else, the source branch is Mir 0.20 and the target is 0.19.

review: Disapprove

Unmerged revisions

3292. By Alberto Aguirre

merge lp:mir/ubuntu

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches