xserver: Branch 'server-1.7-nominations'

[Julien Cristau]

On Wed, Nov 25, 2009 at 21:49:22 -0800, Peter Hutterer wrote:

> commit 196aff9b18381d700fb28027186cce6e68ad587c
> Author: Aaron Plattner <aplattner at nvidia.com>
> Date:   Tue Nov 24 10:21:28 2009 -0800
> 
>     Bug #25136: Revert "Fix clipping when windows are used as sources"
>     
>     That change causes lib(w)fb to make accelerated driver calls after the driver
>     has entered a software fallback.  Most drivers don't expect this, which leads to
>     corruption or crashes.  A change to make this code do the copy in software is
>     unacceptably slow.
>     
>     This reverts commit e9aa61e9f0d663d5b34a397b943b4d1df44e873d.
>     
>     Conflicts:
>     
>     	configure.ac
>     	fb/fbpict.c
>     
>     Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
>     Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> 
> diff --git a/fb/fb.h b/fb/fb.h
> index c35e765..6c9f8a1 100644
> --- a/fb/fb.h
> +++ b/fb/fb.h
> @@ -2080,8 +2080,7 @@ fbFillRegionSolid (DrawablePtr	pDrawable,
>  
>  extern _X_EXPORT pixman_image_t *
>  image_from_pict (PicturePtr pict,
> -		 Bool       has_clip,
> -		 Bool	    is_src);
> +		 Bool       has_clip);
>  extern _X_EXPORT void free_pixman_pict (PicturePtr, pixman_image_t *);
>  
>  #endif /* _FB_H_ */

Looks like the above change breaks ABI, and breaks the intel 2.9.1
driver build.

Cheers,
Julien