Bump to new prerelease. Apply fix for bug #374671, upstream #39375.

Package-Manager: portage-2.2.0_alpha45/cvs/Linux x86_64

3 files changed, 13 insertions, 17 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index c068b4abf0b1..55ffcd2d46e6 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.347 2011/07/15 17:05:25 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.348 2011/07/20 15:22:27 chithanh Exp $
+
+*mesa-7.11_rc2 (20 Jul 2011)
+
+  20 Jul 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -mesa-7.11_rc1-r1.ebuild, +mesa-7.11_rc2.ebuild:
+  Bump to new prerelease. Apply fix for bug #374671, upstream #39375.
 
   15 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> mesa-7.10.2.ebuild:
   ppc64 stable wrt #363965
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 5e0f518f7569..0d1e844384aa 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
@@ -8,7 +5,7 @@ AUX glx_ro_text_segm.patch 731 RMD160 6d2bd85591d6349fa45a5ee16c724859c640e902 S
 DIST MesaLib-7.10.1.tar.bz2 5866217 RMD160 013ce67ea1ddb2563c173b786dcfdf5eb61865f5 SHA1 0cb966b35e57edb00d1cb09d88f502b171ce33d2 SHA256 9f4c67b212d9ecb83819e76645cecbebafbbfd6cb76290d0c2ea9f5ad9507390
 DIST MesaLib-7.10.2.tar.bz2 5863551 RMD160 4e5cfdf3b66f1b05d1aefd5267fe157e542f6ac2 SHA1 71bbb2686230f6334aa625a951b58b4b2d5d6aa0 SHA256 8ced2678ce11cf30804694a92ea3ca6b82f158ae8995bdc626c7e85aac71c7c1
 DIST MesaLib-7.10.3.tar.bz2 6056837 RMD160 bd9800a0cf98560a4424742cac635b4c07a39647 SHA1 e1fe8bad90bb24cc4b25a42932c277a0e0d7a2ac SHA256 1e701fc839b872677ddca9ed8784d754c9da1fbeda98173980e06aa7df0e85c0
-DIST MesaLib-7.11-rc1.tar.bz2 6329407 RMD160 d25e1425af095ed8056a26160611d70b2ad36673 SHA1 8faa738a86fe374541603168d9ff26adad5baf65 SHA256 5697c807b8438e311dc029c1d75d8296597e200b6c1de1d2576467700dce6103
+DIST MesaLib-7.11-rc2.tar.bz2 6296121 RMD160 5adb206406aaec7b8aef90bd3eb4e5740268baa5 SHA1 5ff61ae7a75dd37691915ec1706161d26392ddbb SHA256 c08657a47af6deaf706b6036fc71a5160ca4f718dee35c8ce927b6c7a7964a4c
 DIST MesaLib-7.9.1.tar.bz2 5640520 RMD160 5d83557160dc13f98647889bab351712c7b67316 SHA1 a442f77072c690ccd8c2659664929684f74d82fd SHA256 403986cd83d957db17957f11c320c9562cc8675273efbaa402e88bf4e6586721
 DIST MesaLib-7.9.2.tar.bz2 5648858 RMD160 d6665c1eb1035b9bebc743401355c39aaffcdf5c SHA1 973d27e49654b7bd1ed0d3c4c986d26d25ccabed SHA256 6b54c96ba0673c3f088bf9a56c2d64a6e54831a1065dedf0ac234d7cd5151253
 DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 RMD160 acc52b4f05b82a98e7994dc005699630270de360 SHA1 f38c616eeacbeebe597ed4bc98b84a41caa18108 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8
@@ -18,17 +15,8 @@ EBUILD mesa-7.10.1.ebuild 9505 RMD160 27b888e1a58bcafc4e84f082e7f8046543d7377c S
 EBUILD mesa-7.10.2-r1.ebuild 9742 RMD160 32520243f48c0e40b8668a0f7ec631dacd431141 SHA1 4d45aea58654e7519b1edfe8d70c92831f99cb4c SHA256 90fd24a1149d9177f0522ad1b459a6a6cfb336e1fc4fc9a4101006067f02820a
 EBUILD mesa-7.10.2.ebuild 9737 RMD160 46ae69b973ededabbeda551c713c3497298cab3b SHA1 26cd8781fa335cf5a69c4eab15954f61a11c1e44 SHA256 743b65a11193b649eff1a1aea8cd12a5f9d78b233e281bdfb301e3b6813c3779
 EBUILD mesa-7.10.3.ebuild 9733 RMD160 fba5f65e7f1c55f1f0656b74ab39680f5b637185 SHA1 73f5a1eb53b2e2f4df114e6f98f46376dc959fd5 SHA256 7f96a49473217e6ddb638ac6a541bde9871f373e9b9e2e32fbd76593b74d896e
