--- a/open-src/xserver/xorg/lg3d.patch Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/xserver/xorg/lg3d.patch Tue Jul 31 15:09:29 2007 -0700
@@ -27,8 +27,8 @@
# of the copyright holder.
diff -urp -x '*~' -x '*.orig' Xext/Makefile.am Xext/Makefile.am
---- Xext/Makefile.am 2007-01-23 09:30:43.313604000 -0800
-+++ Xext/Makefile.am 2007-01-23 09:30:59.730254000 -0800
+--- Xext/Makefile.am 2007-07-30 18:38:42.289597000 -0700
++++ Xext/Makefile.am 2007-07-30 18:38:58.872659000 -0700
@@ -153,6 +153,12 @@ endif
TSOL_SRCS = tsolCompat.c
BUILTIN_SRCS += $(TSOL_SRCS)
@@ -51,9 +51,9 @@
+ $(LGE_SRCS)
diff -urp -x '*~' -x '*.orig' configure.ac configure.ac
---- configure.ac 2007-01-23 09:30:44.143027000 -0800
-+++ configure.ac 2007-01-23 09:30:59.732551000 -0800
-@@ -434,6 +434,7 @@ AC_ARG_ENABLE(appgroup, AS_HELP_ST
+--- configure.ac 2007-07-30 18:38:42.685647000 -0700
++++ configure.ac 2007-07-30 18:38:58.875135000 -0700
+@@ -444,6 +444,7 @@ AC_ARG_ENABLE(appgroup, AS_HELP_ST
AC_ARG_ENABLE(xcalibrate, AS_HELP_STRING([--enable-xcalibrate], [Build XCalibrate extension (default: disabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=no])
AC_ARG_ENABLE(tslib, AS_HELP_STRING([--enable-tslib], [Build kdrive tslib touchscreen support (default: disabled)]), [TSLIB=$enableval], [TSLIB=no])
AC_ARG_ENABLE(xevie, AS_HELP_STRING([--disable-xevie], [Build XEvIE extension (default: enabled)]), [XEVIE=$enableval], [XEVIE=yes])
@@ -61,7 +61,7 @@
AC_ARG_ENABLE(cup, AS_HELP_STRING([--disable-cup], [Build TOG-CUP extension (default: enabled)]), [CUP=$enableval], [CUP=yes])
AC_ARG_ENABLE(evi, AS_HELP_STRING([--disable-evi], [Build Extended-Visual-Information extension (default: enabled)]), [EVI=$enableval], [EVI=yes])
AC_ARG_ENABLE(multibuffer, AS_HELP_STRING([--enable-multibuffer], [Build Multibuffer extension (default: disabled)]), [MULTIBUFFER=$enableval], [MULTIBUFFER=no])
-@@ -663,6 +664,12 @@ if test "x$XEVIE" = xyes; then
+@@ -673,6 +674,12 @@ if test "x$XEVIE" = xyes; then
REQUIRED_MODULES="$REQUIRED_MODULES evieproto"
fi
@@ -74,7 +74,7 @@
AM_CONDITIONAL(APPGROUP, [test "x$APPGROUP" = xyes])
if test "x$APPGROUP" = xyes; then
if test "x$XACE" != xyes || test "x$XCSECURITY" != xyes; then
-@@ -886,7 +893,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(t
+@@ -896,7 +903,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(t
PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQUIRED_MODULES $REQUIRED_LIBS])
PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS])
@@ -84,8 +84,8 @@
XSERVER_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS}"
AC_SUBST([SYS_LIBS])
diff -urp -x '*~' -x '*.orig' dix/Makefile.am dix/Makefile.am
---- dix/Makefile.am 2007-01-23 09:30:42.885307000 -0800
-+++ dix/Makefile.am 2007-01-23 09:30:59.732856000 -0800
+--- dix/Makefile.am 2007-07-30 18:38:41.946697000 -0700
++++ dix/Makefile.am 2007-07-30 18:38:58.875437000 -0700
@@ -30,7 +30,8 @@ libdix_la_SOURCES = \
swapreq.c \
tables.c \
@@ -97,8 +97,8 @@
libxpstubs_la_SOURCES = \
xpstubs.c
diff -urp -x '*~' -x '*.orig' dix/events.c dix/events.c
---- dix/events.c 2007-01-23 09:30:43.317946000 -0800
-+++ dix/events.c 2007-01-23 09:30:59.735623000 -0800
+--- dix/events.c 2007-07-30 18:38:42.325047000 -0700
++++ dix/events.c 2007-07-30 18:38:58.878579000 -0700
@@ -167,6 +167,23 @@ xEvent *xeviexE;
#include "dixgrabs.h"
#include "dispatch.h"
@@ -721,8 +721,8 @@
+
+#endif /* LG3D */
diff -urp -x '*~' -x '*.orig' dix/extension.c dix/extension.c
---- dix/extension.c 2007-01-23 09:30:42.890649000 -0800
-+++ dix/extension.c 2007-01-23 09:30:59.736155000 -0800
+--- dix/extension.c 2007-07-30 18:38:41.952219000 -0700
++++ dix/extension.c 2007-07-30 18:38:58.879424000 -0700
@@ -63,6 +63,10 @@ SOFTWARE.
#include "xace.h"
#endif
@@ -781,8 +781,8 @@
memmove(bufptr, extensions[i]->name, len);
bufptr += len;
diff -urp -x '*~' -x '*.orig' include/globals.h include/globals.h
---- include/globals.h 2007-01-22 21:39:17.000000000 -0800
-+++ include/globals.h 2007-01-23 09:30:59.736432000 -0800
+--- include/globals.h 2006-09-17 23:04:18.000000000 -0700
++++ include/globals.h 2007-07-30 18:38:58.898264000 -0700
@@ -184,4 +184,8 @@ extern Bool noXIdleExtension;
extern Bool noXvExtension;
#endif
@@ -793,8 +793,8 @@
+
#endif /* !_XSERV_GLOBAL_H_ */
diff -urp -x '*~' -x '*.orig' mi/miinitext.c mi/miinitext.c
---- mi/miinitext.c 2007-01-23 09:30:43.358019000 -0800
-+++ mi/miinitext.c 2007-01-23 09:30:59.768288000 -0800
+--- mi/miinitext.c 2007-07-30 18:38:42.408483000 -0700
++++ mi/miinitext.c 2007-07-30 18:38:58.899770000 -0700
@@ -88,6 +88,11 @@ SOFTWARE.
#include "extnsionst.h"
#endif
@@ -942,8 +942,8 @@
/* Add built-in extensions to the list. */
for (i = 0; staticExtensions[i].name; i++)
diff -urp -x '*~' -x '*.orig' mi/misprite.c mi/misprite.c
---- mi/misprite.c 2007-01-22 21:39:17.000000000 -0800
-+++ mi/misprite.c 2007-01-23 09:30:59.768903000 -0800
+--- mi/misprite.c 2006-09-17 23:04:18.000000000 -0700
++++ mi/misprite.c 2007-07-30 18:38:58.909854000 -0700
@@ -156,8 +156,23 @@ miSpriteInitialize (pScreen, cursorFuncs
miSpriteScreenPtr pScreenPriv;
VisualPtr pVisual;
@@ -969,8 +969,8 @@
if (miSpriteGeneration != serverGeneration)
{
diff -urp -x '*~' -x '*.orig' os/utils.c os/utils.c
---- os/utils.c 2007-01-23 09:30:43.571510000 -0800
-+++ os/utils.c 2007-01-23 09:30:59.799315000 -0800
+--- os/utils.c 2007-07-30 18:38:42.573625000 -0700
++++ os/utils.c 2007-07-30 18:38:58.935850000 -0700
@@ -236,6 +236,9 @@ _X_EXPORT Bool noXIdleExtension = FALSE;
#ifdef XV
_X_EXPORT Bool noXvExtension = FALSE;
@@ -982,8 +982,8 @@
#define X_INCLUDE_NETDB_H
#include <X11/Xos_r.h>
diff -urp -x '*~' -x '*.orig' xkb/xkbPrKeyEv.c xkb/xkbPrKeyEv.c
---- xkb/xkbPrKeyEv.c 2007-01-22 21:39:17.000000000 -0800
-+++ xkb/xkbPrKeyEv.c 2007-01-23 09:30:59.799841000 -0800
+--- xkb/xkbPrKeyEv.c 2006-09-17 23:04:18.000000000 -0700
++++ xkb/xkbPrKeyEv.c 2007-07-30 18:38:58.940146000 -0700
@@ -39,6 +39,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/extensions/XKBsrv.h>
#include <ctype.h>