summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mandriva.org>2007-09-15 17:04:05 +0000
committerAnssi Hannula <anssi@mandriva.org>2007-09-15 17:04:05 +0000
commitcd0f7ae068298ea69ab4543fd7d0a2d5fdc8ff66 (patch)
treee403857ffa2699c188a96f4815b4f2de5aad0e3e /lib
parent669be7fc67198dc9b3cda97bf16a811849dd566a (diff)
downloaddrakx-kbd-mouse-x11-cd0f7ae068298ea69ab4543fd7d0a2d5fdc8ff66.tar
drakx-kbd-mouse-x11-cd0f7ae068298ea69ab4543fd7d0a2d5fdc8ff66.tar.gz
drakx-kbd-mouse-x11-cd0f7ae068298ea69ab4543fd7d0a2d5fdc8ff66.tar.bz2
drakx-kbd-mouse-x11-cd0f7ae068298ea69ab4543fd7d0a2d5fdc8ff66.tar.xz
drakx-kbd-mouse-x11-cd0f7ae068298ea69ab4543fd7d0a2d5fdc8ff66.zip
Handle the new fglrx-hd2000 alternative driver.
Diffstat (limited to 'lib')
-rw-r--r--lib/Xconfig/card.pm2
-rw-r--r--lib/Xconfig/proprietary.pm9
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/Xconfig/card.pm b/lib/Xconfig/card.pm
index d2f789b..97b2abd 100644
--- a/lib/Xconfig/card.pm
+++ b/lib/Xconfig/card.pm
@@ -343,7 +343,7 @@ sub libgl_config_and_more {
#- ensure old deprecated conf files are not there anymore
unlink("/etc/ld.so.conf.d/$_.conf") foreach 'nvidia', 'nvidia_legacy', 'ati';
- my $wanted = $card->{Driver} eq 'fglrx' ? "/etc/ld.so.conf.d/GL/ati.conf" :
+ my $wanted = $card->{Driver} eq 'fglrx' ? "/etc/ld.so.conf.d/GL/ati$card->{DriverVersion}.conf" :
$card->{Driver} eq 'nvidia' ? "/etc/nvidia$card->{DriverVersion}/ld.so.conf" :
'/etc/ld.so.conf.d/GL/standard.conf';
my $link = "$::prefix/etc/alternatives/gl_conf";
diff --git a/lib/Xconfig/proprietary.pm b/lib/Xconfig/proprietary.pm
index 217b4cc..aace9fe 100644
--- a/lib/Xconfig/proprietary.pm
+++ b/lib/Xconfig/proprietary.pm
@@ -36,7 +36,7 @@ sub install_matrox_hal {
sub pkgs_for_Driver2 {
my ($Driver2, $do_pkgs) = @_;
- my ($pkg, $base_name) = ($Driver2 eq 'fglrx' || $Driver2 =~ /^nvidia/) ?
+ my ($pkg, $base_name) = ($Driver2 =~ /^fglrx/ || $Driver2 =~ /^nvidia/) ?
("x11-driver-video-$Driver2", $Driver2) : () or return;
$do_pkgs->is_available($pkg) or log::l("proprietary package $pkg not available"), return;
@@ -68,6 +68,8 @@ sub may_use_Driver2 {
%$card,
$card->{Driver2} =~ /^nvidia(.*)/ ?
(Driver => 'nvidia', DriverVersion => $1) :
+ $card->{Driver2} =~ /^fglrx(.*)/ ?
+ (Driver => 'fglrx', DriverVersion => $1) :
(Driver => $card->{Driver2}),
};
@@ -82,8 +84,9 @@ sub may_use_Driver2 {
$card2->{Options}{IgnoreEDID} = 1 if $card2->{DriverVersion} ne '-current';
$card2;
} elsif ($card2->{Driver} eq 'fglrx') {
- $check_drv->('fglrx_drv') or return;
- -e "$::prefix$modules_dir/dri/fglrx_dri.so" || -e "$::prefix/usr/$lib/dri/fglrx_dri.so" or
+ $check_drv->('fglrx_drv', "fglrx$card2->{DriverVersion}") or return;
+ $card2->{DriverVersion} eq '-hd2000' || -e "$::prefix$modules_dir/dri/fglrx_dri.so"
+ || -e "$::prefix/usr/$lib/dri/fglrx_dri.so" or
log::l("proprietary fglrx_dri.so missing"), return;
log::explanations("Using specific ATI fglrx and DRI drivers");