Merge lp:mir/0.18 into lp:mir

[Kevin DuBois]

Merge mir version 0.18 into lp:mir/ubuntu

Merge mir version 0.18 into lp:mir/ubuntu

[lp:mir/0.18]

3152. By Alberto Aguirre on 2015-12-01

client buffer stream: always signal wait handle and invoke callback even during creation errors

The wait handle given to the client should always be signaled and the client supplied callback must be invoked
even if the server fails to create the buffer stream.

Clients can use mir_buffer_stream_is_valid to determine if a buffer stream was created succesfully. Fixes: https://bugs.launchpad.net/bugs/1519998, https://bugs.launchpad.net/bugs/1519999.

Approved by PS Jenkins bot, Alan Griffiths.

3153. By Alexandros Frantzis on 2015-12-01

platform: Ensure the platform library is not unloaded while the event handlers it registered are alive.

Approved by PS Jenkins bot, Alberto Aguirre.

3154. By Alberto Aguirre on 2015-12-01

Add mir_buffer_stream_get_error_message

Allow client to retrieve error messages when buffer stream creation fails. Fixes: https://bugs.launchpad.net/bugs/1520005.

Approved by Alan Griffiths, PS Jenkins bot.

3155. By Andreas Pokorny on 2015-12-01

fix error in bitwise logic. Fixes: https://bugs.launchpad.net/bugs/1521225.

Approved by Kevin DuBois, PS Jenkins bot, Alberto Aguirre, Alan Griffiths.

3156. By Alberto Aguirre on 2015-12-01

tests: CrossProcessSync: retry poll after EINTR.

Approved by Alan Griffiths, PS Jenkins bot.

3157. By Chris Halse Rogers on 2015-12-02

Update and re-enable ThreadedDispatcherSignalTest.keeps_dispatching_after_signal_interruption

The test as it was couldn't fail (barring kernel bugs) because ThreadedDispatcher uses poll(), which does not share epoll's non-POSIX EINTR behaviour across SIGSTOP/SIGCONT pairs.

Attaching a signal handler for SIGCONT ensures we get EINTR, and the test fails appropriately.
.

Approved by PS Jenkins bot, Alexandros Frantzis, Kevin DuBois, Alan Griffiths.

3158. By kevin gunn on 2015-12-02

add SYSTEM to system directories.

Approved by PS Jenkins bot, Alan Griffiths, Alberto Aguirre.

3159. By Alexandros Frantzis on 2015-12-02

tests: Ensure mtf::ServerRunner::stop() can be invoked safely even when the server has been destroyed. Fixes: https://bugs.launchpad.net/bugs/1520217.

Approved by PS Jenkins bot, Alberto Aguirre, Alan Griffiths.

3160. By Cemil Azizoglu on 2015-12-02

Pass submitted buffer size in frame_posted.
.

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

3161. By Alberto Aguirre on 2015-12-02

Add UBSan build type.

Invoke with -DCMAKE_BUILD_TYPE=ubsanitizer. Fixes: https://bugs.launchpad.net/bugs/1521808.

Approved by PS Jenkins bot, Alexandros Frantzis, Alan Griffiths.

3162. By Alberto Aguirre on 2015-12-02

session mediator: exchange_buffer: throw when unable to retrieve a buffer for the given stream id. Fixes: https://bugs.launchpad.net/bugs/1522093.

Approved by PS Jenkins bot, Kevin DuBois, Alan Griffiths.

3163. By Kevin DuBois on 2015-12-03

Major changes are coming to the cookie client api, so lets remove the old stuff before its released. Gives us to time to make correct changes without rushing.

Approved by PS Jenkins bot, Brandon Schaefer, Alan Griffiths, Chris Halse Rogers.

3164. By Andreas Pokorny on 2015-12-03

Disable x11 input platform when --vt is specified on comand line, this is in line. Fixes: https://bugs.launchpad.net/bugs/1521651.

Approved by PS Jenkins bot, Alan Griffiths, Kevin DuBois, Alberto Aguirre.

3165. By Alberto Aguirre on 2015-12-03

Add notification for cursor image removal.

Avoid creating references to null pointers when notifying observers when a cursor image has been removed from a surface.
Instead add an explicit call in SurfaceObserver to notify about removal. Fixes: https://bugs.launchpad.net/bugs/1521795.

