summaryrefslogtreecommitdiffstats
path: root/lib/Xconfig
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Xconfig')
-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);