Lines 9-18
Link Here
|
9 |
EBUILD_VERSION="0.0.10" |
9 |
EBUILD_VERSION="0.0.10" |
10 |
|
10 |
|
11 |
MESA_CONF_DIR="${EROOT}/usr/share/mesa" |
11 |
MESA_CONF_DIR="${EROOT}/usr/share/mesa" |
12 |
MESA_DIR_64="${EROOT}/usr/lib/mesa" |
12 |
if [[ -L /usr/lib ]]; then |
13 |
DRI_DIR_64="${EROOT}/usr/lib/dri" |
13 |
MESA_DIR_64="${EROOT}/usr/lib/mesa" |
14 |
MESA_DIR_32="${EROOT}/usr/lib32/mesa" |
14 |
DRI_DIR_64="${EROOT}/usr/lib/dri" |
15 |
DRI_DIR_32="${EROOT}/usr/lib32/dri" |
15 |
MESA_DIR_32="${EROOT}/usr/lib32/mesa" |
|
|
16 |
DRI_DIR_32="${EROOT}/usr/lib32/dri" |
17 |
else |
18 |
MESA_DIR_64="${EROOT}/usr/lib64/mesa" |
19 |
DRI_DIR_64="${EROOT}/usr/lib64/dri" |
20 |
MESA_DIR_32="${EROOT}/usr/lib/mesa" |
21 |
DRI_DIR_32="${EROOT}/usr/lib/dri" |
22 |
MESA_DIR_X32="${EROOT}/usr/libx32/mesa" |
23 |
DRI_DIR_X32="${EROOT}/usr/libx32/dri" |
24 |
fi |
16 |
|
25 |
|
17 |
# receives a filename of the driver as argument, outputs the architecture (classic or gallium) |
26 |
# receives a filename of the driver as argument, outputs the architecture (classic or gallium) |
18 |
drivername_to_architecture() { |
27 |
drivername_to_architecture() { |
Lines 98-106
Link Here
|
98 |
|
107 |
|
99 |
do_show() { |
108 |
do_show() { |
100 |
source "${MESA_CONF_DIR}"/eselect-mesa.conf || die "Failed to source config" |
109 |
source "${MESA_CONF_DIR}"/eselect-mesa.conf || die "Failed to source config" |
101 |
if [[ -d "${MESA_DIR_32}" && -d "${DRI_DIR_32}" ]]; then |
110 |
if [[ -d "${MESA_DIR_32}" && -d "${DRI_DIR_32}" ]] || |
|
|
111 |
[[ -d "${MESA_DIR_X32}" && -d "${DRI_DIR_X32}" ]]; then |
102 |
MESA_DIR=${MESA_DIR_64} DRI_DIR=${DRI_DIR_64} multiarch="64bit " doshow_helper |
112 |
MESA_DIR=${MESA_DIR_64} DRI_DIR=${DRI_DIR_64} multiarch="64bit " doshow_helper |
103 |
MESA_DIR=${MESA_DIR_32} DRI_DIR=${DRI_DIR_32} multiarch="32bit " doshow_helper |
113 |
MESA_DIR=${MESA_DIR_32} DRI_DIR=${DRI_DIR_32} multiarch="32bit " doshow_helper |
|
|
114 |
MESA_DIR=${MESA_DIR_X32} DRI_DIR=${DRI_DIR_X32} multiarch="x32 " doshow_helper |
104 |
else |
115 |
else |
105 |
MESA_DIR=${MESA_DIR_64} DRI_DIR=${DRI_DIR_64} doshow_helper |
116 |
MESA_DIR=${MESA_DIR_64} DRI_DIR=${DRI_DIR_64} doshow_helper |
106 |
fi |
117 |
fi |
Lines 130-138
Link Here
|
130 |
|
141 |
|
131 |
do_list() { |
142 |
do_list() { |
132 |
source "${MESA_CONF_DIR}"/eselect-mesa.conf || die "Failed to source config" |
143 |
source "${MESA_CONF_DIR}"/eselect-mesa.conf || die "Failed to source config" |
133 |
if [[ -d "${MESA_DIR_32}" && -d "${DRI_DIR_32}" ]]; then |
144 |
if [[ -d "${MESA_DIR_32}" && -d "${DRI_DIR_32}" ]] || \ |
|
|
145 |
[[ -d "${MESA_DIR_X32}" && -d "${DRI_DIR_X32}" ]]; then |
134 |
MESA_DIR=${MESA_DIR_64} DRI_DIR=${DRI_DIR_64} multiarch="64bit " dolist_helper |
146 |
MESA_DIR=${MESA_DIR_64} DRI_DIR=${DRI_DIR_64} multiarch="64bit " dolist_helper |
135 |
MESA_DIR=${MESA_DIR_32} DRI_DIR=${DRI_DIR_32} multiarch="32bit " dolist_helper |
147 |
MESA_DIR=${MESA_DIR_32} DRI_DIR=${DRI_DIR_32} multiarch="32bit " dolist_helper |
|
|
148 |
MESA_DIR=${MESA_DIR_X32} DRI_DIR=${DRI_DIR_X32} multiarch="x32 " dolist_helper |
136 |
else |
149 |
else |
137 |
MESA_DIR=${MESA_DIR_64} DRI_DIR=${DRI_DIR_64} dolist_helper |
150 |
MESA_DIR=${MESA_DIR_64} DRI_DIR=${DRI_DIR_64} dolist_helper |
138 |
fi |
151 |
fi |
Lines 144-154
Link Here
|
144 |
} |
157 |
} |
145 |
|
158 |
|
146 |
describe_set_parameters() { |
159 |
describe_set_parameters() { |
147 |
echo "[32bit|64bit] [--auto|<family> <architecture>]" |
160 |
echo "[32bit|64bit|x32] [--auto|<family> <architecture>]" |
148 |
} |
161 |
} |
149 |
|
162 |
|
150 |
describe_set_options() { |
163 |
describe_set_options() { |
151 |
echo "32bit, 64bit : (optional) Apply changes to 32 bit or 64 bit multilib only" |
164 |
echo "32bit, 64bit, x32 : (optional) Apply changes to 32 bit or 64 bit multilib only" |
152 |
echo "--auto : Sets all drivers which are not already set" |
165 |
echo "--auto : Sets all drivers which are not already set" |
153 |
echo "<family> : The chipset family, or sw for software renderer" |
166 |
echo "<family> : The chipset family, or sw for software renderer" |
154 |
echo "<architecture> : The driver architecture" |
167 |
echo "<architecture> : The driver architecture" |
Lines 210-215
Link Here
|
210 |
else |
223 |
else |
211 |
write_warning_msg "The 32bit parameter is intended for multilib systems only" |
224 |
write_warning_msg "The 32bit parameter is intended for multilib systems only" |
212 |
fi |
225 |
fi |
|
|
226 |
elif [[ $1 == "x32" ]]; then |
227 |
if [[ -d "${MESA_DIR_X32}" && -d "${DRI_DIR_X32}" ]]; then |
228 |
MESA_DIR=${MESA_DIR_X32} DRI_DIR=${DRI_DIR_X32} multiarch="$1 " doset_helper $2 $3 |
229 |
else |
230 |
write_warning_msg "The 32bit/x32 parameter is intended for multilib systems only" |
231 |
fi |
213 |
else |
232 |
else |
214 |
if [[ -d "${MESA_DIR_32}" && -d "${DRI_DIR_32}" ]]; then |
233 |
if [[ -d "${MESA_DIR_32}" && -d "${DRI_DIR_32}" ]]; then |
215 |
MESA_DIR=${MESA_DIR_64} DRI_DIR=${DRI_DIR_64} multiarch="64bit " doset_helper $1 $2 |
234 |
MESA_DIR=${MESA_DIR_64} DRI_DIR=${DRI_DIR_64} multiarch="64bit " doset_helper $1 $2 |