Merge lp:~alan-griffiths/mir/test-ABI-bump-libmirserver into lp:mir

[Alan Griffiths]

*Test MP*

It looks as though bumping the mir server ABI breaks the maki when installed. This is just that change to see what happens.

*Test MP*

It looks as though bumping the mir server ABI breaks the maki when installed. This is just that change to see what happens.

[Alan Griffiths (alan-griffiths)]

Not intended to land

review: Disapprove

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2328
http://jenkins.qa.ubuntu.com/job/mir-ci/3009/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1344
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1343
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1300/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1006
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1006/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1300
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1300/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4332/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18167

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

review: Needs Fixing (continuous-integration)

[Alexandros Frantzis (afrantzis)]

See https://bugs.launchpad.net/mir/+bug/1423591 .

Unmerged revisions

2328. By Alan Griffiths on 2015-02-18

Just the libmirserver ABI bump

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-02-13 06:12:34 +0000
+++ CMakeLists.txt	2015-02-18 17:42:16 +0000
@@ -27,7 +27,7 @@
 set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
 
 set(MIR_VERSION_MAJOR 0)
-set(MIR_VERSION_MINOR 12) # This should change at least with every MIRSERVER_ABI
+set(MIR_VERSION_MINOR 13) # This should change at least with every MIRSERVER_ABI
 set(MIR_VERSION_PATCH 0)
 
 add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
 
=== modified file 'debian/control'
--- debian/control	2015-02-18 03:04:18 +0000
+++ debian/control	2015-02-18 17:42:16 +0000
@@ -61,7 +61,7 @@
 
 #TODO: Packaging infrastructure for better dependency generation,
 #      ala pkg-xorg's xviddriver:Provides and ABI detection.
-Package: libmirserver29
+Package: libmirserver30
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
@@ -127,7 +127,7 @@
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmirserver29 (= ${binary:Version}),
+Depends: libmirserver30 (= ${binary:Version}),
          libmirplatform-dev (= ${binary:Version}),
          libmircommon-dev (= ${binary:Version}),
          libglm-dev,
 