-EBUILD mesa-7.11_rc1-r1.ebuild 9822 RMD160 f539d1920c3378c488566d3a62d03c71990795e7 SHA1 3d44b4073b55846575b0fa9f32526c8b9530d5d4 SHA256 6c8327cae4302490e1047e6e8732d1a3714ae101bc7c695b644dad084d24727a
+EBUILD mesa-7.11_rc2.ebuild 9920 RMD160 ba63d85de5e2b5e3ec3826a8f824b5bdbb20e40b SHA1 f0e52cdbc2809ebd69890b9f2e7d5357cc652ceb SHA256 a480627c8366a30f98e1dc6c9f85ae07ef5a943a5525d826c329cc93961bf372
 EBUILD mesa-7.9.1.ebuild 8875 RMD160 7d8affe7e8e5cbdb332e52a0b8b842b37149eb49 SHA1 a85123962651bb07feeb1a70e3f608c49d529211 SHA256 f74f65ca5a94d79d7a8f9017eec41ae0992aa2fa631d17954a9dfeab222101cd
 EBUILD mesa-7.9.2.ebuild 8876 RMD160 58645f5c8ba79e1ec2a08a1bdac329c4b680bd8a SHA1 7b48a4851b6806d01ef0a4f944a5ec734bbc230f SHA256 81d1296f74f02372919a0338ea9bc9aadc6f876ca62fe9cacf2a9833b94e290f
-MISC ChangeLog 57648 RMD160 b1effd2ab18dc49598d99e274d3e7caef0e67526 SHA1 a82930c2c054a776647276ca5bd6d6df05ac55f9 SHA256 3c8d176ac3da938739b3e2b07b6bd30ffc4da094b0a81d4e48778d2269cf3e38
+MISC ChangeLog 57867 RMD160 3acf1e8c9f3fa4da226194d90de259559fdc9fb5 SHA1 1a6f11fabf1eec6319fcd25394b7cd523985dc4f SHA256 3e929c22d145850e7ed71c2cf3e74994ab10005fcd4cd8cb60012c95838432d6
 MISC metadata.xml 860 RMD160 d108595ff01a4508486d4ddc6e5875eb2d6f1277 SHA1 a4a5876ef7be72273d7893a8573b12fb39a50426 SHA256 b8a309225d512ad3848d9bea0b6badd447918bde1ef4489c736f12e6c23970ac
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iJwEAQECAAYFAk4gc1sACgkQIiMqcbOVdxSxTAP/aY+6nOfjB1UCYWXI4hdqxKdi
-Vy0Lqfzeseiw/znaa5vHwSbJnN4cXBDp3VLceKr7CApm98gPXKRUP6KXGqfPUPG2
-CIq2OPS+urODks08D7aYqKQhiFRoh79WE9dX6AtEXL1MpTtIKi1INQWXWUafC1L/
-PQjDDkv8hbEhg5lhQAQ=
-=kSVN
------END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-7.11_rc1-r1.ebuild b/media-libs/mesa/mesa-7.11_rc2.ebuild
index b4468497928d..3c25dec40e95 100644
--- a/media-libs/mesa/mesa-7.11_rc1-r1.ebuild
+++ b/media-libs/mesa/mesa-7.11_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.11_rc1-r1.ebuild,v 1.1 2011/07/10 10:17:14 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.11_rc2.ebuild,v 1.1 2011/07/20 15:22:27 chithanh Exp $
 
 EAPI=3
 
@@ -133,6 +133,8 @@ src_prepare() {
 		EPATCH_SUFFIX="patch" \
 		epatch
 	fi
+	# fix colors, bug #374671
+	sed -i "s/GL_RGBA,/GL_BGRA,/" src/mesa/state_tracker/st_manager.c || die
 
 	# fix for hardened, bug 240956
 	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch