Unity System Compositor

Merge lp:~alan-griffiths/unity-system-compositor/mir-1.0-compat into lp:unity-system-compositor

  1. mir-1.0-compat
  2. Merge into trunk
Proposed by Alan Griffiths
Status: Needs review
Proposed branch: lp:~alan-griffiths/unity-system-compositor/mir-1.0-compat
Merge into: lp:unity-system-compositor
Diff against target: 49 lines (+17/-3)
2 files modified
debian/changelog (+12/-0)
tests/unit-tests/test_session_switcher.cpp (+5/-3)
To merge this branch: bzr merge lp:~alan-griffiths/unity-system-compositor/mir-1.0-compat
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Needs Fixing
Unity System Compositor Development Team Pending
Review via email: mp+331458@code.launchpad.net

Description of the change

I know USC is unsupported, but this branch is useful for Zesty.

I've put up as an MP to make it easy to find.

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:315
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~alan-griffiths/unity-system-compositor/mir-1.0-compat/+merge/331458/+edit-commit-message

https://mir-jenkins.ubuntu.com/job/usc-ci/67/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-usc/98
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5311
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5299
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5299
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5299
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=artful/102
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=artful/102/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial/102
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial/102/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/102
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/102/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=artful/102
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=artful/102/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial/102
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial/102/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/102
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/102/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:316
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~alan-griffiths/unity-system-compositor/mir-1.0-compat/+merge/331458/+edit-commit-message

https://mir-jenkins.ubuntu.com/job/usc-ci/68/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-usc/99
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5313
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5301
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5301
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5301
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=artful/103
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=artful/103/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial/103
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial/103/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/103
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/103/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=artful/103
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=artful/103/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial/103
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial/103/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/103
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/103/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Reply
lp:~alan-griffiths/unity-system-compositor/mir-1.0-compat updated
191. By Alan Griffiths

1.0 compat

192. By Alan Griffiths

Frig for LP build recipe

193. By Alan Griffiths

Mir 1.0 => Mir 0.28

Unmerged revisions

193. By Alan Griffiths

Mir 1.0 => Mir 0.28

192. By Alan Griffiths

Frig for LP build recipe

191. By Alan Griffiths

1.0 compat

190. By Daniel van Vugt

Fix build failures from upstream changes

189. By Daniel van Vugt

Merge latest trunk

188. By Daniel van Vugt

Fix build failure from racarr's new cursor BufferStream stuff.

187. By Daniel van Vugt

Migrate to MirEvent 2.1 API, coming in Mir 0.13

186. By Daniel van Vugt

Revert previous hack. It's fixed upstream in Mir.

185. By Daniel van Vugt

Quick fix to get things building.

184. By Daniel van Vugt

Merge latest trunk. Now identical.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-06-16 15:09:44 +0000
3+++ debian/changelog 2017-10-13 16:23:23 +0000
4@@ -1,3 +1,15 @@
5+unity-system-compositor (0.9.3-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Another no change rebuild for Mir 1.0
8+
9+ -- Alan Griffiths <alan.griffiths@canonical.com> Wed, 27 Sep 2017 12:37:52 +0100
10+
11+unity-system-compositor (0.9.2-0ubuntu1) UNRELEASED; urgency=medium
12+
13+ * No change rebuild for Mir 1.0
14+
15+ -- Alan Griffiths <alan.griffiths@canonical.com> Wed, 27 Sep 2017 12:37:52 +0100
16+
17 unity-system-compositor (0.9.1-0ubuntu1) UNRELEASED; urgency=medium
18
19 * No change rebuild for Mir 0.27
20
21=== modified file 'tests/unit-tests/test_session_switcher.cpp'
22--- tests/unit-tests/test_session_switcher.cpp 2017-03-27 14:40:28 +0000
23+++ tests/unit-tests/test_session_switcher.cpp 2017-10-13 16:23:23 +0000
24@@ -102,6 +102,7 @@
25 mir::frontend::BufferStreamId create_buffer_stream(mir::graphics::BufferProperties const& /*props*/) override { return {}; }
26 std::shared_ptr<mir::frontend::BufferStream> get_buffer_stream(mir::frontend::BufferStreamId /*stream*/) const override { return nullptr; }
27 void destroy_buffer_stream(mir::frontend::BufferStreamId /*stream*/) override {}
28+#if MIR_SERVER_VERSION < MIR_VERSION_NUMBER(0, 28, 0)
29 mir::graphics::BufferID create_buffer(mir::graphics::BufferProperties const&) override
30 {
31 return {};
32@@ -119,13 +120,14 @@
33 void destroy_buffer(mir::graphics::BufferID) override
34 {
35 }
36- void send_error(mir::ClientVisibleError const&) override
37- {
38- }
39 std::shared_ptr<mir::graphics::Buffer> get_buffer(mir::graphics::BufferID) override
40 {
41 return nullptr;
42 }
43+#endif
44+ void send_error(mir::ClientVisibleError const&) override
45+ {
46+ }
47 std::string name() const override { return name_; }
48 void send_display_config(mir::graphics::DisplayConfiguration const&) override {}
49 void send_input_config(MirInputConfig const&) override {}

Subscribers

People subscribed via source and target branches