diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-09-26 11:34:00 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-09-26 11:34:00 +0000 |
| commit | 6237c51ef39e28a027e9c6e5c18e868580142080 (patch) | |
| tree | aa8be4a5d98b7f2c29ff69fd98e5ca6d1fbd4882 /lib/Xconfig | |
| parent | 44fe5ce31d83ca23d194b9bb601ce2ed011ba387 (diff) | |
| download | drakx-kbd-mouse-x11-6237c51ef39e28a027e9c6e5c18e868580142080.tar drakx-kbd-mouse-x11-6237c51ef39e28a027e9c6e5c18e868580142080.tar.gz drakx-kbd-mouse-x11-6237c51ef39e28a027e9c6e5c18e868580142080.tar.bz2 drakx-kbd-mouse-x11-6237c51ef39e28a027e9c6e5c18e868580142080.tar.xz drakx-kbd-mouse-x11-6237c51ef39e28a027e9c6e5c18e868580142080.zip | |
- we don't set ModulesPath to DRI_GLX_SPECIAL value, so we must read it
differently so that Xconfig::various::info() is correct (#31326)
Diffstat (limited to 'lib/Xconfig')
| -rw-r--r-- | lib/Xconfig/card.pm | 2 | ||||
| -rw-r--r-- | lib/Xconfig/proprietary.pm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Xconfig/card.pm b/lib/Xconfig/card.pm index 97b2abd..c65c641 100644 --- a/lib/Xconfig/card.pm +++ b/lib/Xconfig/card.pm @@ -40,7 +40,7 @@ sub from_raw_X { my $card = { use_DRI_GLX => eval { any { /dri/ } $raw_X->get_modules }, - DRI_GLX_SPECIAL => first($raw_X->get_ModulePaths), + DRI_GLX_SPECIAL => $device->{Driver} eq 'nvidia' && eval { any { $_ eq 'glx' } $raw_X->get_modules }, %$device, if_($device->{Driver} eq 'nvidia', DriverVersion => diff --git a/lib/Xconfig/proprietary.pm b/lib/Xconfig/proprietary.pm index aace9fe..9205c5c 100644 --- a/lib/Xconfig/proprietary.pm +++ b/lib/Xconfig/proprietary.pm @@ -80,7 +80,7 @@ sub may_use_Driver2 { -e "$::prefix$libglx_path/libglx.so" or log::l("special NVIDIA libglx missing"), return; log::explanations("Using specific NVIDIA driver and GLX extensions"); - $card2->{DRI_GLX_SPECIAL} = $libglx_path; + $card2->{DRI_GLX_SPECIAL} = 1; $card2->{Options}{IgnoreEDID} = 1 if $card2->{DriverVersion} ne '-current'; $card2; } elsif ($card2->{Driver} eq 'fglrx') { |