Unity System Compositor

Merge lp:~unity-system-compositor-team/unity-system-compositor/mir-0.26-compat into lp:unity-system-compositor

  1. mir-0.26-compat
  2. Merge into trunk
Proposed by Cemil Azizoglu
Status: Merged
Approved by: Alexandros Frantzis
Approved revision: 305
Merged at revision: 303
Proposed branch: lp:~unity-system-compositor-team/unity-system-compositor/mir-0.26-compat
Merge into: lp:unity-system-compositor
Diff against target: 334 lines (+102/-40)
10 files modified
.bzrignore (+1/-0)
CMakeLists.txt (+1/-1)
debian/changelog (+64/-5)
debian/control (+2/-2)
spinner/eglapp.cpp (+1/-1)
spinner/miregl.cpp (+2/-2)
spinner/miregl.h (+1/-1)
src/mir_input_configuration.cpp (+16/-16)
src/mir_input_configuration.h (+5/-5)
tests/unit-tests/test_mir_input_configuration.cpp (+9/-7)
To merge this branch: bzr merge lp:~unity-system-compositor-team/unity-system-compositor/mir-0.26-compat
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve
Alexandros Frantzis (community) Approve
Review via email: mp+314966@code.launchpad.net

Commit message

Sync with distro and prepare trunk for next release.

Description of the change

Sync with distro and prepare trunk for next release.

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

FAILED: Continuous integration, rev:305
https://mir-jenkins.ubuntu.com/job/usc-ci/42/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-usc/60/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3656
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3646
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3646
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3646
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/64
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/64/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/64/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/64
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/64/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/64
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/64/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/64/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

Hmm no zesty in the archive? Is this the first MP after zesty was enabled?

Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

> Hmm no zesty in the archive?

... in the staging PPA, I mean.

Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

> > Hmm no zesty in the archive?
>
> ... in the staging PPA, I mean.

I enabled zesty builds in the PPA, and requested an on-demand build.

Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

I see that the staging ppa now has the zesty packages. Trying this again.

Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:305
https://mir-jenkins.ubuntu.com/job/usc-ci/43/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-usc/61
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3666
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3656
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3656
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3656
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/65
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/65/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/65
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/65/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/65
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/65/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/65
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/65/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/65
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/65/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

\o/

Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Looks good.

