diff options
| author | Frederic Lepied <flepied@mandriva.com> | 2000-08-31 08:01:46 +0000 |
|---|---|---|
| committer | Frederic Lepied <flepied@mandriva.com> | 2000-08-31 08:01:46 +0000 |
| commit | f4799c62971aa4a4a938d9eb854881b2a11a5746 (patch) | |
| tree | f80fba354db56ea70baeec6bcce5e349fcfa2283 | |
| parent | 8d33ee6f70f9f4333c49c724c120a056e36e2bb7 (diff) | |
| download | drakx-backup-do-not-use-f4799c62971aa4a4a938d9eb854881b2a11a5746.tar drakx-backup-do-not-use-f4799c62971aa4a4a938d9eb854881b2a11a5746.tar.gz drakx-backup-do-not-use-f4799c62971aa4a4a938d9eb854881b2a11a5746.tar.bz2 drakx-backup-do-not-use-f4799c62971aa4a4a938d9eb854881b2a11a5746.tar.xz drakx-backup-do-not-use-f4799c62971aa4a4a938d9eb854881b2a11a5746.zip | |
no_comment
| -rw-r--r-- | perl-install/ChangeLog | 5 | ||||
| -rw-r--r-- | perl-install/Xconfigurator.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 9dfabdf9e..89c120a19 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,6 +1,11 @@ 2000-08-31 Frederic Lepied <flepied@mandrakesoft.com> + * install_any.pm (setPackages): install the right glide module + according to the Voodoo card detected. + * Xconfigurator.pm (write_XF86Config): ZAxisMapping for XF 4. + (autoDefaultDepth): default depth to 16 for Voodoo cards except + for Voodo5 ones. 2000-08-29 dam's <damien@mandrakesoft.com> diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 87d9a9ce1..4ca5ee20d 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -475,6 +475,8 @@ sub autoDefaultDepth($$) { return 24 if $card->{identifier} =~ /SiS/; + return 16 if $card->{type} =~ /Voodoo/ && ! ($card->{type} =~ /Voodoo5/); + for ($card->{server}) { /FBDev/ and return 16; #- this should work by default, FBDev is allowed only if install currently uses it at 16bpp. /Sun24/ and return 24; diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 12a23ee08..38434cb91 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -297,7 +297,9 @@ sub setPackages($) { my @l = (); push @l, "kapm", "kcmlaptop" if $o->{pcmcia}; - push @l, "Device3Dfx", "Glide_V3", "XFree86-glide-module" if detect_devices::matching_desc('Voodoo'); + push @l, "Device3Dfx", "XFree86-glide-module" if detect_devices::matching_desc('Voodoo'); + push @l, "Glide_V5" if detect_devices::matching_desc('Voodoo 5'); + push @l, "Glide_V3-DRI" if detect_devices::matching_desc('Voodoo 3'); require timezone; require lang; push @l, "isdn4k-utils" if ($o->{timezone}{timezone} || timezone::bestTimezone(lang::lang2text($o->{lang}))) =~ /Europe/; |