xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/sdksyms.sh |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8b820f221ad54eb96a16c7060048abc8824371b6
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Wed Jul 11 17:31:53 2012 +0100

    sdksyms: Fix build with --disable-xv
    
    I hate this [redacted] script.
    
    Signed-off-by: Daniel Stone <daniel at fooishbar.org>
    Tested-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index c0398da..07372ad 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -46,8 +46,10 @@ cat > sdksyms.c << EOF
 #include "misyncstr.h"
 
 /* Xext/Makefile.am -- half is module, half is builtin */
+#ifdef XV
 #include "xvdix.h"
 #include "xvmcext.h"
+#endif
 #include "geext.h"
 #include "geint.h"
 #ifdef MITSHM