summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mandriva.org>2010-02-09 18:55:05 +0000
committerAnssi Hannula <anssi@mandriva.org>2010-02-09 18:55:05 +0000
commit33a0dbe321bbdd98fb4e7d6586b7d95d9aa5a243 (patch)
tree0931a0bc641d9ce48a3be3bfe6cc5701105b4e41 /lib
parentab1b5acf25cf3167fd145937e2ac0f7dd518ff5c (diff)
downloaddrakx-kbd-mouse-x11-33a0dbe321bbdd98fb4e7d6586b7d95d9aa5a243.tar
drakx-kbd-mouse-x11-33a0dbe321bbdd98fb4e7d6586b7d95d9aa5a243.tar.gz
drakx-kbd-mouse-x11-33a0dbe321bbdd98fb4e7d6586b7d95d9aa5a243.tar.bz2
drakx-kbd-mouse-x11-33a0dbe321bbdd98fb4e7d6586b7d95d9aa5a243.tar.xz
drakx-kbd-mouse-x11-33a0dbe321bbdd98fb4e7d6586b7d95d9aa5a243.zip
XFrake:
o do not disable loading of dri module for non-glx drivers, as KMS drivers require it as well o do not disable loading of glx module for fbdev, in order to allow AIGLX to work in software rasterizer mode o do not add dbe and extmod modules to xorg.conf anymore, they are loaded by default anyway
Diffstat (limited to 'lib')
-rw-r--r--lib/Xconfig/card.pm5
-rw-r--r--lib/Xconfig/default.pm2
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/Xconfig/card.pm b/lib/Xconfig/card.pm
index db8d19e..ad464d6 100644
--- a/lib/Xconfig/card.pm
+++ b/lib/Xconfig/card.pm
@@ -77,8 +77,9 @@ sub to_raw_X {
#- 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;
- $raw_X->set_load_module('glx', $card->{Driver} ne 'fbdev'); #- glx for everyone, except fbdev
- $raw_X->set_load_module('dri', $card->{use_DRI_GLX}); #- dri when needed, except proprietary nvidia
+ #- un-disable modules that we previously disabled
+ $raw_X->remove_disable_module('glx');
+ $raw_X->remove_disable_module('dri');
$raw_X->remove_Section('DRI');
diff --git a/lib/Xconfig/default.pm b/lib/Xconfig/default.pm
index 722ff35..cc09660 100644
--- a/lib/Xconfig/default.pm
+++ b/lib/Xconfig/default.pm
@@ -22,7 +22,7 @@ sub configure {
my $raw_X = Xconfig::xfree->empty_config;
- $raw_X->add_load_module($_) foreach qw(dbe v4l extmod);
+ $raw_X->add_load_module('v4l');
config_mouse($raw_X, $do_pkgs, $mouse);