Mir

Merge lp:~afrantzis/mir/fix-mircommon-debian-replaces into lp:mir

Proposed by Alexandros Frantzis
Status: Superseded
Proposed branch: lp:~afrantzis/mir/fix-mircommon-debian-replaces
Merge into: lp:mir
Diff against target: 25 lines (+4/-4)
1 file modified
debian/control (+4/-4)
To merge this branch: bzr merge lp:~afrantzis/mir/fix-mircommon-debian-replaces
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Alexandros Frantzis (community) Needs Fixing
Alan Griffiths Needs Fixing
Kevin DuBois (community) Abstain
Review via email: mp+228247@code.launchpad.net

Commit message

debian: Replace any version of mircommon-dev with libmircommon-dev

Description of the change

debian: Replace any version of mircommon-dev with libmircommon-dev

Our previous scheme only replaced mircommon-dev up to a specific version, but we have since moved to a newer mircommon-dev version.

To post a comment you must log in.
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

LGTM (but what do I know)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Would a purist prefer "(< 0.6)"?

Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

> dpkg: dependency problems prevent configuration of mircommon-dev:armhf:
> libmircommon-dev:armhf (0.6.0bzr1792pkg0utopic5+autopilot0) breaks mircommon-dev and is installed.
>
> dpkg: error processing package mircommon-dev:armhf (--install):
> dependency problems - leaving unconfigured

Eh? Why doesn't this fix that?

1792. By Alan Griffiths

debian: The Mir API documentation doesn't really depend on the -dev packages and the demos shouldn't recommend the docs as recommendations install by default. Fixes: https://bugs.launchpad.net/bugs/1297100, https://bugs.launchpad.net/bugs/1348518.

Approved by PS Jenkins bot, Alexandros Frantzis, Kevin DuBois.

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1793. By Alexandros Frantzis

