Enough build fixes to get {sdl,ephyr,fake} to link.

7 files changed, 42 insertions, 28 deletions

diff --git a/configure.ac b/configure.ac
index 657d32eaf..05e163165 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1254,17 +1254,17 @@ AM_CONDITIONAL(KDRIVE, [test x$KDRIVE = xyes])
 if test "$KDRIVE" = yes; then
     AC_DEFINE(KDRIVESERVER,1,[Build Kdrive X server])
     AC_DEFINE(KDRIVEDDXACTIONS,,[Build kdrive ddx])
-    
+
     AC_CHECK_HEADERS([sys/vm86.h sys/io.h])
     if test "$ac_cv_header_sys_vm86_h" = yes; then
-        AC_DEFINE(KDRIVEVESA, 1, [Include vesa support in X servers])
+        AC_DEFINE(KDRIVEVESA, 1, [Build VESA-based kdrive servers])
     fi
 
     AC_CHECK_HEADERS([linux/fb.h])
     if test "$ac_cv_header_linux_fb_h" = yes; then
-        AC_DEFINE(KDRIVEFBDEV, 1, [Include framebuffer support in X servers])
+        AC_DEFINE(KDRIVEFBDEV, 1, [Build fbdev-based kdrive server])
     fi
-
+    
     # tslib...
 
     # damage shadow extension glx (NOTYET) fb mi
@@ -1273,7 +1273,7 @@ if test "$KDRIVE" = yes; then
     KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux'
     KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"
     
-    KDRIVE_CFLAGS=
+    KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H"
 
     # dix os fb mi extension glx (NOTYET) damage shadow xpstubs
     #KDRIVE_PURE_LIBS="$DIX_LIB $OS_LIB $FB_LIB $XEXT_LIB $MIEXT_DAMAGE_LIB \
@@ -1281,10 +1281,11 @@ if test "$KDRIVE" = yes; then
     KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
     KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'
     KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a'
-    KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS"
+    KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
+    KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB"
 
     # check if we can build Xephyr
-    PKG_CHECK_MODULES(XEPHYR, x11 xext, [xephyr="yes"], [xephyr="no"])
+    PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])
     
     # check for SDL SDK
     AC_CHECK_HEADERS([SDL/SDL.h])
@@ -1296,10 +1297,13 @@ AC_SUBST(KDRIVE_PURE_LIBS)
 AC_SUBST(KDRIVE_LIBS)
 AM_CONDITIONAL(TSLIB, false)
 AM_CONDITIONAL(H3600_TS, false)
-AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes])
-AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes])
+#AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes])
+#AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes])
+AM_CONDITIONAL(KDRIVEVESA, false)
+AM_CONDITIONAL(KDRIVEFBDEV, false)
 
 AM_CONDITIONAL(XEPHYR, [test x"$xephyr" = xyes])
+XEPHYR_LIBS="$XEPHYR_LIBS $XSERVER_LIBS"
 AC_SUBST([XEPHYR_LIBS])
 AC_SUBST([XEPHYR_INCS])
 
diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am
index d2907bb62..215ef3852 100644
--- a/hw/kdrive/Makefile.am
+++ b/hw/kdrive/Makefile.am
@@ -1,9 +1,6 @@
-# none of this works yet.  fbdev, ephyr, and the hardware servers all rely
-# on miext/shadow/ changes we haven't brought over yet, and sdl relies on
-# some detection-fu that hasn't been ported.
-
 if KDRIVEVESA
-VESA_SUBDIRS = vesa mach64 mga nvidia r128 smi chips pm2 via neomagic
+VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \
+               smi via
 endif
 
 if KDRIVEFBDEV
@@ -11,7 +8,7 @@ FBDEV_SUBDIRS = fbdev
 endif
 
 if XSDLSERVER
-XSDL_SUBDIRS=sdl
+XSDL_SUBDIRS = sdl
 endif
 
 if XEPHYR
@@ -25,8 +22,4 @@ SUBDIRS =			\
 	$(FBDEV_SUBDIRS)	\
 	$(VESA_SUBDIRS)		\
 	$(XEPHYR_SUBDIRS)       \
