lp:~raof/mir/buildsystems-are-the-worst

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:mir

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2014-08-27

Andreas Pokorny (community): Needs Information on 2014-08-26

Alan Griffiths: Needs Fixing on 2014-08-22

Diff: 74 lines (+10/-11)

3 files modified

CMakeLists.txt (+2/-0)
cmake/LinuxCrossCompile.cmake (+3/-5)
cmake/MirCommon.cmake (+5/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1358698: [regression] Test failure holding up all merge proposals: "File already exists in database: mir_protobuf_wire.proto"	Critical	Fix Released
Bug #1359760: The wrong libmirplatformgraphics.so is loaded in CI (which causes bugs and crashes during CI)	High	Invalid

Link a bug report

Related blueprints

1860. By Chris Halse Rogers on 2014-08-27

Merge trunk

1859. By Chris Halse Rogers on 2014-08-22

Don't let CMake play with rpath, it cuts itself.

So, the awesome thing about rpath is that it PRECEEDS all the other paths.
If, just for the sake of argument, your cross compiles set an rpath-link to
your partial chroot you'd find that you're surprisingly linking against the
version of libmirclient.so.8 found in there.

Fixes the multiple inclusion of protobuf singletons caused when the system
Mir stuff is linking against one version of libmircommon and we're building
a new version.

1858. By Chris Halse Rogers on 2014-08-22

Check that the MirConnection is valid in BasicClientServerFixture.

1857. By Chris Halse Rogers on 2014-08-21

Abort test when InProcessServer startup fails.

ASSERT_TRUE does not actually abort the test unless called directly within
the main test body or from a function called within ASSERT_NO_FATAL_FAILURE()
within the main test body.

Throw an exception instead, which will terminate the test unless deliberately
caught.

1856. By Alan Griffiths on 2014-08-21

cmake: Fix dependencies on non-existent (renamed) protobuf targets

1855. By Alan Griffiths on 2014-08-21

tools: The tools/install_on_android.sh needs updating with current binaries

1854. By Daniel van Vugt on 2014-08-21

Remove reference to non-existent empty variable ${PROTO_HDRS}

1853. By Daniel van Vugt on 2014-08-21

DemoRenderer: Don't try to create a texture of width zero. libGL might crash
and definitely won't produce anything useful. This simple regression was
caused by accidentally changing float corner_radius = 0.5f into an int in
revision 1845. (LP: #1358210)

1852. By Alexandros Frantzis on 2014-08-21

client: Fix SIGTERM dispatch in our default lifecycle event handler, which
was resulting in clients looping infinitely in exception handlers
(LP: #1353867)

Our default lifecycle event handler used to call raise() to send a TERM
signal to the app when a connection break was detected. However, in a
multi-threaded program raise() sends the signal to the current thread only.
If the signal is blocked in that thread, then the signal is lost.

Depending on thread in which we detected that the connection was lost, the
TERM signal would be dispatched (e.g. in the context of a driver callback
asking for the next buffer) or not (e.g. in the context of our main RPC
threads which block all signals). This MP fixes the issue by explicitly
sending the signal to the process instead of the current thread. This ensures
that it will be dispatched to some thread that doesn't block it.

1851. By Daniel van Vugt on 2014-08-18

Draft changelog for the big things coming in 0.7
.

Approved by PS Jenkins bot, Cemil Azizoglu.