Really fix 64-bit direct rendering. glcontextmodes.[ch] doesn't include glheader.h, so it also needs to include dix-config.h.

Package-Manager: portage-2.1_pre6-r5

4 files changed, 19 insertions, 2 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index dd6ce39b5aed..75ecdce51a78 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
 # 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.97 2006/03/31 19:33:05 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.98 2006/03/31 19:33:27 spyderous Exp $
+
+  31 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>; ChangeLog:
+  Really fix 64-bit direct rendering. glcontextmodes.[ch] doesn't include
+  glheader.h, so it also needs to include dix-config.h.
 
 *xorg-server-1.0.2-r3 (31 Mar 2006)
 
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r2 b/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r3
index b2e8218ffcfa..b2e8218ffcfa 100644
--- a/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r2
+++ b/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r3
diff --git a/x11-base/xorg-server/files/xorg-server-1.0.2-64bit-fix-for-glx.patch b/x11-base/xorg-server/files/xorg-server-1.0.2-64bit-fix-for-glx.patch
new file mode 100644
index 000000000000..23aa89a7f4af
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.0.2-64bit-fix-for-glx.patch
@@ -0,0 +1,12 @@
+--- ../Mesa-6.4.2/src/mesa/drivers/dri/common/glcontextmodes.c	2005-11-30 02:02:16.000000000 +0300
++++ ../Mesa-6.4.2/src/mesa/drivers/dri/common/glcontextmodes.c	2006-02-07 10:38:46.000000000 +0300
+@@ -39,6 +39,9 @@
+ # include "imports.h"
+ # define __glXMemset  memset
+ #else
++# if defined (HAVE_DIX_CONFIG_H)
++#  include <dix-config.h>
++# endif
+ # include <X11/X.h>
+ # include <GL/glx.h>
+ # include "GL/glxint.h"
diff --git a/x11-base/xorg-server/xorg-server-1.0.2-r2.ebuild b/x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild
index 315439231433..0215a5d51578 100644
--- a/x11-base/xorg-server/xorg-server-1.0.2-r2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.0.2-r3.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.2-r2.ebuild,v 1.1 2006/03/28 21:34:42 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild,v 1.1 2006/03/31 19:33:06 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
 # Hack to make sure autoreconf gets run
@@ -19,6 +19,7 @@ PATCHES="${FILESDIR}/${P}-Sbus.patch
 	${FILESDIR}/${P}-sparc64-cfbrrop-fix.patch
 	${FILESDIR}/${P}-64bit-fix-indirect-vertex-array.patch
 	${FILESDIR}/${P}-64bit-fix-have-dix-config.patch
+	${FILESDIR}/${P}-64bit-fix-for-glx.patch
 	${FILESDIR}/${PV}-try-to-fix-xorgcfg.patch
 	${FILESDIR}/${PV}-fix-xorgconfig-rgbpath-and-mouse.patch
 	${DISTDIR}/${PV}-overlay-window.patch.bz2"