xserver: Branch 'master'

[Eric Anholt]

 xorg-server.pc.in |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
diff-tree 205183a733237ea418a25c7423b689fcc8eae628 (from d67e210f3458b62d7d4a6032aabfda0004d661c1)
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Sep 4 16:19:22 2007 -0700

    Fix driver build by including an appropriate Requires.private line on pixman.
    
    We'd previously been substituting PIXMAN_CFLAGS, but we've got a better tool
    now, plus I deleted the PIXMAN_CFLAGS substitution without noticing.

diff --git a/xorg-server.pc.in b/xorg-server.pc.in
index fba3b15..d3ffaa2 100644
--- a/xorg-server.pc.in
+++ b/xorg-server.pc.in
@@ -8,5 +8,6 @@ sdkdir=@sdkdir@
 Name: xorg-server
 Description: Modular X.Org X Server
 Version: @PACKAGE_VERSION@
-Cflags: -I${sdkdir} @PIXMAN_CFLAGS@
+Requires.private: pixman-1
+Cflags: -I${sdkdir}
 Libs: -L${libdir}