Add a note about needing to rebuild xorg-server with USE='-nptl'.

Package-Manager: portage-2.1.3.17

4 files changed, 44 insertions, 18 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 05636ea6be7b..d0fc6b4e4c20 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.163 2007/11/12 17:33:01 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.164 2007/11/12 19:08:44 dberkholz Exp $
+
+  12 Nov 2007; Donnie Berkholz <dberkholz@gentoo.org>; mesa-7.0.1.ebuild,
+  mesa-7.0.2.ebuild:
+  Add a note about needing to rebuild xorg-server with USE='-nptl'.
 
   12 Nov 2007; Donnie Berkholz <dberkholz@gentoo.org>; mesa-7.0.2.ebuild:
   Re-keyword, I masked USE=nptl for mesa-7 to work around the problem. This
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 3f4e19fff57b..202d68f94f2c 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -24,18 +24,18 @@ EBUILD mesa-6.5.2-r1.ebuild 9088 RMD160 582eb498cc6e2cddb7fc59042f668553a00f1b72
 MD5 028ea865507e0758e8e6dc39a5ae696c mesa-6.5.2-r1.ebuild 9088
 RMD160 582eb498cc6e2cddb7fc59042f668553a00f1b72 mesa-6.5.2-r1.ebuild 9088
 SHA256 7b9e0859b4fbfc31e63562c1459c2f2ccc0ea99749f7c4f3d530a0242d546852 mesa-6.5.2-r1.ebuild 9088
-EBUILD mesa-7.0.1.ebuild 9261 RMD160 6edea58a8a9088d28eb35da6d7fffc8ed1cbe901 SHA1 3d26681f2cf98d72074ecea064fcc590bc6e7689 SHA256 37ddfa889100321f9118b1d24824e6990f4ff65ea65f531ae0879ae0f1665c32
-MD5 dbdb47dcbde0a0772b6832c639c873d7 mesa-7.0.1.ebuild 9261
-RMD160 6edea58a8a9088d28eb35da6d7fffc8ed1cbe901 mesa-7.0.1.ebuild 9261
-SHA256 37ddfa889100321f9118b1d24824e6990f4ff65ea65f531ae0879ae0f1665c32 mesa-7.0.1.ebuild 9261
-EBUILD mesa-7.0.2.ebuild 9477 RMD160 2a2d629e11bdb1cbe66181fcf21c127c81068c0e SHA1 41b06a13f8f771a3acb3c1e19136d74b0422a191 SHA256 251fb2be35317ed3492facca55010806d3e4416ecfc37688053ad6e1611c793e
-MD5 afb408230b480f201e64f8d49a9b2596 mesa-7.0.2.ebuild 9477
-RMD160 2a2d629e11bdb1cbe66181fcf21c127c81068c0e mesa-7.0.2.ebuild 9477
-SHA256 251fb2be35317ed3492facca55010806d3e4416ecfc37688053ad6e1611c793e mesa-7.0.2.ebuild 9477
-MISC ChangeLog 30386 RMD160 7e45b4a0ed7a4bd1a6a337b1e7d769e3d37852cf SHA1 68eb7f06fc5e0d662a4a87ba77a81ae6e9b39f28 SHA256 ccafe879170f045adbc621773751698267a55c83f6c4f87e9879cfc38efbfb84
-MD5 0461aa08bf1dbfe330b62eb02628cad9 ChangeLog 30386
-RMD160 7e45b4a0ed7a4bd1a6a337b1e7d769e3d37852cf ChangeLog 30386
-SHA256 ccafe879170f045adbc621773751698267a55c83f6c4f87e9879cfc38efbfb84 ChangeLog 30386
+EBUILD mesa-7.0.1.ebuild 9738 RMD160 19142cdb7c33aafc28744d2ca9d72409c0672a59 SHA1 263295111aee1e07e839f86824716a4e0ea0444b SHA256 a619ee442ffda5e25d9c15ce16c9a1cff75520ece0a60169cce28010d0956de0
+MD5 969c198560a821cdfdc57b14d9809c0d mesa-7.0.1.ebuild 9738
+RMD160 19142cdb7c33aafc28744d2ca9d72409c0672a59 mesa-7.0.1.ebuild 9738
+SHA256 a619ee442ffda5e25d9c15ce16c9a1cff75520ece0a60169cce28010d0956de0 mesa-7.0.1.ebuild 9738
+EBUILD mesa-7.0.2.ebuild 9950 RMD160 ad86f75d9e8bd0d4af1581c697390f58cc497942 SHA1 edf377d6b2c2317a537b25f2cad0c7dcd8ab9340 SHA256 82567b6b26285888e207c60325fe3e2cede4b8e4a4e3ffbc103d0ecffc3fd402
+MD5 f3bc0d8434b2368f1ce3e40a83877946 mesa-7.0.2.ebuild 9950
+RMD160 ad86f75d9e8bd0d4af1581c697390f58cc497942 mesa-7.0.2.ebuild 9950
+SHA256 82567b6b26285888e207c60325fe3e2cede4b8e4a4e3ffbc103d0ecffc3fd402 mesa-7.0.2.ebuild 9950
+MISC ChangeLog 30550 RMD160 efb754593d631601235d4bb323ea9434d18f771f SHA1 6a658f24578cd0e3de78b4bc118f0e3e48599855 SHA256 22f1b1b6c4520ddadfc1105e8f23658615327d64056afe6befe250acc78ec700
+MD5 7c8d57c60be9f13cc00edf5855d62ada ChangeLog 30550
+RMD160 efb754593d631601235d4bb323ea9434d18f771f ChangeLog 30550
+SHA256 22f1b1b6c4520ddadfc1105e8f23658615327d64056afe6befe250acc78ec700 ChangeLog 30550
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -52,7 +52,7 @@ SHA256 7ac631b09304f1ee9a9a19227fba7fdbcc223c8b07a564b7c00fc042b84df777 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHOI5TXVaO67S1rtsRAs5rAKCUPXNDIaUBf4RCtG70dNLT3uP5cACgsloy
-d9d+4soSjuQiOb6BZAuTQqw=
-=Oj1R
+iD8DBQFHOKTDXVaO67S1rtsRAtXfAKCs7PABJO93Hncs2VI6pEZ6zf9CLQCeJz9Y
+La5QowXy4YlYNBx8zIz53Aw=
+=Lt/q
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-7.0.1.ebuild b/media-libs/mesa/mesa-7.0.1.ebuild
index 3a6dee62929b..8f1d5c60a350 100644
--- a/media-libs/mesa/mesa-7.0.1.ebuild
+++ b/media-libs/mesa/mesa-7.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.0.1.ebuild,v 1.4 2007/11/11 20:38:43 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.0.1.ebuild,v 1.5 2007/11/12 19:08:44 dberkholz Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability versionator
 
