lp://qastaging/~morphis/mir/support-for-dropped-fb-support

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://qastaging/mir/ubuntu

Simon Fels: Disapprove on 2016-01-21

Daniel van Vugt: Needs Resubmitting on 2016-01-21

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2016-01-21

Diff: 348 lines (+111/-61)

13 files modified

debian/changelog (+13/-0)
debian/rules (+5/-1)
src/platforms/android/server/android_alloc_adaptor.cpp (+11/-1)
src/platforms/android/server/gl_context.cpp (+1/-1)
src/platforms/android/server/platform.cpp (+5/-0)
src/platforms/android/server/server_render_window.cpp (+14/-1)
src/platforms/mesa/server/kms/platform_symbols.cpp (+19/-1)
src/renderers/gl/program_family.cpp (+0/-5)
src/renderers/gl/renderer.cpp (+4/-1)
tests/unit-tests/graphics/mesa/kms/test_platform.cpp (+20/-0)
tests/unit-tests/renderers/gl/CMakeLists.txt (+0/-1)
tests/unit-tests/renderers/gl/test_gl_program_family.cpp (+0/-49)
tests/unit-tests/renderers/gl/test_gl_renderer.cpp (+19/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3195. By Simon Fels on 2016-01-21

Merge with lp:mir/ubuntu

3194. By Simon Fels on 2016-01-21

Merge lp:~thomas-voss/mir/test-support-for-dropped-fb-support

3193. By Daniel van Vugt on 2016-01-19

No change. Just waking Jenkins up.

3192. By Daniel van Vugt on 2016-01-18

Correct the package version string

3191. By Daniel van Vugt on 2016-01-18

Update the changelog

3190. By Cemil Azizoglu on 2016-01-18

Fix buffer leak causing server crashes after repeated screencasts.

The workaround for LP: #1454201 caused LP: #1523900. This fixes the former
properly, and hence avoids the latter.

3189. By Daniel van Vugt on 2016-01-18

Avoid choosing graphics-dummy (or no driver at all) over mesa-kms on a
desktop with DRM/Intel graphics. (LP: #1528082)

The right choice is obviously mesa-kms even if it fails to initialize
DRM/VT things. If however mesa-x11 or another driver can be used instead,
it will be.

3188. By Andreas Pokorny on 2016-01-15

resolve changelog conflicts

3187. By Andreas Pokorny on 2016-01-15

* New upstream release 0.18.1 (https://launchpad.net/mir/+milestone/0.18.1)
  - No ABI changes. Bug fix release only.
  - Bug fixed:
    . [regression] pinch to zoom not working reliably (LP: #1531517)

3186. By Andreas Pokorny on 2016-01-15

Never encode more than one action per event

Android InputTransport has only one action parameter per event. Within that the contact that caused the action is also encoded. So until we replace or extend the input transport protocol, we have to split up MirEvents, to not lose touch up/down changes.
Additionally in this version of the fix. also a recent lp:mir cleanup that affected the tool type encoding of pointer events.