summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2006-09-16 08:51:20 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2006-09-16 08:51:20 +0000
commitfae46d61d29e74aec94a222b6377fd029b860e54 (patch)
tree1e04b7f50dd7f2a2bc4c78961935fc2d0c1a58ac /x11-base
parentclean out old, non-modX ebuild (diff)
downloadgentoo-2-fae46d61d29e74aec94a222b6377fd029b860e54.tar.gz
gentoo-2-fae46d61d29e74aec94a222b6377fd029b860e54.tar.bz2
gentoo-2-fae46d61d29e74aec94a222b6377fd029b860e54.zip
Use Mesa 6.5.1 instead of a random prerelease snapshot.
(Portage version: 2.1.1_rc1-r7)
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog6
-rw-r--r--x11-base/xorg-server/files/digest-xorg-server-1.1.1-r16
-rw-r--r--x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild8
3 files changed, 12 insertions, 8 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 1131581bc8e6..3d92c9ff2aaf 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.168 2006/09/15 21:15:10 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.169 2006/09/16 08:51:20 dberkholz Exp $
+
+ 16 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+ xorg-server-1.1.1-r1.ebuild:
+ Use Mesa 6.5.1 instead of a random prerelease snapshot.
15 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
-files/1.1.1-remove-altix.patch, +files/1.1.1-sparc64-ati-lockups.patch,
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r1 b/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r1
index 6711eb87a087..1330edc82b0a 100644
--- a/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r1
+++ b/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r1
@@ -1,6 +1,6 @@
-MD5 d2c168c410009ef13e4198ae02cdb332 Mesa-20060831.tar.bz2 5531569
-RMD160 654eea5f311cd77ee46ded89208a0d8ae697facc Mesa-20060831.tar.bz2 5531569
-SHA256 f6e18eaadf6a0b1c7f926be7e15829c115ca277b2720f5644cfc1bb93db00a49 Mesa-20060831.tar.bz2 5531569
+MD5 c46f2c6646a270911b791dd8e1c2d977 MesaLib-6.5.1.tar.bz2 3138257
+RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 MesaLib-6.5.1.tar.bz2 3138257
+SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0 MesaLib-6.5.1.tar.bz2 3138257
MD5 a8ed678677af8ebb2fba5624602f6b2e xorg-server-1.1.1.tar.bz2 6252103
RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 xorg-server-1.1.1.tar.bz2 6252103
SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c xorg-server-1.1.1.tar.bz2 6252103
diff --git a/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild b/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild
index d47985e3f49a..f0bb5d3276e8 100644
--- a/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.1.1-r1.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.1.1-r1.ebuild,v 1.4 2006/09/15 21:15:10 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild,v 1.5 2006/09/16 08:51:20 dberkholz Exp $
# Must be before x-modular eclass is inherited
SNAPSHOT="yes"
@@ -10,9 +10,9 @@ inherit x-modular multilib
OPENGL_DIR="xorg-x11"
MESA_PN="Mesa"
-MESA_PV="20060831"
+MESA_PV="6.5.1"
MESA_P="${MESA_PN}-${MESA_PV}"
-MESA_SRC_P="${MESA_PN}-${MESA_PV}"
+MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
PATCHES="${FILESDIR}/01-no-move-damage.patch
${FILESDIR}/02-dont-backfill-bg-none.patch
@@ -302,7 +302,7 @@ pkg_setup() {
# Only Xorg and Xgl support this, and we won't build Xgl
# until it merges to trunk
if use xorg; then
- conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/Mesa"
+ conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}"
fi
# localstatedir is used for the log location; we need to override the default