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

[Alan Griffiths]

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

[Gerry Boland (gerboland)]

looks good

review: Approve

=== modified file 'debian/control'
--- debian/control	2017-05-08 11:05:10 +0000
+++ debian/control	2017-05-26 09:20:39 +0000
@@ -24,8 +24,8 @@
                libprotobuf-dev,
                pkg-config,
                android-headers-23,
-               libhardware-dev [i386 amd64 armhf],
-               libandroid-properties-dev [i386 amd64 armhf],
+               libhardware-dev [i386 amd64 armhf arm64],
+               libandroid-properties-dev [i386 amd64 armhf arm64],
                libgoogle-glog-dev,
                liblttng-ust-dev,
                libxkbcommon-dev (>= 0.5),
 
=== modified file 'debian/rules'
--- debian/rules	2017-05-08 09:48:26 +0000
+++ debian/rules	2017-05-26 09:20:39 +0000
@@ -34,7 +34,7 @@
 endif
 
 override_dh_auto_configure:
-ifneq ($(filter armhf,$(DEB_HOST_ARCH)),)
+ifneq ($(filter armhf arm64,$(DEB_HOST_ARCH)),)
 	dh_auto_configure -- \
 	  $(COMMON_CONFIGURE_OPTIONS) \
 	  -DMIR_RUN_ACCEPTANCE_TESTS=OFF \
 
=== modified file 'include/client/mir/event_printer.h'
--- include/client/mir/event_printer.h	2017-01-19 05:30:03 +0000
+++ include/client/mir/event_printer.h	2017-05-26 09:20:39 +0000
@@ -35,19 +35,19 @@
 std::ostream& operator<<(std::ostream& out, MirOrientation orientation);
 
 std::ostream& operator<<(std::ostream& out, MirSurfaceAttrib attribute)
-__attribute__ ((deprecated("use << with MirWindowAttrib instead")));
+MIR_FOR_REMOVAL_IN_VERSION_1("use << with MirWindowAttrib instead");
 std::ostream& operator<<(std::ostream& out, MirWindowAttrib attribute);
 std::ostream& operator<<(std::ostream& out, MirSurfaceFocusState state)
-__attribute__ ((deprecated("use << with MirWindowFocusState instead")));
+MIR_FOR_REMOVAL_IN_VERSION_1("use << with MirWindowFocusState instead");
 std::ostream& operator<<(std::ostream& out, MirWindowFocusState state);
 std::ostream& operator<<(std::ostream& out, MirSurfaceVisibility state)
-__attribute__ ((deprecated("use << with MirWindowVisibility instead")));
+MIR_FOR_REMOVAL_IN_VERSION_1("use << with MirWindowVisibility instead");
 std::ostream& operator<<(std::ostream& out, MirWindowVisibility state);
 std::ostream& operator<<(std::ostream& out, MirSurfaceType type)
-__attribute__ ((deprecated("use << with MirWindowType instead")));
+MIR_FOR_REMOVAL_IN_VERSION_1("use << with MirWindowType instead");
 std::ostream& operator<<(std::ostream& out, MirWindowType type);
 std::ostream& operator<<(std::ostream& out, MirSurfaceState state)
-__attribute__ ((deprecated("use << with MirWindowState instead")));
+MIR_FOR_REMOVAL_IN_VERSION_1("use << with MirWindowState instead");
 std::ostream& operator<<(std::ostream& out, MirWindowState state);
 
 std::ostream& operator<<(std::ostream& out, MirPromptSessionEvent const& event);
 
=== modified file 'include/client/mir/events/event_builders.h'
--- include/client/mir/events/event_builders.h	2017-01-19 05:30:03 +0000
+++ include/client/mir/events/event_builders.h	2017-05-26 09:20:39 +0000
@@ -48,7 +48,7 @@
 EventUPtr make_event(frontend::SurfaceId const& surface_id, geometry::Size const& size);
 // Surface configure event
 EventUPtr make_event(frontend::SurfaceId const& surface_id, MirSurfaceAttrib attribute, int value)
-__attribute__ ((deprecated("use make_event with MirWindowAttribute instead")));
+MIR_FOR_REMOVAL_IN_VERSION_1("use make_event with MirWindowAttribute instead");
 // Window configure event
 EventUPtr make_event(frontend::SurfaceId const& surface_id, MirWindowAttrib attribute, int value);
 // Close surface event
