diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | lib/Xconfig/proprietary.pm | 2 | ||||
| -rw-r--r-- | lib/Xconfig/various.pm | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -1,5 +1,6 @@ - XFdrake: o ensure we don't drop non-main "Device" (when modifying "Options" (#41410) + o use nvidia-current default settings for nvidia173 as well Version 0.58 - 9 June 2008 diff --git a/lib/Xconfig/proprietary.pm b/lib/Xconfig/proprietary.pm index e31b7ea..ab89520 100644 --- a/lib/Xconfig/proprietary.pm +++ b/lib/Xconfig/proprietary.pm @@ -95,7 +95,7 @@ sub may_use_Driver2 { log::explanations("Using specific NVIDIA driver and GLX extensions"); $card2->{DRI_GLX_SPECIAL} = 1; - $card2->{Options}{IgnoreEDID} = 1 if $card2->{DriverVersion} ne '-current'; + $card2->{Options}{IgnoreEDID} = 1 if member($card2->{DriverVersion}, qw(71xx 96xx)); $card2; } elsif ($card2->{Driver} eq 'fglrx') { $check_drv->('fglrx_drv', "fglrx$card2->{DriverVersion}") or return; diff --git a/lib/Xconfig/various.pm b/lib/Xconfig/various.pm index d6aff9d..feaa772 100644 --- a/lib/Xconfig/various.pm +++ b/lib/Xconfig/various.pm @@ -50,7 +50,7 @@ sub default { isLaptop => $isLaptop, xdm => 1, Composite => !($card->{Driver} eq 'fglrx' || $card->{Driver} eq 'nvidia' && $card->{DriverVersion} eq '71xx'), - if_($card->{Driver} eq 'nvidia', RenderAccel => $card->{DriverVersion} eq '-current', + if_($card->{Driver} eq 'nvidia', RenderAccel => !member($card->{DriverVersion}, qw(71xx 96xx)), Clone => 0, ForceModeDVI => 0), if_($card->{Driver} eq 'savage', HWCursor => 1), if_($card->{Driver} eq 'intel' && $isLaptop, Clone => 0), |