Mir

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

Proposed by Alan Griffiths on 2015-10-07
Status: Merged
Approved by: Chris Halse Rogers on 2015-10-07
Approved revision: 3003
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 on 2015-10-07
Tiago Stürmer Daitx (community) 2015-10-07 Approve on 2015-10-07
Kevin DuBois (community) Approve on 2015-10-07
PS Jenkins bot (community) continuous-integration Approve on 2015-10-07
Andreas Pokorny (community) 2015-10-07 Approve on 2015-10-07
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.
lp:~alan-griffiths/mir/fix-1503450 updated on 2015-10-07
3001. By Alan Griffiths on 2015-10-07

And the missing mirclient dependency

Andreas Pokorny (andreas-pokorny) wrote :

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

lgtm

review: Approve
lp:~alan-griffiths/mir/fix-1503450 updated on 2015-10-07
3002. By Alan Griffiths on 2015-10-07

merge lp:mir

3003. By Alan Griffiths on 2015-10-07

Drop duplication with mirclient.pc

Kevin DuBois (kdub) wrote :

ok

Kevin DuBois (kdub) :
review: Approve
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
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