Fix llvm-3.4 patches, bug #497886. Add patch to make opencl build on ppc, upstream #68504.

Package-Manager: portage-2.2.7/cvs/Linux x86_64

3 files changed, 11 insertions, 28 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 118324408204..0669b4875428 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.537 2014/02/03 21:44:45 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.538 2014/02/04 20:49:01 chithanh Exp $
+
+  04 Feb 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  mesa-9.2.5.ebuild:
+  Fix llvm-3.4 patches, bug #497886. Add patch to make opencl build on ppc,
+  upstream #68504.
 
 *mesa-10.0.3 (03 Feb 2014)
 
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 23a657417b11..61477f883f21 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX eselect-mesa.conf.7.10 1670 SHA256 3ff15cedc353feeb2da450533c2ea2efc33ed1c8434a7b3037999c4965907149 SHA512 c62679e2427b6e922a7c04dec7afe1eddb4f8ba255735479338ebaf6da7db4ad7c6c916a3cf62da8bf8d2c0ceb60b6d591f8e878d4add9b7f63ff8121bb610a2 WHIRLPOOL 5d3522f8715ab62c9a1b4a96031db63734a98bb9e8a1cc722d20e018e7eedb3ffac92bb7c727bff1f58e216476b0e20552373b8155a51954f3d9af704e830782
 AUX eselect-mesa.conf.7.11 1670 SHA256 448d08e97e931563aa2e33f22feeaf911caf9a2eb9fd7b446485311d1dcc1225 SHA512 0a8178006f64d2f2d41f0f1ffbceab959ad66ac9142e2f74b593405041ade112b68fbabd54915c21dbf6bd7e3564499e6f76c348e8af632d751409b070420481 WHIRLPOOL 5df8041475f506ed544afb4b7ce94a31b4974c6cd26fd5054a6c29dda26cbec1694d60b68e975106d0797ff857764a39ec820da000e454be34181112b201ae36
 AUX eselect-mesa.conf.8.0.1 1622 SHA256 a7a4306084885dc624304a8893ca4f5645f7f1fe31322f9fb663e5a103f69221 SHA512 58eacf1304ebaa0116ea3c53fafdddb8c94738e31daad8546ac33b46dc51b81a6bccb48c167afe792c7fd41ca5054d8e66123f524b0623ad3e603ed4872f9dc4 WHIRLPOOL 7af55e3cb9448f4b3b4c463443e078a5559588371767e10b5890918d84bfeb16797f11ffabf9aaa205db70c550c5dfc18fe709b3a2e00746d93d4bf4944124b1
@@ -23,7 +20,7 @@ DIST MesaLib-9.2.5.tar.bz2 6678076 SHA256 b46ab9efed176df0591993397594d712ada9da
 DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8 SHA512 c62b45b32e396e67f629003fc5242b7b4df054b8e20b5237489212bc4f0171534915a02fc9efa68965068121d10660b5cd92a419efabe33fd4596a97a39249c2 WHIRLPOOL 5f171959e3a31f5c38438b4806ce371bb8fdf1c7a87501865e4ed5d5ab284cda9568b7773005997d7a1cff151f95e64c027b36c0be48a4dd288a7ab8b5f69b97
 DIST mesa-7.11.2-gentoo-patches-01.tar.bz2 4021 SHA256 e1e29d335f7e0c69824041a92b1815cd4e2defa4689285c86ea59d47a7ef407b SHA512 0dcd60bd40efa25c9895150b6c0230e6582ff42ba0bafae49290e170948ee99ff25be321e7d3d503b3f465eeedcd145fc46b312a54d9bc4d3577fd5e61c3439b WHIRLPOOL 8a4a5c250430ebc08d7081158c6cc41ea7b5718662ef0327e5829c2f26069be0bed7a0df12c82434c58d364926404c929ca9881847554b74906db195b12d6576
 DIST mesa-8.0.4-gentoo-patches-01.tar.bz2 2380 SHA256 bad7443e7163b87b3c14f8f56568551300fe190f58531fdba4fdabd36c2db842 SHA512 855834bc13decb46ab0b81e75002d873d2f40f67c9b1770b2d33e892beffffb32c229db71df72bea24d74ec515a0890a89dc9221cb22bba59c50182c654be676 WHIRLPOOL c78b4fe32d6b3246c7dffa2b7b9c216e13323ece677129618b2333d620f81777e8a23f13c956f88cd3aa0ae790d0a102d4f1c1e96c9ca5a13b3583a14cb2288b
