summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfig/card.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-02-09 13:47:28 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-02-09 13:47:28 +0000
commitb4856f76e4a7c3fde5207387e353ef79c2405c15 (patch)
tree8d2b07f77bda56a75bf7d80ae04ffdb4fdf9b164 /perl-install/Xconfig/card.pm
parent5e3315447547e298ae3efd5324cb48eefb5a8b32 (diff)
downloaddrakx-b4856f76e4a7c3fde5207387e353ef79c2405c15.tar
drakx-b4856f76e4a7c3fde5207387e353ef79c2405c15.tar.gz
drakx-b4856f76e4a7c3fde5207387e353ef79c2405c15.tar.bz2
drakx-b4856f76e4a7c3fde5207387e353ef79c2405c15.tar.xz
drakx-b4856f76e4a7c3fde5207387e353ef79c2405c15.zip
handle allowNVIDIA_rpms & allowATI_rpms directly in Xconfig::card::install_server
Diffstat (limited to 'perl-install/Xconfig/card.pm')
-rw-r--r--perl-install/Xconfig/card.pm15
1 files changed, 9 insertions, 6 deletions
diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm
index 0d5ada42f..f7fbc2218 100644
--- a/perl-install/Xconfig/card.pm
+++ b/perl-install/Xconfig/card.pm
@@ -326,7 +326,7 @@ sub configure {
}
sub install_server {
- my ($card, $options, $do_pkgs) = @_;
+ my ($card, $_options, $do_pkgs) = @_;
my $prog = server_binary($card);
@@ -343,11 +343,14 @@ sub install_server {
if ($card->{use_UTAH_GLX}) {
push @packages, 'Mesa';
}
- #- 3D acceleration configuration for XFree 4
- #- using NVIDIA driver (TNT, TN2 and GeForce cards only).
- push @packages, @{$options->{allowNVIDIA_rpms}} if $card->{Driver2} eq 'nvidia' && $options->{allowNVIDIA_rpms}->();
- #- using ATI fglrx driver (Radeon, Fire GL cards only).
- push @packages, @{$options->{allowATI_rpms}} if $card->{Driver2} eq 'fglrx' && $options->{allowATI_rpms}->();
+
+ my %proprietary_Driver2 = (
+ nvidia => [ 'NVIDIA_kernel', 'NVIDIA_GLX' ], #- using NVIDIA driver (TNT, TN2 and GeForce cards only).
+ fglrx => [ 'ATI_kernel', 'ATI_GLX' ], #- using ATI fglrx driver (Radeon, Fire GL cards only).
+ );
+ if (my $rpms_needed = $proprietary_Driver2{$card->{Driver2}}) {
+ push @packages, $do_pkgs->check_kernel_module_packages($rpms_needed->[0], $rpms_needed->[1]);
+ }
$do_pkgs->install(@packages) if @packages;
-x "$::prefix$prog" or die "server $card->{server} is not available (should be in $::prefix$prog)";