Add missing files, bug #428027

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

4 files changed, 72 insertions, 2 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index ec545ab554b7..458d16e4b7e2 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,11 @@
 # 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.410 2012/07/25 13:34:37 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.411 2012/07/25 18:50:23 chithanh Exp $
+
+  25 Jul 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/eselect-mesa.conf.8.1,
+  +files/mesa-8.1-dont-require-llvm-for-r300.patch:
+  Add missing files, bug #428027
 
   25 Jul 2012; Ben de Groot <yngwin@gentoo.org> mesa-8.1_rc1_pre20120724.ebuild:
   Hide dev-util/indent behind !amd-fbsd wrt bug #427952
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 2e84b8e06013..c4e67fe6d673 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,10 @@
 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
+AUX eselect-mesa.conf.8.1 1622 SHA256 a7a4306084885dc624304a8893ca4f5645f7f1fe31322f9fb663e5a103f69221 SHA512 58eacf1304ebaa0116ea3c53fafdddb8c94738e31daad8546ac33b46dc51b81a6bccb48c167afe792c7fd41ca5054d8e66123f524b0623ad3e603ed4872f9dc4 WHIRLPOOL 7af55e3cb9448f4b3b4c463443e078a5559588371767e10b5890918d84bfeb16797f11ffabf9aaa205db70c550c5dfc18fe709b3a2e00746d93d4bf4944124b1
 AUX glx_ro_text_segm.patch 731 SHA256 e36af5b530fdbe2b0e62a035bf4bf4baef267c3dc56133d1a58e56899ebffc5c SHA512 90d04d1268cc90e1c5596b49b143895eba99d4e7f7d9bb5f699725c1308e3995edac44e3f61536c7ce70ebf5df84a5a22c18fa84fb54fbddb339f908975bb43c WHIRLPOOL 42171ef67930bebdcfdfcb0c9370234791c6125be760b6419abfff44bd65899982167d6da4d6eb4198383438e6376b4b695109af158083b903071c545160d883
 AUX mesa-8.0-dont-require-llvm-for-r300.patch 916 SHA256 560f224a12b47fb86bd2ecbe7dc32c79e2be9a26321a79921f83527656ed553a SHA512 ce637b9210517375ae2c77981e0882d161e2027801356b80ec31d50157e52eecdb2ca3b9dc3787c789b39005fcd4cf73290e0879bd5e25638d33ef2cd5e443b8 WHIRLPOOL a14401c13deb209f0ce2e72c360a33ece1d87bd62be79ca8fcef46db29d75f0f4e60b5ef0527bf0bf6196d99a6d2f11da332537beb8c7627b1d7e810a3cfb2e8
+AUX mesa-8.1-dont-require-llvm-for-r300.patch 861 SHA256 7ca0a7135834448ea7ca27903a40bf3b0a39325613f8a66a718407aa28504fbf SHA512 a2e7ed3b9b51c3a9a98d83c8fdeb8b777a4877fac25e969b01ff92d6971c10dda9f64e6310c739597ad7ba04106c72925ee5931417f2b8d764f9bd799efd2142 WHIRLPOOL a82863366507835ec0a6562f70389e0d050fd23ea25e7c113ef4a0e1298a1543afa8c1fa51c90ece83f41ac6f3bda6083fd50b8f1292b863cd320186fba8f732
 DIST MesaLib-7.10.3.tar.bz2 6056837 SHA256 1e701fc839b872677ddca9ed8784d754c9da1fbeda98173980e06aa7df0e85c0
 DIST MesaLib-7.11.2.tar.bz2 6257280 SHA256 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357 SHA512 f9f93aeb5ba3e4f0cdd7041a7bba6cd18dd8f58446b796849f43c6037297011df826017c32e03f03c8527d4afd3b9096e9ae3cbfb3c86b4ad145c66867198c21 WHIRLPOOL 0cf1b328b95e4f09e549c8adb2f6dc67e36c48ef570c1a5fda73efad54b8327cbec896d67bd01838be8bba7274f32704feca3fde8bb68bf1141563d17e8be707
 DIST MesaLib-7.11.tar.bz2 6559702 SHA256 f8bf37a00882840a3e3d327576bc26a79ae7f4e18fe1f7d5f17a5b1c80dd7acf SHA512 ba33d56b3e163eee896ac0036a4cd5209dfed3fa6bf6d47fd6f3b32b58d55417dc3ac50228909bee46bf0a4900565a86b46431ca89379f072212b025792a9acc WHIRLPOOL 3b81183d87ca1dda202655b3b6f0d699de5447a653d1e35cb89a5f5db0e6fa00a805cb018245b64510090b524b7c0a12f76f0fddd61e64e5caff3f61919bd369
