xserver ChangeLog, 3.159, 3.160 Makefile.am, 3.13, 3.14 configure.ac, 3.69, 3.70

[Daniel Stone]

Committed by: daniel

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

Modified Files:
	ChangeLog Makefile.am configure.ac 
Log Message:
Doing a reimport of the Xorg DDX, and hw/xizzle->hw/xorg.

configure.ac, Makefile.am, et al changed accordingly.

os/* braindamage fixed to the satisfaction of both Xorg and KDrive - fixed
the case where ErrorF() couldn't be satisfactorily defined in the DIX because
KDrive just spat stuff out to the screen, and Xorg logged it too.

xkb, Xi, et al: XFree86 extensions added and fixed for proper usage of includes,
and to build properly.


Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.159
retrieving revision 3.160
diff -u -d -r3.159 -r3.160
--- a/ChangeLog	19 Apr 2004 18:30:05 -0000	3.159
+++ b/ChangeLog	25 Apr 2004 10:25:39 -0000	3.160
@@ -1,3 +1,19 @@
+2004-04-25  Daniel Stone  <daniel at freedesktop.org>
+	* hw/xizzle:
+	* hw/xorg:
+	* configure.ac:
+	* Makefile.am:
+	Xizzle is dead - long live Xorg. Do a reimport, and don't change stuff
+	this time. Use --enable-xorgserver instead of --enable-xizzleserver.
+
+	* Xext/*.c:
+	* Xext/Makefile.am:
+	* Xi/Makefile.am:
+	* Xi/*.c:
+	* xkb:
+	Some XFree86 extensions added and/or fixed, including XKB and Xi (both
+	needed for an Xorg build).
+
 2004-04-20  Daniel Stone  <daniel at freedesktop.org>
 	
 	* dix/devices.c:

Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/Makefile.am,v
retrieving revision 3.13
retrieving revision 3.14
diff -u -d -r3.13 -r3.14
--- a/Makefile.am	14 Feb 2004 05:20:47 -0000	3.13
+++ b/Makefile.am	25 Apr 2004 10:25:39 -0000	3.14
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS=dist-bzip2
+AUTOMAKE_OPTIONS=dist-bzip2 foreign
 
 if GLX
 GLX_SUBDIR=	GL
@@ -16,6 +16,10 @@
 XI_SUBDIR = Xi
 endif
 
+if XORGSERVER
+XKB_SUBDIR = xkb
+endif
+
 SUBDIRS=	\
 	include	\
 	dix 	\
@@ -32,5 +36,6 @@
 	$(DRI_SUBDIRS) \
 	$(COMPOSITE_SUBDIR) \
 	$(XI_SUBDIR) \
+	$(XKB_SUBDIR) \
 	hw
 

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.69
retrieving revision 3.70
diff -u -d -r3.69 -r3.70
--- a/configure.ac	19 Mar 2004 05:49:58 -0000	3.69
+++ b/configure.ac	25 Apr 2004 10:25:39 -0000	3.70
@@ -95,7 +95,7 @@
 AC_ARG_ENABLE(xnestserver,   [  --enable-xnestserver ],[XNESTSERVER=$enableval],[XNESTSERVER=no])
 AC_ARG_ENABLE(xwinserver,    [  --enable-xwinserver ],[XWINSERVER=$enableval],[XWINSERVER=no])
 AC_ARG_ENABLE(xsdlserver,    [  --enable-xsdlserver ],[XSDLSERVER=$enableval],[XSDLSERVER=no])
-AC_ARG_ENABLE(xizzleserver,  [  --enable-xizzleserver ],[XIZZLESERVER=$enableval],[XIZZLESERVER=no])
+AC_ARG_ENABLE(xorgserver,    [  --enable-xorgserver ],[XORGSERVER=$enableval],[XORGSERVER=no])
 AC_ARG_ENABLE(xtrap,         [  --enable-xtrap ],[XTRAP=$enableval],[XTRAP=no])
 AC_ARG_ENABLE(builtinrgb,    [  --disable-builtinrgb ],[USE_RGB_BUILTIN=$enableval],[USE_RGB_BUILTIN=yes])
 AC_ARG_ENABLE(screensaver,   [  --disable-screensaver ],
@@ -107,7 +107,7 @@
 AC_ARG_ENABLE(dri,           [  --enable-dri ],[DRI=$enableval],[DRI=no])
 AC_ARG_ENABLE(xinput,	     [  --enable-xinput ],[XINPUT=$enableval],[XINPUT=no])
 AC_ARG_ENABLE(xloadable,     [  --enable-xloadable ],[XLOADABLE=$enableval],[XLOADABLE=no])
-AC_ARG_ENABLE(xinerama,	     [  --disable-xinerama ],[XINERAMA=$enableval],[XINERAMA=no])
+AC_ARG_ENABLE(xinerama,	     [  --enable-xinerama ],[XINERAMA=$enableval],[XINERAMA=no])
 
 AC_ARG_WITH(mesa-source,        [  --with-mesa-source=PATH ],
 				[MESA_SOURCE="$withval"],
@@ -165,10 +165,14 @@
 	XWIN_REQUIRED_MODULES="x11"
 fi
 
-AM_CONDITIONAL(XIZZLESERVER, [test x$XIZZLESERVER = xyes])
-if test "$XIZZLESERVER" = yes; then
-	AC_DEFINE(XIZZLESERVER,,[Build Xizzle server])
+AM_CONDITIONAL(XORGSERVER, [test x$XORGSERVER = xyes])
+if test "$XORGSERVER" = yes; then
+	AC_DEFINE(XORGSERVER,,[Build Xorg server])
+	AC_DEFINE(XKB,,[Build Xkb])
+	AC_DEFINE(XINPUT,,[Build XInput])
+	REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
 fi
+AC_SUBST([XKB])
 
 AM_CONDITIONAL(XTRAP, [test x$XTRAP = xyes])
 if test "$XTRAP" = yes; then
@@ -195,8 +199,8 @@
 
 AM_CONDITIONAL(DRI, test x$DRI = xyes)
 if test "$DRI" = yes; then
-	AC_DEFINE(XIZZLEDRI,1,[Build DRI extension])
-	AC_DEFINE(_XIZZLEDRI_SERVER_,1,[XIZZLEDRI internal define])
+	AC_DEFINE(XORGDRI,1,[Build DRI extension])
+	AC_DEFINE(_XORGDRI_SERVER_,1,[XORGDRI internal define])
 fi
 AM_CONDITIONAL(XINPUT, [test x$XINPUT = xyes])
 if test "$XINPUT" = yes; then
@@ -347,6 +351,9 @@
 SHADOW_INC='-I$(top_srcdir)/miext/shadow'
 XPSTUBS_LIB='$(top_builddir)/dix/libxpstubs.a'
 XSERVER_LIBS="${XSERVER_LIBS} -lm -lz"
+XKB_LIB='$(top_builddir)/xkb/libxkb.a'
+XI_LIB='$(top_builddir)/Xi/libXi.a'
+XI_INC='-I$(top_builddir)/Xi'
 
 PKG_CHECK_MODULES(XSERVER, $REQUIRED_MODULES)
 
@@ -414,71 +421,73 @@
 AC_SUBST([XSDL_INCS])
 AC_SUBST([XSDL_DIRS])
 
-XIZZLE_LIBS=
-XIZZLE_INCS=
-XIZZLE_OS=
-if test "$XIZZLESERVER" = yes; then
-	XIZZLE_INC='-I$(top_srcdir)/hw/xizzle/include \\\
-	-I$(top_srcdir)/hw/xizzle/common \\\
-	-I$(top_srcdir)/hw/xizzle/os-support \\\
+XORG_LIBS=
+XORG_INCS=
+XORG_OS=
+if test "$XORGSERVER" = yes; then
+	XORG_INC='-I$(top_srcdir)/hw/xorg/include \\\
+	-I$(top_srcdir)/hw/xorg/common \\\
+	-I$(top_srcdir)/hw/xorg/os-support \\\
 	-I$(top_srcdir)/include \\\
-	-I$(top_srcdir)/hw/xizzle/os-support/bus'
-	XIZZLE_CORE_LIBS="$DIX_LIB $OS_LIB"
-	XIZZLE_LIBS="$FB_LIB $MI_LIB $EXTENSION_LIBS $DAMAGE_LIB $SHADOW_LIB \
-	             $XPSTUBS_LIB -ldl"
-	XIZZLE_INCS="$XIZZLE_INC $EXTENSION_INCS $MI_INC $DAMAGE_INC \
-	             $SHADOW_INC $FB_INC $XSERVER_CFLAGS "'-I$(top_srcdir)/os'
-	XIZZLE_CFLAGS="$XIZZLESERVER_CFLAGS -D_XOPEN_SOURCE -D_POSIX_SOURCE=500 \
-	               -D_BSD_SOURCE -Wall -DNEED_XF86_TYPES"
+	-I$(top_srcdir)/os \\\
+	-I$(top_srcdir)/hw/xorg/os-support/bus'
+	XORG_CORE_LIBS="$DIX_LIB $OS_LIB"
+	XORG_LIBS="$FB_LIB $MI_LIB $XI_LIB $XKB_LIB $EXTENSION_LIBS \
+	           $DAMAGE_LIB $SHADOW_LIB $XPSTUBS_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 \
+	             -D_BSD_SOURCE -Wall -DNEED_XF86_TYPES
+	             -DNEED_XF86_PROTOTYPES"
 	case $host_os in
 	  linux-gnu*)
 	  	# support: yea
-	  	XIZZLE_OS="linux"
-		XIZZLE_OS_SUBDIR="linux"
+	  	XORG_OS="linux"
+		XORG_OS_SUBDIR="linux"
 		;;
 	  freebsd*)
 	  	# support: nay
 		# daniel has an account on an fbsd box, working on this
 		# jaymz too
-	  	XIZZLE_OS="freebsd"
-		XIZZLE_OS_SUBDIR="bsd"
+	  	XORG_OS="freebsd"
+		XORG_OS_SUBDIR="bsd"
 		;;
 	  netbsd*)
 	  	# support: nay
 	  	# volunteers?
-	  	XIZZLE_OS="netbsd"
-		XIZZLE_OS_SUBDIR="bsd"
+	  	XORG_OS="netbsd"
+		XORG_OS_SUBDIR="bsd"
 		;;
 	  openbsd*)
 	  	# support: nay
 	  	# volunteers?
-	  	XIZZLE_OS="openbsd"
-		XIZZLE_OS_SUBDIR="bsd"
+	  	XORG_OS="openbsd"
+		XORG_OS_SUBDIR="bsd"
 		;;
 	  solaris*)
 	  	# support: nay
-	  	XIZZLE_OS="solaris"
-		XIZZLE_OS_SUBDIR="solaris"
+	  	XORG_OS="solaris"
+		XORG_OS_SUBDIR="solaris"
 		;;
 	  *)
-	  	XIZZLE_OS="unknown"
-		XIZZLE_OS_SUBDIR="unknown"
-		AC_MSG_ERROR([Your OS is unknown. Xizzle currently only supports Linux, Free/Open/NetBSD, and Solaris. If you are interested in porting Xizzle to your platform, please email xserver at freedesktop.org.])
+	  	XORG_OS="unknown"
+		XORG_OS_SUBDIR="unknown"
+		AC_MSG_ERROR([Your OS is unknown. Xorg currently only supports Linux, Free/Open/NetBSD, and Solaris. If you are interested in porting Xorg to your platform, please email xserver at freedesktop.org.])
 		;;
 	esac
 	case $host_cpu in
 	  sparc*)
-	  	xizzle_bus_sbus="yes"
+	  	xorg_bus_sbus="yes"
 		;;
 	esac
 fi
-AC_SUBST([XIZZLE_CORE_LIBS])
-AC_SUBST([XIZZLE_LIBS])
-AC_SUBST([XIZZLE_INCS])
-AC_SUBST([XIZZLE_CFLAGS])
-AC_SUBST([XIZZLE_OS])
-AC_SUBST([XIZZLE_OS_SUBDIR])
-AM_CONDITIONAL([XIZZLE_BUS_SBUS], [test "x$xizzle_bus_sbus" = xyes])
+AC_SUBST([XORG_CORE_LIBS])
+AC_SUBST([XORG_LIBS])
+AC_SUBST([XORG_INCS])
+AC_SUBST([XORG_CFLAGS])
+AC_SUBST([XORG_OS])
+AC_SUBST([XORG_OS_SUBDIR])
+AM_CONDITIONAL([XORG_BUS_SBUS], [test "x$xorg_bus_sbus" = xyes])
 
 AC_CHECK_HEADERS([X11/XF86keysym.h],,,${XSERVER_CFLAGS})
 
@@ -532,6 +541,7 @@
 xfixes/Makefile
 damageext/Makefile
 composite/Makefile
+xkb/Makefile
 Xext/Makefile
 Xi/Makefile
 hw/Makefile
@@ -550,26 +560,26 @@
 hw/kdrive/chips/Makefile
 hw/xnest/Makefile
 hw/xwin/Makefile
-hw/xizzle/Makefile
-hw/xizzle/common/Makefile
-hw/xizzle/ddc/Makefile
-hw/xizzle/drivers/Makefile
-hw/xizzle/drivers/ati/Makefile
-hw/xizzle/dummylib/Makefile
-hw/xizzle/fbdevhw/Makefile
-hw/xizzle/i2c/Makefile
-hw/xizzle/int10/Makefile
-hw/xizzle/loader/Makefile
-hw/xizzle/os-support/Makefile
-hw/xizzle/os-support/bus/Makefile
-hw/xizzle/os-support/linux/Makefile
-hw/xizzle/os-support/linux/drm/Makefile
-hw/xizzle/os-support/linux/int10/Makefile
-hw/xizzle/parser/Makefile
-hw/xizzle/rac/Makefile
-hw/xizzle/ramdac/Makefile
-hw/xizzle/shadowfb/Makefile
-hw/xizzle/vbe/Makefile
-hw/xizzle/vgahw/Makefile
-hw/xizzle/xaa/Makefile
+hw/xorg/Makefile
+hw/xorg/common/Makefile
+hw/xorg/ddc/Makefile
+hw/xorg/drivers/Makefile
+hw/xorg/drivers/ati/Makefile
+hw/xorg/dummylib/Makefile
+hw/xorg/fbdevhw/Makefile
+hw/xorg/i2c/Makefile
+hw/xorg/input/Makefile
+hw/xorg/int10/Makefile
+hw/xorg/os-support/Makefile
+hw/xorg/os-support/bus/Makefile
+hw/xorg/os-support/linux/Makefile
+hw/xorg/os-support/linux/drm/Makefile
+hw/xorg/os-support/linux/int10/Makefile
+hw/xorg/parser/Makefile
+hw/xorg/rac/Makefile
+hw/xorg/ramdac/Makefile
+hw/xorg/shadowfb/Makefile
+hw/xorg/vbe/Makefile
+hw/xorg/vgahw/Makefile
+hw/xorg/xaa/Makefile
 ])