Get rid of non-live CVS mesa and xorg-server and x-modular.eclass, all changes

are merged to gentoo-x86.

11 files changed, 4 insertions, 393 deletions

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 2d6191c..93cc627 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -4,24 +4,9 @@ SHA256 8f636c2e09ac7fdab0d06ebe62af5a311b52a03bf7b7bdecf4789a6e30e0777e files/6.
 MD5 d6254b7a775480084efcd30d9fb4cbad files/6.4-multilib-fix.patch 535
 RMD160 5ab0237e5096728b38675c9c265cfb2c88009c00 files/6.4-multilib-fix.patch 535
 SHA256 8fe39ec2ca86b206cb0d870d6644f68eb52af209f5bfb6eaad612deee80d754f files/6.4-multilib-fix.patch 535
-MD5 0009bfb15983cd6258cde8ca9ec7134c files/64bit-fix-have-dix-config.patch 645
-RMD160 4a05bcdab2828f9b5ad80df80d63d4767617b756 files/64bit-fix-have-dix-config.patch 645
-SHA256 757a94fe2e76f6ea4d831a3aaf3fac7e344527239a10b014d6900af341e7abab files/64bit-fix-have-dix-config.patch 645
-MD5 c955d3e7a9971b7a32359a45383569f8 files/64bit-fix-indirect-vertex-array.patch 748
-RMD160 b413df73cc43b83931cd25d5e207d3c49078dd55 files/64bit-fix-indirect-vertex-array.patch 748
-SHA256 2e070e5e4aa4b1a1f12ccce290496c5eca92d76819805fe8d529a4f7fd71c82c files/64bit-fix-indirect-vertex-array.patch 748
 MD5 81ac0734b6194da3d9ca40d564303670 files/change-default-dri-driver-dir-X7.1.patch 399
 RMD160 169dd99888a66bf63bc528f183bd4c2b6d16b0f9 files/change-default-dri-driver-dir-X7.1.patch 399
 SHA256 8dbdbad95f47bfc18a366e091ffc1d67ff16da970181626d939a19eed46a212d files/change-default-dri-driver-dir-X7.1.patch 399
-MD5 445388fef1aaba316654749716f66086 files/configurable-dri-dir.patch 361
-RMD160 f837b97daeb02dddca43031ed67eadfca5eba638 files/configurable-dri-dir.patch 361
-SHA256 a11e6d0bad33f9e7aa04de5baab9ab0aeb607165a6ff5bbaa1ed2f6050390feb files/configurable-dri-dir.patch 361
-MD5 573c1cb18905c1d9339a9a84bd9779d8 files/digest-mesa-6.4.2 247
-RMD160 2d14f708463f76c30291f3950a6448c1227fbaf4 files/digest-mesa-6.4.2 247
-SHA256 097fd81c0c397325418ce66f42aa19a137843d8953e4ac9265bc4f90cf2f2ab7 files/digest-mesa-6.4.2 247
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mesa-6.4.2_alpha20060121 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mesa-6.4.2_alpha20060121 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mesa-6.4.2_alpha20060121 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mesa-9999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mesa-9999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mesa-9999 0
@@ -31,15 +16,6 @@ SHA256 0fb9c02b01c9b2306fac89034144bb3e87aedba0dee0a49203aa18fbf0b706bf files/li
 MD5 9abdd26694e6f1d7bd93193f900acc6c files/lib/libGLU.la 752
 RMD160 04de8835526a3472480d7c285dd33d497bcc0bd7 files/lib/libGLU.la 752
 SHA256 e28519d7ae719bc106f7d4239799580474d1b69a2254ede3b2179a5e50655fe5 files/lib/libGLU.la 752
