Really fix GLX on 64-bit systems.

Package-Manager: portage-2.1_pre4-r1

6 files changed, 71 insertions, 6 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 762fd917af08..c78b07a0e852 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.87 2006/02/14 22:10:52 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.88 2006/02/19 03:54:56 spyderous Exp $
+
+*xorg-server-1.0.1-r4 (19 Feb 2006)
+
+  19 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/xorg-server-1.0.1-64bit-fix-have-dix-config.patch,
+  +files/xorg-server-1.0.1-64bit-fix-indirect-vertex-array.patch,
+  -xorg-server-1.0.1-r3.ebuild, +xorg-server-1.0.1-r4.ebuild:
+  Really fix GLX on 64-bit systems.
 
   14 Feb 2006; Markus Rothe <corsair@gentoo.org>
   xorg-server-1.0.1-r3.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index f6bb8903c51e..557cc09ded53 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,7 +1,27 @@
-MD5 988cc4346cfe4b253f4a11b8364bb594 ChangeLog 17366
-MD5 86320440e484d8e90b27370ab2519e56 files/digest-xorg-server-1.0.1-r3 506
+MD5 aaa75aa89086e496d9725756b1afc201 ChangeLog 17685
+RMD160 e712c8500911bfe730c69c9085201faa6249b472 ChangeLog 17685
+SHA256 bfeb5d9c18c506bf906e85442ffbbffbcb9fd08e3c0f72ff9ab4711a1f1d68ab ChangeLog 17685
+MD5 86320440e484d8e90b27370ab2519e56 files/digest-xorg-server-1.0.1-r4 506
+RMD160 6e633c70f3e3b764f2d868d18b30bf0b5e007cc2 files/digest-xorg-server-1.0.1-r4 506
+SHA256 c0f208ece5b8014af656dbc7587ed2c363785a60f7c165dd60d32537ac744b88 files/digest-xorg-server-1.0.1-r4 506
+MD5 1b8b160cdbeaf3a2994f50e83d9fa8d7 files/xorg-server-1.0.1-64bit-fix-have-dix-config.patch 663
+RMD160 ce0868d46d92431db41d474a77fea184f6a61682 files/xorg-server-1.0.1-64bit-fix-have-dix-config.patch 663
+SHA256 3535e137595623f7f5f23b0a8ee8b52d4d5acf7b6dfb534dff5f537e68603c6b files/xorg-server-1.0.1-64bit-fix-have-dix-config.patch 663
+MD5 8fa71f7fa2e17a2ccd41532909b153a8 files/xorg-server-1.0.1-64bit-fix-indirect-vertex-array.patch 766
+RMD160 595ccef38810f2ec5056999ba1f5ce8f22b29bd0 files/xorg-server-1.0.1-64bit-fix-indirect-vertex-array.patch 766
+SHA256 1bceddffeacbf67202b2aff6dba27234746b37004a186415560a4cd8896458f1 files/xorg-server-1.0.1-64bit-fix-indirect-vertex-array.patch 766
 MD5 912a66d58d73ad9c95c1c7d40c71f679 files/xorg-server-1.0.1-Sbus.patch 2388
+RMD160 f9757cbfed84e0e873f706e7a33ac04216b7dd72 files/xorg-server-1.0.1-Sbus.patch 2388
+SHA256 5e3255a38216599ddd7e3b108eb96c53a9c1d595ceee80ac3c698e1d0af7811e files/xorg-server-1.0.1-Sbus.patch 2388
 MD5 900d8194df467de2c86276d446522062 files/xorg-server-1.0.1-amd64-fix-for-glx.patch 414
+RMD160 17732b6ebe06e1533ce8f9b97e6ca8d7e4347a88 files/xorg-server-1.0.1-amd64-fix-for-glx.patch 414
+SHA256 1b2337fa0438c72fc8a17d710133f79ed17d49650efd9bc530bbb97b116427c4 files/xorg-server-1.0.1-amd64-fix-for-glx.patch 414
 MD5 21e8ec19796104d0b0136766513c2ed7 files/xorg-server-1.0.1-backtrace.patch 668
+RMD160 481b146703a9ada524c7ce69cffa1f16cb7d62cd files/xorg-server-1.0.1-backtrace.patch 668
+SHA256 f27b5e39557bf1c628ace760166e78a6781bfc6a45c12316895d360e2e208915 files/xorg-server-1.0.1-backtrace.patch 668
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
-MD5 83adcdfc02f15afbd1714b5988912a07 xorg-server-1.0.1-r3.ebuild 4255
+RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
+SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
+MD5 f3ba53d6a63062ee0ea0bf0585b029cc xorg-server-1.0.1-r4.ebuild 4363
+RMD160 f746917fea93e067de91da91a439e089008fd073 xorg-server-1.0.1-r4.ebuild 4363
+SHA256 ea49a1a54dc633672006381be169d2ac3493ca4fabdabf61ca7a1ada4fe49b3e xorg-server-1.0.1-r4.ebuild 4363
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;
diff --git a/x11-base/xorg-server/xorg-server-1.0.1-r3.ebuild b/x11-base/xorg-server/xorg-server-1.0.1-r4.ebuild
index 4043aff99e52..564e61365f5e 100644
--- a/x11-base/xorg-server/xorg-server-1.0.1-r3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.0.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.1-r3.ebuild,v 1.2 2006/02/14 22:10:52 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.1-r4.ebuild,v 1.1 2006/02/19 03:54:56 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
 # Hack to make sure autoreconf gets run
@@ -17,7 +17,9 @@ MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
 
 PATCHES="${FILESDIR}/${P}-Sbus.patch
 	${FILESDIR}/${P}-backtrace.patch
-	${FILESDIR}/${P}-amd64-fix-for-glx.patch"
+	${FILESDIR}/${P}-amd64-fix-for-glx.patch
+	${FILESDIR}/${P}-64bit-fix-have-dix-config.patch
+	${FILESDIR}/${P}-64bit-fix-indirect-vertex-array.patch"
 
 SRC_URI="${SRC_URI}
 	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2"