-DIST mesa-9.2-gentoo-patches-02.tar.xz 1992 SHA256 d707864f600a07682fc66cf571e65ca561c5894dbb58e58e245ebef00568e224 SHA512 11a4f8e61bd0d80cad46442b050d2448a32c8688b3e6de9995fb308be92ddac2af204db994dedbe9e23b5336c271656d5b2c351e2cf8c39f5ab8684862eec993 WHIRLPOOL a3105ccd508ea42b0535c40a6fc723536c54edde050d928a679c3079fb9e526bfbb4afe43b0ffd34686ca1acefa660c0e2a28c46bd5b6d80631baa65a2489fde
+DIST mesa-9.2-gentoo-patches-03.tar.xz 2108 SHA256 46467bc8b07a930b61214ab5b50dd2ce8ffcd9cb683a050581f3a3a676b8763e SHA512 81d3a904e67373504f227accdca5cdbce4e6c0627122db7748f72fb7ef49a5bdce226766cdc3486404170e842fffc48306d753f6444cd61a6b5346f8d48404a0 WHIRLPOOL 2dff1e3c8c33758651ad054f02029e11b2c501a63604ccff841796184835de9f6aaaae09e5127bbfccc2e89239d472c4918aee1b34410b3e34b017915196d0a5
 EBUILD mesa-10.0.2-r1.ebuild 13065 SHA256 b2c0df5539d1cfc79ac90e705a0822e8c79c1b82b5b42ab0225819e6561444bf SHA512 19ecf429b1e3c7b03730f0d2158817d30faa366004597eaf67ff368521c1ffd915f724149bba3c56a61a04c62ee23492fd3a1f15a70309c94eeaf422daff06e1 WHIRLPOOL 9556cd6945edcf4bc40d45e040c9a00ffc674a0557bd0f624266da6f098fd696274011a86bb2da68bf21105d0c2231f108e2afbed7f329d89bd4f2dfd2d1a15b
 EBUILD mesa-10.0.3.ebuild 12991 SHA256 1b32ad7be88b9acce0c579803bb9a3d1303efa9fff6a92dacf5e03f084ac7836 SHA512 a084dcf16631f354d7c88a5d08296bfc62da70020ab704efbb79c5a29c54e1a9482c1f7d072bdc8dbdfb45a82346d368a5bdaa2923e1f2717e92fc29defe46e9 WHIRLPOOL 1387264efe548c0788a3484f4361ca7841c22d145b2a9fe2db83337ad3c43e7953bfbe24e1172d2f92b6f3c51ade98c8faa7f721fc02c564c59e3f8513dc40ae
 EBUILD mesa-7.10.3.ebuild 9833 SHA256 8d0fcf291314e22dfcc1e4a913320d67390920fae9dcbb1cc664989e8ae80fcd SHA512 71b145c6725f4ccf2ab7f99b45ec366c56fa9d3d0f602525cc95ad47f616563fbb6f8ff499408c6b0352b92b92413e130165fbddc64f4e09a3de3ce854533fc4 WHIRLPOOL 0084102900d7d9d4f2c206cb8f8c4087d0bfe974e60544b8afda1273a759d2a441ec8803f13fd0dc98a3bdef3cde69f11ef42128969e0fef4cc8c1257942765a
