(#122140) Add patch to fix OpenGL on amd64, thanks to Igor V. Kovalenko <garrison@mail.ru>. Also update to Mesa 6.4.2 tarball so people only need to download one version of it.

Package-Manager: portage-2.1_pre4-r1

6 files changed, 44 insertions, 15 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 78c61e5a3d72..cb9e0e56e2fb 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,15 @@
 # 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.85 2006/02/06 23:36:57 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.86 2006/02/13 05:34:07 spyderous Exp $
+
+*xorg-server-1.0.1-r3 (13 Feb 2006)
+
+  13 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/xorg-server-1.0.1-amd64-fix-for-glx.patch,
+  -xorg-server-1.0.1-r2.ebuild, +xorg-server-1.0.1-r3.ebuild:
+  (#122140) Add patch to fix OpenGL on amd64, thanks to Igor V. Kovalenko
+  <garrison@mail.ru>. Also update to Mesa 6.4.2 tarball so people only need to
+  download one version of it.
 
   06 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-server-1.0.1-r2.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 3ce13863b661..4bcc9f6069d5 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,18 +1,21 @@
-MD5 85d3e6f2984c658b2c3eb009042ba3f8 ChangeLog 16882
-RMD160 80194d6d8b59be951f1f9b767eea0943660b2153 ChangeLog 16882
-SHA256 6970aa85d5dcb3cbe84fc44c5255a8523abbd6d2610b7c634d0ffc4147b75c1d ChangeLog 16882
-MD5 3d490e022ae44d377a50153b649185d5 files/digest-xorg-server-1.0.1-r2 138
-RMD160 d3bac120b5d18c43332df45394539c4a254ac5dd files/digest-xorg-server-1.0.1-r2 138
-SHA256 3103ffd6bd5260f0e50da1ada54e89ca604f94f050e386c496a81612709204eb files/digest-xorg-server-1.0.1-r2 138
+MD5 8d6d13be5d80bb815b0282647bd26ece ChangeLog 17272
+RMD160 c165bd2a58ff3984d4b12c1959e53887b2e200d6 ChangeLog 17272
+SHA256 fc0d2780a7f36b46056355dc6a4f2906e764c3f2b49b96c58c8bd1d46e6dc143 ChangeLog 17272
+MD5 86320440e484d8e90b27370ab2519e56 files/digest-xorg-server-1.0.1-r3 506
+RMD160 6e633c70f3e3b764f2d868d18b30bf0b5e007cc2 files/digest-xorg-server-1.0.1-r3 506
+SHA256 c0f208ece5b8014af656dbc7587ed2c363785a60f7c165dd60d32537ac744b88 files/digest-xorg-server-1.0.1-r3 506
 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
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 300d9a45411c5cbbf5dafb5323b2bb9f xorg-server-1.0.1-r2.ebuild 4208
-RMD160 e1d63e9e003f69e1ca4b7815d2a4ef5ab40aaa72 xorg-server-1.0.1-r2.ebuild 4208
-SHA256 429b70995ffc3cd9f4c11de63fc6564da449a62d87171b0081136ee0cf172759 xorg-server-1.0.1-r2.ebuild 4208
+MD5 e6c3285bad27712cd4677b1869043b2a xorg-server-1.0.1-r3.ebuild 4250
+RMD160 2f0a2fe853971c83841b2567ff0013dd838918dc xorg-server-1.0.1-r3.ebuild 4250
+SHA256 6f7f8e54fb1ad4baf06e9c1f70b3c7b46c19f5f78a0257037ab5bbb34844d312 xorg-server-1.0.1-r3.ebuild 4250
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.0.1-r2 b/x11-base/xorg-server/files/digest-xorg-server-1.0.1-r2
deleted file mode 100644
index 03b15b3b3286..000000000000
--- a/x11-base/xorg-server/files/digest-xorg-server-1.0.1-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ea148c828ec6f645526451db1b8556f1 MesaLib-6.4.1.tar.bz2 2913887
-MD5 aa0ccb851ec5f7f9b132581d9a5827e4 xorg-server-1.0.1.tar.bz2 5975199
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-r3
new file mode 100644
index 000000000000..6804ff2d5f72
--- /dev/null
+++ b/x11-base/xorg-server/files/digest-xorg-server-1.0.1-r3
@@ -0,0 +1,6 @@
+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
+MD5 aa0ccb851ec5f7f9b132581d9a5827e4 xorg-server-1.0.1.tar.bz2 5975199
+RMD160 e8433721dcd71963afa2d5bcbb2764fdc838e524 xorg-server-1.0.1.tar.bz2 5975199
+SHA256 54b1d6ba0df10b8b1a9c962b509e0e95dd76a9742a5adabcff36ee7087f20e5d xorg-server-1.0.1.tar.bz2 5975199
diff --git a/x11-base/xorg-server/files/xorg-server-1.0.1-amd64-fix-for-glx.patch b/x11-base/xorg-server/files/xorg-server-1.0.1-amd64-fix-for-glx.patch
new file mode 100644
index 000000000000..23aa89a7f4af
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.0.1-amd64-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.1-r2.ebuild b/x11-base/xorg-server/xorg-server-1.0.1-r3.ebuild
index 55f496dda7f1..e20b49a5bb8b 100644
--- a/x11-base/xorg-server/xorg-server-1.0.1-r2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.0.1-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.1-r2.ebuild,v 1.4 2006/02/06 23:36:57 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.1-r3.ebuild,v 1.1 2006/02/13 05:34:07 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
 # Hack to make sure autoreconf gets run
@@ -11,12 +11,13 @@ inherit flag-o-matic x-modular multilib
 OPENGL_DIR="xorg-x11"
 
 MESA_PN="Mesa"
-MESA_PV="6.4.1"
+MESA_PV="6.4.2"
 MESA_P="${MESA_PN}-${MESA_PV}"
 MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
 
 PATCHES="${FILESDIR}/${P}-Sbus.patch
-	${FILESDIR}/${P}-backtrace.patch"
+	${FILESDIR}/${P}-backtrace.patch
+	${FILESDIR}/${P}-amd64-fix-for-glx.patch"
 
 SRC_URI="${SRC_URI}
 	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2"