@@ -19,5 +21,5 @@ EBUILD mesa-8.0.3-r1.ebuild 10837 SHA256 150016d8d1abfcd26b92840d09b9a8bdadb69eb
 EBUILD mesa-8.0.3.ebuild 10677 SHA256 4796ba40c2716200b492ef0640247d0e84b1fa9dc8d5f35aee532125bb517e55 SHA512 9417da8706b3bfa024b533635b9b3baf9cf0e7033c565bcdc3d64d0b16f9bb7a9b6d3aed667fe930de991eec2137b20442becd4bf78c1e22d1bf052f63ec24a0 WHIRLPOOL 5f92e62dfdac5277f22e06d50364881b5dd1b56c2a9e303da847c7b9f12276bdaf6d22a1fed9baa748d06058a84aefbe5151456fb81fd1cae6642339fa753284
 EBUILD mesa-8.0.4.ebuild 10840 SHA256 88cea27f029d400b3dc124b8a8b90b46c2225eeffa6a8344305c17224b017ece SHA512 310767241b0ae3063129bce82cea63fb5342ec7353d1e4e5eb1d99709cbd77e4cfff4f72ccdd14696d2c5f8a8a504d2b5b86cef141ac6781f470f4cd16dde6c5 WHIRLPOOL aefa80ad0f0a8fa6caefe48133b10c1ade5608019b841327ae8a2917f7abb519fae79320b6c2c5d400893381139344c8b748101722fa2f8e6b0764520c7acca4
 EBUILD mesa-8.1_rc1_pre20120724.ebuild 11298 SHA256 8316411a58d938e8c739d0d3c00b00781ac7947df91e1e48ab2bc1f11c3df54f SHA512 fde680243cd7b3e2d537420c373cc026ae4b86a4207974135690ba38f69c35ee10606368b80a86766c58150ec35f93a3a54598a2dac5cf9ff65da0d7a75aa38a WHIRLPOOL 38c637039da8034e8577b9be10e986fd7f6a0e163b295b8bde692ff453ce2bb6660340e93281288841bcd7f58eb21e1188391fed47b07dac0e2abe0ffa0c9738
-MISC ChangeLog 67108 SHA256 8b4382e788e5e8a5865156a732bdbcf5cecfbd0e747e3d68cf83a0920000c510 SHA512 11384c84b944af9bb49ebc249fe7c529612742c6ba7475abe11959cf424c922fd69a53ed3f2b11b176393eab647dd2114fa2d503d55c4207384ac41f2e4950c8 WHIRLPOOL 70d5eefa8b44171c728dddb7dd0016126b229358af2d0a2b6cb1f8f70cd5e9a7540247040eee6ea66358939b971bbee5d232824f019010d940e1f366dc09febe
+MISC ChangeLog 67297 SHA256 fa7721b8a2b448adb97b580c8125b6007888e3d110dbe1ec8d1a95206009aab0 SHA512 bf55ff4ee89a38837a5c8a452c4b12d0cc04c9d1b6d45824bbd63bc45d8c2b69bc9c55ba89b693d8954aaa4a3b88f384941016218f0d6ab8f660ebeff13df7cd WHIRLPOOL 8c7762092bb029db0ffc00fde78ab9c96d06a99e08a37756ab8562b44e5fd49f3d927d3d846650f504d76af847dac07a7ca7f22f06ea4a973395d703da9a99b0
 MISC metadata.xml 1892 SHA256 dada89abde4af18c3a548d01c1f9e25792a2dc2008aaf9ce856a6188c302df2c SHA512 0e2dbbe0bf8625ca35cb283bd30ba4f1119fcdb00233ca7c054dd29a2dfb2cf7e6fd0e204620e83ecedf7c72784c41e843a566888bca89ceccbb29d9f009b2bc WHIRLPOOL 321eba59fbac32a001a918c37180984a15c713ca6bb83d09eab577bfa07a7ff401cfd083150f6779af8e3f6607e9be13298bd50048bec6938b0ed36cad8f1dac
