lp://staging/~vanvugt/mir/deduplicate-NullDisplayReport

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://staging/mir

Mir CI Bot: Approve (continuous-integration) on 2016-09-07

Alan Griffiths: Disapprove on 2016-09-05

Diff: 272 lines (+40/-63)

9 files modified

include/platform/mir/graphics/null_display_report.h (+9/-12)
src/platform/graphics/CMakeLists.txt (+1/-0)
src/platform/graphics/null_display_report.cpp (+19/-17)
src/platform/symbols.map (+3/-0)
src/platforms/android/server/device_quirks.cpp (+2/-14)
src/platforms/android/utils/render_overlays.cpp (+2/-15)
src/server/report/null/CMakeLists.txt (+0/-1)
src/server/report/null/null_report_factory.cpp (+2/-2)
tests/unit-tests/platforms/nested/test_nested_display.cpp (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3687. By Daniel van Vugt on 2016-09-07

Merge latest trunk

3686. By Daniel van Vugt on 2016-09-06

Ping Jenkins

3685. By Daniel van Vugt on 2016-09-05

It's LGPL, not GPL

3684. By Daniel van Vugt on 2016-09-05

First attempt

3683. By Michael Terry on 2016-09-02

Have libmirserver-dev Depend on uuid-dev so that other packages have all the files they need. Fixes: https://bugs.launchpad.net/bugs/1617435.

Approved by mir-ci-bot, Daniel van Vugt, Alan Griffiths, Alexandros Frantzis.

3682. By Chris Halse Rogers on 2016-08-31

Improvements to display configuration API and implementation.

*) Don't crash the server if a client calls mir_connection_confirm_base_display_configuration before the deferred event loop gets around to processing a previous call to mir_connection_preview_base_display_configuration.
*) Allow a client to cancel a base-configuration change preview
*) Notify a client when it tries to preview a new display configuration while another client already has a change in progress.

Approved by mir-ci-bot, Alan Griffiths, Kevin DuBois.

3681. By Kevin DuBois on 2016-08-31

nested: add mgn::NestedBuffer in preparation for "nested-passthrough" (bypass for clients of nested server).

Approved by mir-ci-bot, Alan Griffiths, Chris Halse Rogers.

3680. By Cemil Azizoglu on 2016-08-31

r3652 accidentally omitted some of unit tests. This MP restores them.
.

Approved by Daniel van Vugt, mir-ci-bot.

3679. By Daniel van Vugt on 2016-08-29

mirserver-dev headers include uuid.h so make sure our consumers have that
at configure time instead of them failing during build. (LP: #1617435). Fixes: https://bugs.launchpad.net/bugs/1617435.

Approved by Alan Griffiths, Kevin DuBois, mir-ci-bot.

3678. By Daniel van Vugt on 2016-08-29

Add missing build-dep for libepoxy-dev (LP: #1617256). Fixes: https://bugs.launchpad.net/bugs/1617256.

Approved by Alan Griffiths, Kevin DuBois, mir-ci-bot.