--- trunk/vnc/patches/vnc-server-xorg.patch	2008/06/03 22:40:41	645
+++ trunk/vnc/patches/vnc-server-xorg.patch	2008/06/03 22:52:24	646
@@ -1,81 +1,61 @@
---- vnc-4_1-unixsrc/unix/xc/config/cf/vnc.def.in.xorg	2005-03-04 09:09:37.000000000 +0000
-+++ vnc-4_1-unixsrc/unix/xc/config/cf/vnc.def.in	2005-03-04 09:09:56.000000000 +0000
-@@ -8,6 +8,8 @@
- #define BuildGlxExt NO
- #define XnestServer NO
- #define XprtServer NO
-+#define BuildXFree86ConfigTools NO
-+#define BuildScanpci NO
- 
- #ifdef SunArchitecture
- #define ProjectRoot /usr/openwin
---- vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/XserverDesktop.cc.xorg	2005-03-04 09:05:36.000000000 +0000
-+++ vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/XserverDesktop.cc	2005-03-04 09:05:47.000000000 +0000
-@@ -413,25 +413,6 @@
-   }
- }
- 
--static void printRegion(RegionPtr reg)
--{
--  int nrects = REGION_NUM_RECTS(reg);
--
--  fprintf(stderr,"Region num rects %2d extents %3d,%3d %3dx%3d\n",nrects,
--          (REGION_EXTENTS(pScreen,reg))->x1,
--          (REGION_EXTENTS(pScreen,reg))->y1,
--          (REGION_EXTENTS(pScreen,reg))->x2-(REGION_EXTENTS(pScreen,reg))->x1,
--          (REGION_EXTENTS(pScreen,reg))->y2-(REGION_EXTENTS(pScreen,reg))->y1);
--
--  for (int i = 0; i < nrects; i++) {
--    fprintf(stderr,"    rect %3d,%3d %3dx%3d\n",
--            REGION_RECTS(reg)[i].x1,
--            REGION_RECTS(reg)[i].y1,
--            REGION_RECTS(reg)[i].x2-REGION_RECTS(reg)[i].x1,
--            REGION_RECTS(reg)[i].y2-REGION_RECTS(reg)[i].y1);
--  }
--}
--
- CARD32 XserverDesktop::deferredUpdateTimerCallback(OsTimerPtr timer,
-                                                    CARD32 now, pointer arg)
- {
---- vnc-4_1-unixsrc/unix/xc/programs/Xserver/Imakefile.xorg	2005-03-04 09:05:54.000000000 +0000
-+++ vnc-4_1-unixsrc/unix/xc/programs/Xserver/Imakefile	2005-03-04 09:06:19.000000000 +0000
-@@ -128,7 +128,7 @@
-        LIBREGEX = RegexLibrary
- 
- #if DoLoadableServer
--    LIBCWRAPPER = os/libcwrapper.o
-+    LIBCWRAPPER = os/libcwrapper.o os/libos.a
+diff -up mi/miinitext.c.orig xorg/mi/miinitext.c
+--- mi/miinitext.c.orig	2008-01-28 10:18:46.000000000 +0100
++++ mi/miinitext.c	2008-01-28 10:18:58.000000000 +0100
+@@ -289,6 +289,7 @@ extern void BigReqExtensionInit(INITARGS
+ #ifdef MITMISC
+ extern void MITMiscExtensionInit(INITARGS);
  #endif
++extern void vncExtensionInit(INITARGS);
+ #ifdef XIDLE
+ extern void XIdleExtensionInit(INITARGS);
+ #endif
+@@ -560,6 +561,7 @@ InitExtensions(argc, argv)
+ #ifdef MITMISC
+     if (!noMITMiscExtension) MITMiscExtensionInit();
+ #endif
++    vncExtensionInit();
+ #ifdef XIDLE
+     if (!noXIdleExtension) XIdleExtensionInit();
+ #endif
+diff -up hw/Makefile.am.orig xorg/hw/Makefile.am
+--- hw/Makefile.am.orig	2008-01-28 10:18:46.000000000 +0100
++++ hw/Makefile.am	2008-01-28 10:18:58.000000000 +0100
+@@ -43,7 +43,8 @@ SUBDIRS =			\
+ 	$(DMX_SUBDIRS)		\
+ 	$(KDRIVE_SUBDIRS)	\
+ 	$(XQUARTZ_SUBDIRS)	\
+-	$(XPRINT_SUBDIRS)
++	$(XPRINT_SUBDIRS)	\
++	vnc
+ 
+ DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xgl xprint
+ 
+diff -up configure.ac.orig xserver/configure.ac
+--- configure.ac.orig	2008-03-25 14:32:36.000000000 +0100
++++ configure.ac	2008-03-26 20:14:16.000000000 +0100
+@@ -29,7 +29,6 @@ AC_PREREQ(2.57)
+ AC_INIT([xorg-server], 1.4.99.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+ AC_CONFIG_SRCDIR([Makefile.am])
+ AM_INIT_AUTOMAKE([dist-bzip2 foreign])
+-AM_MAINTAINER_MODE
+ 
+ dnl this gets generated by autoheader, and thus contains all the defines.  we
+ dnl don't ever actually use it, internally.
+@@ -1206,6 +1205,9 @@ if test "x$XVFB" = xyes; then
+ 	AC_SUBST([XVFB_SYS_LIBS])
+ fi
+ 
++dnl Xvnc DDX
++AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC"])
++AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_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"])
+ 
+ dnl Xnest DDX
  
- #if BuildXprint
---- vnc-4_1-unixsrc/unix/xc.patch.xorg	2005-03-04 09:07:52.000000000 +0000
-+++ vnc-4_1-unixsrc/unix/xc.patch	2005-03-04 09:08:37.000000000 +0000
-@@ -8,19 +8,19 @@
- + XCOMM
- + XCOMM X VNC server
- + XCOMM
--+ MFBDIR = mfb
--+ CFB8DIR = cfb
--+ CFB16DIR = cfb16
--+ CFB24DIR = cfb24
--+ CFB32DIR = cfb32
--+ FBDIR = fb
-++ MFBSUBDIR = mfb
-++ CFB8SUBDIR = cfb
-++ CFB16SUBDIR = cfb16
-++ CFB24SUBDIR = cfb24
-++ CFB32SUBDIR = cfb32
-++ FBSUBDIR = fb
- + XVNCDDXDIR = vnc/Xvnc
- + #if VncUseFb
--+ XVNCDIRS = $(STDDIRS) $(FBDIR) $(XVNCDDXDIR) $(DEPDIRS)
-++ XVNCDIRS = $(STDDIRS) $(FBSUBDIR) $(XVNCDDXDIR) $(DEPDIRS)
- + XVNCLIBS = PreFbLibs vnc/Xvnc/LibraryTargetName(xvnc) FbPostFbLibs
- + #else
--+ XVNCDIRS = $(STDDIRS) $(MFBDIR) \
--+ 	    $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \
-++ XVNCDIRS = $(STDDIRS) $(MFBSUBDIR) \
-++ 	    $(CFB8SUBDIR) $(CFB16SUBDIR) $(CFB24SUBDIR) $(CFB32SUBDIR) \
- + 	    $(XVNCDDXDIR) $(DEPDIRS)
- + XVNCLIBS = PreFbLibs vnc/Xvnc/LibraryTargetName(xvnc) CFBLibs PostFbLibs
- + #endif
+@@ -2186,6 +2188,7 @@ hw/dmx/input/Makefile
+ hw/dmx/glxProxy/Makefile
+ hw/dmx/Makefile
+ hw/vfb/Makefile
++hw/vnc/Makefile
+ hw/xgl/Makefile
+ hw/xgl/egl/Makefile
+ hw/xgl/egl/module/Makefile