summaryrefslogtreecommitdiff
path: root/x11-base
diff options
context:
space:
mode:
authorBertrand Jacquin <beber@meleeweb.net>2006-04-20 20:11:02 +0200
committerBertrand Jacquin <beber@meleeweb.net>2006-04-20 20:11:02 +0200
commit5981a4422c8285806134111dfaf6083bc2325f33 (patch)
treed9dd010de708b20658c6f8d30d12999620aa80ea /x11-base
parentcairo: delete, too heavy (diff)
downloadportage-5981a4422c8285806134111dfaf6083bc2325f33.tar.xz
xgl: delete
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xgl/Manifest8
-rw-r--r--x11-base/xgl/files/digest-xgl-200601181
-rw-r--r--x11-base/xgl/files/mesa-glx-x11-get-drawable-attribs-fix-1.diff73
-rw-r--r--x11-base/xgl/files/mesa-glx-x11-glxproto-defines.diff12
-rw-r--r--x11-base/xgl/files/r200-copy-pixels-1.patch112
-rw-r--r--x11-base/xgl/files/xgl-glxproto-defines.diff24
-rw-r--r--x11-base/xgl/files/xgl-mesa-stable-180106.diff217
-rw-r--r--x11-base/xgl/files/xgl-symlink-glapi.diff10
-rw-r--r--x11-base/xgl/xgl-20060118.ebuild66
9 files changed, 0 insertions, 523 deletions
diff --git a/x11-base/xgl/Manifest b/x11-base/xgl/Manifest
deleted file mode 100644
index dfc7fa76..00000000
--- a/x11-base/xgl/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-MD5 063dc3bc1f6634ab506e9c8ca8bb05c0 files/digest-xgl-20060118 67
-MD5 d7a1589b573e858f7feafdd6a8214975 files/mesa-glx-x11-get-drawable-attribs-fix-1.diff 1866
-MD5 66e2f35bb026673c9848dc43a22b0120 files/mesa-glx-x11-glxproto-defines.diff 392
-MD5 9a6eaed5ab1fd6748d543679a335f72c files/r200-copy-pixels-1.patch 2741
-MD5 fd9d83283d2b6ce25cd86542df63925b files/xgl-glxproto-defines.diff 945
-MD5 4b3946e65a33435fc06db7b2040e4d5b files/xgl-mesa-stable-180106.diff 6310
-MD5 f18e3d02affd6bc0dcbafde514e36438 files/xgl-symlink-glapi.diff 297
-MD5 1f2f08b8d79e3e26a65e97c79d1b585b xgl-20060118.ebuild 1702
diff --git a/x11-base/xgl/files/digest-xgl-20060118 b/x11-base/xgl/files/digest-xgl-20060118
deleted file mode 100644
index 0f4cbf1e..00000000
--- a/x11-base/xgl/files/digest-xgl-20060118
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ea148c828ec6f645526451db1b8556f1 MesaLib-6.4.1.tar.bz2 2913887
diff --git a/x11-base/xgl/files/mesa-glx-x11-get-drawable-attribs-fix-1.diff b/x11-base/xgl/files/mesa-glx-x11-get-drawable-attribs-fix-1.diff
deleted file mode 100644
index a13b56d3..00000000
--- a/x11-base/xgl/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/x11-base/xgl/files/mesa-glx-x11-glxproto-defines.diff b/x11-base/xgl/files/mesa-glx-x11-glxproto-defines.diff
deleted file mode 100644
index c0835843..00000000
--- a/x11-base/xgl/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/x11-base/xgl/files/r200-copy-pixels-1.patch b/x11-base/xgl/files/r200-copy-pixels-1.patch
deleted file mode 100644
index 26463cd0..00000000
--- a/x11-base/xgl/files/r200-copy-pixels-1.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -u ../Mesa-6.4.1.old/src/mesa/drivers/dri/r200/r200_pixel.c ./src/mesa/drivers/dri/r200/r200_pixel.c
---- ../Mesa-6.4.1.old/src/mesa/drivers/dri/r200/r200_pixel.c 2004-07-31 10:14:50.000000000 +0200
-+++ ./src/mesa/drivers/dri/r200/r200_pixel.c 2005-12-21 15:19:24.000000000 +0100
-@@ -472,6 +472,98 @@
- }
-
-
-+void
-+r200CopyPixels( GLcontext *ctx,
-+ GLint srcx, GLint srcy, GLsizei width, GLsizei height,
-+ GLint destx, GLint desty,
-+ GLenum type )
-+{
-+ if (type == GL_COLOR &&
-+ ctx->Pixel.ReadBuffer == GL_BACK &&
-+ ctx->Color.DrawBuffer[0] == GL_FRONT &&
-+ srcx == destx && srcy == desty &&
-+ ctx->_ImageTransferState == 0 && /* no color tables, scale/bias, etc */
-+ ctx->Pixel.ZoomX == 1.0 && /* no zooming */
-+ ctx->Pixel.ZoomY == 1.0)
-+ {
-+ r200ContextPtr rmesa = R200_CONTEXT (ctx);
-+ __DRIdrawablePrivate *dPriv = rmesa->dri.drawable;
-+ GLint x, y, size;
-+ GLint nbox, i, ret;
-+
-+ x = destx;
-+ y = desty;
-+
-+ if (!clip_pixelrect (ctx, ctx->DrawBuffer, &x, &y, &width, &height,
-+ &size))
-+ {
-+ if (R200_DEBUG & DEBUG_PIXEL)
-+ fprintf (stderr, "%s totally clipped -- nothing to do\n",
-+ __FUNCTION__);
-+
-+ return;
-+ }
-+
-+ y = dPriv->h - y - height; /* convert from gl to hardware coords */
-+ x += dPriv->x;
-+ y += dPriv->y;
-+
-+ R200_FIREVERTICES( rmesa );
-+
-+ LOCK_HARDWARE( rmesa );
-+
-+ nbox = dPriv->numClipRects; /* must be in locked region */
-+
-+ for (i = 0; i < nbox; )
-+ {
-+ drm_clip_rect_t *box = dPriv->pClipRects;
-+ drm_clip_rect_t *b = rmesa->sarea->boxes;
-+ drm_clip_rect_t r;
-+ GLint n = 0;
-+
-+ while (n < RADEON_NR_SAREA_CLIPRECTS && i < nbox)
-+ {
-+ r = box[i++];
-+
-+ if (r.x1 < x)
-+ r.x1 = x;
-+ if (r.y1 < y)
-+ r.y1 = y;
-+ if (r.x2 > x + width)
-+ r.x2 = x + width;
-+ if (r.y2 > y + height)
-+ r.y2 = y + height;
-+
-+ if (r.x1 < r.x2 && r.y1 < r.y2)
-+ {
-+ *b++ = r;
-+ n++;
-+ }
-+ }
-+
-+ if (n)
-+ {
-+ rmesa->sarea->nbox = n;
-+
-+ ret = drmCommandNone ( rmesa->dri.fd, DRM_RADEON_SWAP );
-+
-+ if ( ret ) {
-+ fprintf( stderr, "DRM_R200_SWAP_BUFFERS: return = %d\n",
-+ ret );
-+ UNLOCK_HARDWARE( rmesa );
-+ exit( 1 );
-+ }
-+ }
-+ }
-+
-+ UNLOCK_HARDWARE( rmesa );
-+ }
-+ else
-+ {
-+ _swrast_CopyPixels (ctx, srcx, srcy, width, height, destx, desty, type);
-+ }
-+}
-+
-
- void r200InitPixelFuncs( GLcontext *ctx )
- {
-@@ -485,7 +577,8 @@
-
- if (!getenv("R200_NO_BLITS") && R200_CONTEXT(ctx)->dri.drmMinor >= 6) {
- ctx->Driver.ReadPixels = r200ReadPixels;
-- ctx->Driver.DrawPixels = r200DrawPixels;
-+ ctx->Driver.DrawPixels = r200DrawPixels;
-+ ctx->Driver.CopyPixels = r200CopyPixels;
- if (getenv("R200_HW_BITMAP"))
- ctx->Driver.Bitmap = r200Bitmap;
- }
diff --git a/x11-base/xgl/files/xgl-glxproto-defines.diff b/x11-base/xgl/files/xgl-glxproto-defines.diff
deleted file mode 100644
index 36bcd15c..00000000
--- a/x11-base/xgl/files/xgl-glxproto-defines.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- xgl-xorg/GL/glx/glxcmds.c.1 2006-01-21 00:47:33.466284000 +0100
-+++ xgl-xorg/GL/glx/glxcmds.c 2006-01-21 00:48:49.579040750 +0100
-@@ -57,6 +57,9 @@
- #include "glthread.h"
- #include "dispatch.h"
-
-+#define X_GLXvop_BindTexImageMESA 15
-+#define X_GLXvop_ReleaseTexImageMESA 16
-+
- /************************************************************************/
-
- void GlxSetRenderTables (struct _glapi_table *table)
---- xgl-xorg/GL/glx/glxcmdsswap.c.1 2006-01-21 00:50:57.467033250 +0100
-+++ xgl-xorg/GL/glx/glxcmdsswap.c 2006-01-21 00:51:05.979565250 +0100
-@@ -55,6 +55,9 @@
- #include "glthread.h"
- #include "dispatch.h"
-
-+#define X_GLXvop_BindTexImageMESA 15
-+#define X_GLXvop_ReleaseTexImageMESA 16
-+
- static int __glXSwapGetFBConfigsSGIX(__GLXclientState *cl, GLbyte *pc);
- static int __glXSwapCreateContextWithConfigSGIX(__GLXclientState *cl, GLbyte *pc);
- static int __glXSwapCreateGLXPixmapWithConfigSGIX(__GLXclientState *cl, GLbyte *pc);
diff --git a/x11-base/xgl/files/xgl-mesa-stable-180106.diff b/x11-base/xgl/files/xgl-mesa-stable-180106.diff
deleted file mode 100644
index b370b558..00000000
--- a/x11-base/xgl/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/x11-base/xgl/files/xgl-symlink-glapi.diff b/x11-base/xgl/files/xgl-symlink-glapi.diff
deleted file mode 100644
index 1a4181a5..00000000
--- a/x11-base/xgl/files/xgl-symlink-glapi.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- xgl-xorg/GL/symlink-mesa.sh.1 2006-01-21 02:06:26.546083000 +0100
-+++ xgl-xorg/GL/symlink-mesa.sh 2006-01-21 02:05:57.448264500 +0100
-@@ -64,6 +64,7 @@
-
- action dispatch.h
- action glapi.h
-+ action glapi.c
- action glapioffsets.h
- action glapitable.h
- action glapitemp.h
diff --git a/x11-base/xgl/xgl-20060118.ebuild b/x11-base/xgl/xgl-20060118.ebuild
deleted file mode 100644
index dab7cbb1..00000000
--- a/x11-base/xgl/xgl-20060118.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit cvs eutils
-
-ECVS_SERVER="cvs.freedesktop.org:/cvs/xorg"
-ECVS_MODULE="xserver/xorg"
-ECVS_BRANCH="xgl-0-0-1"
-ECVS_LOCALNAME="xgl-xorg"
-S=${WORKDIR}/${ECVS_LOCALNAME}
-
-MESA_SRC=MesaLib-6.4.1.tar.bz2
-SRC_URI="mirror://sourceforge/mesa3d/${MESA_SRC}"
-
-DESCRIPTION="XGL X server"
-HOMEPAGE="http://xorg.freedesktop.org/"
-LICENSE="X11"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-DEPEND=">=media-libs/glitz-0.5.0_alpha0
- >=media-libs/mesa-6.4.2_alpha0"
-
-src_compile() {
- use amd64 && CFLAGS="${CFLAGS} -D_XSERVER64"
-
- unpack ${MESA_SRC}
- pushd Mesa-6.4.1
- epatch ${FILESDIR}/mesa-glx-x11-get-drawable-attribs-fix-1.diff
- epatch ${FILESDIR}/r200-copy-pixels-1.patch
- epatch ${FILESDIR}/xgl-mesa-stable-180106.diff
- epatch ${FILESDIR}/mesa-glx-x11-glxproto-defines.diff
- popd
-
- epatch ${FILESDIR}/xgl-glxproto-defines.diff
- epatch ${FILESDIR}/xgl-symlink-glapi.diff
-# ln -s `pwd`/Mesa-6.4.1/src/mesa/glapi/glapi.c GL/mesa/glapi/glapi.c
-
- ./autogen.sh --host=${CHOST} \
- --prefix=/usr \
- --infodir=/usr/share/info \
- --mandir=/usr/share/man \
- --with-fontdir=/usr/share/fonts \
- --enable-glx \
- --enable-dri \
- --disable-xkb \
- --enable-xgl \
- --enable-xglx \
- --disable-xorg \
- --disable-xprint \
- --disable-dmx \
- --disable-xvfb \
- --disable-xnest \
- --with-mesa-source=${S}/Mesa-6.4.1 || die "econf failed"
- # --enable-xkb
- emake || die "emake failed"
-}
-
-src_install() {
- make DESTDIR=${D} install || die
- rm ${D}/usr/share/aclocal/xorg-server.m4 \
- ${D}/usr/lib/xserver/SecurityPolicy \
- ${D}/usr/lib/pkgconfig/xorg-server.pc \
- ${D}/usr/share/man/man1/Xserver.1x
-}