summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-02-11 04:38:37 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-02-11 04:38:37 +0000
commit5140dc10efc60daa42bf056edd4a8c9443e4825d (patch)
treea6a6b34205d59fd2eca20770846922edc8e5b85d /media-libs/mesa
parentBump, improves error handling. (diff)
downloadhistorical-5140dc10efc60daa42bf056edd4a8c9443e4825d.tar.gz
historical-5140dc10efc60daa42bf056edd4a8c9443e4825d.tar.bz2
historical-5140dc10efc60daa42bf056edd4a8c9443e4825d.zip
switch to xorg-x11 and back if necessary, bug #374647 comment 11
Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64
Diffstat (limited to 'media-libs/mesa')
-rw-r--r--media-libs/mesa/ChangeLog6
-rw-r--r--media-libs/mesa/Manifest24
-rw-r--r--media-libs/mesa/mesa-8.0.ebuild10
3 files changed, 16 insertions, 24 deletions
diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 317b42b4cdce..08fe95dd6117 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/mesa
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.378 2012/02/10 18:44:37 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.379 2012/02/11 04:38:37 chithanh Exp $
+
+ 11 Feb 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ mesa-8.0.ebuild:
+ switch to xorg-x11 and back if necessary, bug #374647 comment 11
*mesa-8.0 (10 Feb 2012)
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 40ab2843b306..6e8cbaa7df85 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX eselect-mesa.conf.7.10 1670 RMD160 a500c3af1c036678a84548b92e348b12a72ec117 SHA1 38cc1b51398382f5a2d1b89da4f16d3fa0e55450 SHA256 3ff15cedc353feeb2da450533c2ea2efc33ed1c8434a7b3037999c4965907149
AUX eselect-mesa.conf.7.11 1670 RMD160 74d85b0481f36a8e2b2e09245d49d09671500946 SHA1 5c5f468feaae946e5901698d1c0ffe8fc480b783 SHA256 448d08e97e931563aa2e33f22feeaf911caf9a2eb9fd7b446485311d1dcc1225
AUX eselect-mesa.conf.7.9 1652 RMD160 922a0cc81e31548eacc7bc079448a93912124180 SHA1 2fb5a1fad37cc907871541ba8daca927dca968bb SHA256 bee4d061f1fb63c4c70d3f643fee7b53726c8826782f57b988f545e12eccd8c1
@@ -18,23 +15,6 @@ EBUILD mesa-7.10.3.ebuild 9772 RMD160 029610362c1c2b4db62c66ba624a6065fcfbe250 S
EBUILD mesa-7.11.2.ebuild 9923 RMD160 90b34d066bdec23f69b6f82801cda9b3ce184858 SHA1 3a307039dd174942c4d58c0abdc373d01bf5a32a SHA256 4f98020aefb0a42bdad2b2468a7b01fd60a07964d98ec2ce7e5df72391fbce68
EBUILD mesa-7.11.ebuild 9928 RMD160 342615f5405e60bdacf9b808befc6ca7dd6d5dda SHA1 eedb96d6b4aaa2fdd4b7022d8f416aeb2eea8d71 SHA256 df66bee9b379abf08d49941c0b5af68ac0638ba16af887b56bf362b32ae1bfa3
EBUILD mesa-7.9.2.ebuild 8916 RMD160 624eba5aca74c86386abd7ea66662b41bf4060df SHA1 9240ed7fba8bcf59169b8b6fa0800485d1a4f320 SHA256 2054a5b8158966ebd27faf79f405bbbe2c41d4b3d5f4144fb3653638ff79c047
-EBUILD mesa-8.0.ebuild 10195 RMD160 5fbc01990d74c3213993c68ae1eb4340c764eb5d SHA1 c096f1496b977cda05e61ff50e5c252fcfc2afc6 SHA256 7fd4c2c03f4fa74447bcfb6cabaf6d77a164b7ae27c51afe72394fe5a033aead
-MISC ChangeLog 62452 RMD160 e0e80b29c1c5fd80fba8d3e895d0e8e08feb4abe SHA1 63fa2a8d2263e7f6edb8b8cde6916a6251f6fbc1 SHA256 e16b0f165931c7cd04e291e215ccb0ec78d73b85f5b9f7988d28ed1975ab808c
+EBUILD mesa-8.0.ebuild 10425 RMD160 e7995e9023d31f0320db8fab356e925372e9b8ac SHA1 36296e6fcb41f74a7a67a0e4644ab11a47c1ccfe SHA256 a53f295b9a2cb739dd0b3211b91c0f53d011c9671d5370308c72eec9f1b93928
+MISC ChangeLog 62608 RMD160 4f647c8c0b7a822c67696683b96da08462940665 SHA1 31c70a3f8a3994ef0bb67a7522766682bc899589 SHA256 f0b1a903bb87ff10beef249321437e8c314d5adcbe34ac1957cdd8d326ecb6cd
MISC metadata.xml 1645 RMD160 b0c9968af8c9f1c8322a7ba91f41a2a421becd09 SHA1 4ec1437f97a065700c7121f229363712497a73ec SHA256 f11445e8e52048b4252e385820fd20b7a5ebc40a0b1e0980e15e5719f1481569
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBAgAGBQJPNWWYAAoJEA/daC2XTKcqzQEP/2i34Lbmnhz9wHy5Dh/5djic
-HJ0fy+vF2/mnYctm51UeTNM0dxbdRuWe8+zpcDEgOV7wCUAfY7A9uFFB5SEkLecI
-ZiLHhhuJaY4rUGtWN7bTLVd9SIvqpKXftPR92jlsf7Jc25BZAUTEZ4AOzGXRGtWa
-PU7KLSYlx6MEZCmDpuNYjeVSC2+KmHwPZEw1o9gUIpU/BEsruLPoyKtFQApreBLB
-e4eAplNgojXfQuGq+bRpReJwgtuHN3egBAIbvDNG9UL+/UJP7JGohGgRyYxplXiP
-jaMdPGZHv0ZKLpd6YUmDV1TAntZQBVZ2adhfecJWu/v29mTLFBXmBNg0zeY4xGco
-lU6i8Q/2uizQmfE8kiITweWOV6w1wb2gE/iEzigZqns8/JvHKSyw0uhaQOZVxTU5
-YtLsGUr5vvfgRO3jgOdYa0UVufqb1Bw3oQu8ygoxJQj4x8k084p/EXM2JWPd6/Fm
-tpOFf81kHVZeek6LBMnpl33oHZkksuR3M0S+6mrMun2ZZaT69p3EkAHl19eKb9Je
-hUCvYzNovqDXZX13hm0mPf1vE7TuP2FqlDZ26iK1D+5TZklgUz2pN/YhXIjgdqjJ
-0jEdeqz6LaWX7FuoK2VOAE6ldkPbWHVaCaKzkP/FV6hU7hDj44fys0BXEfsBT1ut
-O+C1CXKgbpMO/9JwpxrA
-=NcNZ
------END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-8.0.ebuild b/media-libs/mesa/mesa-8.0.ebuild
index 9d2ff2dc17f3..ebd21f47934d 100644
--- a/media-libs/mesa/mesa-8.0.ebuild
+++ b/media-libs/mesa/mesa-8.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-8.0.ebuild,v 1.1 2012/02/10 18:44:37 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-8.0.ebuild,v 1.2 2012/02/11 04:38:37 chithanh Exp $
EAPI=4
@@ -326,6 +326,14 @@ pkg_postinst() {
# Switch to the xorg implementation.
echo
eselect opengl set --use-old ${OPENGL_DIR}
+
+ # switch to xorg-x11 and back if necessary, bug #374647 comment 11
+ OLD_IMPLEM="$(eselect opengl show)"
+ if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then
+ eselect opengl set ${OPENGL_DIR}
+ eselect opengl set ${OLD_IMPLEM}
+ fi
+
# Select classic/gallium drivers
if use classic || use gallium; then
eselect mesa set --auto