xserver: Branch 'master' - 2 commits

[Peter Hutterer]

 configure.ac        |    2 +-
 hw/dmx/Makefile.am  |    5 +----
 hw/dmx/dmx-config.h |   13 -------------
 mi/miinitext.c      |   12 ++++++++++++
 4 files changed, 14 insertions(+), 18 deletions(-)

New commits:
commit c9ec2bab2f258798fd6e6676698c732f09571a60
Author: Kevin E Martin <kem at redhat.com>
Date:   Sat Sep 26 13:10:54 2009 +1000

    dmx: undefine MITSHM, move undefs to miinitext.c.
    
    This patch undefines MITSHM for dmx - we don't support the required
    screen->ModifyPixmapHeaders. All undefines are moved from dmx-config to
    miinitext.c, where they belong.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/dmx/dmx-config.h b/hw/dmx/dmx-config.h
index 5b7b605..9791dc0 100644
--- a/hw/dmx/dmx-config.h
+++ b/hw/dmx/dmx-config.h
@@ -72,17 +72,4 @@
 /* Enable the DMX extension */
 #define DMXEXT
 
-/* Disable the extensions that are not currently supported */
-#undef MULTIBUFFER
-#undef XV
-#undef DBE
-#undef XF86VIDMODE
-#undef XFreeXDGA
-#undef XF86DRI
-#undef SCREENSAVER
-#undef RANDR
-#undef XFIXES
-#undef DAMAGE
-#undef COMPOSITE
-
 #endif /* DMX_CONFIG_H */
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 7f59126..0dca390 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -55,6 +55,18 @@ SOFTWARE.
 
 #ifdef HAVE_DMX_CONFIG_H
 #include <dmx-config.h>
+#undef MULTIBUFFER
+#undef XV
+#undef DBE
+#undef XF86VIDMODE
+#undef XFreeXDGA
+#undef XF86DRI
+#undef SCREENSAVER
+#undef RANDR
+#undef XFIXES
+#undef DAMAGE
+#undef COMPOSITE
+#undef MITSHM
 #endif
 
 #ifdef HAVE_XNEST_CONFIG_H
commit fc9d733bab3ff0e4e51b19c73b66196dca563a70
Author: Kevin E Martin <kem at redhat.com>
Date:   Sat Sep 26 13:09:52 2009 +1000

    dmx: reshuffle linker order to avoid errors when MITSHM is undefined.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/configure.ac b/configure.ac
index 82d86db..2754d92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1807,7 +1807,7 @@ if test "x$DMX" = xyes; then
 	fi
 	DMX_INCLUDES="$XEXT_INC $RENDER_INC $RECORD_INC"
 	XDMX_CFLAGS="$DMXMODULES_CFLAGS"
-	XDMX_LIBS="$XEXT_LIB $FB_LIB $CONFIG_LIB $FIXES_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB"
+	XDMX_LIBS="$FB_LIB $MI_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $XEXT_LIB $MAIN_LIB $DIX_LIB $CONFIG_LIB $OS_LIB $FIXES_LIB"
 	XDMX_SYS_LIBS="$DMXMODULES_LIBS"
 	AC_SUBST([XDMX_CFLAGS])
 	AC_SUBST([XDMX_LIBS])
diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index b31fbb8..3c59320 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -84,10 +84,7 @@ XDMX_LIBS = \
 	@XDMX_LIBS@ \
 	$(GLX_LIBS) \
         input/libdmxinput.a \
-        config/libdmxconfig.a \
-	$(MAIN_LIB) \
-	$(XSERVER_LIBS) \
-	$(top_builddir)/xfixes/libxfixes.la
+        config/libdmxconfig.a
 
 Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
 Xdmx_DEPENDENCIES= $(XDMX_LIBS)