Mir

Merge lp:~robert-ancell/mir/mir-client-platform-mesa-dev-depends into lp:mir

Proposed by Robert Ancell on 2015-10-07
Status: Rejected
Rejected by: Chris Halse Rogers on 2015-10-07
Proposed branch: lp:~robert-ancell/mir/mir-client-platform-mesa-dev-depends
Merge into: lp:mir
Diff against target: 23 lines (+3/-1)
2 files modified
debian/control (+2/-1)
src/platforms/mesa/mir-client-platform-mesa.pc.in (+1/-0)
To merge this branch: bzr merge lp:~robert-ancell/mir/mir-client-platform-mesa-dev-depends
Reviewer Review Type Date Requested Status
Alan Griffiths Disapprove on 2015-10-07
PS Jenkins bot (community) continuous-integration Approve on 2015-10-07
Daniel van Vugt 2015-10-07 Needs Information on 2015-10-07
Tiago Stürmer Daitx (community) 2015-10-07 Approve on 2015-10-07
Review via email: mp+273631@code.launchpad.net

Commit message

Update mir-client-platform-mesa pkgconfig and package depends.

The mir-client-platform-mesa headers use:
mir_toolkit/mir_native_buffer.h
mir_toolkit/client_types.h

The former is from libmircommon-dev, so add this to the package dependencies.
The latter is from libmirclient-dev so add the appropriate dependency into the
pkgconfig file so the include directories are passed to the compiler.

To post a comment you must log in.
2999. By Robert Ancell on 2015-10-07

Use Requires.private, not Depends...

review: Approve
Daniel van Vugt (vanvugt) wrote :

Seems like the right solution, and I assume it works.

In theory however external non-server projects should have zero visibility of libmircommon-things. So I wonder what did we mess up in Mir to violate that goal?...

review: Needs Information
Alan Griffiths (alan-griffiths) wrote :

> In theory however external non-server projects should have zero visibility of
> libmircommon-things. So I wonder what did we mess up in Mir to violate that
> goal?...

That theory is clearly wrong. ;)

If we want to enforce that rule then there ought to be some tests for it - and there are not.

Also, do you mean "non-server" or "client" (we don't currently have external "platform" projects but I think they will need access to libmircommon).

PS I want to dig a little as to why these specific dependencies are visible before voting.

Alan Griffiths (alan-griffiths) wrote :

I think the correct solution is lp:~alan-griffiths/mir/fix-1503450/+merge/273668

review: Disapprove
Chris Halse Rogers (raof) wrote :

Alan's solution is approved; marking this one as rejected.

Unmerged revisions

2999. By Robert Ancell on 2015-10-07

Use Requires.private, not Depends...

2998. By Robert Ancell on 2015-10-07

Update mir-client-platform-mesa pkgconfig and package depends.

The mir-client-platform-mesa headers use:
mir_toolkit/mir_native_buffer.h
mir_toolkit/client_types.h

The former is from libmircommon-dev, so add this to the package dependencies.
The latter is from libmirclient-dev so add the appropriate dependency into the
pkgconfig file so the include directories are passed to the compiler.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-09-30 06:15:00 +0000
3+++ debian/control 2015-10-07 01:29:18 +0000
4@@ -364,7 +364,8 @@
5 Architecture: linux-any
6 Multi-Arch: same
7 Pre-Depends: ${misc:Pre-Depends}
8-Depends: libmirclient-dev,
9+Depends: libmircommon-dev,
10+ libmirclient-dev,
11 ${misc:Depends},
12 Description: Display server for Ubuntu - client platform library for Mesa development files
13 Mir is a display server running on linux systems, with a focus on efficiency,
14
15=== modified file 'src/platforms/mesa/mir-client-platform-mesa.pc.in'
16--- src/platforms/mesa/mir-client-platform-mesa.pc.in 2015-09-24 22:30:09 +0000
17+++ src/platforms/mesa/mir-client-platform-mesa.pc.in 2015-10-07 01:29:18 +0000
18@@ -4,4 +4,5 @@
19 Name: mir-client-platform-mesa
20 Description: Mir Mesa client platform development files
21 Version: @MIR_VERSION@
22+Requires.private: mirclient
23 Cflags: -I${includedir} -I${common_includedir}

Subscribers

People subscribed via source and target branches