@@ -31,23 +28,6 @@ EBUILD mesa-7.11.2.ebuild 9983 SHA256 e73e54da27a1ecbae6d5e6f094514240572c22f17b
 EBUILD mesa-8.0.4-r1.ebuild 10781 SHA256 1b62281c25288f440354da2174c88ad421f25db152c8a92f9b6355a1b9843c7d SHA512 5a8ba6be94ee2eb4ef633ed60120835cabdce92749208ec31e4298644b314f54d9c56b5249ee763f61b16ddd46efe97e914059f1d396aac62eea227b8c7c223c WHIRLPOOL 20c09649ff6daf0d1ed9625ba9c3963b1fb91bc6d244e9dc38fdb36cab9bf011e9247e65c06cc59be2eeeffb35c53f6df4c0e6c2259aa7eb115866dcab032d0e
 EBUILD mesa-9.0.3.ebuild 11102 SHA256 89964cd4b42ef13098ed2ff18927824251ed01322eb788bc4c3e0c68c7ac4db3 SHA512 1b561d589029d213f66eec1e73044f43fada79bac2ebded4f2bc10c92cd7aadaf056aa7e5aeb186794515212d1e366aee4268271f71def9e317525a558d36f75 WHIRLPOOL 805c370457a0cf4017f5a4217249a2befe42b7730f032edba580f1e268af5706a1815def41e6ddae84e2c2d1f8606adf751e3c6016b426f0e4138a22141749a0
 EBUILD mesa-9.1.6.ebuild 11033 SHA256 b6783455dece114dbeeedfdc04f52e6c59835bc58965845b577dff59d3167f44 SHA512 7e6675fab5c25d5370606002ae7b94023a6f7c78e77af929da90773280c4276661d96c7a0259010b87ea829050d3519cb461ab6a9d0970cc608e2eb0ebfc9240 WHIRLPOOL 044ad192979971f37150417194c42a7cc70f0b0f08d25f2cf1342ab54d7a75d48266ee94f41a273fea8f230873941e2d1165d3b7dd9f9f003afaef408c86fa86
