/[soft]/drakx-kbd-mouse-x11/trunk/lib/Xconfig/proprietary.pm
ViewVC logotype

Diff of /drakx-kbd-mouse-x11/trunk/lib/Xconfig/proprietary.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3925 by anssi, Thu Apr 5 02:49:52 2012 UTC revision 3926 by anssi, Thu Apr 5 02:49:56 2012 UTC
# Line 48  sub handle_DRIVER2_NO_SSE { Line 48  sub handle_DRIVER2_NO_SSE {
48  }  }
49    
50  sub handle_FIRMWARE {  sub handle_FIRMWARE {
51      my ($do_pkgs, $card) = @_;      my ($do_pkgs, $card, $o_in) = @_;
52    
53      my $pkg = $card->{FIRMWARE} or return;      my $pkg = $card->{FIRMWARE} or return;
54    
55      $do_pkgs->is_installed($pkg) || $do_pkgs->install($pkg) and return;      $do_pkgs->is_installed($pkg) || ($do_pkgs->is_available($pkg) && $do_pkgs->install($pkg)) and return;
56    
57      if ($card->{DRIVER_NO_FIRMWARE}) {      if ($card->{DRIVER_NO_FIRMWARE}) {
58          log::l("$card->{Driver} need a firmware to work, switching back to $card->{DRIVER_NO_FIRMWARE}");          log::l("$card->{Driver} need a firmware to work, switching back to $card->{DRIVER_NO_FIRMWARE}");
59    
60            # do not show warning if the user selected the proprietary driver
61            !$card->{Driver2} and $o_in and $o_in->ask_warn('', N("The free '%s' driver for your graphics card requires a proprietary firmware package '%s' to be installed, but it was not available on the enabled media.\n\nThe basic non-accelerated '%s' driver will be configured instead.\n\nTo enable full graphics support later, enable the 'nonfree' repository section at \"Install and remove software\" and reconfigure the graphics driver by going to \"Set up the graphical server\" at Mageia Control Center and re-selecting your graphics card.", $card->{Driver}, $card->{FIRMWARE}, $card->{DRIVER_NO_FIRMWARE}));
62    
63          $card->{Driver} = $card->{DRIVER_NO_FIRMWARE};          $card->{Driver} = $card->{DRIVER_NO_FIRMWARE};
64    
65      } else {      } else {
66          log::l("$card->{Driver} needs a firmware to work smoothly/better (eg: 3D, KMS) but will still work");          log::l("$card->{Driver} needs a firmware to work smoothly/better (eg: 3D, KMS) but will still work");
67    
68            # do not show warning if the user selected the proprietary driver
69            !$card->{Driver2} and $o_in and $o_in->ask_warn('', N("The free '%s' driver for your graphics card requires a proprietary firmware package '%s' to be installed in order for all features (including 3D acceleration) to work properly, but that package was not available in the enabled media.\n\nTo enable all graphics card features later, enable the 'nonfree' repository section at \"Install and remove software\" and install the firmware package manually or reconfigure your graphics card.", $card->{Driver}, $card->{FIRMWARE}));
70      }      }
71  }  }
72    

Legend:
Removed from v.3925  
changed lines
  Added in v.3926

  ViewVC Help
Powered by ViewVC 1.1.26