Merge lp:~alan-griffiths/unity-system-compositor/compatibility into lp:unity-system-compositor

[Alan Griffiths]

Fix build against lp:mir (and Mir 0.26!)

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

PASSED: Continuous integration, rev:309
https://mir-jenkins.ubuntu.com/job/usc-ci/56/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-usc/79
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4469
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4459
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4459
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4459
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/83
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/83/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/83
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/83/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/83
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/83/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/83
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/83/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/83
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/83/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

WFM

review: Approve

[Cemil Azizoglu (cemil-azizoglu)]

It would be more accurate to do

#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
class StubMirSession : public mir::frontend::Session
#else
class StubMirSession : public mir::frontend::Session, public mir::frontend::SessionExtensions
#endif

review: Abstain

[Alan Griffiths (alan-griffiths)]

>
> It would be more accurate to do
>
> #if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
> class StubMirSession : public mir::frontend::Session
> #else
> class StubMirSession : public mir::frontend::Session, public
> mir::frontend::SessionExtensions
> #endif

I don't understand what that refers to.

review: Needs Information

[Cemil Azizoglu (cemil-azizoglu)]

mir::frontend::Session has diverged (due to an API break we noticed in 0.26.1 silo) in 0.26.* from the trunk. We split the couple create_buffer() functions into another object we called mir::frontend::SessionExtensions.

So it'd be more correct for StubMirSession to be inheriting from both interfaces for Mir version < 0.27.

[Brandon Schaefer (brandontschaefer)]

Seems reasonable to me, if we need to address the above issue we can in a different branch

[Brandon Schaefer (brandontschaefer)]

review: Approve

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

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://mir-jenkins.ubuntu.com/job/usc-autolanding/24/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-usc/88
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1326/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4549
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4539
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/4539
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4539
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4539
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/92
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/92/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/92
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/92/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/92
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/92/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/92
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/92/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/92
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/92/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/usc-autolanding/24/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-usc/88
    FAILURE: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1326/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1327/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4549
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4539
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/4539
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4539
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4539
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/92
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/92/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/92
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/92/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/92
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/92/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/92
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/92/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/92
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/92/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

review: Abstain

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

review: Approve (continuous-integration)

=== modified file 'tests/include/usc/test/mock_display.h'
--- tests/include/usc/test/mock_display.h	2016-11-09 18:13:05 +0000
+++ tests/include/usc/test/mock_display.h	2017-03-27 14:52:53 +0000
@@ -21,6 +21,7 @@
 
 #include <mir/graphics/display.h>
 #include <mir/graphics/virtual_output.h>
+#include <mir/version.h>
 #include <gmock/gmock.h>
 
 namespace usc
@@ -53,11 +54,15 @@
 
     void resume() override {};
 
+#if MIR_SERVER_VERSION < MIR_VERSION_NUMBER(0, 27, 0)
     std::shared_ptr<mir::graphics::Cursor> create_hardware_cursor(
         std::shared_ptr<mir::graphics::CursorImage> const&) override
     {
         return {};
     };
+#else
+    std::shared_ptr<mir::graphics::Cursor> create_hardware_cursor() override { return {}; }
+#endif
 
     std::unique_ptr<mir::graphics::VirtualOutput> create_virtual_output(int, int) override
     { return std::unique_ptr<mir::graphics::VirtualOutput>{}; }

=== modified file 'tests/unit-tests/test_mir_input_configuration.cpp'
--- tests/unit-tests/test_mir_input_configuration.cpp	2017-01-19 19:49:44 +0000
+++ tests/unit-tests/test_mir_input_configuration.cpp	2017-03-27 14:52:53 +0000
@@ -25,6 +25,11 @@
 #include "mir/input/mir_keyboard_config.h"
 #include "mir/input/mir_pointer_config.h"
 #include "mir/input/mir_touchpad_config.h"
+#include <mir/version.h>
+
+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
+#include <mir/input/mir_touchscreen_config.h>
+#endif
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -54,6 +59,11 @@
         ON_CALL(*this, capabilities()).WillByDefault(Return(this->caps));
     }
 
+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
+    mir::optional_value<MirTouchscreenConfig> touchscreen_configuration() const { return {}; }
+    void apply_touchscreen_configuration(MirTouchscreenConfig const&) {}
+#endif
+
     mi::DeviceCapabilities caps;
 };
 

=== modified file 'tests/unit-tests/test_session_switcher.cpp'
--- tests/unit-tests/test_session_switcher.cpp	2017-02-06 12:48:40 +0000
+++ tests/unit-tests/test_session_switcher.cpp	2017-03-27 14:52:53 +0000
@@ -20,6 +20,7 @@
 #include "src/spinner.h"
 
 #include "mir/frontend/session.h"
+#include <mir/version.h>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -105,6 +106,7 @@
     {
         return {};
     }
+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
     mir::graphics::BufferID create_buffer(mir::geometry::Size, MirPixelFormat) override
     {
         return {};
@@ -113,6 +115,7 @@
     {
         return {};
     }
+#endif
     void destroy_buffer(mir::graphics::BufferID) override
     {
     }