@@ -81,12 +81,12 @@
 // Deprecated version with uint64_t mac
 EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
     uint64_t mac, MirKeyboardAction action, xkb_keysym_t key_code,
-    int scan_code, MirInputEventModifiers modifiers) __attribute__ ((deprecated));
+    int scan_code, MirInputEventModifiers modifiers) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
 
 // Deprecated version without mac
 EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
     MirKeyboardAction action, xkb_keysym_t key_code,
-    int scan_code, MirInputEventModifiers modifiers) __attribute__ ((deprecated));
+    int scan_code, MirInputEventModifiers modifiers) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
 
 // Touch event
 EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
@@ -94,11 +94,11 @@
 
 // Deprecated version with uint64_t mac
 EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
-    uint64_t mac, MirInputEventModifiers modifiers) __attribute__ ((deprecated));
+    uint64_t mac, MirInputEventModifiers modifiers) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
 
 // Deprecated version without mac
 EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
-    MirInputEventModifiers modifiers) __attribute__ ((deprecated));
+    MirInputEventModifiers modifiers) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
 
 void add_touch(MirEvent &event, MirTouchId touch_id, MirTouchAction action,
     MirTouchTooltype tooltype, float x_axis_value, float y_axis_value,
@@ -110,14 +110,14 @@
     uint64_t mac, MirInputEventModifiers modifiers, MirPointerAction action,
     MirPointerButtons buttons_pressed,
     float x_axis_value, float y_axis_value,
-    float hscroll_value, float vscroll_value) __attribute__ ((deprecated));
+    float hscroll_value, float vscroll_value) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
 
 // Deprecated version without relative axis and mac
 EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
     MirInputEventModifiers modifiers, MirPointerAction action,
     MirPointerButtons buttons_pressed,
     float x_axis_value, float y_axis_value,
-    float hscroll_value, float vscroll_value) __attribute__ ((deprecated));
+    float hscroll_value, float vscroll_value) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
 
 EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
     std::vector<uint8_t> const& mac, MirInputEventModifiers modifiers, MirPointerAction action,
@@ -132,7 +132,7 @@
     MirPointerButtons buttons_pressed,
     float x_axis_value, float y_axis_value,
     float hscroll_value, float vscroll_value,
-    float relative_x_value, float relative_y_value) __attribute__ ((deprecated));
+    float relative_x_value, float relative_y_value) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
 
 // Deprecated version without mac
 EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
@@ -140,11 +140,11 @@
     MirPointerButtons buttons_pressed,
     float x_axis_value, float y_axis_value,
     float hscroll_value, float vscroll_value,
-    float relative_x_value, float relative_y_value) __attribute__ ((deprecated));
+    float relative_x_value, float relative_y_value) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
 
 // Input configuration event
 EventUPtr make_event(MirInputConfigurationAction action,
-    MirInputDeviceId id, std::chrono::nanoseconds time) __attribute__((deprecated));
+    MirInputDeviceId id, std::chrono::nanoseconds time) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
 
 EventUPtr make_event(std::chrono::nanoseconds timestamp,
                      MirPointerButtons pointer_buttons,
 
=== modified file 'include/client/mir_toolkit/client_types.h'
--- include/client/mir_toolkit/client_types.h	2017-04-24 13:11:01 +0000
+++ include/client/mir_toolkit/client_types.h	2017-05-26 09:20:39 +0000
@@ -54,8 +54,7 @@
 typedef struct MirError MirError;
 typedef struct MirPresentationChain MirPresentationChain;
 typedef struct MirBuffer MirBuffer;
-typedef struct MirRenderSurface MirRenderSurface
-MIR_FOR_REMOVAL_IN_VERSION_1("This type is slated for rename due to MirRenderSurface-->MirSurface transition");
+typedef struct MirRenderSurface MirRenderSurface;
 
 /**
  * Descriptor for an output connection.
@@ -202,7 +201,7 @@
      * use the value mir_display_output_id_invalid.
      */
     uint32_t output_id;
-} MirSurfaceParameters MIR_FOR_REMOVAL_IN_VERSION_1("Use MirWindowParameters instead");
+} MirSurfaceParameters MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_get apis or listen for attribute events instead");
 
 enum { mir_platform_package_max = 32 };
 
@@ -556,9 +555,6 @@
     MirSurface* surface, MirPersistentId* id, void* context)
 MIR_FOR_REMOVAL_IN_VERSION_1("Use MirWindowIdCallback instead");
 
