Merge lp:mir/0.15 into lp:mir/ubuntu

[Alberto Aguirre]

Mir 0.15.1 release

Mir 0.15.1 release

[lp:mir/0.15]

2832. By Alberto Aguirre on 2015-08-25

Update changelog

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2832
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/73/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/29/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/446/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1118/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/31/console

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

OK

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-18 21:42:12 +0000
+++ debian/changelog	2015-08-25 15:28:14 +0000
@@ -1,3 +1,12 @@
+mir (0.15.1) UNRELEASED; urgency=medium
+
+  * New upstream release 0.15.1 (https://launchpad.net/mir/+milestone/0.15.1)
+    - Bug fixes:
+      . Client API minor version was not updated (LP: #1488542)
+      . [regression] ubuntu-emulator fails to start Mir demos (LP: #1486535)
+
+ -- Alberto Aguirre <[e-mail]>  Tue, 25 Aug 2015 10:24:22 -0500
+
 mir (0.15.0+15.10.20150818-0ubuntu1) wily; urgency=medium
 
   [ Daniel van Vugt ]

=== modified file 'examples/eglapp.c'
--- examples/eglapp.c	2015-08-06 03:17:35 +0000
+++ examples/eglapp.c	2015-08-25 15:28:14 +0000
@@ -351,7 +351,6 @@
     {
         EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
         EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-        EGL_COLOR_BUFFER_TYPE, EGL_RGB_BUFFER,
         EGL_RED_SIZE, rgb_bits,
         EGL_GREEN_SIZE, rgb_bits,
         EGL_BLUE_SIZE, rgb_bits,

=== modified file 'include/client/mir_toolkit/version.h'
--- include/client/mir_toolkit/version.h	2015-08-07 15:55:22 +0000
+++ include/client/mir_toolkit/version.h	2015-08-25 15:28:14 +0000
@@ -43,7 +43,7 @@
  * 
  * See also: http://semver.org/
  */
-#define MIR_CLIENT_MINOR_VERSION (0)
+#define MIR_CLIENT_MINOR_VERSION (1)
 
 /**
  * MIR_CLIENT_MICRO_VERSION

=== modified file 'src/platforms/android/server/fb_device.cpp'
--- src/platforms/android/server/fb_device.cpp	2015-07-21 04:30:03 +0000
+++ src/platforms/android/server/fb_device.cpp	2015-08-25 15:28:14 +0000
@@ -53,10 +53,12 @@
         fb_device->enableScreen(fb_device.get(), enable);
 }
 
-mg::DisplayConfigurationOutput mga::FbControl::active_config_for(DisplayName)
+mg::DisplayConfigurationOutput mga::FbControl::active_config_for(DisplayName display_name)
 {
+    auto const connected = (display_name == DisplayName::primary);
+
     return {
-        mg::DisplayConfigurationOutputId{0},
+        static_cast<mg::DisplayConfigurationOutputId>(display_name),
         mg::DisplayConfigurationCardId{0},
         mg::DisplayConfigurationOutputType::lvds,
         std::vector<MirPixelFormat>{mga::to_mir_format(fb_device->format)},
@@ -65,11 +67,11 @@
         },
         0,
         {0,0},
-        true,
-        false,
+        connected,
+        connected,
         {0,0},
         0,
-        mir_pixel_format_abgr_8888,
+        mga::to_mir_format(fb_device->format),
         mir_power_mode_on,
         mir_orientation_normal
     };

=== modified file 'tests/unit-tests/graphics/android/test_fb_device.cpp'
--- tests/unit-tests/graphics/android/test_fb_device.cpp	2015-06-26 09:52:00 +0000
+++ tests/unit-tests/graphics/android/test_fb_device.cpp	2015-08-25 15:28:14 +0000
@@ -146,3 +146,30 @@
     EXPECT_EQ(display_size, attribs.modes[attribs.current_mode_index].size);
     EXPECT_EQ(mir_pixel_format_abgr_8888, attribs.current_format);
 }
+
+TEST_F(FBDevice, supports_primary_display)
+{
+    mga::FbControl fb_control(fb_hal_mock);
+    auto const primary = fb_control.active_config_for(mga::DisplayName::primary);
+
+    EXPECT_TRUE(primary.connected);
+    EXPECT_TRUE(primary.used);
+}
+
+TEST_F(FBDevice, does_not_support_external_display)
+{
+    mga::FbControl fb_control(fb_hal_mock);
+    auto const external = fb_control.active_config_for(mga::DisplayName::external);
+
+    EXPECT_FALSE(external.connected);
+    EXPECT_FALSE(external.used);
+}
+
+TEST_F(FBDevice, assigns_different_output_ids_to_displays)
+{
+    mga::FbControl fb_control(fb_hal_mock);
+    auto const primary = fb_control.active_config_for(mga::DisplayName::primary);
+    auto const external = fb_control.active_config_for(mga::DisplayName::external);
+
+    EXPECT_NE(primary.id, external.id);
+}