|
Lines 30-45
Link Here
|
| 30 |
|
30 |
|
| 31 |
|
31 |
|
| 32 |
choose_driver_folder() { |
32 |
choose_driver_folder() { |
| 33 |
BASE_NAME="${WORKDIR}/x$(get_version_component_range 1 ${X11_IMPLEM_V})" |
33 |
if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 7 ] |
| 34 |
|
|
|
| 35 |
# Determine if we are facing X.org 6.8.99 aka 6.9 |
| 36 |
if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 6 ] && |
| 37 |
[ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 8 ] && |
| 38 |
[ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ] |
| 39 |
then |
34 |
then |
| 40 |
BASE_NAME="${BASE_NAME}90" |
35 |
BASE_NAME="${WORKDIR}/x690" |
| 41 |
else |
36 |
else |
| 42 |
BASE_NAME="${BASE_NAME}$(get_version_component_range 2 ${X11_IMPLEM_V})0" |
37 |
BASE_NAME="${WORKDIR}/x$(get_version_component_range 1 ${X11_IMPLEM_V})" |
|
|
38 |
|
| 39 |
# Determine if we are facing X.org 6.8.99 aka 6.9 |
| 40 |
if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 6 ] && |
| 41 |
[ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 8 ] && |
| 42 |
[ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ] |
| 43 |
then |
| 44 |
BASE_NAME="${BASE_NAME}90" |
| 45 |
else |
| 46 |
BASE_NAME="${BASE_NAME}$(get_version_component_range 2 ${X11_IMPLEM_V})0" |
| 47 |
fi |
| 43 |
fi |
48 |
fi |
| 44 |
|
49 |
|
| 45 |
if use amd64 ; then |
50 |
if use amd64 ; then |
|
Lines 207-213
Link Here
|
| 207 |
|
212 |
|
| 208 |
src_install-libs() { |
213 |
src_install-libs() { |
| 209 |
local pkglibdir=lib |
214 |
local pkglibdir=lib |
| 210 |
local inslibdir=$(get_libdir) |
215 |
local inslibdir=$(get_libdir)/xorg |
| 211 |
|
216 |
|
| 212 |
if [ ${#} -eq 2 ]; then |
217 |
if [ ${#} -eq 2 ]; then |
| 213 |
pkglibdir=${1} |
218 |
pkglibdir=${1} |
|
Lines 218-224
Link Here
|
| 218 |
|
223 |
|
| 219 |
einfo "${pkglibdir} -> ${inslibdir}" |
224 |
einfo "${pkglibdir} -> ${inslibdir}" |
| 220 |
|
225 |
|
| 221 |
local ATI_ROOT="/usr/${inslibdir}/opengl/ati" |
226 |
local ATI_ROOT="/usr/$(get_libdir)/opengl/ati" |
| 222 |
|
227 |
|
| 223 |
# The GLX libraries |
228 |
# The GLX libraries |
| 224 |
exeinto ${ATI_ROOT}/lib |
229 |
exeinto ${ATI_ROOT}/lib |
|
Lines 234-240
Link Here
|
| 234 |
#Workaround |
239 |
#Workaround |
| 235 |
if use opengl ; then |
240 |
if use opengl ; then |
| 236 |
sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \ |
241 |
sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \ |
| 237 |
/usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \ |
242 |
/usr/$(get_libdir)/opengl/${X11_IMPLEM}/lib/libGL.la \ |
| 238 |
> $D/${ATI_ROOT}/lib/libGL.la |
243 |
> $D/${ATI_ROOT}/lib/libGL.la |
| 239 |
dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include |
244 |
dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include |
| 240 |
fi |
245 |
fi |