-typedef void (*MirRenderSurfaceCallback)(MirRenderSurface*, void* context)
-MIR_FOR_REMOVAL_IN_VERSION_1("This type is slated for rename due to MirRenderSurface-->MirSurface transition");
-
 typedef MirSurfaceParameters MirWindowParameters;
 
 #pragma GCC diagnostic pop
 
=== modified file 'include/client/mir_toolkit/events/keymap_event.h'
--- include/client/mir_toolkit/events/keymap_event.h	2017-01-18 02:29:37 +0000
+++ include/client/mir_toolkit/events/keymap_event.h	2017-05-26 09:20:39 +0000
@@ -42,7 +42,7 @@
  */
 void mir_keymap_event_get_rules(MirKeymapEvent const* ev,
                                 struct xkb_rule_names* rules)
-    __attribute__ ((deprecated));
+MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_keymap_event_get_keymap_buffer() instead");
 
 /**
  * Retrieve the new keymap reported by this MirKeymapEvent
 
=== modified file 'include/client/mir_toolkit/events/surface_event.h'
--- include/client/mir_toolkit/events/surface_event.h	2017-04-24 12:52:42 +0000
+++ include/client/mir_toolkit/events/surface_event.h	2017-05-26 09:20:39 +0000
@@ -49,7 +49,7 @@
  * \return           The associated attribute value
  */
 int mir_surface_event_get_attribute_value(MirSurfaceEvent const* event)
-MIR_FOR_REMOVAL_IN_VERSION_1("use make_event with mir_window_event_get_attribute_value instead");
+MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_event_get_attribute_value with MirWindowEvent instead");
 #pragma GCC diagnostic pop
 
 #ifdef __cplusplus
 
=== modified file 'include/client/mir_toolkit/rs/mir_render_surface.h'
--- include/client/mir_toolkit/rs/mir_render_surface.h	2017-04-24 12:52:42 +0000
+++ include/client/mir_toolkit/rs/mir_render_surface.h	2017-05-26 09:20:39 +0000
@@ -23,6 +23,17 @@
 #include <mir_toolkit/client_types.h>
 #include <mir_toolkit/deprecations.h>
 
+#ifndef MIR_DEPRECATE_RENDERSURFACES
+    #define MIR_DEPRECATE_RENDERSURFACES 0
+#endif
+
+#if MIR_ENABLE_DEPRECATIONS > 0 && MIR_DEPRECATE_RENDERSURFACES > 0
+    #define MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME\
+    __attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")))
+#else
+    #define MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME
+#endif
+
 #ifdef __cplusplus
 /**
  * \addtogroup mir_toolkit
@@ -31,6 +42,9 @@
 extern "C" {
 #endif
 
+typedef void (*MirRenderSurfaceCallback)(MirRenderSurface*, void* context)
+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
+
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 /**
@@ -50,7 +64,7 @@
     int width, int height,
     MirRenderSurfaceCallback callback,
     void* context)
-MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");
+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
 
 /**
  * Create a render surface and wait for the result
@@ -65,7 +79,7 @@
 MirRenderSurface* mir_connection_create_render_surface_sync(
     MirConnection* connection,
     int width, int height)
-MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");
+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
 
 /**
  * Get the size of the MirRenderSurface
@@ -77,7 +91,7 @@
 void mir_render_surface_get_size(
     MirRenderSurface* render_surface,
     int* width, int* height)
-MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");
+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
 
 /**
  * Set the size of the MirRenderSurface
@@ -89,7 +103,7 @@
 void mir_render_surface_set_size(
     MirRenderSurface* render_surface,
     int width, int height)
-MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");
+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
 
 /**
  * Test for a valid render surface
@@ -101,8 +115,7 @@
  */
 bool mir_render_surface_is_valid(
     MirRenderSurface* render_surface)
-MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");
-
+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
 /**
  * Retrieve a text description of the error. The returned string is owned by
  * the library and remains valid until the render surface or the associated
@@ -114,7 +127,7 @@
  */
 char const *mir_render_surface_get_error_message(
     MirRenderSurface* render_surface)
-MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");
+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
 
 /**
  * Release the specified render surface
@@ -123,7 +136,7 @@
  */
 void mir_render_surface_release(
     MirRenderSurface* render_surface)
-MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");
+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
 
 /**
  * Obtain the buffer stream backing a given render surface.
@@ -143,7 +156,7 @@
     MirRenderSurface* render_surface,
     int width, int height,
     MirPixelFormat format)
-MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");
+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
 
 /**
  * Obtain the presentation chain backing a given render surface.
@@ -156,7 +169,7 @@
  */
 MirPresentationChain* mir_render_surface_get_presentation_chain(
     MirRenderSurface* render_surface)
-MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");
+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
 
 /** Query whether the server supports a given presentation mode.
  *
@@ -190,7 +203,29 @@
     MirWindowSpec* spec,
     MirRenderSurface* render_surface,
     int hotspot_x, int hotspot_y)
-MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");
+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
+
+/**
+ * Set the MirWindowSpec to display content contained in a render surface
+ *
+ * \warning: The initial call to mir_window_spec_add_render_surface will set
+ *           the bottom-most content, and subsequent calls will stack the
+ *           content on top.
+ *
+ * \param spec             The window_spec to be updated
+ * \param render_surface   The render surface containing the content to be displayed
+ * \param logical_width    The width that the content will be displayed at
+ *                         (Ignored for buffer streams)
+ * \param logical_height   The height that the content will be displayed at
+ *                         (Ignored for buffer streams)
+ * \param displacement_x   The x displacement from the top-left corner of the MirWindow
+ * \param displacement_y   The y displacement from the top-left corner of the MirWindow
+ */
+void mir_window_spec_add_render_surface(MirWindowSpec* spec,
+                                        MirRenderSurface* render_surface,
+                                        int logical_width, int logical_height,
+                                        int displacement_x, int displacement_y)
+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
 
 #pragma GCC diagnostic pop
 
 
=== modified file 'include/core/mir_toolkit/deprecations.h'
--- include/core/mir_toolkit/deprecations.h	2017-04-25 09:32:01 +0000
+++ include/core/mir_toolkit/deprecations.h	2017-05-26 09:20:39 +0000
@@ -18,8 +18,8 @@
 #define MIR_DEPRECATIONS_H_
 
 #ifndef MIR_ENABLE_DEPRECATIONS
-    // use __GNUC__ < 6 as a proxy for building on Ubunutu 16.04LTS ("Xenial")
-    #if defined(__clang__) || !defined(__GNUC__) || (__GNUC__ >= 6)
+    // use g++ version < 6.2 as a proxy for building on Ubunutu 16.04LTS ("Xenial") or 16.10 (Yakkety)
+    #if defined(__clang__) || !defined(__GNUC__) || (__GNUC__ > 6) || ((__GNUC__ == 6) && (__GNUC_MINOR__ >= 2))
         #define MIR_ENABLE_DEPRECATIONS 1
     #else
         #define MIR_ENABLE_DEPRECATIONS 0
 
=== modified file 'src/common/events/input_configuration_event.cpp'
--- src/common/events/input_configuration_event.cpp	2017-01-20 16:27:50 +0000
+++ src/common/events/input_configuration_event.cpp	2017-05-26 09:20:39 +0000
@@ -18,13 +18,12 @@
 
 #include "mir/events/input_configuration_event.h"
 
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 MirInputConfigurationEvent::MirInputConfigurationEvent()
 {
     event.initInputConfiguration();
 }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 MirInputConfigurationAction MirInputConfigurationEvent::action() const
 {
     return static_cast<MirInputConfigurationAction>(event.asReader().getInputConfiguration().getAction());
@@ -34,7 +33,6 @@
 {
     event.getInputConfiguration().setAction(static_cast<mir::capnp::InputConfigurationEvent::Action>(action));
 }
-#pragma GCC diagnostic pop
 
 std::chrono::nanoseconds MirInputConfigurationEvent::when() const
 {
 
=== modified file 'src/include/common/mir/events/input_configuration_event.h'
--- src/include/common/mir/events/input_configuration_event.h	2017-01-20 16:27:50 +0000
+++ src/include/common/mir/events/input_configuration_event.h	2017-05-26 09:20:39 +0000
@@ -37,8 +37,7 @@
 
     MirInputDeviceId id() const;
     void set_id(MirInputDeviceId id);
-}
- __attribute__((deprecated));
+};
 #pragma GCC diagnostic pop
 
 #endif /* MIR_COMMON_INPUT_CONFIGURATION_EVENT_H_ */