=== renamed file 'debian/libmirserver29.install' => 'debian/libmirserver30.install'
--- debian/libmirserver29.install	2015-01-21 09:03:53 +0000
+++ debian/libmirserver30.install	2015-02-18 17:42:16 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirserver.so.29
+usr/lib/*/libmirserver.so.30
 
=== modified file 'src/server/CMakeLists.txt'
--- src/server/CMakeLists.txt	2015-02-13 06:12:34 +0000
+++ src/server/CMakeLists.txt	2015-02-18 17:42:16 +0000
@@ -106,7 +106,7 @@
   ${CMAKE_SOURCE_DIR}/include/server/mir DESTINATION "include/mirserver"
 )
 
-set(MIRSERVER_ABI 29) # Be sure to increment MIR_VERSION_MINOR at the same time
+set(MIRSERVER_ABI 30) # Be sure to increment MIR_VERSION_MINOR at the same time
 set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
 
 set_target_properties(
 
=== modified file 'src/server/symbols.map'
--- src/server/symbols.map	2015-02-13 06:12:34 +0000
+++ src/server/symbols.map	2015-02-18 17:42:16 +0000
@@ -1,4 +1,4 @@
-MIR_SERVER_29 {
+MIR_SERVER_30 {
  global:
   extern "C++" {
 # Symbols not yet picked up by script
@@ -213,6 +213,7 @@
     mir::scene::SurfaceBufferAccess::?SurfaceBufferAccess*;
     mir::scene::SurfaceBufferAccess::SurfaceBufferAccess*;
     mir::scene::SurfaceBufferAccess::with_most_recent_buffer_do*;
+    mir::scene::Surface::buffers_ready_for_compositor*;
     mir::scene::Surface::client_size*;
     mir::scene::Surface::compositor_snapshot*;
     mir::scene::SurfaceConfigurator::attribute_set*;
@@ -225,6 +226,7 @@
     mir::scene::SurfaceCoordinator::operator*;
     mir::scene::SurfaceCoordinator::raise*;
     mir::scene::SurfaceCoordinator::remove_surface*;
+    mir::scene::SurfaceCoordinator::surface_at*;
     mir::scene::SurfaceCoordinator::?SurfaceCoordinator*;
     mir::scene::SurfaceCoordinator::SurfaceCoordinator*;
     mir::scene::SurfaceCreationParameters::of_buffer_usage*;
@@ -377,9 +379,6 @@
     mir::shell::FocusController::focussed_application*;
     mir::shell::FocusController::operator*;
     mir::shell::FocusController::set_focus_to*;
-    mir::shell::FocusSetter::FocusSetter*;
-    mir::shell::FocusSetter::operator*;
-    mir::shell::FocusSetter::set_focus_to*;
     mir::shell::HostLifecycleEventListener::?HostLifecycleEventListener*;
     mir::shell::HostLifecycleEventListener::HostLifecycleEventListener*;
     mir::shell::HostLifecycleEventListener::lifecycle_event_occurred*;
@@ -389,16 +388,6 @@
     mir::shell::InputTargeter::?InputTargeter*;
     mir::shell::InputTargeter::InputTargeter*;
     mir::shell::InputTargeter::operator*;
-    mir::shell::SessionCoordinatorWrapper::add_prompt_provider_for*;
-    mir::shell::SessionCoordinatorWrapper::close_session*;
-    mir::shell::SessionCoordinatorWrapper::focus_next*;
-    mir::shell::SessionCoordinatorWrapper::focussed_application*;
-    mir::shell::SessionCoordinatorWrapper::handle_surface_created*;
-    mir::shell::SessionCoordinatorWrapper::open_session*;
-    mir::shell::SessionCoordinatorWrapper::SessionCoordinatorWrapper*;
-    mir::shell::SessionCoordinatorWrapper::set_focus_to*;
-    mir::shell::SessionCoordinatorWrapper::start_prompt_session_for*;
-    mir::shell::SessionCoordinatorWrapper::stop_prompt_session*;
     mir::shell::Shell::add_prompt_provider_for*;
     mir::shell::Shell::close_session*;
     mir::shell::Shell::create_surface*;
@@ -423,10 +412,6 @@
     mir::shell::ShellWrapper::ShellWrapper*;
     mir::shell::ShellWrapper::start_prompt_session_for*;
     mir::shell::ShellWrapper::stop_prompt_session*;
-    mir::shell::SurfaceCoordinatorWrapper::add_surface*;
-    mir::shell::SurfaceCoordinatorWrapper::raise*;
-    mir::shell::SurfaceCoordinatorWrapper::remove_surface*;
-    mir::shell::SurfaceCoordinatorWrapper::SurfaceCoordinatorWrapper*;
     mir::terminate_with_current_exception*;
     mir::time::Alarm::?Alarm*;
     mir::time::Alarm::Alarm*;
@@ -497,11 +482,6 @@
     non-virtual?thunk?to?mir::shell::FocusController::?FocusController*;
     non-virtual?thunk?to?mir::shell::HostLifecycleEventListener::?HostLifecycleEventListener*;
     non-virtual?thunk?to?mir::shell::InputTargeter::?InputTargeter*;
-    non-virtual?thunk?to?mir::shell::SessionCoordinatorWrapper::close_session*;
-    non-virtual?thunk?to?mir::shell::SessionCoordinatorWrapper::focus_next*;
-    non-virtual?thunk?to?mir::shell::SessionCoordinatorWrapper::focussed_application*;
-    non-virtual?thunk?to?mir::shell::SessionCoordinatorWrapper::open_session*;
-    non-virtual?thunk?to?mir::shell::SessionCoordinatorWrapper::set_focus_to*;
     non-virtual?thunk?to?mir::shell::ShellWrapper::add_prompt_provider_for*;
     non-virtual?thunk?to?mir::shell::ShellWrapper::close_session*;
     non-virtual?thunk?to?mir::shell::ShellWrapper::create_surface*;
@@ -515,9 +495,6 @@
     non-virtual?thunk?to?mir::shell::ShellWrapper::set_surface_attribute*;
     non-virtual?thunk?to?mir::shell::ShellWrapper::start_prompt_session_for*;
     non-virtual?thunk?to?mir::shell::ShellWrapper::stop_prompt_session*;
-    non-virtual?thunk?to?mir::shell::SurfaceCoordinatorWrapper::add_surface*;
-    non-virtual?thunk?to?mir::shell::SurfaceCoordinatorWrapper::raise*;
-    non-virtual?thunk?to?mir::shell::SurfaceCoordinatorWrapper::remove_surface*;
     non-virtual?thunk?to?mir::time::Alarm::?Alarm*;
     non-virtual?thunk?to?mir::time::Timer::?Timer*;
     typeinfo?for?mir::compositor::Compositor;
@@ -566,13 +543,10 @@
     typeinfo?for?mir::shell::AbstractShell;
     typeinfo?for?mir::shell::DisplayLayout;
     typeinfo?for?mir::shell::FocusController;
-    typeinfo?for?mir::shell::FocusSetter;
     typeinfo?for?mir::shell::HostLifecycleEventListener;
     typeinfo?for?mir::shell::InputTargeter;
-    typeinfo?for?mir::shell::SessionCoordinatorWrapper;
     typeinfo?for?mir::shell::Shell;
     typeinfo?for?mir::shell::ShellWrapper;
-    typeinfo?for?mir::shell::SurfaceCoordinatorWrapper;
     typeinfo?for?mir::time::Alarm;
     typeinfo?for?mir::time::Timer;
     vtable?for?mir::compositor::Compositor;
@@ -621,13 +595,10 @@
     vtable?for?mir::shell::AbstractShell;
     vtable?for?mir::shell::DisplayLayout;
     vtable?for?mir::shell::FocusController;
-    vtable?for?mir::shell::FocusSetter;
     vtable?for?mir::shell::HostLifecycleEventListener;
     vtable?for?mir::shell::InputTargeter;
-    vtable?for?mir::shell::SessionCoordinatorWrapper;
     vtable?for?mir::shell::Shell;
     vtable?for?mir::shell::ShellWrapper;
-    vtable?for?mir::shell::SurfaceCoordinatorWrapper;
     vtable?for?mir::time::Alarm;
     vtable?for?mir::time::Timer;