- updated xserver.patch (part of it was merged to xorg upstream)

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1.5-xserver@2478 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/unix/xserver.patch b/unix/xserver.patch
index fb90c5676ff171ec1bb62336e18f3910c7c3c1f4..ec1fa3419caa056b514f61366d4299390e67ec3b 100644 (file)
--- a/unix/xserver.patch
+++ b/unix/xserver.patch
@@ -1,20 +1,3 @@
-diff -up os/WaitFor.c.orig xorg/os/WaitFor.c
---- os/WaitFor.c.orig  2008-01-28 10:20:35.000000000 +0100
-+++ os/WaitFor.c       2008-01-28 10:21:08.000000000 +0100
-@@ -332,13 +332,11 @@ WaitForSomething(int *pClientsReady)
- 
-           if (XFD_ANYSET (&devicesReadable) || XFD_ANYSET (&clientsReadable))
-               break;
--#ifdef WIN32
-           /* Windows keyboard and mouse events are added to the input queue
-              in Block- and WakupHandlers. There is no device to check if  
-              data is ready. So check here if new input is available */
-           if (*checkForInput[0] != *checkForInput[1])
-               return 0;
--#endif
-       }
-     }
- 
 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
@@ -47,9 +30,9 @@ diff -up hw/Makefile.am.orig xorg/hw/Makefile.am
  
  DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xgl xprint
  
-diff -up configure.ac.orig xorg/configure.ac
---- configure.ac.orig  2008-01-28 10:18:45.000000000 +0100
-+++ configure.ac       2008-01-28 10:18:58.000000000 +0100
+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])
@@ -58,7 +41,17 @@ diff -up configure.ac.orig xorg/configure.ac
  
  dnl this gets generated by autoheader, and thus contains all the defines.  we
  dnl don't ever actually use it, internally.
-@@ -2173,6 +2172,7 @@ hw/dmx/input/Makefile
+@@ -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
+ 
+@@ -2186,6 +2188,7 @@ hw/dmx/input/Makefile
  hw/dmx/glxProxy/Makefile
  hw/dmx/Makefile
  hw/vfb/Makefile