Approved by PS Jenkins bot, Kevin DuBois, Alan Griffiths.

3166. By Alan Griffiths on 2015-12-03

tests: provide a public FakeDisplay to facilitate testing of display configuration changes.

Approved by PS Jenkins bot, Kevin DuBois, Andreas Pokorny.

3167. By Alberto Aguirre on 2015-12-03

fix some complaints from UBSan.

Approved by PS Jenkins bot, Alan Griffiths, Kevin DuBois.

3168. By Andreas Pokorny on 2015-12-03

make evdev input platform required by the driver packages.

Approved by Alan Griffiths, PS Jenkins bot, Chris Halse Rogers.

3169. By Kevin DuBois on 2015-12-03

android: use the EGL_fence_sync extensions to synchronize client software buffers.

fixes: lp: #1517205

Approved by: Alan Griffiths, Cemil Azizoglu, Andreas Pokorny

3170. By Kevin DuBois on 2015-12-03

Don't hide the mtd alias in Mesa-only builds like ppc64 (LP: #1522122)

Approved by: Alan Griffiths, Kevin DuBois

3171. By Kevin DuBois on 2015-12-03

merge in lp:mir/ubuntu, fixing 6 conflicts

3172. By Kevin DuBois on 2015-12-03

update changelog for 0.18 release

3173. By Kevin DuBois on 2015-12-04

cherrypick lp:mir rev 3172:
scene: fix the locking in SurfaceStack. Fixes: https://bugs.launchpad.net/bugs/1522105.

Approved by Kevin DuBois, Alberto Aguirre, PS Jenkins bot.

3174. By Daniel van Vugt on 2015-12-07

Revert spurious merge r3171. Everything in it is incorrect.

The good news is that since the merge is still in the bzr history, the
aforementioned conflicts are still resolved as far as bzr is concerned.

3175. By Kevin DuBois on 2015-12-07

input-evdev: use ticks where possible, or scale scroll units and invert vertical scroll axis

fixes LP: #1522673

Approved by: Alan Griffiths, Daniel van Vugt

3176. By Kevin DuBois on 2015-12-07

make sure client doesnt have symbols with _unreleased stanza, use 9v18 for the new symbols

3177. By Daniel van Vugt on 2015-12-08

debian/changelog: Fix indentation and line wrapping.

3178. By Daniel van Vugt on 2015-12-09

