[Xquartz-changes] xserver: Branch 'master' - 3 commits

[Jeremy Huddleston]

Rebased ref, commits from common ancestor:
commit d50319550458f8127298cf8672b47f914b74ab1f
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Dec 11 16:42:43 2009 -0800

    Xfake: Nuke -Wl,-undefined=InitExtensions from LDFLAGS
    
    This is not portable, and accodring to Paulo should not be required any more.
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at freedesktop.org>

diff --git a/hw/kdrive/fake/Makefile.am b/hw/kdrive/fake/Makefile.am
index 71b24b7..be0fa42 100644
--- a/hw/kdrive/fake/Makefile.am
+++ b/hw/kdrive/fake/Makefile.am
@@ -20,7 +20,7 @@ Xfake_LDADD = 						\
 	libfake.la					\
 	@KDRIVE_LIBS@
 
-Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -Wl,-undefined=InitExtensions
+Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
 
 Xfake_DEPENDENCIES =	\
 	libfake.la					\
commit ed7d2527190ec56aed38db19d9e958abe88441b9
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Dec 11 11:53:28 2009 -0800

    dtrace: Add Xserver-dtrace.h to CLEANFILES
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at freedesktop.org>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at sun.com>

diff --git a/dix/Makefile.am b/dix/Makefile.am
index b29f2e1..42b5121 100644
--- a/dix/Makefile.am
+++ b/dix/Makefile.am
@@ -70,4 +70,4 @@ endif
 dix.c:
 	touch $@
 
-CLEANFILES = dix.c
+CLEANFILES = dix.c Xserver-dtrace.h
commit 77221c9155a3c96cb63b210a048db1ea71a5e359
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Oct 29 14:01:29 2009 -0400

    glx: swrast can do GLX 1.4 too
    
    Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
index 44f658f..20f9f90 100644
--- a/glx/glxdriswrast.c
+++ b/glx/glxdriswrast.c
@@ -510,6 +510,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
 
     __glXScreenInit(&screen->base, pScreen);
 
+    screen->base.GLXmajor = 1;
+    screen->base.GLXminor = 4;
+
     LogMessage(X_INFO,
 	       "AIGLX: Loaded and initialized %s\n", filename);