-	ati			\
-	fake			\
-	ephyr                   \
-	i810			\
-	epson
+	fake
diff --git a/hw/kdrive/fake/Makefile.am b/hw/kdrive/fake/Makefile.am
index 78b69003a..f3a6a3453 100644
--- a/hw/kdrive/fake/Makefile.am
+++ b/hw/kdrive/fake/Makefile.am
@@ -24,7 +24,8 @@ Xfake_LDADD = 						\
 	libfake.a					\
 	@KDRIVE_LIBS@					\
 	@KDRIVE_LIBS@					\
-	$(TSLIB_FLAG)
+	$(TSLIB_FLAG)                                   \
+        @XSERVER_LIBS@
 
 Xfake_DEPENDENCIES =					\
 	libfake.a					\
diff --git a/hw/kdrive/src/Makefile.am b/hw/kdrive/src/Makefile.am
index b71748b1a..192665ec2 100644
--- a/hw/kdrive/src/Makefile.am
+++ b/hw/kdrive/src/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = 					\
 	@KDRIVE_INCS@				\
 	@KDRIVE_CFLAGS@
 
-noinst_LIBRARIES = libkdrive.a
+noinst_LIBRARIES = libkdrive.a libkdrivestubs.a
 
 libkdrive_a_SOURCES =	\
 	fourcc.h	\
@@ -26,4 +26,9 @@ libkdrive_a_SOURCES =	\
 	kxv.c		\
 	kxv.h		\
 	vga.c		\
-	vga.h
+	vga.h           \
+        $(top_srcdir)/mi/miinitext.c
+
+libkdrivestubs_a_SOURCES = \
+        $(top_srcdir)/Xi/stubs.c \
+        $(top_srcdir)/fb/fbcmap.c
diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index cc939d43f..0ddc1cfc3 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -1512,3 +1512,5 @@ DPMSSupported (void)
     return FALSE;
 }
 #endif
+
+void ddxInitGlobals(void) { /* THANK YOU XPRINT */ }
diff --git a/hw/kdrive/src/kshadow.c b/hw/kdrive/src/kshadow.c
index 36537ad40..34e1d5de4 100644
--- a/hw/kdrive/src/kshadow.c
+++ b/hw/kdrive/src/kshadow.c
@@ -68,12 +68,12 @@ KdShadowSet (ScreenPtr pScreen, int randr, ShadowUpdateProc update, ShadowWindow
     KdScreenInfo *screen = pScreenPriv->screen;
     int	 fb;
 
-    shadowUnset (pScreen);
+    shadowRemove (pScreen, pScreen->GetScreenPixmap(pScreen));
     for (fb = 0; fb < KD_MAX_FB && screen->fb[fb].depth; fb++)
     {
 	if (screen->fb[fb].shadow)
-	    return shadowSet (pScreen, (*pScreen->GetScreenPixmap) (pScreen), 
-			      update, window, randr, 0);
+            return shadowAdd (pScreen, pScreen->GetScreenPixmap(pScreen),
+                              update, window, randr, 0);
     }
     return TRUE;
 }
@@ -81,5 +81,5 @@ KdShadowSet (ScreenPtr pScreen, int randr, ShadowUpdateProc update, ShadowWindow
 void
 KdShadowUnset (ScreenPtr pScreen)
 {
-    shadowUnset (pScreen);
+    shadowRemove(pScreen, pScreen->GetScreenPixmap(pScreen));
 }
diff --git a/mi/miinitext.c b/mi/miinitext.c
index d2c68e18a..18f3a38ce 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.20 2005/05/19 18:53:50 ajax Exp $ */
+/* $XdotOrg: xserver/xorg/mi/miinitext.c,v 1.26 2005/07/16 03:49:59 kem Exp $ */
 /* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */
 /***********************************************************
 
@@ -65,6 +65,15 @@ SOFTWARE.
 #undef DPMSExtension
 #endif
 
+#ifdef HAVE_KDRIVE_CONFIG_H
+#include <kdrive-config.h>
+/* there must be a better way... */
+#undef XF86MISC
+#undef XFreeXDGA
+#undef XF86DRI
+#undef XF86VIDMODE
+#endif
+
 #include "misc.h"
 #include "extension.h"
 #include "micmap.h"