summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-04-25 17:26:53 +0000
committerFrancois Pons <fpons@mandriva.com>2001-04-25 17:26:53 +0000
commitda10c27cd2d85c45293eff0717cff2384bc87efb (patch)
treeba68402332e36310d8616a7a60057fc7c36824ee
parent231e05ca33f33d3f8dfa1c0739a4c80ffc675138 (diff)
downloaddrakx-da10c27cd2d85c45293eff0717cff2384bc87efb.tar
drakx-da10c27cd2d85c45293eff0717cff2384bc87efb.tar.gz
drakx-da10c27cd2d85c45293eff0717cff2384bc87efb.tar.bz2
drakx-da10c27cd2d85c45293eff0717cff2384bc87efb.tar.xz
drakx-da10c27cd2d85c45293eff0717cff2384bc87efb.zip
updated NVIDIA cards detection.
-rw-r--r--perl-install/Xconfigurator.pm8
1 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 1ca9fe7d7..fdcec95fb 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -284,8 +284,12 @@ What do you want to do?"), sub { translate($_[0]{text}) }, \@choices) or return;
$card->{identifier} =~ /SiS.*630/ ||
$card->{identifier} =~ /Radeon /); #- 16bits preferable ?
#- 3D acceleration configuration for XFree 4.0 using NVIDIA driver (TNT, TN2 and GeForce cards only).
- $card->{NVIDIA_glx} = $cardOptions->{allowNVIDIA_rpms} && ($card->{type} =~ /RIVA TNT/ ||
- $card->{type} =~ /GeForce/);
+ $card->{NVIDIA_glx} = $cardOptions->{allowNVIDIA_rpms} && ($card->{identifier} =~ /[nN]Vidia.*T[nN]T2/ || #- TNT2 cards
+ $card->{identifier} =~ /[nN]Vidia.*NV[56]/ ||
+ $card->{identifier} =~ /[nN]Vidia.*Vanta/ ||
+ $card->{identifier} =~ /[nN]Vidia.*GeForce/ || #- GeForce cards
+ $card->{identifier} =~ /[nN]Vidia.*NV1[15]/ ||
+ $card->{identifier} =~ /[nN]Vidia.*Quadro/);
#- check to use XFree 4.0 or XFree 3.3.
$card->{use_xf4} = $card->{driver} && !$card->{flags}{unsupported};