Merge lp:~andreas-pokorny/mir/0.14-fix-abi-problems into lp:mir/0.14

[Andreas Pokorny]

Bump the server graphics platform ABI and fix the symbols in libmirplatform.so.8 (LP: #1474773)

This change bumps the server graphics platform ABI, since even with proper symbol naming inside libmirplatform.so.8 we run into stack smashing problems as soon as mirserver31 (0.13.3) tries to draw with android-graphics.so.2 (0.14.0).

[Daniel van Vugt (vanvugt)]

Is it necessary to bump both ABIs to fix the problem?

Is the stack smashing just due to the mixup of symbols from bug 1474773?

review: Needs Information

[Daniel van Vugt (vanvugt)]

Sorry, just read the description again. It sounds like we broke the ABI of android-graphics.so.2 in the past but failed to notice and bump it.

Reminder: If these ABIs are higher in 0.14 then we'll need to bump them higher yet again in 0.15 where we've broken them differently.

review: Approve

[Chris Halse Rogers (raof)]

Seems reasonable. Do we know how we broke the graphics platform ABI?

review: Approve

[Andreas Pokorny (andreas-pokorny)]

I could not figure out what change in particular caused this. But it corrupts the stack when we attempt to draw. Client connecting creating buffers and some initial redraws seem to work fine, but as soon as we try to draw to screen the process is killed.

[Daniel van Vugt (vanvugt)]

ABI bumps are free. If it works, land it.

Still remember to try and automate ABI checking ASAP... :P

=== modified file 'debian/control'
--- debian/control	2015-07-20 20:38:44 +0000
+++ debian/control	2015-07-20 21:59:30 +0000
@@ -268,7 +268,7 @@
  Contains the shared libraries required for the Mir server and client.
 
 # Longer-term these drivers should move out-of-tree
-Package: mir-platform-graphics-mesa-kms2
+Package: mir-platform-graphics-mesa-kms3
 Section: libs
 Architecture: linux-any
 Multi-Arch: same
@@ -287,14 +287,14 @@
 Package: mir-platform-graphics-mesa2
 Section: oldlibs
 Architecture: linux-any
-Depends: mir-platform-graphics-mesa-kms2,
+Depends: mir-platform-graphics-mesa-kms3,
          ${misc:Depends},
          ${shlibs:Depends},
 Description: transitional dummy package
  This is a transitional dummy package created due to package renaming.
  It can safely be removed.
 
-Package: mir-platform-graphics-android2
+Package: mir-platform-graphics-android3
 Section: libs
 Architecture: i386 amd64 armhf
 Multi-Arch: same
@@ -356,7 +356,7 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
-         mir-platform-graphics-mesa-kms2,
+         mir-platform-graphics-mesa-kms3,
          mir-client-platform-mesa2,
 Description: Display server for Ubuntu - desktop driver metapackage
  Mir is a display server running on linux systems, with a focus on efficiency,
@@ -371,7 +371,7 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
-         mir-platform-graphics-android2,
+         mir-platform-graphics-android3,
          mir-client-platform-android2,
 Description: Display server for Ubuntu - android driver metapackage
  Mir is a display server running on linux systems, with a focus on efficiency,

=== renamed file 'debian/mir-platform-graphics-android2.install' => 'debian/mir-platform-graphics-android3.install'
--- debian/mir-platform-graphics-android2.install	2015-06-17 05:20:42 +0000
+++ debian/mir-platform-graphics-android3.install	2015-07-20 21:59:30 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/server-platform/graphics-android.so.2
+usr/lib/*/mir/server-platform/graphics-android.so.3

=== renamed file 'debian/mir-platform-graphics-mesa-kms2.install' => 'debian/mir-platform-graphics-mesa-kms3.install'
--- debian/mir-platform-graphics-mesa-kms2.install	2015-06-17 05:20:42 +0000
+++ debian/mir-platform-graphics-mesa-kms3.install	2015-07-20 21:59:30 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/server-platform/graphics-mesa-kms.so.2
+usr/lib/*/mir/server-platform/graphics-mesa-kms.so.3

=== modified file 'src/platform/symbols.map'
--- src/platform/symbols.map	2015-06-17 05:20:42 +0000
+++ src/platform/symbols.map	2015-07-20 21:59:30 +0000
@@ -1,4 +1,4 @@
-MIRPLATFORM_7 {
+MIRPLATFORM_8 {
  global:
   extern "C++" {
 # The following symbols come from running a script over the generated docs. Vis:

=== modified file 'src/platforms/CMakeLists.txt'
--- src/platforms/CMakeLists.txt	2015-06-17 05:20:42 +0000
+++ src/platforms/CMakeLists.txt	2015-07-20 21:59:30 +0000
@@ -7,7 +7,7 @@
 set(MIR_SERVER_INPUT_PLATFORM_ABI ${MIR_SERVER_INPUT_PLATFORM_ABI} PARENT_SCOPE)
 set(MIR_SERVER_INPUT_PLATFORM_VERSION "MIR_INPUT_PLATFORM_${MIR_SERVER_INPUT_PLATFORM_ABI}")
 set(MIR_SERVER_INPUT_PLATFORM_VERSION ${MIR_SERVER_INPUT_PLATFORM_VERSION} PARENT_SCOPE)
-set(MIR_SERVER_GRAPHICS_PLATFORM_ABI 2)
+set(MIR_SERVER_GRAPHICS_PLATFORM_ABI 3)
 set(MIR_SERVER_GRAPHICS_PLATFORM_ABI ${MIR_SERVER_GRAPHICS_PLATFORM_ABI} PARENT_SCOPE)
 set(MIR_SERVER_GRAPHICS_PLATFORM_VERSION "MIR_GRAPHICS_PLATFORM_${MIR_SERVER_GRAPHICS_PLATFORM_ABI}")
 set(MIR_SERVER_GRAPHICS_PLATFORM_VERSION ${MIR_SERVER_GRAPHICS_PLATFORM_VERSION} PARENT_SCOPE)

=== modified file 'src/platforms/android/server/symbols.map'
--- src/platforms/android/server/symbols.map	2015-04-28 07:54:10 +0000
+++ src/platforms/android/server/symbols.map	2015-07-20 21:59:30 +0000
@@ -1,4 +1,4 @@
-MIR_GRAPHICS_PLATFORM_2 {
+MIR_GRAPHICS_PLATFORM_3 {
   global:
     add_graphics_platform_options;
     create_host_platform;

=== modified file 'src/platforms/mesa/server/kms/symbols.map'
--- src/platforms/mesa/server/kms/symbols.map	2015-06-17 05:20:42 +0000
+++ src/platforms/mesa/server/kms/symbols.map	2015-07-20 21:59:30 +0000
@@ -1,4 +1,4 @@
-MIR_GRAPHICS_PLATFORM_2 {
+MIR_GRAPHICS_PLATFORM_3 {
   global:
     add_graphics_platform_options;
     create_host_platform;

=== modified file 'tests/mir_test_framework/symbols-server.map'
--- tests/mir_test_framework/symbols-server.map	2015-04-28 07:54:10 +0000
+++ tests/mir_test_framework/symbols-server.map	2015-07-20 21:59:30 +0000
@@ -1,4 +1,4 @@
-MIR_GRAPHICS_PLATFORM_2 {
+MIR_GRAPHICS_PLATFORM_3 {
   global:
     add_graphics_platform_options;
     create_host_platform;