-EBUILD mesa-9.2.5.ebuild 13065 SHA256 ccdc9022e18c0f67e10381e10c499af5c9ba32d5b965594c83865a739941047d SHA512 51e91b915cb30bad0147b0cfbd226e1a4e4b187dc9f816bc49be12f1ac23332894dcb1308c4d1472950e7f7561dc6e30df2871882bc37fbbb515f3aec06befcd WHIRLPOOL fdd95c12a1cabdee51f0ff1695d46e775f16b4fb66d80e880f2e41c4e92a5c657b2660dc55984cee38572bd5e1eefc5e3a0b15f41e9651addbe3e973239d1138
-MISC ChangeLog 86426 SHA256 8ae92182f212bc05b0415ebe5896640220befde2e470c5aa87f7f801b46d38d8 SHA512 bfb896f3eb33495792da7ac1f4c750890ae24bf154038fcd7e16730a678d45f19dfebfd88599f7dfe38cffdc4a4a96179cdb0fa6e939b49e19d5543d7e4ac45c WHIRLPOOL 0b60082737fee88de4e2a83c310bd993544a969d29622db4c45f497d36e1c59f1384cc07df1a9c3ca822c4849a58dc2eb17412ab87c30231e01c10936c4a8b40
+EBUILD mesa-9.2.5.ebuild 12962 SHA256 fd511d718481252cedbb30dd354bc135c9efd22da5b63a3b792417b29d683d85 SHA512 a530fd55793b5e74890bd2f5e940ac23ef5b7b4b5ca338a3b16e2a388536d9b7ad093b28adb803a36f7b59e970caf154ee29c5ce191caa0bc19c2d588edebbf0 WHIRLPOOL 8566fea4f448aca8969be2746e583279ccb40aa02c23c8248f68d45fab3828ba6fc27a2ddc25b411fcf07fd142e039493fda1107c5bd32f3519a85d54403683e
+MISC ChangeLog 86612 SHA256 2ec45dcf5424426f22d1d804295dc52caa0cf57924e56dab52a273dba434df03 SHA512 00f49a78172aa14ccdc3b2ca38b4578e5acb52bfac2473d0d7a6ec3abd9a75218dc9b26b256de851a512349c51b32b90bc2164f7c3abc1c765144deb1caabeb8 WHIRLPOOL c9b2dfbb27d22464bd17396d5d22c0ab16a92f197c128089f3165b4a847226f98959781031d9f7a0eaf8970c5af8a1d1ac9f2de82b47f71ee5d252d51930f6b2
 MISC metadata.xml 2149 SHA256 579a58d3fe0f64b315090dddbcf027041e5b2d2b8249e088213c7ed8a4417f61 SHA512 51e06e966e10ae0121cc490d293ae6cbb27282c538159f71e9c004236edf73ecc138991297f579937f46b08226d6d101ae5892dddb12196bad838a0ba4770831 WHIRLPOOL cadb35665914c8ce925baae33d276600c9e6328703c15d32652d5687ab7b937094ad15a44cf7c052b9595cf0dc97d6c62edbc575d8d2ec85a2d01b7e906303ae
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJS8A4vAAoJEA/daC2XTKcq5lUQAKSHRmwOVZspOBN7J9JBYpzV
-2kGDyD0Oeb1/hhjP+9+nLtKAuZEIEbv0BwGadkbyQpQgMXOkwlVwwGF1ZDUJuZ+i
-Ze90a8o0FBSb5je2NFyHStCAQnJJKgV9Kbzsw2X5U1uRyNoFPD8ekqoyz2mkihnK
-zxUQBj23Eqp2AY7A5zghXH+nlHD+F7q+qOC5gWSZJ66WjeN9iG2DT17xSytyKnGe
-mplHpLcnqbaRDkF63dPNtyDYFfFNE8oeigd8murBSiG7sDDemQ28Jb/LY8FWpefH
-A4bXXekq1v98vJAufR/xJph56YAOoyWHhz7PlOIo6RJzwQwQZDmxBx5dqTtxArSv
-6pAPhrWYz+2AhhojEYX7I7Kr8NnqZ4vxCcZQmn1bsGz/Qk0B2/8UTBDhCCA2WRxC
-d2aXLXT823qL0wa3LbhnndO+8BgFuOaljLkEa9LVPJc61kWLvHkLG3FYxOC9GYGx
-Q7XbTQtmwk6bsY7+TwnKuwP5D0Z5cY5c340qodVQIs1pkKS5Y+OOUM/xEzIzp1As
-CPLHyOEO61PLfWNNvI69KnOUT61k0HjAC8VBUSLYG5D4ojtcEOJhEoNUO/O4dABd
-AHmnTfEQSUVzJasvj7soTkoF914hfhP6DRD7uTvG88mh8L6eDZBb/tjcQdTlQslR
-2nVYW2Yqq+UpdboOMT0r
-=dZgB
------END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-9.2.5.ebuild b/media-libs/mesa/mesa-9.2.5.ebuild
index 8ff7bb0b0a1a..097cb2100697 100644
--- a/media-libs/mesa/mesa-9.2.5.ebuild
+++ b/media-libs/mesa/mesa-9.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.2.5.ebuild,v 1.5 2014/01/26 20:28:12 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.2.5.ebuild,v 1.6 2014/02/04 20:49:01 chithanh Exp $
 
 EAPI=5
 
@@ -27,7 +27,7 @@ FOLDER="${PV/_rc*/}"
 DESCRIPTION="OpenGL-like graphic library for Linux"
 HOMEPAGE="http://mesa3d.sourceforge.net/"
 
-SRC_PATCHES="mirror://gentoo/${PN}-9.2-gentoo-patches-02.tar.xz"
+SRC_PATCHES="mirror://gentoo/${PN}-9.2-gentoo-patches-03.tar.xz"
 if [[ $PV = 9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
@@ -128,13 +128,11 @@ done
 
 DEPEND="${RDEPEND}
 	llvm? (
-		<sys-devel/llvm-3.4[${MULTILIB_USEDEP}]
 		>=sys-devel/llvm-2.9[${MULTILIB_USEDEP}]
 		r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
 		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
 	)
 	opencl? (
-		<sys-devel/llvm-3.4[video_cards_radeon,${MULTILIB_USEDEP}]
 		>=sys-devel/llvm-3.3-r1[video_cards_radeon,${MULTILIB_USEDEP}]
 		>=sys-devel/clang-3.3[${MULTILIB_USEDEP}]
 		>=sys-devel/gcc-4.6