SOURCES: xorg-xserver-server-glxproxy.patch (NEW), xorg-xserver-server-Xi.p...

[arekm]

Author: arekm                        Date: Wed Dec  3 10:04:03 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- new

---- Files affected:
SOURCES:
   xorg-xserver-server-glxproxy.patch (NONE -> 1.1)  (NEW), xorg-xserver-server-Xi.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/xorg-xserver-server-glxproxy.patch
diff -u /dev/null SOURCES/xorg-xserver-server-glxproxy.patch:1.1
--- /dev/null	Wed Dec  3 11:04:04 2008
+++ SOURCES/xorg-xserver-server-glxproxy.patch	Wed Dec  3 11:03:57 2008
@@ -0,0 +1,28 @@
+--- xorg-server-1.5.99.2/hw/dmx/glxProxy/glxutil.c~	2008-11-14 22:27:05.000000000 +0100
++++ xorg-server-1.5.99.2/hw/dmx/glxProxy/glxutil.c	2008-12-03 10:26:14.431540404 +0100
+@@ -36,6 +36,11 @@
+ #include <windowstr.h>
+ #include "glxutil.h"
+ 
++#undef Xmalloc
++#undef Xcalloc
++#undef Xrealloc
++#undef Xfree
++
+ /************************************************************************/
+ 
+ void __glXNop(void) {}
+--- xorg-server-1.5.99.2/hw/dmx/glxProxy/glxvisuals.c~	2008-11-14 22:27:05.000000000 +0100
++++ xorg-server-1.5.99.2/hw/dmx/glxProxy/glxvisuals.c	2008-12-03 10:26:28.231539217 +0100
+@@ -38,6 +38,11 @@
+ #include "glxutil.h"
+ #include "dmx_glxvisuals.h"
+ 
++#undef Xmalloc
++#undef Xcalloc
++#undef Xrealloc
++#undef Xfree
++
+ static int                 numConfigs     = 0;
+ static __GLXvisualConfig  *visualConfigs  = NULL;
+ static void              **visualPrivates = NULL;

================================================================
Index: SOURCES/xorg-xserver-server-Xi.patch
diff -u /dev/null SOURCES/xorg-xserver-server-Xi.patch:1.1
--- /dev/null	Wed Dec  3 11:04:04 2008
+++ SOURCES/xorg-xserver-server-Xi.patch	Wed Dec  3 11:03:58 2008
@@ -0,0 +1,13 @@
+diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c
+index da1e731..1adfb41 100644
+--- a/hw/dmx/input/dmxinputinit.c
++++ b/hw/dmx/input/dmxinputinit.c
+@@ -865,7 +865,7 @@ static void dmxInputScanForExtensions(DMXInputInfo *dmxInput, int doXI)
+     
+     /* Print out information about the XInput Extension. */
+     handler = XSetExtensionErrorHandler(dmxInputExtensionErrorHandler);
+-    ext     = XQueryInputVersion(display, XI_2_Major, XI_2_Minor);
++    ext     = XGetExtensionVersion(display, INAME);
+     XSetExtensionErrorHandler(handler);
+     
+     if (!ext || ext == (XExtensionVersion *)NoSuchExtension) {
================================================================