diff --git a/media-libs/mesa/files/eselect-mesa.conf.8.1 b/media-libs/mesa/files/eselect-mesa.conf.8.1
new file mode 100644
index 000000000000..63a21aa4fb46
--- /dev/null
+++ b/media-libs/mesa/files/eselect-mesa.conf.8.1
@@ -0,0 +1,38 @@
+# mesa classic/gallium implementations in this release
+
+# Syntax description:
+# * MESA_IMPLEMENTATIONS contains a space-delimited list of switchable
+#   classic/gallium implementations.
+# * MESA_DRIVERS is an associative array, for each member "foo" of
+#   MESA_IMPLEMENTATIONS it contains the following elements:
+#   foo,description - Human-readable description of the driver
+#   foo,classicdriver - Filename of the classic driver
+#   foo,galliumdriver - Filename of the gallium driver
+#   foo,default - which of classic or gallium is chosen by default
+
+MESA_IMPLEMENTATIONS="i915 i965 r300 r600 sw"
+declare -A MESA_DRIVERS || die "MESA_DRIVERS already in environment and not associative."
+
+MESA_DRIVERS[i915,description]="i915 (Intel 915, 945)"
+MESA_DRIVERS[i915,classicdriver]="i915_dri.so"
+MESA_DRIVERS[i915,galliumdriver]="i915g_dri.so"
+MESA_DRIVERS[i915,default]="gallium"
+
+MESA_DRIVERS[i965,description]="i965 (Intel 965, G/Q3x, G/Q4x)"
+MESA_DRIVERS[i965,classicdriver]="i965_dri.so"
+MESA_DRIVERS[i965,default]="classic"
+
+MESA_DRIVERS[r300,description]="r300 (Radeon R300-R500)"
+MESA_DRIVERS[r300,classicdriver]="r300_dri.so"
+MESA_DRIVERS[r300,galliumdriver]="r300g_dri.so"
+MESA_DRIVERS[r300,default]="gallium"
+
+MESA_DRIVERS[r600,description]="r600 (Radeon R600-R700, Evergreen, Northern Islands)"
+MESA_DRIVERS[r600,classicdriver]="r600_dri.so"
+MESA_DRIVERS[r600,galliumdriver]="r600g_dri.so"
+MESA_DRIVERS[r600,default]="gallium"
+
+MESA_DRIVERS[sw,description]="sw (Software renderer)"
+MESA_DRIVERS[sw,classicdriver]="swrast_dri.so"
+MESA_DRIVERS[sw,galliumdriver]="swrastg_dri.so"
+MESA_DRIVERS[sw,default]="gallium"
diff --git a/media-libs/mesa/files/mesa-8.1-dont-require-llvm-for-r300.patch b/media-libs/mesa/files/mesa-8.1-dont-require-llvm-for-r300.patch
new file mode 100644
index 000000000000..9fe7e32699a3
--- /dev/null
+++ b/media-libs/mesa/files/mesa-8.1-dont-require-llvm-for-r300.patch
@@ -0,0 +1,25 @@
+--- a/configure.ac	2012-05-12 11:50:09.786970584 +0200
++++ b/configure.ac	2012-05-12 12:00:00.770582272 +0200
+@@ -1922,14 +1922,6 @@
+     fi
+ }
+ 
+-gallium_require_llvm() {
+-    if test "x$MESA_LLVM" = x0; then
+-        case "$host_cpu" in
+-        i*86|x86_64) AC_MSG_ERROR([LLVM is required to build $1 on x86 and x86_64]);;
+-        esac
+-    fi
+-}
+-
+ gallium_require_drm_loader() {
+     if test "x$enable_gallium_loader" = xyes; then
+         PKG_CHECK_MODULES([LIBUDEV], [libudev], [],
+@@ -1962,7 +1954,6 @@
+             ;;
+         xr300)
+             PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED])
+-            gallium_require_llvm "Gallium R300"
+             GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
+             gallium_check_st "radeon/drm" "dri-r300" "xorg-r300" "" "xvmc-r300" "vdpau-r300" "va-r300"
+             ;;