diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2006-02-19 03:54:56 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2006-02-19 03:54:56 +0000 |
| commit | 6963f1124fd12d1407e2b17459af29d3085529a3 (patch) | |
| tree | 52fba3c9f8cf66c7ce5770b8e186d051ab182b8b /x11-base/xorg-server/files | |
| parent | Fixed enewuser invocation wrt #123152 (diff) | |
| download | gentoo-2-6963f1124fd12d1407e2b17459af29d3085529a3.tar.gz gentoo-2-6963f1124fd12d1407e2b17459af29d3085529a3.tar.bz2 gentoo-2-6963f1124fd12d1407e2b17459af29d3085529a3.zip | |
Really fix GLX on 64-bit systems.
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'x11-base/xorg-server/files')
| -rw-r--r-- | x11-base/xorg-server/files/digest-xorg-server-1.0.1-r4 (renamed from x11-base/xorg-server/files/digest-xorg-server-1.0.1-r3) | 0 | ||||
| -rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.0.1-64bit-fix-have-dix-config.patch | 18 | ||||
| -rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.0.1-64bit-fix-indirect-vertex-array.patch | 17 |
3 files changed, 35 insertions, 0 deletions
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.0.1-r3 b/x11-base/xorg-server/files/digest-xorg-server-1.0.1-r4 index 6804ff2d5f72..6804ff2d5f72 100644 --- a/x11-base/xorg-server/files/digest-xorg-server-1.0.1-r3 +++ b/x11-base/xorg-server/files/digest-xorg-server-1.0.1-r4 diff --git a/x11-base/xorg-server/files/xorg-server-1.0.1-64bit-fix-have-dix-config.patch b/x11-base/xorg-server/files/xorg-server-1.0.1-64bit-fix-have-dix-config.patch new file mode 100644 index 000000000000..55177bcfed70 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.0.1-64bit-fix-have-dix-config.patch @@ -0,0 +1,18 @@ +=================================================================== +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-6.4.2/src/mesa/main/glheader.h 2006/02/11 02:59:38 1.70 ++++ ../Mesa-6.4.2/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/x11-base/xorg-server/files/xorg-server-1.0.1-64bit-fix-indirect-vertex-array.patch b/x11-base/xorg-server/files/xorg-server-1.0.1-64bit-fix-indirect-vertex-array.patch new file mode 100644 index 000000000000..4c1291b107d2 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.0.1-64bit-fix-indirect-vertex-array.patch @@ -0,0 +1,17 @@ +=================================================================== +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-6.4.2/src/glx/x11/indirect_vertex_array.c 2005/08/19 18:53:26 1.6 ++++ ../Mesa-6.4.2/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; |