Merge lp:~alan-griffiths/mir/fix-1503450 into lp:mir

[Alan Griffiths]

mir-client-platform-mesa: declare MirBufferPackage in mir_toolkit/mesa/native_display.h.

mir-client-platform-mesa: declare MirBufferPackage in mir_toolkit/mesa/native_display.h.

I.e. do not include mir_toolkit/mir_native_buffer.h to define it as that header belongs to libmircommon-dev which should not need to be a dependency.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3001
http://jenkins.qa.ubuntu.com/job/mir-ci/5193/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4342
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3249
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4284/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/242/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1347
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1347/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/242/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4285
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4285/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/6944/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24031
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/243/console

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

review: Needs Fixing (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

DNS failure krillin-09.. at least the types of failures keep varying..

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3002
http://jenkins.qa.ubuntu.com/job/mir-ci/5194/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4344
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3251
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4286
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/244/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1348
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1348/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/244/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4287
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4287/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/6946
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24034
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/245/console

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3003
http://jenkins.qa.ubuntu.com/job/mir-ci/5196/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4347
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4289
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/247/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1350
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1350/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/247/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4290
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4290/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/6949
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24039
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/248/console

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

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

ok

[Kevin DuBois (kdub)]

review: Approve

[Tiago Stürmer Daitx (tdaitx)]

I can approve the following piece for LP: #1503450

+Requires.private: mirclient

Everything else depends on Mir developers (and I am not one). =)

review: Approve

[Chris Halse Rogers (raof)]

Seems sensible.

review: Approve

=== modified file 'include/platforms/mesa/mir_toolkit/mesa/native_display.h'
--- include/platforms/mesa/mir_toolkit/mesa/native_display.h	2015-09-15 17:13:45 +0000
+++ include/platforms/mesa/mir_toolkit/mesa/native_display.h	2015-10-07 13:06:34 +0000
@@ -18,7 +18,6 @@
 #ifndef MIR_TOOLKIT_MESA_NATIVE_DISPLAY_H
 #define MIR_TOOLKIT_MESA_NATIVE_DISPLAY_H
 
-#include <mir_toolkit/mir_native_buffer.h>
 #include <mir_toolkit/client_types.h>
 
 #define MIR_MESA_TRUE 1
@@ -35,6 +34,7 @@
 
 typedef struct MirMesaEGLNativeDisplay MirMesaEGLNativeDisplay;
 typedef struct MirMesaEGLNativeSurface MirMesaEGLNativeSurface;
+typedef struct MirBufferPackage MirBufferPackage;
 
 struct MirMesaEGLNativeDisplay
 {

=== modified file 'src/platforms/mesa/mir-client-platform-mesa.pc.in'
--- src/platforms/mesa/mir-client-platform-mesa.pc.in	2015-09-24 22:30:09 +0000
+++ src/platforms/mesa/mir-client-platform-mesa.pc.in	2015-10-07 13:06:34 +0000
@@ -1,7 +1,7 @@
 includedir=@INCLUDEDIR@/mirplatform
-common_includedir=@INCLUDEDIR@/mircommon
 
 Name: mir-client-platform-mesa
 Description: Mir Mesa client platform development files
 Version: @MIR_VERSION@
-Cflags: -I${includedir} -I${common_includedir} 
+Requires.private: mirclient
+Cflags: -I${includedir}