[PULL weston] simple fixes

[Kristian Hoegsberg]

On Thu, Apr 26, 2012 at 04:02:32PM +0300, Pekka Paalanen wrote:
> Hi Kristian,
> 
> here is a set of minor fixes, mostly simple-shm related. The series
> includes soreau's patch for xserver variable from the mailing list,
> since I hit that problem, too.
> 
> http://cgit.collabora.com/git/user/pq/wayland-demos.git/log/?h=simple-fixes
> 
> The main feature of this series is:
> 
>     simple-shm: render meaningful diagnostics
>     
>     Previously, simple-shm was rendering an image that looked like stride
>     gone wrong somewhere, and was quite confusing if you did not know it was
>     supposed to look like that.
>     
>     Replace the drawing code. Two circles, inner and outer, now delimit
>     three co-centric areas. The outmost area from surface borders to outer
>     circle contains horizontal gradients that move (animate) to the left.
>     The area between outer and inner circles contains vertical gradients
>     that move upwards. The center disc has circular gradients moving towards
>     the center.
>     
>     The circles are not ellipses.
>     
>     Diagnostics:
>     The X-channel is manipulated so, that if a compositor takes the XRGB
>     image, and uses the X channel as alpha instead of ignoring it, the whole
>     image will be crossed out by two lines that either quickly saturate to
>     white or show through with additive blending. Does not work on black
>     background.

Looks good to me, all merged.
Kristian

> The following changes since commit 7890c4d36dbec14d44109ead6fb12adfece47a7b:
> 
>   gears: Allow model rotation with pointer (2012-04-25 10:52:43 -0400)
> 
> are available in the git repository at:
>   git://git.collabora.co.uk/git/user/pq/wayland-demos.git simple-fixes
> 
> Pekka Paalanen (5):
>       simple-shm: render meaningful diagnostics
>       compositor: report .so path when load_module() fails
>       simple-shm: handle shm buffer failure
>       simple-shm: no need for wayland-egl.h
>       fix build for --disable-clients --enable-simple-clients
> 
> Scott Moreau (1):
>       compositor: Initialize xserver variable
> 
>  clients/Makefile.am  |   15 ++++++----
>  clients/simple-shm.c |   69 ++++++++++++++++++++++++++++++++++++++++---------
>  src/compositor.c     |    7 +++--
>  3 files changed, 69 insertions(+), 22 deletions(-)
> 
> 
> Thanks,
> pq