summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mandriva.org>2007-08-27 13:31:58 +0000
committerAnssi Hannula <anssi@mandriva.org>2007-08-27 13:31:58 +0000
commitad1cdab5b9d5ed8e69241ec9ab48d67e270eb287 (patch)
tree358e7b1cf8fa0164a84e299b39b1dbaa32c4e67a
parent466694c594170337ab42a440743f4898d8539d38 (diff)
downloaddrakx-kbd-mouse-x11-ad1cdab5b9d5ed8e69241ec9ab48d67e270eb287.tar
drakx-kbd-mouse-x11-ad1cdab5b9d5ed8e69241ec9ab48d67e270eb287.tar.gz
drakx-kbd-mouse-x11-ad1cdab5b9d5ed8e69241ec9ab48d67e270eb287.tar.bz2
drakx-kbd-mouse-x11-ad1cdab5b9d5ed8e69241ec9ab48d67e270eb287.tar.xz
drakx-kbd-mouse-x11-ad1cdab5b9d5ed8e69241ec9ab48d67e270eb287.zip
- use standard.conf as default gl_conf alternative
- do not add additional libglx ModulePaths for nvidia anymore
-rw-r--r--NEWS1
-rw-r--r--lib/Xconfig/card.pm6
2 files changed, 2 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index b3360e8..0b28349 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@
corresponding entry in ServerLayout. ie do not rely on InputDevice sections
to use XFdrake-compatible Identifiers (as suggested by fcrozat)
- add avivo in the Xorg drivers list
+- handle libglx.so provided by standard.conf alternative
Version 0.21 - 8 August 2007, by Pascal "Pixel" Rigaux
diff --git a/lib/Xconfig/card.pm b/lib/Xconfig/card.pm
index 1042864..a92edf1 100644
--- a/lib/Xconfig/card.pm
+++ b/lib/Xconfig/card.pm
@@ -75,10 +75,6 @@ sub to_raw_X {
# remove ModulePath that we added
$raw_X->remove_ModulePath(modules_dir() . "/extensions/$_") foreach 'nvidia97xx', 'nvidia96xx', 'nvidia71xx', 'nvidia-current';
$raw_X->remove_ModulePath(modules_dir());
- # then may re-add some
- if ($card->{DRI_GLX_SPECIAL}) {
- $raw_X->add_ModulePath($card->{DRI_GLX_SPECIAL});
- }
#- if we have some special ModulePath, ensure the last one is the standard ModulePath
$raw_X->add_ModulePath(modules_dir()) if $raw_X->get_ModulePaths;
@@ -348,7 +344,7 @@ sub libgl_config_and_more {
my $wanted = $card->{Driver} eq 'fglrx' ? "/etc/ld.so.conf.d/GL/ati.conf" :
$card->{Driver} eq 'nvidia' ? "/etc/nvidia$card->{DriverVersion}/ld.so.conf" :
- '/etc/ld.so.conf.d/GL/' . (arch() =~ /64/ ? 'lib64' : 'lib') . 'mesagl1.conf';
+ '/etc/ld.so.conf.d/GL/standard.conf';
my $link = "$::prefix/etc/alternatives/gl_conf";
my $need_run_ldconfig = readlink($link) ne $wanted;
-e "$::prefix$wanted" or log::l("ERROR: $wanted does not exist, linking $link to it anyway");