-MD5 ceae0782c8844ebdc68ede6b4d8969d9 files/makedepend-location.patch 375
-RMD160 30e1c4a45cdd2077edd80043911bf05275493195 files/makedepend-location.patch 375
-SHA256 c0ec505e5fb263d4cde901ce9afe3197346acf67372460a2177231be8425e0ab files/makedepend-location.patch 375
-MD5 d7a1589b573e858f7feafdd6a8214975 files/mesa-glx-x11-get-drawable-attribs-fix-1.diff 1866
-RMD160 0103dc43508d950a446df15666d7129e971ba69b files/mesa-glx-x11-get-drawable-attribs-fix-1.diff 1866
-SHA256 91c042914fdbef2f136ae1670d02ad4c7cc1c90c3a942997d34fd5a7101c23c5 files/mesa-glx-x11-get-drawable-attribs-fix-1.diff 1866
-MD5 66e2f35bb026673c9848dc43a22b0120 files/mesa-glx-x11-glxproto-defines.diff 392
-RMD160 840de4171c2a1f82de232f456144fb6edcd47b53 files/mesa-glx-x11-glxproto-defines.diff 392
-SHA256 d735665585ca667305378752a7814c3415d5a08d142dfc2ad1eaa9e8b829e06b files/mesa-glx-x11-glxproto-defines.diff 392
 MD5 7a491058ce29d6ecc9eb5c549dba1c1e files/mesa-radeon-0depthbits.patch 3052
 RMD160 370e8f70e899c0b097d43649886fa0061a1da181 files/mesa-radeon-0depthbits.patch 3052
 SHA256 f77c8ead3bf78dcc241d69542fa1f2c99ca0900c1287a3501d23cce27348a35b files/mesa-radeon-0depthbits.patch 3052
@@ -55,9 +31,6 @@ SHA256 68cdb9f1490f8b84dcf121f4931ae83b09e4cf8adfadc0fb1d3559b4cc98b6d7 files/r3
 MD5 98634596bb3b55d66e6e60fdbc7590f9 files/r300Fallback-always-return-false.patch 756
 RMD160 c8994d5c46badb26fcce945739bda65405825238 files/r300Fallback-always-return-false.patch 756
 SHA256 fe43a9eb36c3afe095b09be5f066f2b89aca186251fa6350604fb7d53b644c11 files/r300Fallback-always-return-false.patch 756