client: Fix race when setting up surface attributes during surface creation
(LP: #1348095)

Move attribute initialization before the asynchronous surface creation request,
since at its current position (after the creation request), attribute
initialization may happen concurrently with attribute updates from the surface
creation process in a different thread. Fixes: https://bugs.launchpad.net/bugs/1348095.

Approved by PS Jenkins bot, Daniel van Vugt, Robert Carr, Alan Griffiths, Kevin DuBois.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
1794. By Andreas Pokorny

Fixes an update problem that causes an exception inside ASIO. (lp: #1346952)

The problem occurs when the response of a client races with another send operation about the mia::InputSender::ActiveTransfer object. Previously a reponse leads to deregistration of the fd. That operation is implemented by first removing the ActiveTransfer from the internal registry before it gets destroyed and unregistered. Meanwhile the sending thread forces the creation of another ActiveTransfer with the same file descriptor. This operation fails at epoll_ctl, since it attempts to add the fd another time.

This fix changes InputSender to register an FDHandler on first send attempt, and unregisters the file descriptor when the surface is removed. Additionally the unregistration on destruction is done with the sender_mutex locked. Which avoids a similar scenario when a surface gets removed while one with the same fd gets added and used. Fixes: https://bugs.launchpad.net/bugs/1346952.

Approved by PS Jenkins bot, Alexandros Frantzis, Daniel van Vugt, Alberto Aguirre, Kevin DuBois.

Revision history for this message
Kevin DuBois (kdub) wrote :

"don't disapprove"... Not quite sure of the debian policies.

review: Abstain
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

I don't think we should be reverting these:

34 +Recommends: mir-doc
...
42 + libmirclient-dev,
43 + libmirserver-dev,

review: Needs Fixing
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

> I don't think we should be reverting these:

No we shouldn't, I reverted them for testing purposes (since otherwise I wouldn't see the effect of my changes).

Do not top approve.

review: Needs Fixing
1795. By Alan Griffiths

shared, platform: link the shared objects into the mircommon shared library and not the libraries that link against it. (Partial fix for lp:1347522). Fixes: https://bugs.launchpad.net/bugs/1347522.

Approved by PS Jenkins bot, Alexandros Frantzis, Kevin DuBois.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
1796. By Alexandros Frantzis

server: Drop stale frames when a surface becomes exposed

When a surface changes from occluded to exposed, at best there is no
point in showing older, stale frames in quick succession, at worst the
stale frames result in visual glitches. We only care about the latest
surface buffer.
.

Approved by Kevin DuBois, PS Jenkins bot, Robert Carr, Alan Griffiths.

1797. By Daniel van Vugt

Hide -Wformat compiler warnings from the android-input code. (LP: #1348467)

We don't care to fix Google's log messages.
. Fixes: https://bugs.launchpad.net/bugs/1348467.

Approved by PS Jenkins bot, Kevin DuBois, Alan Griffiths.

1798. By Alan Griffiths

platform: link the platform objects into the mirplatform shared library and not the libraries that link against it. (Partial fix for lp:1347522). Fixes: https://bugs.launchpad.net/bugs/1347522.

Approved by PS Jenkins bot, Alexandros Frantzis, Kevin DuBois.

1799. By Alan Griffiths

client: provide linker scripts to control the symbols exported by [mesa|android] libmirclientplatform.

Approved by Chris Halse Rogers, Kevin DuBois, PS Jenkins bot.

1800. By Alan Griffiths

build: MIR_LINK_TIME_OPTIMIZATION option to use link time optimization
.

Approved by Chris Halse Rogers, Cemil Azizoglu, PS Jenkins bot, Kevin DuBois, Alexandros Frantzis.

1801. By Daniel van Vugt

GLRenderer/DemoRenderer: Optimize out inefficient std::vector operations
that were consuming too much CPU time. (LP: #1349698)

 1. Instead of a vector-of-vectors make it a flat vector of structures.
 2. Cache the primitives vector memory instead of reallocating a new one
    for every renderable on every frame.

This reduces tessellation CPU usage from 12% to 3% and almost doubles the
number of clients I can run under callgrind before they skip frames.
. Fixes: https://bugs.launchpad.net/bugs/1349698.

Approved by Kevin DuBois, Alan Griffiths, Alexandros Frantzis, PS Jenkins bot.

1802. By Kevin DuBois

correct the xcursor loader test to fail instead of segfault if it cannot find the cursor images it is looking for. Modify the test to find the cursor images from the directory the test is ran from (much like umockdev recordings) Change the scripts to install the cursor images to the proper directories when cross compiling.

fixes: lp: #1342029. Fixes: https://bugs.launchpad.net/bugs/1342029.

Approved by PS Jenkins bot, Alan Griffiths, Alexandros Frantzis.

1803. By Alan Griffiths

client: fix libmirclient so it doesn't bleed loads of public symbols that users shouldn't rely on. Fixes: https://bugs.launchpad.net/bugs/1349742.

Approved by Kevin DuBois, PS Jenkins bot, Alexandros Frantzis, Andreas Pokorny, Chris Halse Rogers.

1804. By Cemil Azizoglu

Add cursors.h to the client-ABI-sha1sums and server-ABI-sha1sums list.

Approved by Kevin DuBois, PS Jenkins bot, Alan Griffiths.

1805. By Alexandros Frantzis

server: Allow clients to create surfaces even when there are no active outputs (LP: #1344024)

This is fixed by removing obsolete placement rules from our default placement
policy. These rules had the side-effect of prohibiting surface creation when
there were no active outputs. Fixes: https://bugs.launchpad.net/bugs/1344024.

Approved by Alan Griffiths, PS Jenkins bot.

1806. By Daniel van Vugt

Merge latest Ubuntu changelog entries from utopic.

Approved by PS Jenkins bot, Cemil Azizoglu, Daniel van Vugt.

1807. By Kevin DuBois

make the mir::Fd type CopyConstructible (and also CopyAssignable).

Approved by Alan Griffiths, PS Jenkins bot, Alexandros Frantzis.

1808. By Alexandros Frantzis

client: Export symbols required by the Mir Mesa EGL platform. Fixes: https://bugs.launchpad.net/bugs/1350163.

Approved by Daniel van Vugt, Chris Halse Rogers, Kevin DuBois, PS Jenkins bot.

1809. By Alberto Aguirre

Release overlay buffers when screen is turned off (LP: #1350961). Fixes: https://bugs.launchpad.net/bugs/1350961.

Approved by PS Jenkins bot, Kevin DuBois.

1810. By Chris Halse Rogers

Fix a couple of harmless, but reasonable, warnings clang raises about the android platform code.

Approved by Alan Griffiths, PS Jenkins bot.

1811. By Alan Griffiths

platformgraphics - restrict the exports of the platform libraries.

Approved by Alexandros Frantzis, Kevin DuBois, PS Jenkins bot.

1812. By Chris Halse Rogers

Finish off the removal of libmirprotobuf.

Fixes: https://bugs.launchpad.net/mir/+bug/1351133. Fixes: https://bugs.launchpad.net/bugs/1351133.

Approved by PS Jenkins bot, Daniel van Vugt.

1813. By Kevin DuBois

Simplify the demo shell occlusion detection. Fixes: https://bugs.launchpad.net/bugs/1348330.

Approved by PS Jenkins bot, Cemil Azizoglu, Alan Griffiths, Alexandros Frantzis.

1814. By Daniel van Vugt

Bump version to 0.7.0, since series 0.6 is already branched.

Approved by Kevin DuBois, PS Jenkins bot.

1815. By Daniel van Vugt

Condense and deduplicate references to MIR_VERSION_*. This reduces coupling
between makefiles/scripts.
.

Approved by Alan Griffiths, Alexandros Frantzis, Kevin DuBois, PS Jenkins bot.

1816. By Robert Carr

Add a script for updating client and server sha1sum files.

Approved by PS Jenkins bot, Daniel van Vugt.

1817. By PS Jenkins bot

packaging: fix some errors in the package config files.

Approved by PS Jenkins bot, Cemil Azizoglu, Daniel van Vugt, Andreas Pokorny.

1818. By Alexandros Frantzis

mesa,android: Don't propagate exceptions to graphics driver code. Fixes: https://bugs.launchpad.net/bugs/1347053.

Approved by PS Jenkins bot, Kevin DuBois, Robert Carr.

1819. By Daniel van Vugt

Drop unused build-dep "boost-filesystem".

Approved by Alan Griffiths, Alexandros Frantzis, PS Jenkins bot.

1820. By Daniel van Vugt

Remember to honor MIR_ENABLE_TESTS and not emit tests if it's disabled.
(LP: #1352800)
. Fixes: https://bugs.launchpad.net/bugs/1352800.

Approved by Alan Griffiths, Kevin DuBois, PS Jenkins bot, Alexandros Frantzis.

1821. By Daniel van Vugt

Drop unused build-dep "boost-thread".

Approved by PS Jenkins bot, Alan Griffiths, Alexandros Frantzis.

1822. By Daniel van Vugt

platform: provide support for customizing Mir's behavior when a fatal_error occurs.

Approved by PS Jenkins bot, Robert Carr, Cemil Azizoglu, Kevin DuBois, Alexandros Frantzis.

1823. By Daniel van Vugt

Drop unused build-dep "boost-chrono".

Approved by Kevin DuBois, PS Jenkins bot, Alan Griffiths, Alexandros Frantzis.

1824. By Robert Carr

Expose an interface for touch visualization. Fixes: https://bugs.launchpad.net/bugs/1323522.

Approved by PS Jenkins bot, Cemil Azizoglu, Alan Griffiths.

1825. By Daniel van Vugt

Drop unnecessary boost-regex usage. Only simple pattern searching is needed.
This also speeds up builds a little and trims around 300KB from each
affected binary.
.

Approved by PS Jenkins bot, Kevin DuBois, Alexandros Frantzis, Cemil Azizoglu.

1826. By Alan Griffiths

config: make it easier to separate command line options used by Mir from those used elsewhere. Fixes: https://bugs.launchpad.net/bugs/1351255.

Approved by PS Jenkins bot, Robert Carr, Alexandros Frantzis.

1827. By Kevin DuBois

android: client: clean up classes concerning client side buffers. preparation for sharing fences.

Approved by Alan Griffiths, Alexandros Frantzis, PS Jenkins bot.

1828. By Daniel van Vugt

Convert the sub-libraries of libmirserver from STATIC into OBJECT libraries.
This stops them from polluting the build/lib/ directory which is down from
177MB to 119MB. Also builds are slightly faster thanks to the reduced
disk usage.
.

Approved by Kevin DuBois, PS Jenkins bot, Alan Griffiths.

1829. By Kevin DuBois

graphics: expose create_native_platform in libmirplatformgraphics.so

nested servers (like u8) need this symbol, and they will throw an exception if they cant find it.

fix: lp: #1353658. Fixes: https://bugs.launchpad.net/bugs/1353658.

Approved by Alexandros Frantzis, PS Jenkins bot, Alan Griffiths.

1830. By Alan Griffiths

config: provide a configuration option: --on-fatal-error-abort.

Approved by PS Jenkins bot, Kevin DuBois, Alexandros Frantzis, Cemil Azizoglu.

1831. By Alan Griffiths

Add versioning and pkg config to libmirplatform. Fixes: https://bugs.launchpad.net/bugs/1293944.

Approved by PS Jenkins bot, Chris Halse Rogers, Alexandros Frantzis.

1832. By Daniel van Vugt

Drop ancient support for building libmirserver as STATIC and tidy up the
surrounding makefile.
.

Approved by Alan Griffiths, Alexandros Frantzis, Chris Halse Rogers, PS Jenkins bot.

1833. By Alan Griffiths

Users of libmirserver also need to be linked to libmirclient automatically
to resolve the client symbols used in libmirserver for nesting
(LP: #1355021)

1834. By Alexandros Frantzis

client: Rework mechanism to override Mir client functions.

Approved by PS Jenkins bot, Chris Halse Rogers, Kevin DuBois, Alan Griffiths.

1835. By Kevin DuBois

android: log hwc commands issued to turn the display on and off.

Approved by Robert Carr, PS Jenkins bot.

1836. By Chris Halse Rogers

Wait longer for InProcessServer startup.

This was reliably timing out for me when running the valgrind tests
in parallel.

10 seconds is enough to make “make test ARGS=-j8” work fine here,
and that cuts down the time of a full test run from 1500s to 300s.

That's still too slow, but 5× faster is better than nothing.

Approved by Daniel van Vugt, Kevin DuBois, Robert Carr, Alexandros Frantzis, PS Jenkins bot.

1837. By Kevin DuBois

android: fix intermittent problem that happens during certain list rearrangements. Scan the list of onscreen buffers in HwcDevice instead of trying to have the list helper classes figure out the onscreen buffers.
(LP: #1352883). Fixes: https://bugs.launchpad.net/bugs/1352883.

Approved by Alan Griffiths, Daniel van Vugt, PS Jenkins bot.

1838. By Alexandros Frantzis

Update version number for libmircommon-dev and libmirplatform-dev Breaks,Replaces clauses

Unmerged revisions

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 2014-08-07 08:43:25 +0000
3+++ debian/control 2014-08-13 07:04:01 +0000
4@@ -111,8 +111,8 @@
5 Depends: libmircommon1 (= ${binary:Version}),
6 libprotobuf-dev (>= 2.4.1),
7 ${misc:Depends},
8-Breaks: mircommon-dev (<= 0.5.0+14.10.20140722-0ubuntu1)
9-Replaces: mircommon-dev (<= 0.5.0+14.10.20140722-0ubuntu1)
10+Breaks: mircommon-dev (<< 0.6)
11+Replaces: mircommon-dev (<< 0.6)
12 Description: Display server for Ubuntu - development headers
13 Mir is a display server running on linux systems, with a focus on efficiency,
14 robust operation and a well-defined driver model.
15@@ -128,8 +128,8 @@
16 libmircommon-dev,
17 libboost-program-options-dev,
18 ${misc:Depends},
19-Breaks: libmirplatform (<=0.5.1+14.10.20140728-0ubuntu1)
20-Replaces: libmirplatform (<=0.5.1+14.10.20140728-0ubuntu1)
21+Breaks: libmirplatform (<< 0.6)
22+Replaces: libmirplatform (<< 0.6)
23 Description: Display server for Ubuntu - development headers
24 Mir is a display server running on linux systems, with a focus on efficiency,
25 robust operation and a well-defined driver model.

Subscribers

People subscribed via source and target branches