xserver ChangeLog,3.163,3.164 configure.ac,3.73,3.74

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xserver
In directory pdx:/tmp/cvs-serv15203

Modified Files:
	ChangeLog configure.ac 
Log Message:

	* configure.ac:
	* hw/xorg/Makefile.am:
	* hw/xorg/drivers/Makefile.am:
	* hw/xorg/drivers/fbdev:
	* hw/xorg/input/Makefile.am:
	* hw/xorg/input/mouse:
	Import fbdev and mouse drivers.

	* hw/xorg/common/xf86cmap.c:
	Test for whether pmap is !NULL, rather than just blindly calling
	CMapReinstallMap. This seems to break things, but meh.


Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.163
retrieving revision 3.164
diff -u -d -r3.163 -r3.164
--- a/ChangeLog	28 Apr 2004 07:26:46 -0000	3.163
+++ b/ChangeLog	3 May 2004 15:39:43 -0000	3.164
@@ -1,3 +1,21 @@
+2004-05-03  Daniel Stone  <daniel at freedesktop.org>
+
+	* configure.ac:
+	* hw/xorg/Makefile.am:
+	* hw/xorg/drivers/Makefile.am:
+	* hw/xorg/drivers/fbdev:
+	* hw/xorg/input/Makefile.am:
+	* hw/xorg/input/mouse:
+	Import fbdev and mouse drivers.
+
+	* hw/xorg/common/xf86cmap.c:
+	Test for whether pmap is !NULL, rather than just blindly calling
+	CMapReinstallMap. This seems to break things.
+
+	While the display is very, very blue, it actually works. You can run
+	programs with it. It looks odd, but you can move the mouse, input
+	data, whatever.
+
 2004-04-28  Keith Packard  <keithp at keithp.com>
 
 	* configure.ac:
@@ -29,6 +47,7 @@
 	Stabs at extra #define's to get things working, hopefully.
 
 2004-04-25  Daniel Stone  <daniel at freedesktop.org>
+
 	* hw/xizzle:
 	* hw/xorg:
 	* configure.ac:

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.73
retrieving revision 3.74
diff -u -d -r3.73 -r3.74
--- a/configure.ac	28 Apr 2004 07:26:46 -0000	3.73
+++ b/configure.ac	3 May 2004 15:39:43 -0000	3.74
@@ -81,7 +81,7 @@
 
 DEFAULT_FONT_PATH="/usr/lib/X11/fonts/misc,/usr/lib/X11/fonts/100dpi,/usr/lib/X11/fonts/75dpi"
 DEFAULT_VENDOR_STRING="freedesktop.org"
-DEFAULT_VENDOR_RELEASE="6600"
+DEFAULT_VENDOR_RELEASE="6710"
 EXTENSION_LIBS='$(top_builddir)/Xext/libXext.a'
 EXTENSION_INCS='-I$(top_srcdir)/Xext'
 
@@ -431,9 +431,9 @@
 	-I$(top_srcdir)/include \\\
 	-I$(top_srcdir)/os \\\
 	-I$(top_srcdir)/hw/xorg/os-support/bus'
-	XORG_CORE_LIBS="$DIX_LIB $OS_LIB"
+	XORG_CORE_LIBS="$DIX_LIB"
 	XORG_LIBS="$FB_LIB $MI_LIB $XI_LIB $XKB_LIB $EXTENSION_LIBS \
-	           $DAMAGE_LIB $SHADOW_LIB $XPSTUBS_LIB"
+	           $DAMAGE_LIB $SHADOW_LIB $XPSTUBS_LIB $OS_LIB"
 	XORG_INCS="$XORG_INC $EXTENSION_INCS $MI_INC $DAMAGE_INC \
 	           $SHADOW_INC $FB_INC $XSERVER_CFLAGS $XI_INC"
 	XORG_CFLAGS="$XORGSERVER_CFLAGS -D_XOPEN_SOURCE -D_POSIX_SOURCE=500 \
@@ -567,10 +567,12 @@
 hw/xorg/ddc/Makefile
 hw/xorg/drivers/Makefile
 hw/xorg/drivers/ati/Makefile
+hw/xorg/drivers/fbdev/Makefile
 hw/xorg/dummylib/Makefile
 hw/xorg/fbdevhw/Makefile
 hw/xorg/i2c/Makefile
 hw/xorg/input/Makefile
+hw/xorg/input/mouse/Makefile
 hw/xorg/int10/Makefile
 hw/xorg/os-support/Makefile
 hw/xorg/os-support/bus/Makefile