Merge lp:mir/0.16 into lp:mir/ubuntu

[Cemil Azizoglu]

Mir 0.16.1 :

Fix for LP: #1499134

Fix for LP: #1499134

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2952
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/84/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/40/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/457/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1129/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/39/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/42/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ubuntu-ci/84/rebuild

review: Needs Fixing (continuous-integration)

=== added file '3rd_party/android-deps/android/native_window.h'
--- 3rd_party/android-deps/android/native_window.h	1970-01-01 00:00:00 +0000
+++ 3rd_party/android-deps/android/native_window.h	2015-09-29 14:58:53 +0000
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ANDROID_NATIVE_WINDOW_H
+#define ANDROID_NATIVE_WINDOW_H
+
+#include <android/rect.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Pixel formats that a window can use.
+ */
+enum {
+    WINDOW_FORMAT_RGBA_8888          = 1,
+    WINDOW_FORMAT_RGBX_8888          = 2,
+    WINDOW_FORMAT_RGB_565            = 4,
+};
+
+struct ANativeWindow;
+typedef struct ANativeWindow ANativeWindow;
+
+typedef struct ANativeWindow_Buffer {
+    // The number of pixels that are show horizontally.
+    int32_t width;
+
+    // The number of pixels that are shown vertically.
+    int32_t height;
+
+    // The number of *pixels* that a line in the buffer takes in
+    // memory.  This may be >= width.
+    int32_t stride;
+
+    // The format of the buffer.  One of WINDOW_FORMAT_*
+    int32_t format;
+
+    // The actual bits.
+    void* bits;
+    
+    // Do not touch.
+    uint32_t reserved[6];
+} ANativeWindow_Buffer;
+
+/**
+ * Acquire a reference on the given ANativeWindow object.  This prevents the object
+ * from being deleted until the reference is removed.
+ */
+void ANativeWindow_acquire(ANativeWindow* window);
+
+/**
+ * Remove a reference that was previously acquired with ANativeWindow_acquire().
+ */
+void ANativeWindow_release(ANativeWindow* window);
+
+/*
+ * Return the current width in pixels of the window surface.  Returns a
+ * negative value on error.
+ */
+int32_t ANativeWindow_getWidth(ANativeWindow* window);
+
+/*
+ * Return the current height in pixels of the window surface.  Returns a
+ * negative value on error.
+ */
+int32_t ANativeWindow_getHeight(ANativeWindow* window);
+
+/*
+ * Return the current pixel format of the window surface.  Returns a
+ * negative value on error.
+ */
+int32_t ANativeWindow_getFormat(ANativeWindow* window);
+
+/*
+ * Change the format and size of the window buffers.
+ *
+ * The width and height control the number of pixels in the buffers, not the
+ * dimensions of the window on screen.  If these are different than the
+ * window's physical size, then it buffer will be scaled to match that size
+ * when compositing it to the screen.
+ *
+ * For all of these parameters, if 0 is supplied then the window's base
+ * value will come back in force.
+ *
+ * width and height must be either both zero or both non-zero.
+ *
+ */
+int32_t ANativeWindow_setBuffersGeometry(ANativeWindow* window,
+        int32_t width, int32_t height, int32_t format);
+
+/**
+ * Lock the window's next drawing surface for writing.
+ * inOutDirtyBounds is used as an in/out parameter, upon entering the
+ * function, it contains the dirty region, that is, the region the caller
+ * intends to redraw. When the function returns, inOutDirtyBounds is updated
+ * with the actual area the caller needs to redraw -- this region is often
+ * extended by ANativeWindow_lock.
+ */
+int32_t ANativeWindow_lock(ANativeWindow* window, ANativeWindow_Buffer* outBuffer,
+        ARect* inOutDirtyBounds);
+
+/**
+ * Unlock the window's drawing surface after previously locking it,
+ * posting the new buffer to the display.
+ */
+int32_t ANativeWindow_unlockAndPost(ANativeWindow* window);
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif // ANDROID_NATIVE_WINDOW_H

=== added file '3rd_party/android-deps/android/rect.h'
--- 3rd_party/android-deps/android/rect.h	1970-01-01 00:00:00 +0000
+++ 3rd_party/android-deps/android/rect.h	2015-09-29 14:58:53 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#ifndef ANDROID_RECT_H
+#define ANDROID_RECT_H
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct ARect {
+#ifdef __cplusplus
+    typedef int32_t value_type;
+#endif
+    int32_t left;
+    int32_t top;
+    int32_t right;
+    int32_t bottom;
+} ARect;
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif // ANDROID_RECT_H

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-09-17 20:32:32 +0000
+++ CMakeLists.txt	2015-09-29 14:58:53 +0000
@@ -28,7 +28,7 @@
 
 set(MIR_VERSION_MAJOR 0)
 set(MIR_VERSION_MINOR 16) # This should change at least with every MIRSERVER_ABI
-set(MIR_VERSION_PATCH 0)
+set(MIR_VERSION_PATCH 1)
 
 add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
 add_definitions(-DMIR_VERSION_MINOR=${MIR_VERSION_MINOR})

=== modified file 'debian/changelog'
--- debian/changelog	2015-09-21 16:03:27 +0000
+++ debian/changelog	2015-09-29 14:58:53 +0000
@@ -1,3 +1,14 @@
+mir (0.16.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release 0.16.1 (https://launchpad.net/mir/+milestone/0.16.1)
+    - No ABI changes. Bug fix release only.
+    - Bugs fixed:
+      . Mir suddenly no longer builds since 'mesa (11.0.0-1ubuntu1) wily':
+        /usr/include/EGL/eglplatform.h:100:35: fatal error:
+        android/native_window.h: No such file or directory (LP: #1499134)
+
+ -- Daniel van Vugt <[e-mail]>  Tue, 29 Sep 2015 13:55:06 +0800
+
 mir (0.16.0+15.10.20150921.1-0ubuntu1) wily; urgency=medium
 
   [ Daniel van Vugt ]

=== modified file 'src/common/graphics/android/CMakeLists.txt'
--- src/common/graphics/android/CMakeLists.txt	2015-06-17 05:20:42 +0000
+++ src/common/graphics/android/CMakeLists.txt	2015-09-29 14:58:53 +0000
@@ -1,4 +1,5 @@
 include_directories(SYSTEM ${LIBHARDWARE_INCLUDE_DIRS})
+include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/3rd_party/android-deps)
 
 add_definitions( -DANDROID )
 

=== modified file 'src/platforms/android/client/CMakeLists.txt'
--- src/platforms/android/client/CMakeLists.txt	2015-07-21 04:30:03 +0000
+++ src/platforms/android/client/CMakeLists.txt	2015-09-29 14:58:53 +0000
@@ -1,5 +1,7 @@
 include_directories(${client_common_include_dirs})
 include_directories(SYSTEM ${LIBHARDWARE_INCLUDE_DIRS})
+include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/3rd_party/android-deps)
+
 add_definitions(-DANDROID)
 
 set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)

=== modified file 'src/platforms/android/server/CMakeLists.txt'
--- src/platforms/android/server/CMakeLists.txt	2015-07-21 04:30:03 +0000
+++ src/platforms/android/server/CMakeLists.txt	2015-09-29 14:58:53 +0000
@@ -8,6 +8,7 @@
     ${GLESv2_INCLUDE_DIRS}
     ${ANDROID_PROPERTIES_INCLUDE_DIRS}
 )
+include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/3rd_party/android-deps)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
 add_definitions( -DANDROID )