diff options
author | Mageia SVN-Git Migration <svn-git-migration@mageia.org> | 2011-02-03 13:54:58 +0000 |
---|---|---|
committer | Mageia SVN-Git Migration <svn-git-migration@mageia.org> | 2011-02-03 13:54:58 +0000 |
commit | f77c8e8447276f649dba448cb87fd6f53fe1637e (patch) | |
tree | d2d74914d44845e6d97186aba5bda92ff65f66a9 /lib/Xconfig/proprietary.pm | |
parent | 0e92a8c2aa253c877c6efba914ab8698ac8356d1 (diff) | |
download | drakx-kbd-mouse-x11-f77c8e8447276f649dba448cb87fd6f53fe1637e.tar drakx-kbd-mouse-x11-f77c8e8447276f649dba448cb87fd6f53fe1637e.tar.gz drakx-kbd-mouse-x11-f77c8e8447276f649dba448cb87fd6f53fe1637e.tar.bz2 drakx-kbd-mouse-x11-f77c8e8447276f649dba448cb87fd6f53fe1637e.tar.xz drakx-kbd-mouse-x11-f77c8e8447276f649dba448cb87fd6f53fe1637e.zip |
Synthesized commit during git-svn import combining previous Mandriva history with Magiea.
This commit consitsts of the following subversion commits:
------------------------------------------------------------------------
r391 | dmorgan | 2011-02-03 13:54:58 +0000 (Thu, 03 Feb 2011) | 1 line
Import cleaned drakx-kbd-mouse-x11
------------------------------------------------------------------------
In addition to the above commits, the following cleaning work has been recorded:
- License is GPLv2
- Problematic files:
o lib/keyboard.pm: run_program::run('mandriva-setup-keyboard'); (does this need to be changed?) we keep it for now
o lib/Xconfig/resolution_and_depth.pm: symlinkf "$theme{THEME}.xml", "$dir/Mandriva.xml"; (this will be changed, and should be synced with whatever will be does to the default Mageia wallpapers theme; this .xml file is used to change the wallpaper in GNOME/KDE depending on the time of the day)
=> switched to Mageia.xml
- Various icons that'll need to be changed in data/pixmaps: done with oxygen icons
Diffstat (limited to 'lib/Xconfig/proprietary.pm')
-rw-r--r-- | lib/Xconfig/proprietary.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/Xconfig/proprietary.pm b/lib/Xconfig/proprietary.pm index 34b1c4f..86b8a4d 100644 --- a/lib/Xconfig/proprietary.pm +++ b/lib/Xconfig/proprietary.pm @@ -1,4 +1,4 @@ -package Xconfig::proprietary; # $Id$ +package Xconfig::proprietary; # $Id: proprietary.pm 269741 2010-06-02 09:25:33Z cfergeau $ use diagnostics; use strict; @@ -96,7 +96,8 @@ sub may_use_Driver2 { log::explanations("Using specific NVIDIA driver and GLX extensions"); $card2->{DRI_GLX_SPECIAL} = 1; - $card2->{Options}{IgnoreEDID} = 1 if member($card2->{DriverVersion}, qw(71xx 96xx)); + $card2->{Options}{IgnoreEDID} = 1 if ($card2->{DriverVersion} eq "71xx"); + $card2->{Options}{UseEDID} = 0 if ($card2->{DriverVersion} eq "96xx"); $card2; } elsif ($card2->{Driver} eq 'fglrx') { $check_drv->('fglrx_drv', "fglrx$card2->{DriverVersion}") or return; |