Merge lp:~morphis/unity-system-compositor/changes-for-virtual-output into lp:unity-system-compositor/ubuntu

[Simon Fels]

Changes to build against a newer mir with virtual output support.

NOTE: NOT MEANT TO BE MERGED!!! JUST FOR TESTING!!!

Changes to build against a newer mir with virtual output support.

NOTE: NOT MEANT TO BE MERGED!!! JUST FOR TESTING!!!

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:233
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ubuntu-ci/42/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ubuntu-xenial-amd64-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ubuntu-xenial-armhf-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ubuntu-xenial-i386-ci/12/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ubuntu-ci/42/rebuild

review: Needs Fixing (continuous-integration)

[lp:~morphis/unity-system-compositor/changes-for-virtual-output]

234. By Simon Fels on 2016-02-18

Merge trunk

[ CI Train Bot ]
* No-change rebuild.
* Orient the spinner according to the native orientation of the device.
  (LP: #1543495)
* Implement a stub cookie authority (LP: #1536662)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:234
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ubuntu-ci/44/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ubuntu-xenial-amd64-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ubuntu-xenial-armhf-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ubuntu-xenial-i386-ci/14/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ubuntu-ci/44/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

234. By Simon Fels on 2016-02-18

Merge trunk

[ CI Train Bot ]
* No-change rebuild.
* Orient the spinner according to the native orientation of the device.
  (LP: #1543495)
* Implement a stub cookie authority (LP: #1536662)

233. By Simon Fels on 2016-02-16

Test release server abi break

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-02-11 11:16:24 +0000
+++ CMakeLists.txt	2016-02-18 15:42:48 +0000
@@ -16,8 +16,8 @@
 
 project(UnitySystemCompositor)
 set(USC_VERSION_MAJOR 0)
-set(USC_VERSION_MINOR 4)
-set(USC_VERSION_PATCH 2)
+set(USC_VERSION_MINOR 5)
+set(USC_VERSION_PATCH 0)
 set(USC_VERSION "${USC_VERSION_MAJOR}.${USC_VERSION_MINOR}.${USC_VERSION_PATCH}")
 
 cmake_minimum_required(VERSION 2.8)

=== modified file 'debian/changelog'
--- debian/changelog	2016-02-11 12:22:48 +0000
+++ debian/changelog	2016-02-18 15:42:48 +0000
@@ -1,3 +1,9 @@
+unity-system-compositor (0.5.0) UNRELEASED; urgency=medium
+
+  * Test release server abi break 
+
+ -- Alberto Aguirre <[e-mail]>  Wed, 03 Feb 2016 17:39:47 -0600
+
 unity-system-compositor (0.4.2+16.04.20160211.2-0ubuntu1) xenial; urgency=medium
 
   [ CI Train Bot ]

=== modified file 'tests/include/usc/test/mock_display.h'
--- tests/include/usc/test/mock_display.h	2015-11-12 12:28:17 +0000
+++ tests/include/usc/test/mock_display.h	2016-02-18 15:42:48 +0000
@@ -20,6 +20,7 @@
 #include "usc/test/stub_display_configuration.h"
 
 #include <mir/graphics/display.h>
+#include <mir/graphics/virtual_output.h>
 #include <gmock/gmock.h>
 
 namespace usc
@@ -60,6 +61,9 @@
 
     std::unique_ptr<mir::graphics::GLContext> create_gl_context() override
     { return std::unique_ptr<mir::graphics::GLContext>{};};
+
+    std::unique_ptr<mir::graphics::VirtualOutput> create_virtual_output(int,int) override
+    { return nullptr; }
 };
 }
 }