@@ -259,6 +259,17 @@ src_install() {
 
 pkg_postinst() {
 	switch_opengl_implem
+
+	# We need the outer check, because xorg-server may not be installed
+	# first, and built_with_use() dies if the package isn't installed.
+	if best_version x11-base/xorg-server; then
+		if built_with_use x11-base/xorg-server nptl; then
+			ewarn "Rebuild x11-base/xorg-server without USE=nptl"
+			ewarn "or AIGLX (compiz, etc.) will not work."
+			ewarn "This is because of a bug in the Mesa NPTL assembly code"
+			ewarn "in all Mesa 7.0.x versions (Mesa 6.x is OK)."
+		fi
+	fi
 }
 
 fix_opengl_symlinks() {
diff --git a/media-libs/mesa/mesa-7.0.2.ebuild b/media-libs/mesa/mesa-7.0.2.ebuild
index 213746ef273f..9747d99dd512 100644
--- a/media-libs/mesa/mesa-7.0.2.ebuild
+++ b/media-libs/mesa/mesa-7.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.0.2.ebuild,v 1.3 2007/11/12 17:33:01 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.0.2.ebuild,v 1.4 2007/11/12 19:08:44 dberkholz Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability versionator
 
@@ -263,6 +263,17 @@ src_install() {
 
 pkg_postinst() {
 	switch_opengl_implem
+
+	# We need the outer check, because xorg-server may not be installed
+	# first, and built_with_use() dies if the package isn't installed.
+	if best_version x11-base/xorg-server; then
+		if built_with_use x11-base/xorg-server nptl; then
+			ewarn "Rebuild x11-base/xorg-server without USE=nptl"
+			ewarn "or AIGLX (compiz, etc.) will not work."
+			ewarn "This is because of a bug in the Mesa NPTL assembly code"
+			ewarn "in all Mesa 7.0.x versions (Mesa 6.x is OK)."
+		fi
+	fi
 }
 
 fix_opengl_symlinks() {