diff options
Diffstat (limited to 'x11-base')
-rw-r--r-- | x11-base/xorg-server/ChangeLog | 11 | ||||
-rw-r--r-- | x11-base/xorg-server/files/digest-xorg-server-1.0.1-r2 | 2 | ||||
-rw-r--r-- | x11-base/xorg-server/files/digest-xorg-server-1.0.1-r3 | 6 | ||||
-rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.0.1-amd64-fix-for-glx.patch | 12 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-1.0.1-r3.ebuild (renamed from x11-base/xorg-server/xorg-server-1.0.1-r2.ebuild) | 7 |
5 files changed, 32 insertions, 6 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/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" |