Mir

Merge lp:~alan-griffiths/mir/reboot-0.26.3-release into lp:~mir-team/mir/0.26-old

Proposed by Alan Griffiths on 2017-05-26
Status: Merged
Approved by: Gerry Boland on 2017-05-26
Approved revision: 4069
Merged at revision: 4066
Proposed branch: lp:~alan-griffiths/mir/reboot-0.26.3-release
Merge into: lp:~mir-team/mir/0.26-old
Diff against target: 398 lines (+72/-44)
11 files modified
debian/control (+2/-2)
debian/rules (+1/-1)
include/client/mir/event_printer.h (+5/-5)
include/client/mir/events/event_builders.h (+10/-10)
include/client/mir_toolkit/client_types.h (+2/-6)
include/client/mir_toolkit/events/keymap_event.h (+1/-1)
include/client/mir_toolkit/events/surface_event.h (+1/-1)
include/client/mir_toolkit/rs/mir_render_surface.h (+46/-11)
include/core/mir_toolkit/deprecations.h (+2/-2)
src/common/events/input_configuration_event.cpp (+1/-3)
src/include/common/mir/events/input_configuration_event.h (+1/-2)
To merge this branch: bzr merge lp:~alan-griffiths/mir/reboot-0.26.3-release
Reviewer Review Type Date Requested Status
Gerry Boland 2017-05-26 Approve on 2017-05-26
Review via email: mp+324662@code.launchpad.net

This proposal supersedes a proposal from 2017-05-26.

Commit message

Restore platforms that are unsupported in xenial, add support for building downstreams on, and re-sync deprecation macros with current development.

To post a comment you must log in.
Gerry Boland (gerboland) wrote :

looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2017-05-08 11:05:10 +0000
3+++ debian/control 2017-05-26 09:20:39 +0000
4@@ -24,8 +24,8 @@
5 libprotobuf-dev,
6 pkg-config,
7 android-headers-23,
8- libhardware-dev [i386 amd64 armhf],
9- libandroid-properties-dev [i386 amd64 armhf],
10+ libhardware-dev [i386 amd64 armhf arm64],
11+ libandroid-properties-dev [i386 amd64 armhf arm64],
12 libgoogle-glog-dev,
13 liblttng-ust-dev,
14 libxkbcommon-dev (>= 0.5),
15
16=== modified file 'debian/rules'
17--- debian/rules 2017-05-08 09:48:26 +0000
18+++ debian/rules 2017-05-26 09:20:39 +0000
19@@ -34,7 +34,7 @@
20 endif
21
22 override_dh_auto_configure:
23-ifneq ($(filter armhf,$(DEB_HOST_ARCH)),)
24+ifneq ($(filter armhf arm64,$(DEB_HOST_ARCH)),)
25 dh_auto_configure -- \
26 $(COMMON_CONFIGURE_OPTIONS) \
27 -DMIR_RUN_ACCEPTANCE_TESTS=OFF \
28
29=== modified file 'include/client/mir/event_printer.h'
30--- include/client/mir/event_printer.h 2017-01-19 05:30:03 +0000
31+++ include/client/mir/event_printer.h 2017-05-26 09:20:39 +0000
32@@ -35,19 +35,19 @@
33 std::ostream& operator<<(std::ostream& out, MirOrientation orientation);
34
35 std::ostream& operator<<(std::ostream& out, MirSurfaceAttrib attribute)
36-__attribute__ ((deprecated("use << with MirWindowAttrib instead")));
37+MIR_FOR_REMOVAL_IN_VERSION_1("use << with MirWindowAttrib instead");
38 std::ostream& operator<<(std::ostream& out, MirWindowAttrib attribute);
39 std::ostream& operator<<(std::ostream& out, MirSurfaceFocusState state)
40-__attribute__ ((deprecated("use << with MirWindowFocusState instead")));
41+MIR_FOR_REMOVAL_IN_VERSION_1("use << with MirWindowFocusState instead");
42 std::ostream& operator<<(std::ostream& out, MirWindowFocusState state);
43 std::ostream& operator<<(std::ostream& out, MirSurfaceVisibility state)
44-__attribute__ ((deprecated("use << with MirWindowVisibility instead")));
45+MIR_FOR_REMOVAL_IN_VERSION_1("use << with MirWindowVisibility instead");
46 std::ostream& operator<<(std::ostream& out, MirWindowVisibility state);
47 std::ostream& operator<<(std::ostream& out, MirSurfaceType type)
48-__attribute__ ((deprecated("use << with MirWindowType instead")));
49+MIR_FOR_REMOVAL_IN_VERSION_1("use << with MirWindowType instead");
50 std::ostream& operator<<(std::ostream& out, MirWindowType type);
51 std::ostream& operator<<(std::ostream& out, MirSurfaceState state)
52-__attribute__ ((deprecated("use << with MirWindowState instead")));
53+MIR_FOR_REMOVAL_IN_VERSION_1("use << with MirWindowState instead");
54 std::ostream& operator<<(std::ostream& out, MirWindowState state);
55
56 std::ostream& operator<<(std::ostream& out, MirPromptSessionEvent const& event);
57
58=== modified file 'include/client/mir/events/event_builders.h'
59--- include/client/mir/events/event_builders.h 2017-01-19 05:30:03 +0000
60+++ include/client/mir/events/event_builders.h 2017-05-26 09:20:39 +0000
61@@ -48,7 +48,7 @@
62 EventUPtr make_event(frontend::SurfaceId const& surface_id, geometry::Size const& size);
63 // Surface configure event
64 EventUPtr make_event(frontend::SurfaceId const& surface_id, MirSurfaceAttrib attribute, int value)
65-__attribute__ ((deprecated("use make_event with MirWindowAttribute instead")));
66+MIR_FOR_REMOVAL_IN_VERSION_1("use make_event with MirWindowAttribute instead");
67 // Window configure event
68 EventUPtr make_event(frontend::SurfaceId const& surface_id, MirWindowAttrib attribute, int value);
69 // Close surface event
70@@ -81,12 +81,12 @@
71 // Deprecated version with uint64_t mac
72 EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
73 uint64_t mac, MirKeyboardAction action, xkb_keysym_t key_code,
74- int scan_code, MirInputEventModifiers modifiers) __attribute__ ((deprecated));
75+ int scan_code, MirInputEventModifiers modifiers) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
76
77 // Deprecated version without mac
78 EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
79 MirKeyboardAction action, xkb_keysym_t key_code,
80- int scan_code, MirInputEventModifiers modifiers) __attribute__ ((deprecated));
81+ int scan_code, MirInputEventModifiers modifiers) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
82
83 // Touch event
84 EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
85@@ -94,11 +94,11 @@
86
87 // Deprecated version with uint64_t mac
88 EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
89- uint64_t mac, MirInputEventModifiers modifiers) __attribute__ ((deprecated));
90+ uint64_t mac, MirInputEventModifiers modifiers) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
91
92 // Deprecated version without mac
93 EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
94- MirInputEventModifiers modifiers) __attribute__ ((deprecated));
95+ MirInputEventModifiers modifiers) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
96
97 void add_touch(MirEvent &event, MirTouchId touch_id, MirTouchAction action,
98 MirTouchTooltype tooltype, float x_axis_value, float y_axis_value,
99@@ -110,14 +110,14 @@
100 uint64_t mac, MirInputEventModifiers modifiers, MirPointerAction action,
101 MirPointerButtons buttons_pressed,
102 float x_axis_value, float y_axis_value,
103- float hscroll_value, float vscroll_value) __attribute__ ((deprecated));
104+ float hscroll_value, float vscroll_value) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
105
106 // Deprecated version without relative axis and mac
107 EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
108 MirInputEventModifiers modifiers, MirPointerAction action,
109 MirPointerButtons buttons_pressed,
110 float x_axis_value, float y_axis_value,
111- float hscroll_value, float vscroll_value) __attribute__ ((deprecated));
112+ float hscroll_value, float vscroll_value) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
113
114 EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
115 std::vector<uint8_t> const& mac, MirInputEventModifiers modifiers, MirPointerAction action,
116@@ -132,7 +132,7 @@
117 MirPointerButtons buttons_pressed,
118 float x_axis_value, float y_axis_value,
119 float hscroll_value, float vscroll_value,
120- float relative_x_value, float relative_y_value) __attribute__ ((deprecated));
121+ float relative_x_value, float relative_y_value) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
122
123 // Deprecated version without mac
124 EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
125@@ -140,11 +140,11 @@
126 MirPointerButtons buttons_pressed,
127 float x_axis_value, float y_axis_value,
128 float hscroll_value, float vscroll_value,
129- float relative_x_value, float relative_y_value) __attribute__ ((deprecated));
130+ float relative_x_value, float relative_y_value) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
131
132 // Input configuration event
133 EventUPtr make_event(MirInputConfigurationAction action,
134- MirInputDeviceId id, std::chrono::nanoseconds time) __attribute__((deprecated));
135+ MirInputDeviceId id, std::chrono::nanoseconds time) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
136
137 EventUPtr make_event(std::chrono::nanoseconds timestamp,
138 MirPointerButtons pointer_buttons,
139
140=== modified file 'include/client/mir_toolkit/client_types.h'
141--- include/client/mir_toolkit/client_types.h 2017-04-24 13:11:01 +0000
142+++ include/client/mir_toolkit/client_types.h 2017-05-26 09:20:39 +0000
143@@ -54,8 +54,7 @@
144 typedef struct MirError MirError;
145 typedef struct MirPresentationChain MirPresentationChain;
146 typedef struct MirBuffer MirBuffer;
147-typedef struct MirRenderSurface MirRenderSurface
148-MIR_FOR_REMOVAL_IN_VERSION_1("This type is slated for rename due to MirRenderSurface-->MirSurface transition");
149+typedef struct MirRenderSurface MirRenderSurface;
150
151 /**
152 * Descriptor for an output connection.
153@@ -202,7 +201,7 @@
154 * use the value mir_display_output_id_invalid.
155 */
156 uint32_t output_id;
157-} MirSurfaceParameters MIR_FOR_REMOVAL_IN_VERSION_1("Use MirWindowParameters instead");
158+} MirSurfaceParameters MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_get apis or listen for attribute events instead");
159
160 enum { mir_platform_package_max = 32 };
161
162@@ -556,9 +555,6 @@
163 MirSurface* surface, MirPersistentId* id, void* context)
164 MIR_FOR_REMOVAL_IN_VERSION_1("Use MirWindowIdCallback instead");
165
166-typedef void (*MirRenderSurfaceCallback)(MirRenderSurface*, void* context)
167-MIR_FOR_REMOVAL_IN_VERSION_1("This type is slated for rename due to MirRenderSurface-->MirSurface transition");
168-
169 typedef MirSurfaceParameters MirWindowParameters;
170
171 #pragma GCC diagnostic pop
172
173=== modified file 'include/client/mir_toolkit/events/keymap_event.h'
174--- include/client/mir_toolkit/events/keymap_event.h 2017-01-18 02:29:37 +0000
175+++ include/client/mir_toolkit/events/keymap_event.h 2017-05-26 09:20:39 +0000
176@@ -42,7 +42,7 @@
177 */
178 void mir_keymap_event_get_rules(MirKeymapEvent const* ev,
179 struct xkb_rule_names* rules)
180- __attribute__ ((deprecated));
181+MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_keymap_event_get_keymap_buffer() instead");
182
183 /**
184 * Retrieve the new keymap reported by this MirKeymapEvent
185
186=== modified file 'include/client/mir_toolkit/events/surface_event.h'
187--- include/client/mir_toolkit/events/surface_event.h 2017-04-24 12:52:42 +0000
188+++ include/client/mir_toolkit/events/surface_event.h 2017-05-26 09:20:39 +0000
189@@ -49,7 +49,7 @@
190 * \return The associated attribute value
191 */
192 int mir_surface_event_get_attribute_value(MirSurfaceEvent const* event)
193-MIR_FOR_REMOVAL_IN_VERSION_1("use make_event with mir_window_event_get_attribute_value instead");
194+MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_event_get_attribute_value with MirWindowEvent instead");
195 #pragma GCC diagnostic pop
196
197 #ifdef __cplusplus
198
199=== modified file 'include/client/mir_toolkit/rs/mir_render_surface.h'
200--- include/client/mir_toolkit/rs/mir_render_surface.h 2017-04-24 12:52:42 +0000
201+++ include/client/mir_toolkit/rs/mir_render_surface.h 2017-05-26 09:20:39 +0000
202@@ -23,6 +23,17 @@
203 #include <mir_toolkit/client_types.h>
204 #include <mir_toolkit/deprecations.h>
205
206+#ifndef MIR_DEPRECATE_RENDERSURFACES
207+ #define MIR_DEPRECATE_RENDERSURFACES 0
208+#endif
209+
210+#if MIR_ENABLE_DEPRECATIONS > 0 && MIR_DEPRECATE_RENDERSURFACES > 0
211+ #define MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME\
212+ __attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")))
213+#else
214+ #define MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME
215+#endif
216+
217 #ifdef __cplusplus
218 /**
219 * \addtogroup mir_toolkit
220@@ -31,6 +42,9 @@
221 extern "C" {
222 #endif
223
224+typedef void (*MirRenderSurfaceCallback)(MirRenderSurface*, void* context)
225+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
226+
227 #pragma GCC diagnostic push
228 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
229 /**
230@@ -50,7 +64,7 @@
231 int width, int height,
232 MirRenderSurfaceCallback callback,
233 void* context)
234-MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");
235+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
236
237 /**
238 * Create a render surface and wait for the result
239@@ -65,7 +79,7 @@
240 MirRenderSurface* mir_connection_create_render_surface_sync(
241 MirConnection* connection,
242 int width, int height)
243-MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");
244+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
245
246 /**
247 * Get the size of the MirRenderSurface
248@@ -77,7 +91,7 @@
249 void mir_render_surface_get_size(
250 MirRenderSurface* render_surface,
251 int* width, int* height)
252-MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");
253+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
254
255 /**
256 * Set the size of the MirRenderSurface
257@@ -89,7 +103,7 @@
258 void mir_render_surface_set_size(
259 MirRenderSurface* render_surface,
260 int width, int height)
261-MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");
262+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
263
264 /**
265 * Test for a valid render surface
266@@ -101,8 +115,7 @@
267 */
268 bool mir_render_surface_is_valid(
269 MirRenderSurface* render_surface)
270-MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");
271-
272+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
273 /**
274 * Retrieve a text description of the error. The returned string is owned by
275 * the library and remains valid until the render surface or the associated
276@@ -114,7 +127,7 @@
277 */
278 char const *mir_render_surface_get_error_message(
279 MirRenderSurface* render_surface)
280-MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");
281+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
282
283 /**
284 * Release the specified render surface
285@@ -123,7 +136,7 @@
286 */
287 void mir_render_surface_release(
288 MirRenderSurface* render_surface)
289-MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");
290+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
291
292 /**
293 * Obtain the buffer stream backing a given render surface.
294@@ -143,7 +156,7 @@
295 MirRenderSurface* render_surface,
296 int width, int height,
297 MirPixelFormat format)
298-MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");
299+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
300
301 /**
302 * Obtain the presentation chain backing a given render surface.
303@@ -156,7 +169,7 @@
304 */
305 MirPresentationChain* mir_render_surface_get_presentation_chain(
306 MirRenderSurface* render_surface)
307-MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");
308+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
309
310 /** Query whether the server supports a given presentation mode.
311 *
312@@ -190,7 +203,29 @@
313 MirWindowSpec* spec,
314 MirRenderSurface* render_surface,
315 int hotspot_x, int hotspot_y)
316-MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");
317+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
318+
319+/**
320+ * Set the MirWindowSpec to display content contained in a render surface
321+ *
322+ * \warning: The initial call to mir_window_spec_add_render_surface will set
323+ * the bottom-most content, and subsequent calls will stack the
324+ * content on top.
325+ *
326+ * \param spec The window_spec to be updated
327+ * \param render_surface The render surface containing the content to be displayed
328+ * \param logical_width The width that the content will be displayed at
329+ * (Ignored for buffer streams)
330+ * \param logical_height The height that the content will be displayed at
331+ * (Ignored for buffer streams)
332+ * \param displacement_x The x displacement from the top-left corner of the MirWindow
333+ * \param displacement_y The y displacement from the top-left corner of the MirWindow
334+ */
335+void mir_window_spec_add_render_surface(MirWindowSpec* spec,
336+ MirRenderSurface* render_surface,
337+ int logical_width, int logical_height,
338+ int displacement_x, int displacement_y)
339+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
340
341 #pragma GCC diagnostic pop
342
343
344=== modified file 'include/core/mir_toolkit/deprecations.h'
345--- include/core/mir_toolkit/deprecations.h 2017-04-25 09:32:01 +0000
346+++ include/core/mir_toolkit/deprecations.h 2017-05-26 09:20:39 +0000
347@@ -18,8 +18,8 @@
348 #define MIR_DEPRECATIONS_H_
349
350 #ifndef MIR_ENABLE_DEPRECATIONS
351- // use __GNUC__ < 6 as a proxy for building on Ubunutu 16.04LTS ("Xenial")
352- #if defined(__clang__) || !defined(__GNUC__) || (__GNUC__ >= 6)
353+ // use g++ version < 6.2 as a proxy for building on Ubunutu 16.04LTS ("Xenial") or 16.10 (Yakkety)
354+ #if defined(__clang__) || !defined(__GNUC__) || (__GNUC__ > 6) || ((__GNUC__ == 6) && (__GNUC_MINOR__ >= 2))
355 #define MIR_ENABLE_DEPRECATIONS 1
356 #else
357 #define MIR_ENABLE_DEPRECATIONS 0
358
359=== modified file 'src/common/events/input_configuration_event.cpp'
360--- src/common/events/input_configuration_event.cpp 2017-01-20 16:27:50 +0000
361+++ src/common/events/input_configuration_event.cpp 2017-05-26 09:20:39 +0000
362@@ -18,13 +18,12 @@
363
364 #include "mir/events/input_configuration_event.h"
365
366+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
367 MirInputConfigurationEvent::MirInputConfigurationEvent()
368 {
369 event.initInputConfiguration();
370 }
371
372-#pragma GCC diagnostic push
373-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
374 MirInputConfigurationAction MirInputConfigurationEvent::action() const
375 {
376 return static_cast<MirInputConfigurationAction>(event.asReader().getInputConfiguration().getAction());
377@@ -34,7 +33,6 @@
378 {
379 event.getInputConfiguration().setAction(static_cast<mir::capnp::InputConfigurationEvent::Action>(action));
380 }
381-#pragma GCC diagnostic pop
382
383 std::chrono::nanoseconds MirInputConfigurationEvent::when() const
384 {
385
386=== modified file 'src/include/common/mir/events/input_configuration_event.h'
387--- src/include/common/mir/events/input_configuration_event.h 2017-01-20 16:27:50 +0000
388+++ src/include/common/mir/events/input_configuration_event.h 2017-05-26 09:20:39 +0000
389@@ -37,8 +37,7 @@
390
391 MirInputDeviceId id() const;
392 void set_id(MirInputDeviceId id);
393-}
394- __attribute__((deprecated));
395+};
396 #pragma GCC diagnostic pop
397
398 #endif /* MIR_COMMON_INPUT_CONFIGURATION_EVENT_H_ */

Subscribers

People subscribed via source and target branches