diff options
| author | Anssi Hannula <anssi@mageia.org> | 2012-04-05 02:49:52 +0000 |
|---|---|---|
| committer | Anssi Hannula <anssi@mageia.org> | 2012-04-05 02:49:52 +0000 |
| commit | fabeb39b5ef13fd2d4796cc5072b009295c2d430 (patch) | |
| tree | 68368a3471c2d57b585d076207ab66bca6a2ecfc /lib/Xconfig/card.pm | |
| parent | ae005c070f2232f77d5ae70f9b1c5160a855b75f (diff) | |
| download | drakx-kbd-mouse-x11-fabeb39b5ef13fd2d4796cc5072b009295c2d430.tar drakx-kbd-mouse-x11-fabeb39b5ef13fd2d4796cc5072b009295c2d430.tar.gz drakx-kbd-mouse-x11-fabeb39b5ef13fd2d4796cc5072b009295c2d430.tar.bz2 drakx-kbd-mouse-x11-fabeb39b5ef13fd2d4796cc5072b009295c2d430.tar.xz drakx-kbd-mouse-x11-fabeb39b5ef13fd2d4796cc5072b009295c2d430.zip | |
Fix firmware handling (it is DRIVER which needs it, not DRIVER2)
Diffstat (limited to 'lib/Xconfig/card.pm')
| -rw-r--r-- | lib/Xconfig/card.pm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/Xconfig/card.pm b/lib/Xconfig/card.pm index 0eab464..1a533d1 100644 --- a/lib/Xconfig/card.pm +++ b/lib/Xconfig/card.pm @@ -311,7 +311,6 @@ sub install_server { my ($card, $options, $do_pkgs, $o_in) = @_; my @packages; - my @must_have = "x11-driver-video-$card->{Driver}"; if ($options->{freedriver}) { delete $card->{Driver2}; @@ -320,7 +319,6 @@ sub install_server { if ($card->{Driver2}) { require Xconfig::proprietary; Xconfig::proprietary::handle_DRIVER2_NO_SSE($card); - Xconfig::proprietary::handle_FIRMWARE($do_pkgs, $card); my @pkgs = Xconfig::proprietary::pkgs_for_Driver2($card->{Driver2}, $do_pkgs); if (@pkgs && (!$o_in || $o_in->ask_yesorno('', formatAlaTeX(N("There is a proprietary driver available for your video card which may support additional features. Do you wish to use it?")), 1))) { @@ -330,6 +328,11 @@ Do you wish to use it?")), 1))) { } } + Xconfig::proprietary::handle_FIRMWARE($do_pkgs, $card); + + # handle_FIRMWARE could've changed $card->{Driver} + my @must_have = "x11-driver-video-$card->{Driver}"; + $do_pkgs->ensure_are_installed([ @must_have, @packages ], 1) or @must_have == listlength($do_pkgs->are_installed(@must_have)) or return; @@ -496,10 +499,10 @@ sub readCardsDB { LINE => sub { $val =~ s/^\s*//; $card->{raw_LINES} .= "$val\n" }, CHIPSET => sub { $card->{Chipset} = $val }, DRIVER => sub { $card->{Driver} = $val }, + DRIVER_NO_FIRMWARE => sub { $card->{DRIVER_NO_FIRMWARE} = $val }, DRIVER2 => sub { $card->{Driver2} = $val }, DRIVER2_NEEDS_SSE => sub { $card->{DRIVER2_NEEDS_SSE} = 1 }, DRIVER2_NO_SSE => sub { $card->{DRIVER2_NO_SSE} = $val }, - DRIVER2_NO_FIRMWARE => sub { $card->{DRIVER2_NO_FIRMWARE} = $val }, FIRMWARE => sub { $card->{FIRMWARE} = $val }, NEEDVIDEORAM => sub { $card->{needVideoRam} = 1 }, DRI_GLX => sub { $card->{DRI_GLX} = 1 if $card->{Driver} }, |