Fix failing cross compile on xenial due to changes in dpkg-checkbuilddeps
return codes and error messages, which we parse. (LP: #1523801)

This updated script should still work with older dpkg-checkbuilddeps too.

3179. By Daniel van Vugt on 2015-12-09

Mention the fix for LP: #1523801 in the changelog too.

3180. By Kevin DuBois on 2015-12-11

revert fix for 1517205 in order to avoid regression noted in 1524414

3181. By Kevin DuBois on 2015-12-14

reprivatize headers from revert

3182. By Kevin DuBois on 2015-12-15

revert changes to vt option passing. reverts rev 3098, and fixes u8 desktop session (lp: #1526505)

3183. By Kevin DuBois on 2015-12-16

readd fix and regressions introduced in 3098

3184. By Kevin DuBois on 2015-12-16

merge in lp:~andreas-pokorny/mir/bandaid-probing-kms-when-nested, which hopefully leaves the fix for 1506707 without reintroducing the regressions

3185. By Kevin DuBois on 2015-12-22

capture release signature for 0.18

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.

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)

3188. By Andreas Pokorny on 2016-01-15

resolve changelog conflicts

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.

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.

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

Update the changelog

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

Correct the package version string

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

No change. Just waking Jenkins up.

Unmerged revisions

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.

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-17 11:16:06 +0000
+++ debian/changelog	2015-12-01 12:36:49 +0000
@@ -1,8 +1,70 @@
 mir (0.18.0-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ kdub ]
   * New upstream release 0.18.0 (https://launchpad.net/mir/+milestone/0.18.0)
+    - ABI summary: Only servers need rebuilding;
+      . Mirclient ABI unchanged at 9
+      . Mirserver ABI bumped to 36
+      . Mircommon ABI unchanged at 5
+      . Mirplatform ABI unchanged at 11
+      . Mirprotobuf ABI unchanged at 3
+      . Mirplatformgraphics ABI bumped to 7
+      . Mirclientplatform ABI unchanged at 3
+      . Mirinputplatform ABI added. Current version is 4
+    - Enhancements:
+      . Use libinput by default, and remove the android input stack
+      . Add x11 input probing
+      . Add alternative buffer swapping mechanism internally, available with
+--nbuffers 0
+      . Automatic searching and selection of input platforms
+      . Better support for themed cursors
+      . Add demo client that uses multiple buffer streams in one surface
+      . Improve fingerpaint demo to use touch pressure
+      . Allow for configuring cursor acceleration, scroll speed and left or
+right handed mice
+      . Allow for setting a base display configuration via client api
+      . Various nested server multimonitor fixes and stability improvements
+      . Remove DepthId from the SurfaceStack
+    - Bug fixes:
+        . Unit test failures in Display.* on Android (LP: #1519276)
+        . Build failure due to missing dependency of client rpc code on mir protobuf (LP: #1518372)
+        . Test failure in NestedServer.display_configuration_reset_when_application_exits (LP: #1517990)
+        . CI test failures in various NesterServer tests (LP: #1517781)
+        . FTBFS with -DMIR_PLATFORM=android (LP: #1517532)
+        . Nesting Mir servers with assorted display configs causes lockup (LP: #1516670)
+        . [testsfail] RaiseSurfaces.motion_events_dont_prevent_raise (LP: #1515931)
+        . CI test failures in GLMark2Test (LP: #1515660)
+        . Shells that inject user input events need to agree with the system compositor on the clock to use (LP: #1515515)
+        . mircookie-dev is missing nettle-dev dependency (LP: #1514391)
+        . Segmentation fault on server shutdown with mesa-kms (LP: #1513901)
+        . mircookie requires nettle but libmircookie-dev doesn't depend on it (LP: #1513792)
+        . libmircookie1 package does not list libnettle as dependency (LP: #1513225)
+        . display configuration not reset when application exits (LP: #1511798)
+        . unplugging external monitor causes nested server to throttle client (LP: #1511723)
+        . 1/2 screen on external monitor (LP: #1511538)
+        . unity-system-compositor crash, no interaction on windowed mode (LP: #1511095)
+        . [regression] arm64/powerpc cross compile doesn't build any more (LP: #1510778)
+        . mir_connection_get_egl_pixel_format() crashes if libEGL is loaded RTLD_LAZY (LP: #1510218)
+        . [multimonitor] nested server surface positioning incorrect (LP: #1506846)
+        . unity-system-compositor fails to build against lp:mir r3027 (LP: #1506537)
+        . [regression] Resampled touch events are slightly less regular than they used to be (LP: #1506331)
+        . [testsfail] Segmentation fault mir_demo_server --test-client /usr/bin/mir_demo_client_basic (LP: #1506137)
+        . [regression] Can't move/resize windows any more using Alt+left/middle buttons (LP: #1505114)
+        . CI failure on some 32-bit targets in ServerSignal.terminate_handler_is_called_for_SIGTERM and others (LP: #1504579)
+        . multibufferstreams use surface size instead of stream size (LP: #1503317)
+        . CI segfault in mir-mediumtests-runner-mako in client tests (LP: #1502896)
+        . CI segfault in mir-mediumtests-runner-mako after AndroidHardwareSanity tests (LP: #1502782)
+        . compositing never stops when external monitor is connected (LP: #1499039)
+        . mir_demo_server crashes with ERROR: Dynamic exception type: std::out_of_range - std::exception::what: map::at when an Xmir rootless app is closed by its File menu. (LP: #1497128)
+        . Nested servers don't apply their display configuration at startup (LP: #1492269)
+        . mir fails to open the right mouse device in kvm/qemu (LP: #1489522)
+        . nexus4 & nexus7 hotplug survival (LP: #1488863)
+        . Android uses mir_display_output_invalid_id (0) as an output id value (LP: #1463873)
+        . DemoRenderer: GL_BLEND is really always enabled even when not required (also causes RGBX discolouration in mir_proving_server) (LP: #1423462)
+        . Severe graphical corruption (mostly horizontal streaks/lines) running software clients (including Xmir) on android (LP: #1406725)
+        . [enhancement] Ubuntu needs a way to set mouse scrolling speed (LP: #124440) 
 
- -- Alexandros Frantzis <[e-mail]>  Tue, 17 Nov 2015 13:14:36 +0200
+ -- Kevin DuBois <[e-mail]>  Mon, 30 Nov 2015 14:09:31 -0500
 
 mir (0.17.1+16.04.20151105.1-0ubuntu1) xenial; urgency=medium
 

=== modified file 'debian/mir-client-platform-mesa-dev.install'
--- debian/mir-client-platform-mesa-dev.install	2015-09-24 22:30:09 +0000
+++ debian/mir-client-platform-mesa-dev.install	2015-12-01 12:36:49 +0000
@@ -1,2 +1,3 @@
 usr/include/mirplatform/mir_toolkit/mesa
+usr/lib/*/pkgconfig/mir-client-platform-mesa-dev.pc
 usr/lib/*/pkgconfig/mir-client-platform-mesa.pc

=== modified file 'src/platforms/mesa/CMakeLists.txt'
--- src/platforms/mesa/CMakeLists.txt	2015-09-24 22:30:09 +0000
+++ src/platforms/mesa/CMakeLists.txt	2015-12-01 12:36:49 +0000
@@ -1,6 +1,12 @@
 set(INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include")
 
 configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/mir-client-platform-mesa-dev.pc.in
+  ${CMAKE_CURRENT_BINARY_DIR}/mir-client-platform-mesa-dev.pc
+  @ONLY
+)
+
+configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/mir-client-platform-mesa.pc.in
   ${CMAKE_CURRENT_BINARY_DIR}/mir-client-platform-mesa.pc
   @ONLY
@@ -20,6 +26,9 @@
 )
 
 install(
-  FILES ${CMAKE_CURRENT_BINARY_DIR}/mir-client-platform-mesa.pc
+  FILES
+  ${CMAKE_CURRENT_BINARY_DIR}/mir-client-platform-mesa-dev.pc
+  ${CMAKE_CURRENT_BINARY_DIR}/mir-client-platform-mesa.pc
+
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
 )

=== renamed file 'src/platforms/mesa/mir-client-platform-mesa.pc.in' => 'src/platforms/mesa/mir-client-platform-mesa-dev.pc.in'
--- src/platforms/mesa/mir-client-platform-mesa.pc.in	2015-10-07 12:53:33 +0000
+++ src/platforms/mesa/mir-client-platform-mesa-dev.pc.in	2015-12-01 12:36:49 +0000
@@ -1,6 +1,6 @@
 includedir=@INCLUDEDIR@/mirplatform
 
-Name: mir-client-platform-mesa
+Name: mir-client-platform-mesa-dev
 Description: Mir Mesa client platform development files
 Version: @MIR_VERSION@
 Requires.private: mirclient

=== added file 'src/platforms/mesa/mir-client-platform-mesa.pc.in'
--- src/platforms/mesa/mir-client-platform-mesa.pc.in	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/mir-client-platform-mesa.pc.in	2015-12-01 12:36:49 +0000
@@ -0,0 +1,7 @@
+includedir=@INCLUDEDIR@/mirplatform
+
+Name: mir-client-platform-mesa
+Description: Mir Mesa client platform development files
+Version: @MIR_VERSION@
+Requires.private: mirclient
+Cflags: -I${includedir}

=== modified file 'src/server/scene/surface_stack.cpp'
--- src/server/scene/surface_stack.cpp	2015-11-05 11:51:04 +0000
+++ src/server/scene/surface_stack.cpp	2015-12-01 12:36:49 +0000
@@ -168,12 +168,16 @@
             auto const tracker = rendering_trackers.find(surface.get());
             if (tracker != rendering_trackers.end() && tracker->second->is_exposed_in(id))
             {
-                // Note that we ask the surface and not a Renderable.
-                // This is because we don't want to waste time and resources
-                // on a snapshot till we're sure we need it...
-                int ready = surface->buffers_ready_for_compositor(id);
-                if (ready > result)
-                    result = ready;
+                auto const tracker = rendering_trackers.find(surface.get());
+                if (tracker != rendering_trackers.end() && tracker->second->is_exposed_in(id))
+                {
+                    // Note that we ask the surface and not a Renderable.
+                    // This is because we don't want to waste time and resources
+                    // on a snapshot till we're sure we need it...
+                    int ready = surface->buffers_ready_for_compositor(id);
+                    if (ready > result)
+                        result = ready;
+                }
             }
         }
     }