Mir

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

  1. fix-1503450
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Merged
Approved by: Chris Halse Rogers
Approved revision: no longer in the source branch.
Merged at revision: 3005
Proposed branch: lp:~alan-griffiths/mir/fix-1503450
Merge into: lp:mir
Diff against target: 33 lines (+3/-3)
2 files modified
include/platforms/mesa/mir_toolkit/mesa/native_display.h (+1/-1)
src/platforms/mesa/mir-client-platform-mesa.pc.in (+2/-2)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-1503450
Reviewer Review Type Date Requested Status
Chris Halse Rogers Approve
Tiago Stürmer Daitx (community) Approve
Kevin DuBois (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Andreas Pokorny (community) Approve
Review via email: mp+273668@code.launchpad.net

Commit message

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

Description of the change

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.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Andreas Pokorny (andreas-pokorny) wrote :

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

lgtm

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Kevin DuBois (kdub) wrote :

ok

Revision history for this message
Kevin DuBois (kdub) :
review: Approve
Revision history for this message
Tiago Stürmer Daitx (tdaitx) wrote :

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
Revision history for this message
Chris Halse Rogers (raof) wrote :

Seems sensible.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
18#ifndef MIR_TOOLKIT_MESA_NATIVE_DISPLAY_H18#ifndef MIR_TOOLKIT_MESA_NATIVE_DISPLAY_H
19#define MIR_TOOLKIT_MESA_NATIVE_DISPLAY_H19#define MIR_TOOLKIT_MESA_NATIVE_DISPLAY_H
2020
21#include <mir_toolkit/mir_native_buffer.h>
22#include <mir_toolkit/client_types.h>21#include <mir_toolkit/client_types.h>
2322
24#define MIR_MESA_TRUE 123#define MIR_MESA_TRUE 1
@@ -35,6 +34,7 @@
3534
36typedef struct MirMesaEGLNativeDisplay MirMesaEGLNativeDisplay;35typedef struct MirMesaEGLNativeDisplay MirMesaEGLNativeDisplay;
37typedef struct MirMesaEGLNativeSurface MirMesaEGLNativeSurface;36typedef struct MirMesaEGLNativeSurface MirMesaEGLNativeSurface;
37typedef struct MirBufferPackage MirBufferPackage;
3838
39struct MirMesaEGLNativeDisplay39struct MirMesaEGLNativeDisplay
40{40{
4141
=== 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 @@
1includedir=@INCLUDEDIR@/mirplatform1includedir=@INCLUDEDIR@/mirplatform
2common_includedir=@INCLUDEDIR@/mircommon
32
4Name: mir-client-platform-mesa3Name: mir-client-platform-mesa
5Description: Mir Mesa client platform development files4Description: Mir Mesa client platform development files
6Version: @MIR_VERSION@5Version: @MIR_VERSION@
7Cflags: -I${includedir} -I${common_includedir} 6Requires.private: mirclient
7Cflags: -I${includedir}

Subscribers

People subscribed via source and target branches