Merge lp:mir/0.20 into lp:mir/ubuntu

[Alberto Aguirre]

Mir 0.20.3 release

Mir 0.20.3 release

[Andreas Pokorny (andreas-pokorny)]

looks good

review: Approve

[Kevin DuBois (kdub)]

lgtm

review: Approve

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3337
https://mir-jenkins.ubuntu.com/job/mir-ubuntu-ci/12/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/559/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/595
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/587
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/587
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/569/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/569/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/569/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/569/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/569
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/569/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/569
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/569/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ubuntu-ci/12/rebuild

review: Needs Fixing (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

Good

review: Approve

[Daniel van Vugt (vanvugt)]

Just a passing reminder: lp:mir/ubuntu needs to die, and be replaced in future

The reason is lp:mir/ubuntu does not specify a target series. And if we're supporting multiple Ubuntu releases simultaneously, like any mature project, then they will each get different Mir point releases concurrently. So you will also need different target branches.

This is something we used to be able to do easily prior to the introduction of the CI train. And we used it too, releasing different Compiz series' to different Ubuntu series' simultaneously. So the train needs to be modified to deal with multiple branches better.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-03-07 15:15:27 +0000
+++ CMakeLists.txt	2016-03-22 15:33:29 +0000
@@ -29,7 +29,7 @@
 
 set(MIR_VERSION_MAJOR 0)
 set(MIR_VERSION_MINOR 20)
-set(MIR_VERSION_PATCH 2)
+set(MIR_VERSION_PATCH 3)
 
 add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
 add_definitions(-DMIR_VERSION_MINOR=${MIR_VERSION_MINOR})

=== modified file 'debian/changelog'
--- debian/changelog	2016-03-07 17:18:40 +0000
+++ debian/changelog	2016-03-22 15:33:29 +0000
@@ -1,3 +1,14 @@
+mir (0.20.3) UNRELEASED; urgency=medium
+
+  * New upstream release 0.20.3 (https://launchpad.net/mir/+milestone/0.20.3)
+    - ABI summary:
+      . No ABI changes in any libraries. Bugfix release only.
+    - Bug fixed:
+      . Mir crashed with exception 'failed to add sync point to command
+        buffer' (LP: #1554635)
+
+ -- Alberto Aguirre <[e-mail]>  Tue, 22 Mar 2016 10:21:04 -0500
+
 mir (0.20.2+16.04.20160307-0ubuntu1) xenial; urgency=medium
 
   [ Andreas Pokorny ]

=== modified file 'src/platforms/android/common/egl_sync_fence.cpp'
--- src/platforms/android/common/egl_sync_fence.cpp	2016-01-28 17:46:29 +0000
+++ src/platforms/android/common/egl_sync_fence.cpp	2016-03-22 15:33:29 +0000
@@ -18,6 +18,9 @@
 
 #include "egl_sync_fence.h"
 #include <boost/throw_exception.hpp>
+#define MIR_LOG_COMPONENT "egl sync fence"
+#include "mir/log.h"
+#include <sstream>
 
 namespace mg = mir::graphics;
 
@@ -52,9 +55,18 @@
     wait_for(lk, default_timeout);
 
     fence_display = eglGetCurrentDisplay();
+    if (fence_display == EGL_NO_DISPLAY)
+    {
+        log_error("no current display");
+    }
+
     sync_point = egl->eglCreateSyncKHR(fence_display, EGL_SYNC_FENCE_KHR, NULL);
     if (sync_point == EGL_NO_SYNC_KHR)
-        BOOST_THROW_EXCEPTION(std::runtime_error("failed to add sync point to command buffer"));
+    {
+        std::stringstream str;
+        str << "failed to add sync point to command buffer: 0x" << std::hex << eglGetError(); 
+        log_error(str.str());
+    }
 }
 
 void mg::EGLSyncFence::reset()

=== modified file 'tests/unit-tests/graphics/android/test_egl_sync_fence.cpp'
--- tests/unit-tests/graphics/android/test_egl_sync_fence.cpp	2016-02-18 09:56:08 +0000
+++ tests/unit-tests/graphics/android/test_egl_sync_fence.cpp	2016-03-22 15:33:29 +0000
@@ -42,9 +42,9 @@
         .WillOnce(Return(EGL_NO_SYNC_KHR));
 
     mg::EGLSyncFence fence(sync_extensions);
-    EXPECT_THROW({
+    EXPECT_NO_THROW({
         fence.raise();
-    }, std::runtime_error); 
+    });
 }
 
 TEST_F(EglSyncFence, raise_sets_sync_point)