xserver: Branch 'master'

[Keith Packard]

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

New commits:
commit c51534961e1bb4c68ff881758862d2f85f572ce7
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat May 22 11:11:48 2010 -0700

    xorg-server.pc Requires: xproto >= 7.0.17
    
    Since the headers we export in the SDK use the _X_NORETURN #define
    introduced in xproto 7.0.17, drivers built with the SDK will also
    need to have at least that version of xproto installed.
    
    I considered exporting the version from configure.ac, but decided not
    to since the minimum required to build the X server may not always
    be the same as the minimum required to build drivers (for instance,
    if the X server used a new #define in its .c files or internal headers,
    but didn't export it in any of the SDK headers).
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Julien Cristau <jcristau at debian.org>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/xorg-server.pc.in b/xorg-server.pc.in
index 376cb93..44f886a 100644
--- a/xorg-server.pc.in
+++ b/xorg-server.pc.in
@@ -15,6 +15,6 @@ abi_extension=@abi_extension@
 Name: xorg-server
 Description: Modular X.Org X Server
 Version: @PACKAGE_VERSION@
-Requires: pixman-1 pciaccess
+Requires: pixman-1 pciaccess xproto >= 7.0.17
 Cflags: -I${sdkdir} @symbol_visibility@
 Libs: -L${libdir}