review: Approve
Revision history for this message
Mir CI Bot (mir-ci-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2013-04-09 04:47:20 +0000
3+++ .bzrignore 2017-01-17 21:15:46 +0000
4@@ -4,3 +4,4 @@
5 CMakeFiles
6 Makefile
7 src/dm_protocol.pb.*
8+.project
9
10=== modified file 'CMakeLists.txt'
11--- CMakeLists.txt 2016-06-17 16:00:58 +0000
12+++ CMakeLists.txt 2017-01-17 21:15:46 +0000
13@@ -16,7 +16,7 @@
14
15 project(UnitySystemCompositor)
16 set(USC_VERSION_MAJOR 0)
17-set(USC_VERSION_MINOR 6)
18+set(USC_VERSION_MINOR 9)
19 set(USC_VERSION_PATCH 0)
20 set(USC_VERSION "${USC_VERSION_MAJOR}.${USC_VERSION_MINOR}.${USC_VERSION_PATCH}")
21
22
23=== modified file 'debian/changelog'
24--- debian/changelog 2016-06-09 08:36:48 +0000
25+++ debian/changelog 2017-01-17 21:15:46 +0000
26@@ -1,8 +1,61 @@
27-unity-system-compositor (0.6.0-0ubuntu1) yakkety; urgency=medium
28-
29- * Update for compatibility with repowerd.
30-
31- -- Alexandros Frantzis <alexandros.frantzis@canonical.com> Thu, 09 Jun 2016 11:34:40 +0300
32+unity-system-compositor (0.9.0-0ubuntu1) UNRELEASED; urgency=medium
33+
34+ * Update for compatibility with Mir 0.26
35+
36+ -- Cemil Azizoglu <cemil.azizoglu@canonical.com> Tue, 17 Jan 2017 10:58:13 -0600
37+
38+unity-system-compositor (0.8.0+17.04.20161206-0ubuntu1) zesty; urgency=medium
39+
40+ * 0.8.0 release, containing compatibility fixes for mir 0.25 release
41+
42+ -- Brandon Schaefer <brandon.schaefer@canonical.com> Tue, 06 Dec 2016 02:48:56 +0000
43+
44+unity-system-compositor (0.7.1+16.10.20160909.1-0ubuntu1) yakkety; urgency=medium
45+
46+ [ Michael Terry ]
47+ * Use system wallpaper instead of custom built-in one.
48+
49+ -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 09 Sep 2016 14:39:40 +0000
50+
51+unity-system-compositor (0.7.1+16.10.20160824-0ubuntu1) yakkety; urgency=medium
52+
53+ * 0.7.1 release
54+ - Use libandroid-properties-dev build-dep on arm64
55+ - Use python3 for everything (autopilot tests and internal scripts)
56+ - Remove obsolete ubuntu-desktop-mir binary package
57+
58+ -- Alexandros Frantzis <alexandros.frantzis@canonical.com> Wed, 24 Aug 2016 07:16:37 +0000
59+
60+unity-system-compositor (0.7.0+16.10.20160815-0ubuntu1) yakkety; urgency=medium
61+
62+ * 0.7.0 release, containing compatibility fixes for mir 0.24 release.
63+ Only test code changes.
64+
65+ -- Kevin DuBois <kevin.dubois@canonical.com> Mon, 15 Aug 2016 18:57:15 +0000
66+
67+unity-system-compositor (0.6.0+16.10.20160805.1-0ubuntu1) yakkety; urgency=medium
68+
69+ * No-change rebuild.
70+
71+ -- Alexandros Frantzis <alexandros.frantzis@canonical.com> Fri, 05 Aug 2016 10:18:16 +0000
72+
73+unity-system-compositor (0.6.0+16.10.20160609-0ubuntu2) yakkety; urgency=medium
74+
75+ * No-change rebuild for boost soname change.
76+
77+ -- Matthias Klose <doko@ubuntu.com> Thu, 04 Aug 2016 08:33:29 +0000
78+
79+unity-system-compositor (0.6.0+16.10.20160609-0ubuntu1) yakkety; urgency=medium
80+
81+ * 0.6.0 release
82+
83+ -- Alexandros Frantzis <alexandros.frantzis@canonical.com> Thu, 09 Jun 2016 09:05:15 +0000
84+
85+unity-system-compositor (0.6.0-0ubuntu1) xenial; urgency=medium
86+
87+ * Grand repowerd update.
88+
89+ -- Alexandros Frantzis <alexandros.frantzis@canonical.com> Wed, 01 Jun 2016 19:39:14 +0000
90
91 unity-system-compositor (0.5.1+16.10.20160602.1-0ubuntu1) yakkety; urgency=medium
92
93@@ -11,6 +64,12 @@
94
95 -- Kevin DuBois <kdub432@gmail.com> Thu, 02 Jun 2016 17:53:14 +0000
96
97+unity-system-compositor (0.5.1+16.04.20160428-0ubuntu2) yakkety; urgency=medium
98+
99+ * No-change rebuild of latest xenial trunk against current archive.
100+
101+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Thu, 19 May 2016 21:02:28 +0200
102+
103 unity-system-compositor (0.5.1+16.04.20160428-0ubuntu1) xenial; urgency=medium
104
105 [ CI Train Bot ]
106
107=== modified file 'debian/control'
108--- debian/control 2016-09-02 13:52:05 +0000
109+++ debian/control 2017-01-17 21:15:46 +0000
110@@ -16,8 +16,8 @@
111 libglib2.0-dev,
112 libgles2-mesa-dev,
113 libglm-dev,
114- libmirclient-dev (>= 0.22.0),
115- libmirserver-dev (>= 0.22.0),
116+ libmirclient-dev (>= 0.26.0),
117+ libmirserver-dev (>= 0.26.0),
118 pkg-config,
119 python3,
120 python3-setuptools,
121
122=== modified file 'spinner/eglapp.cpp'
123--- spinner/eglapp.cpp 2015-08-25 15:51:00 +0000
124+++ spinner/eglapp.cpp 2017-01-17 21:15:46 +0000
125@@ -74,7 +74,7 @@
126
127 std::vector<std::shared_ptr<MirEglSurface>> mir_eglapp_init(int argc, char *argv[])
128 {
129- MirSurfaceParameters surfaceparm =
130+ MirWindowParameters surfaceparm =
131 {
132 "eglappsurface",
133 0, 0,
134
135=== modified file 'spinner/miregl.cpp'
136--- spinner/miregl.cpp 2015-08-20 09:33:36 +0000
137+++ spinner/miregl.cpp 2017-01-17 21:15:46 +0000
138@@ -60,7 +60,7 @@
139
140 namespace
141 {
142-MirSurface* create_surface(MirConnection* const connection, MirSurfaceParameters const& surfaceparm)
143+MirWindow* create_surface(MirConnection* const connection, MirWindowParameters const& surfaceparm)
144 {
145 auto const spec = mir_connection_create_spec_for_normal_surface(
146 connection,
147@@ -85,7 +85,7 @@
148 }
149 }
150
151-MirEglSurface::MirEglSurface(std::shared_ptr<MirEglApp> const& mir_egl_app, MirSurfaceParameters const& surfaceparm, int swapinterval) :
152+MirEglSurface::MirEglSurface(std::shared_ptr<MirEglApp> const& mir_egl_app, MirWindowParameters const& surfaceparm, int swapinterval) :
153 mir_egl_app{mir_egl_app},
154 surface{create_surface(mir_egl_app->connection, surfaceparm)},
155 eglsurface{mir_egl_app->create_surface(surface)},
156
157=== modified file 'spinner/miregl.h'
158--- spinner/miregl.h 2015-06-10 14:17:13 +0000
159+++ spinner/miregl.h 2017-01-17 21:15:46 +0000
160@@ -37,7 +37,7 @@
161 public:
162 MirEglSurface(
163 std::shared_ptr<MirEglApp> const& mir_egl_app,
164- MirSurfaceParameters const& surfaceparm,
165+ MirWindowParameters const& surfaceparm,
166 int swapinterval);
167
168 ~MirEglSurface();
169
170=== modified file 'src/mir_input_configuration.cpp'
171--- src/mir_input_configuration.cpp 2016-01-20 23:32:14 +0000
172+++ src/mir_input_configuration.cpp 2017-01-17 21:15:46 +0000
173@@ -17,8 +17,6 @@
174 #include "mir_input_configuration.h"
175 #include "mir/input/input_device_observer.h"
176 #include "mir/input/input_device_hub.h"
177-#include "mir/input/pointer_configuration.h"
178-#include "mir/input/touchpad_configuration.h"
179 #include "mir/input/device.h"
180
181 namespace mi = mir::input;
182@@ -108,9 +106,9 @@
183
184 void usc::MirInputConfiguration::set_mouse_primary_button(int32_t button)
185 {
186- mouse_pointer_config.handedness = button == 0 ?
187+ mouse_pointer_config.handedness(button == 0 ?
188 mir_pointer_handedness_right :
189- mir_pointer_handedness_left;
190+ mir_pointer_handedness_left);
191 update_mice();
192 }
193
194@@ -121,20 +119,22 @@
195 clamped = 0.0;
196 if (clamped > 1.0)
197 clamped = 1.0;
198- mouse_pointer_config.cursor_acceleration_bias = clamped * 2.0 - 1.0;
199+ mouse_pointer_config.cursor_acceleration_bias(clamped * 2.0 - 1.0);
200 update_mice();
201 }
202
203 void usc::MirInputConfiguration::set_mouse_scroll_speed(double speed)
204 {
205- mouse_pointer_config.horizontal_scroll_scale = speed;
206- mouse_pointer_config.vertical_scroll_scale = speed;
207+ mouse_pointer_config.horizontal_scroll_scale(speed);
208+ mouse_pointer_config.vertical_scroll_scale(speed);
209 update_mice();
210 }
211
212 void usc::MirInputConfiguration::set_touchpad_primary_button(int32_t button)
213 {
214- touchpad_pointer_config.handedness = button == 0?mir_pointer_handedness_right:mir_pointer_handedness_left;
215+ touchpad_pointer_config.handedness(button == 0 ?
216+ mir_pointer_handedness_right :
217+ mir_pointer_handedness_left);
218 update_touchpads();
219 }
220
221@@ -145,43 +145,43 @@
222 clamped = 0.0;
223 if (clamped > 1.0)
224 clamped = 1.0;
225- touchpad_pointer_config.cursor_acceleration_bias = clamped * 2.0 - 1.0;
226+ touchpad_pointer_config.cursor_acceleration_bias(clamped * 2.0 - 1.0);
227 update_touchpads();
228 }
229
230 void usc::MirInputConfiguration::set_touchpad_scroll_speed(double speed)
231 {
232- touchpad_pointer_config.horizontal_scroll_scale = speed;
233- touchpad_pointer_config.vertical_scroll_scale = speed;
234+ touchpad_pointer_config.horizontal_scroll_scale(speed);
235+ touchpad_pointer_config.vertical_scroll_scale(speed);
236 update_touchpads();
237 }
238
239 void usc::MirInputConfiguration::set_two_finger_scroll(bool enable)
240 {
241- MirTouchpadScrollModes current = touchpad_config.scroll_mode;
242+ MirTouchpadScrollModes current = touchpad_config.scroll_mode();
243 if (enable)
244 current |= mir_touchpad_scroll_mode_two_finger_scroll;
245 else
246 current &= ~mir_touchpad_scroll_mode_two_finger_scroll;
247- touchpad_config.scroll_mode = current;
248+ touchpad_config.scroll_mode(current);
249 update_touchpads();
250 }
251
252 void usc::MirInputConfiguration::set_tap_to_click(bool enable)
253 {
254- touchpad_config.tap_to_click = enable;
255+ touchpad_config.tap_to_click(enable);
256 update_touchpads();
257 }
258
259 void usc::MirInputConfiguration::set_disable_touchpad_while_typing(bool enable)
260 {
261- touchpad_config.disable_while_typing = enable;
262+ touchpad_config.disable_while_typing(enable);
263 update_touchpads();
264 }
265
266 void usc::MirInputConfiguration::set_disable_touchpad_with_mouse(bool enable)
267 {
268- touchpad_config.disable_with_mouse = enable;
269+ touchpad_config.disable_with_mouse(enable);
270 update_touchpads();
271 }
272
273
274=== modified file 'src/mir_input_configuration.h'
275--- src/mir_input_configuration.h 2015-11-03 19:59:19 +0000
276+++ src/mir_input_configuration.h 2017-01-17 21:15:46 +0000
277@@ -19,8 +19,8 @@
278
279 #include "input_configuration.h"
280
281-#include "mir/input/touchpad_configuration.h"
282-#include "mir/input/pointer_configuration.h"
283+#include "mir/input/mir_touchpad_config.h"
284+#include "mir/input/mir_pointer_config.h"
285
286 #include <memory>
287 #include <thread>
288@@ -67,9 +67,9 @@
289 std::mutex devices_lock;
290 std::unordered_set<std::shared_ptr<mir::input::Device>> touchpads;
291 std::unordered_set<std::shared_ptr<mir::input::Device>> mice;
292- mir::input::PointerConfiguration mouse_pointer_config;
293- mir::input::PointerConfiguration touchpad_pointer_config;
294- mir::input::TouchpadConfiguration touchpad_config;
295+ MirPointerConfig mouse_pointer_config;
296+ MirPointerConfig touchpad_pointer_config;
297+ MirTouchpadConfig touchpad_config;
298 };
299
300 }
301
302=== modified file 'tests/unit-tests/test_mir_input_configuration.cpp'
303--- tests/unit-tests/test_mir_input_configuration.cpp 2016-08-11 11:28:28 +0000
304+++ tests/unit-tests/test_mir_input_configuration.cpp 2017-01-17 21:15:46 +0000
305@@ -22,7 +22,9 @@
306 #include "mir/input/device_capability.h"
307 #include "mir/input/input_device_observer.h"
308 #include "mir/input/device.h"
309-#include "mir/input/keyboard_configuration.h"
310+#include "mir/input/mir_keyboard_config.h"
311+#include "mir/input/mir_pointer_config.h"
312+#include "mir/input/mir_touchpad_config.h"
313
314 #include <gtest/gtest.h>
315 #include <gmock/gmock.h>
316@@ -39,12 +41,12 @@
317 MOCK_CONST_METHOD0(capabilities, mi::DeviceCapabilities());
318 MOCK_CONST_METHOD0(name, std::string());
319 MOCK_CONST_METHOD0(unique_id, std::string());
320- MOCK_CONST_METHOD0(pointer_configuration, mir::optional_value<mi::PointerConfiguration>());
321- MOCK_METHOD1(apply_pointer_configuration, void(mi::PointerConfiguration const&));
322- MOCK_CONST_METHOD0(touchpad_configuration, mir::optional_value<mi::TouchpadConfiguration>());
323- MOCK_METHOD1(apply_touchpad_configuration, void(mi::TouchpadConfiguration const&));
324- MOCK_CONST_METHOD0(keyboard_configuration, mir::optional_value<mi::KeyboardConfiguration>());
325- MOCK_METHOD1(apply_keyboard_configuration, void(mi::KeyboardConfiguration const&));
326+ MOCK_CONST_METHOD0(pointer_configuration, mir::optional_value<MirPointerConfig>());
327+ MOCK_METHOD1(apply_pointer_configuration, void(MirPointerConfig const&));
328+ MOCK_CONST_METHOD0(touchpad_configuration, mir::optional_value<MirTouchpadConfig>());
329+ MOCK_METHOD1(apply_touchpad_configuration, void(MirTouchpadConfig const&));
330+ MOCK_CONST_METHOD0(keyboard_configuration, mir::optional_value<MirKeyboardConfig>());
331+ MOCK_METHOD1(apply_keyboard_configuration, void(MirKeyboardConfig const&));
332
333 MockDevice(mi::DeviceCapabilities caps)
334 : caps(caps)

Subscribers

People subscribed via source and target branches