| 1 |
Author: chithanh |
| 2 |
Date: 2010-10-31 21:49:04 +0000 (Sun, 31 Oct 2010) |
| 3 |
New Revision: 777 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/extern/ChangeLog |
| 7 |
trunk/extern/modules/mesa.eselect |
| 8 |
Log: |
| 9 |
mesa.eselect: update for new media-libs/mesa ebuild |
| 10 |
|
| 11 |
Modified: trunk/extern/ChangeLog |
| 12 |
=================================================================== |
| 13 |
--- trunk/extern/ChangeLog 2010-08-30 08:01:43 UTC (rev 776) |
| 14 |
+++ trunk/extern/ChangeLog 2010-10-31 21:49:04 UTC (rev 777) |
| 15 |
@@ -1,3 +1,7 @@ |
| 16 |
+2010-10-31 Chí-Thanh Christopher Nguyễn <chithanh@g.o> |
| 17 |
+ |
| 18 |
+ * modules/mesa.eselect: Update for new media-libs/mesa ebuild |
| 19 |
+ |
| 20 |
2010-02-26 Ulrich Mueller <ulm@g.o> |
| 21 |
|
| 22 |
* modules/vi.eselect (set_symlinks): Fix handling of ROOT in |
| 23 |
|
| 24 |
Modified: trunk/extern/modules/mesa.eselect |
| 25 |
=================================================================== |
| 26 |
--- trunk/extern/modules/mesa.eselect 2010-08-30 08:01:43 UTC (rev 776) |
| 27 |
+++ trunk/extern/modules/mesa.eselect 2010-10-31 21:49:04 UTC (rev 777) |
| 28 |
@@ -6,35 +6,14 @@ |
| 29 |
MAINTAINER="x11@g.o" |
| 30 |
SVN_DATE='$Date: $' |
| 31 |
VERSION=$(svn_date_to_version "${SVN_DATE}" ) |
| 32 |
-EBUILD_VERSION="0.0.5" |
| 33 |
+EBUILD_VERSION="0.0.7" |
| 34 |
|
| 35 |
-# Known mesa classic/gallium implementations |
| 36 |
-MESA_IMPLEMENTATIONS="i915 i965 r300 r600 sw" |
| 37 |
-declare -A MESA_DRIVERS || die "MESA_DRIVERS already in environment and not associative." |
| 38 |
- |
| 39 |
-MESA_DRIVERS[i915,description]="i915 (Intel 915, 945)" |
| 40 |
-MESA_DRIVERS[i915,classicdriver]="i915_dri.so" |
| 41 |
-MESA_DRIVERS[i915,galliumdriver]="i915g_dri.so" |
| 42 |
- |
| 43 |
-MESA_DRIVERS[i965,description]="i965 (Intel 965, G/Q3x, G/Q4x)" |
| 44 |
-MESA_DRIVERS[i965,classicdriver]="i965_dri.so" |
| 45 |
-MESA_DRIVERS[i965,galliumdriver]="i965g_dri.so" |
| 46 |
- |
| 47 |
-MESA_DRIVERS[r300,description]="r300 (Radeon R300-R500)" |
| 48 |
-MESA_DRIVERS[r300,classicdriver]="r300_dri.so" |
| 49 |
-MESA_DRIVERS[r300,galliumdriver]="r300g_dri.so" |
| 50 |
- |
| 51 |
-MESA_DRIVERS[r600,description]="r600 (Radeon R600-R700)" |
| 52 |
-MESA_DRIVERS[r600,classicdriver]="r600_dri.so" |
| 53 |
-MESA_DRIVERS[r600,galliumdriver]="r600g_dri.so" |
| 54 |
- |
| 55 |
-MESA_DRIVERS[sw,description]="sw (Software renderer)" |
| 56 |
-MESA_DRIVERS[sw,classicdriver]="swrast_dri.so" |
| 57 |
-MESA_DRIVERS[sw,galliumdriver]="swrastg_dri.so" |
| 58 |
- |
| 59 |
+CONFIG_DIR="${EROOT}/usr/share/mesa" |
| 60 |
MESA_DIR="${EROOT}/usr/lib/mesa" |
| 61 |
DRI_DIR="${EROOT}/usr/lib/dri" |
| 62 |
|
| 63 |
+source "${CONFIG_DIR}"/eselect-mesa.conf || die "Failed to source config" |
| 64 |
+ |
| 65 |
# receives a filename of the driver as argument, outputs the architecture (classic or gallium) |
| 66 |
drivername_to_architecture() { |
| 67 |
local drivername=$1 |
| 68 |
@@ -153,6 +132,10 @@ |
| 69 |
local x |
| 70 |
for x in ${MESA_IMPLEMENTATIONS}; do |
| 71 |
local y=( $(get_implementations ${x}) ) |
| 72 |
+ # prefer default implementation |
| 73 |
+ if [[ ${y[1]} == ${MESA_DRIVERS[${x},default]} ]]; then |
| 74 |
+ y=${y[1]} |
| 75 |
+ fi |
| 76 |
if [[ -n ${y} && ! -n $(get_current_implementation ${x}) ]]; then |
| 77 |
do_set ${x} ${y} |
| 78 |
fi |
Archives