summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-04-04 17:02:53 +0000
committerFrancois Pons <fpons@mandriva.com>2001-04-04 17:02:53 +0000
commit20ed5cd56bb433cba4b19e41d6baea4311b79eb2 (patch)
treef2b1be43ee67feb25bdd6191ff4b0efa060a5196
parent6fe6e56dc0534f0e7a37001c5ae8631b89b2cf29 (diff)
downloaddrakx-backup-do-not-use-20ed5cd56bb433cba4b19e41d6baea4311b79eb2.tar
drakx-backup-do-not-use-20ed5cd56bb433cba4b19e41d6baea4311b79eb2.tar.gz
drakx-backup-do-not-use-20ed5cd56bb433cba4b19e41d6baea4311b79eb2.tar.bz2
drakx-backup-do-not-use-20ed5cd56bb433cba4b19e41d6baea4311b79eb2.tar.xz
drakx-backup-do-not-use-20ed5cd56bb433cba4b19e41d6baea4311b79eb2.zip
removed limitation to 24 bits for SiS card, make sure to remove 32 bits depth
for such card.
-rw-r--r--perl-install/Xconfigurator.pm3
1 files changed, 1 insertions, 2 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index a721e4129..254eb679e 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -382,7 +382,7 @@ NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.", $xf3_ver)) . "
-x "$prefix$card->{prog}" or $install && $install->($card->{use_xf4} ? 'XFree86-server' : "XFree86-$card->{server}", @l);
-x "$prefix$card->{prog}" or die "server $card->{server} is not available (should be in $prefix$card->{prog})";
- delete $card->{depth}{32} if $card->{type} =~ /S3 Trio3D/;
+ delete $card->{depth}{32} if $card->{type} =~ /S3 Trio3D|SiS/;
$card->{options}{sw_cursor} = 1 if $card->{type} =~ /S3 Trio3D|SiS 6326/;
unless ($card->{type}) {
$card->{flags}{noclockprobe} = member($card->{server}, qw(I128 S3 S3V Mach64));
@@ -619,7 +619,6 @@ sub autoDefaultDepth($$) {
my ($card, $wres_wanted) = @_;
my ($best, $depth);
- return 24 if $card->{identifier} =~ /SiS/; #- assume 24 bit even for 3D acceleration (not enabled currently).
return 16 if $card->{Utah_glx} || $card->{DRI_glx}; #- assume 16bit as most of them need 16.
for ($card->{server}) {