lp:~albaguirre/unity-system-compositor/silo-virtual-output

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:unity-system-compositor/ubuntu

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2016-02-03

Unity System Compositor Development Team: Pending requested 2016-02-03

Diff: 282 lines (+79/-27)

6 files modified

CMakeLists.txt (+2/-2)
debian/changelog (+6/-0)
src/mir_screen.cpp (+59/-17)
src/mir_screen.h (+4/-4)
tests/include/usc/test/mock_display.h (+4/-0)
tests/integration-tests/test_deadlock_lp1491566.cpp (+4/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

277. By Alberto Aguirre on 2016-02-03

update version

276. By Alberto Aguirre on 2016-02-03

merge lp:mir/ubuntu

275. By Alberto Aguirre on 2016-02-03

mocks: Implement new method added to mir::graphics::Display

274. By Alan Griffiths on 2016-02-02

MirScreen makes calls to reconfigure Mir that can fail by throwing exceptions. Log these errors instead of crashing. Fixes: https://bugs.launchpad.net/bugs/1528384.

Approved by Alexandros Frantzis, Andreas Pokorny, PS Jenkins bot.

273. By Alexandros Frantzis on 2016-02-02

Sync debian and build files with release 0.4.0

272. By Brandon Schaefer on 2016-02-02

Fix up for the new changes coming in mir 0.19.

Approved by Alexandros Frantzis, PS Jenkins bot, Cemil Azizoglu.

271. By Alan Griffiths on 2016-02-01

MirScreen has a convention that functions that do not end "_l" need to acquire a lock before accessing member data or calling functions that do end "_l". Also functions that end "_l" may not call functions that don't end "_l".

Follow the convention.

Approved by Alberto Aguirre, Alexandros Frantzis, Andreas Pokorny, PS Jenkins bot.

270. By Brandon Schaefer on 2016-01-27

Set the cookie authority to a stub that does not do anything because we dont need cookies in USC.

The overall issue is mir cookie authority depends on needing to create a secret. This secret depends on randomness ie. urandom. So a system booting up that depends on the mir server will then need to block until urandom has some entropy. Really USC does not need the cookie authority so, we are overrideing it so we dont block on boot. Fixes: https://bugs.launchpad.net/bugs/1536662.

Approved by PS Jenkins bot, Chris Halse Rogers, Alberto Aguirre, Andreas Pokorny.

269. By Alexandros Frantzis on 2016-01-21

Unblank the screen when a pointer or key event arrives. Fixes: https://bugs.launchpad.net/bugs/1488413.

Approved by Andreas Pokorny, PS Jenkins bot.

268. By Michael Terry on 2016-01-21

Properly clamp mouseCursorSpeed and touchpadCursorSpeed settings.

Approved by PS Jenkins bot, Andreas Pokorny.