-MD5 4b3946e65a33435fc06db7b2040e4d5b files/xgl-mesa-stable-180106.diff 6310
-RMD160 d5daadc2b5def792fae54ab4b7508c0ce70f6b7f files/xgl-mesa-stable-180106.diff 6310
-SHA256 27afecd49c2cf80ef9545462e6a86cdd885867f0cbff61ec4b25ed1550a2b06e files/xgl-mesa-stable-180106.diff 6310
-MD5 544d2d4aa9c1c447b14f92007357eda9 mesa-9999.ebuild 9161
-RMD160 949daa8cc0b11239d436ca2a382325c2fdc5fbe7 mesa-9999.ebuild 9161
-SHA256 52388e685edaabd245f9a22062dc80b6151a47b84c2ec455a21e80d1f22e1e6b mesa-9999.ebuild 9161
+MD5 f85640ffe1443d9970461b94bbd84241 mesa-9999.ebuild 9160
+RMD160 9100781ebdaf3004babcd08aa923057eeb5f8963 mesa-9999.ebuild 9160
+SHA256 367c97a82db13a32db82e455ffaa99ba109ad037ca0361bf946441135dace2b2 mesa-9999.ebuild 9160
diff --git a/media-libs/mesa/files/64bit-fix-have-dix-config.patch b/media-libs/mesa/files/64bit-fix-have-dix-config.patch
deleted file mode 100644
index 29e6f40..0000000
--- a/media-libs/mesa/files/64bit-fix-have-dix-config.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/mesa/main/glheader.h,v
-rcsdiff: /cvs/mesa/Mesa/src/mesa/main/glheader.h,v: warning: Unknown phrases like `commitid ...;' are present.
-retrieving revision 1.70
-retrieving revision 1.71
-diff -u -r1.70 -r1.71
---- Mesa/src/mesa/main/glheader.h	2006/02/11 02:59:38	1.70
-+++ Mesa/src/mesa/main/glheader.h	2006/02/15 21:03:34	1.71
-@@ -46,6 +46,9 @@
- #ifndef GLHEADER_H
- #define GLHEADER_H
- 
-+#ifdef HAVE_DIX_CONFIG_H
-+#include "dix-config.h"
-+#endif
- 
- #if defined(XFree86LOADER) && defined(IN_MODULE) && !defined(NO_LIBCWRAPPER)
- #include "xf86_ansic.h"
diff --git a/media-libs/mesa/files/64bit-fix-indirect-vertex-array.patch b/media-libs/mesa/files/64bit-fix-indirect-vertex-array.patch
deleted file mode 100644
index 4e744e9..0000000
--- a/media-libs/mesa/files/64bit-fix-indirect-vertex-array.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/glx/x11/indirect_vertex_array.c,v
-rcsdiff: /cvs/mesa/Mesa/src/glx/x11/indirect_vertex_array.c,v: warning: Unknown phrases like `commitid ...;' are present.
-retrieving revision 1.6
-retrieving revision 1.7
-diff -u -r1.6 -r1.7
---- Mesa/src/glx/x11/indirect_vertex_array.c	2005/08/19 18:53:26	1.6
-+++ Mesa/src/glx/x11/indirect_vertex_array.c	2006/02/14 15:04:45	1.7
-@@ -530,7 +530,7 @@
- emit_DrawArrays_header_old( __GLXcontext * gc,
- 			    struct array_state_vector * arrays,
- 			    size_t * elements_per_request,
--			    size_t * total_requests,
-+			    unsigned int * total_requests,
- 			    GLenum mode, GLsizei count )
- {
-     size_t command_size;
diff --git a/media-libs/mesa/files/configurable-dri-dir.patch b/media-libs/mesa/files/configurable-dri-dir.patch
deleted file mode 100644
index 3b0f65a..0000000
--- a/media-libs/mesa/files/configurable-dri-dir.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Mesa-6.4/src/glx/x11/Makefile.modular	2005-08-19 16:20:03.000000000 -0400
-+++ Mesa-6.4/src/glx/x11/Makefile	2005-11-20 15:32:47.000000000 -0500
-@@ -2,6 +2,7 @@
- include $(TOP)/configs/current
- 
- DEFINES += -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER
-+DEFINES += -DDEFAULT_DRIVER_DIR='"$(DRI_DRIVER_DIR)"'
- 
- C_SOURCES = \
- 	  $(TOP)/src/mesa/glapi/glapi.c \
diff --git a/media-libs/mesa/files/digest-mesa-6.4.2 b/media-libs/mesa/files/digest-mesa-6.4.2
deleted file mode 100644
index 13d7ad4..0000000
--- a/media-libs/mesa/files/digest-mesa-6.4.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7674d2c603b5834259e4e5a820cefd5b MesaLib-6.4.2.tar.bz2 2913009
-RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 MesaLib-6.4.2.tar.bz2 2913009
-SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86 MesaLib-6.4.2.tar.bz2 2913009
diff --git a/media-libs/mesa/files/digest-mesa-6.4.2_alpha20060121 b/media-libs/mesa/files/digest-mesa-6.4.2_alpha20060121
deleted file mode 100644
index e69de29..0000000
--- a/media-libs/mesa/files/digest-mesa-6.4.2_alpha20060121
+++ /dev/null
diff --git a/media-libs/mesa/files/makedepend-location.patch b/media-libs/mesa/files/makedepend-location.patch
deleted file mode 100644
index 7e49dee..0000000
--- a/media-libs/mesa/files/makedepend-location.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN Mesa-6.3.1.1.orig/configs/linux-dri Mesa-6.3.1.1/configs/linux-dri
---- Mesa-6.3.1.1.orig/configs/linux-dri	2005-07-23 23:29:14.000000000 -0700
-+++ Mesa-6.3.1.1/configs/linux-dri	2005-08-10 14:56:16.000000000 -0700
-@@ -9,7 +9,7 @@
- CC = gcc
- CXX = g++
- 
--MKDEP = /usr/X11R6/bin/makedepend
-+MKDEP = /usr/bin/makedepend
- #MKDEP = gcc -M
- #MKDEP_OPTIONS = -MF depend
- 
diff --git a/media-libs/mesa/files/mesa-glx-x11-get-drawable-attribs-fix-1.diff b/media-libs/mesa/files/mesa-glx-x11-get-drawable-attribs-fix-1.diff
deleted file mode 100644
index a13b56d..0000000
--- a/media-libs/mesa/files/mesa-glx-x11-get-drawable-attribs-fix-1.diff
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -u -r1.5 glx_pbuffer.c
---- src/glx/x11/glx_pbuffer.c	11 Aug 2005 14:18:53 -0000	1.5
-+++ src/glx/x11/glx_pbuffer.c	30 Aug 2005 01:48:16 -0000
-@@ -200,6 +200,7 @@
-    GLboolean use_glx_1_3 = ((priv->majorVersion > 1)
- 			    || (priv->minorVersion >= 3));
- 
-+   *value = 0;
- 
-    if ( (dpy == NULL) || (drawable == 0) ) {
-       return 0;
-@@ -230,32 +231,40 @@
- 
-    _XReply(dpy, (xReply*) &reply, 0, False);
- 
--   length = reply.length;
--   num_attributes = (use_glx_1_3) ? reply.numAttribs : length / 2;
--   data = (CARD32 *) Xmalloc( length * sizeof(CARD32) );
--   if ( data == NULL ) {
--      /* Throw data on the floor */
--      _XEatData(dpy, length);
--   } else {
--      _XRead(dpy, (char *)data, length * sizeof(CARD32) );
-+   if (reply.type == X_Error)
-+   {
-+       UnlockDisplay(dpy);
-+       SyncHandle();
-+       return 0;
-    }
- 
--   UnlockDisplay(dpy);
--   SyncHandle();
--
--
--   /* Search the set of returned attributes for the attribute requested by
--    * the caller.
--    */
-+   length = reply.length;
-+   if (length)
-+   {
-+       num_attributes = (use_glx_1_3) ? reply.numAttribs : length / 2;
-+       data = (CARD32 *) Xmalloc( length * sizeof(CARD32) );
-+       if ( data == NULL ) {
-+	   /* Throw data on the floor */
-+	   _XEatData(dpy, length);
-+       } else {
-+	   _XRead(dpy, (char *)data, length * sizeof(CARD32) );
-+
-+	   /* Search the set of returned attributes for the attribute requested by
-+	    * the caller.
-+	    */
-+	   for ( i = 0 ; i < num_attributes ; i++ ) {
-+	       if ( data[i*2] == attribute ) {
-+		   *value = data[ (i*2) + 1 ];
-+		   break;
-+	       }
-+	   }
- 
--   for ( i = 0 ; i < num_attributes ; i++ ) {
--      if ( data[i*2] == attribute ) {
--	 *value = data[ (i*2) + 1 ];
--	 break;
--      }
-+	   Xfree( data );
-+       }
-    }
- 
--   Xfree( data );
-+   UnlockDisplay(dpy);
-+   SyncHandle();
- 
-    return 0;
- }
diff --git a/media-libs/mesa/files/mesa-glx-x11-glxproto-defines.diff b/media-libs/mesa/files/mesa-glx-x11-glxproto-defines.diff
deleted file mode 100644
index c083584..0000000
--- a/media-libs/mesa/files/mesa-glx-x11-glxproto-defines.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- Mesa/src/glx/x11/glxcmds.c.1	2006-01-11 22:43:47.395961500 +0100
-+++ Mesa/src/glx/x11/glxcmds.c	2006-01-11 22:44:12.717544000 +0100
-@@ -56,6 +56,9 @@
- #include "glheader.h"
- #include <sys/time.h>
- 
-+#define X_GLXvop_BindTexImageMESA 15
-+#define X_GLXvop_ReleaseTexImageMESA 16
-+
- static const char __glXGLXClientVendorName[] = "SGI";
- static const char __glXGLXClientVersion[] = "1.4";
- 
diff --git a/media-libs/mesa/files/xgl-mesa-stable-180106.diff b/media-libs/mesa/files/xgl-mesa-stable-180106.diff
deleted file mode 100644
index b370b55..0000000
--- a/media-libs/mesa/files/xgl-mesa-stable-180106.diff
+++ /dev/null
@@ -1,217 +0,0 @@
-Index: src/glx/x11/glxcmds.c
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/glx/x11/glxcmds.c,v
-retrieving revision 1.11
-diff -u -u -r1.11 glxcmds.c
---- src/glx/x11/glxcmds.c	11 Aug 2005 14:18:53 -0000	1.11
-+++ src/glx/x11/glxcmds.c	18 Jan 2006 07:22:19 -0000
-@@ -2589,7 +2589,88 @@
- }
- /*@}*/
- 
-+PUBLIC Bool glXBindTexImageMESA(Display *dpy,
-+				GLXDrawable drawable,
-+				int buffer)
-+{
-+    xGLXVendorPrivateReq *req;
-+    GLXContext gc = __glXGetCurrentContext();
-+    GLXDrawable *drawable_ptr;
-+    int *buffer_ptr;
-+    CARD8 opcode;
-+
-+    if (gc == NULL)
-+	return False;
-+
-+#ifdef GLX_DIRECT_RENDERING
-+    if (gc->isDirect)
-+	return False;
-+#endif
-+
-+    opcode = __glXSetupForCommand(dpy);
-+    if (!opcode)
-+	return False;
-+
-+    LockDisplay(dpy);
-+    GetReqExtra(GLXVendorPrivate, sizeof(GLXDrawable)+sizeof(int),req);
-+    req->reqType = opcode;
-+    req->glxCode = X_GLXVendorPrivate;
-+    req->vendorCode = X_GLXvop_BindTexImageMESA;
-+    req->contextTag = gc->currentContextTag;
-+
-+    drawable_ptr = (GLXDrawable *) (req + 1);
-+    buffer_ptr = (int *) (drawable_ptr + 1);
- 
-+    *drawable_ptr = drawable;
-+    *buffer_ptr = buffer;
-+
-+    UnlockDisplay(dpy);
-+    SyncHandle();
-+
-+    return True;
-+}
-+
-+PUBLIC Bool glXReleaseTexImageMESA(Display *dpy,
-+				   GLXDrawable drawable,
-+				   int buffer)
-+{
-+    xGLXVendorPrivateReq *req;
-+    GLXContext gc = __glXGetCurrentContext();
-+    GLXDrawable *drawable_ptr;
-+    int *buffer_ptr;
-+    xGLXVendorPrivReply reply;
-+    CARD8 opcode;
-+
-+    if (gc == NULL)
-+	return False;
-+
-+#ifdef GLX_DIRECT_RENDERING
-+    if (gc->isDirect)
-+	return False;
-+#endif
-+
-+    opcode = __glXSetupForCommand(dpy);
-+    if (!opcode)
-+	return False;
-+
-+    LockDisplay(dpy);
-+    GetReqExtra(GLXVendorPrivate, sizeof(GLXDrawable)+sizeof(int),req);
-+    req->reqType = opcode;
-+    req->glxCode = X_GLXVendorPrivate;
-+    req->vendorCode = X_GLXvop_ReleaseTexImageMESA;
-+    req->contextTag = gc->currentContextTag;
-+
-+    drawable_ptr = (GLXDrawable *) (req + 1);
-+    buffer_ptr = (int *) (drawable_ptr + 1);
-+
-+    *drawable_ptr = drawable;
-+    *buffer_ptr = buffer;
-+
-+    UnlockDisplay(dpy);
-+    SyncHandle();
-+
-+    return True;
-+}
- 
- /**
-  * \c strdup is actually not a standard ANSI C or POSIX routine.
-@@ -2771,6 +2852,10 @@
-    GLX_FUNCTION( glXGetMscRateOML ),
-    GLX_FUNCTION( glXGetSyncValuesOML ),
- 
-+   /*** GLX_MESA_render_texture ***/
-+   GLX_FUNCTION( glXBindTexImageMESA ),
-+   GLX_FUNCTION( glXReleaseTexImageMESA ),
-+
- #ifdef GLX_DIRECT_RENDERING
-    /*** DRI configuration ***/
-    GLX_FUNCTION( glXGetScreenDriver ),
-Index: src/glx/x11/glxextensions.c
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/glx/x11/glxextensions.c,v
-retrieving revision 1.11
-diff -u -u -r1.11 glxextensions.c
---- src/glx/x11/glxextensions.c	11 Aug 2005 14:18:53 -0000	1.11
-+++ src/glx/x11/glxextensions.c	18 Jan 2006 07:22:19 -0000
-@@ -107,6 +107,7 @@
-    { GLX(SGIX_video_source),           VER(0,0), N, N, N, N },
-    { GLX(SGIX_visual_select_group),    VER(0,0), Y, Y, N, N },
-    { GLX(SUN_get_transparent_index),   VER(0,0), N, N, N, N },
-+   { GLX(MESA_render_texture),         VER(0,0), Y, N, N, N },
-    { NULL }
- };
- 
-Index: src/glx/x11/glxextensions.h
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/glx/x11/glxextensions.h,v
-retrieving revision 1.8
-diff -u -u -r1.8 glxextensions.h
---- src/glx/x11/glxextensions.h	26 Jul 2005 22:53:38 -0000	1.8
-+++ src/glx/x11/glxextensions.h	18 Jan 2006 07:22:20 -0000
-@@ -69,7 +69,8 @@
-    SGIX_video_resize_bit,
-    SGIX_video_source_bit,
-    SGIX_visual_select_group_bit,
--   SUN_get_transparent_index_bit
-+   SUN_get_transparent_index_bit,
-+   MESA_render_texture_bit
- };
- 
- enum {
-Index: src/mesa/glapi/glapi.c
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/mesa/glapi/glapi.c,v
-retrieving revision 1.95.2.1
-diff -u -u -r1.95.2.1 glapi.c
---- src/mesa/glapi/glapi.c	11 Oct 2005 16:56:27 -0000	1.95.2.1
-+++ src/mesa/glapi/glapi.c	18 Jan 2006 07:22:21 -0000
-@@ -343,7 +343,7 @@
- }
- 
- 
--#if !defined( USE_X86_ASM ) && !defined( XFree86Server )
-+#if !defined( USE_X86_ASM ) && !defined( XFree86Server ) && !defined( XGLServer )
- #define NEED_FUNCTION_POINTER
- #endif
- 
-@@ -388,7 +388,7 @@
- }
- 
- 
--#if !defined( XFree86Server )
-+#if !defined( XFree86Server ) && !defined (XGLServer)
- #ifdef USE_X86_ASM
- 
- #if defined( GLX_USE_TLS )
-@@ -763,13 +763,13 @@
-       /* Do some trivial validation on the name of the function.
-        */
- 
--#ifdef MANGLE
--      if (!function_names[i] || function_names[i][0] != 'm' || function_names[i][1] != 'g' || function_names[i][2] != 'l')
--	return GL_FALSE;
--#else
--      if (!function_names[i] || function_names[i][0] != 'g' || function_names[i][1] != 'l')
--	return GL_FALSE;
--#endif
-+//#if 0//def USE_MGL_NAMESPACE
-+//      if (!function_names[i] || function_names[i][0] != 'm' || function_names[i][1] != 'g' || function_names[i][2] != 'l')
-+//	return GL_FALSE;
-+//#else
-+//      if (!function_names[i] || function_names[i][0] != 'g' || function_names[i][1] != 'l')
-+//	return GL_FALSE;
-+//#endif
-    
-    
-       /* Determine if the named function already exists.  If the function does
-@@ -892,7 +892,7 @@
-       }
-    }
- 
--#if !defined( XFree86Server )
-+#if !defined( XFree86Server ) && !defined( XGLServer )
-    /* search static functions */
-    {
-       const _glapi_proc func = get_static_proc_address(funcName);
-Index: src/mesa/glapi/glapi.h
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/mesa/glapi/glapi.h,v
-retrieving revision 1.29
-diff -u -u -r1.29 glapi.h
---- src/mesa/glapi/glapi.h	10 Aug 2005 23:54:15 -0000	1.29
-+++ src/mesa/glapi/glapi.h	18 Jan 2006 07:22:21 -0000
-@@ -50,6 +50,15 @@
- 
- typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...);
- 
-+#if defined(USE_MGL_NAMESPACE)
-+#define _glapi_set_dispatch _mglapi_set_dispatch
-+#define _glapi_get_dispatch _mglapi_get_dispatch
-+#define _glapi_set_context _mglapi_set_context
-+#define _glapi_get_context _mglapi_get_context
-+#define _glapi_Context _mglapi_Context
-+#define _glapi_Dispatch _mglapi_Dispatch
-+#endif
-+
- 
- #if defined (GLX_USE_TLS)
- 
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 1731e67..5da9164 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -55,7 +55,7 @@ DEPEND="${RDEPEND}
 	x11-proto/xextproto
 	!hppa? ( x11-proto/xf86driproto )
 	x11-proto/xf86vidmodeproto
-	>=x11-proto/glproto-1.4-r1
+	>=x11-proto/glproto-1.4.4
 	motif? ( x11-proto/printproto )"
 
 PROVIDE="virtual/opengl virtual/glu"