xserver: Branch 'master'

[Julien Cristau]

On Fri, Oct 12, 2007 at 06:33:38 -0700, Matthias Hopf wrote:

>  xorg-server.pc.in |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> New commits:
> diff-tree 17ffc34ad5e9a8e2269afef05f209701f1895c01 (from eaf0e2a21c2cb14e19852e61a4521b3c240253af)
> Author: Matthias Hopf <mhopf at suse.de>
> Date:   Fri Oct 12 15:33:31 2007 +0200
> 
>     Drivers include miscstruct.h which requires pixman.h.
> 
> diff --git a/xorg-server.pc.in b/xorg-server.pc.in
> index d3ffaa2..c1cdb7d 100644
> --- a/xorg-server.pc.in
> +++ b/xorg-server.pc.in
> @@ -8,6 +8,6 @@ sdkdir=@sdkdir@
>  Name: xorg-server
>  Description: Modular X.Org X Server
>  Version: @PACKAGE_VERSION@
> -Requires.private: pixman-1
> +Requires: pixman-1
>  Cflags: -I${sdkdir}
>  Libs: -L${libdir}

I think this change is wrong, drivers don't use pixman directly so
there's no reason for them to link with libpixman.
cflags are already included when using Requires.private.

Cheers,
Julien