summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-03-13 08:45:37 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-03-13 08:45:37 +0000
commit1d5c3d410796bbec065774939bf39920ce1cebaf (patch)
tree9618925a9829d43884e49462fc23d3836abe8943
parent2849caa55ff88d2a9202a9b637df8d56facd24a1 (diff)
downloaddrakx-kbd-mouse-x11-1d5c3d410796bbec065774939bf39920ce1cebaf.tar
drakx-kbd-mouse-x11-1d5c3d410796bbec065774939bf39920ce1cebaf.tar.gz
drakx-kbd-mouse-x11-1d5c3d410796bbec065774939bf39920ce1cebaf.tar.bz2
drakx-kbd-mouse-x11-1d5c3d410796bbec065774939bf39920ce1cebaf.tar.xz
drakx-kbd-mouse-x11-1d5c3d410796bbec065774939bf39920ce1cebaf.zip
- XFdrake:
o never write a ModeLine when using fglrx driver (#30934) (backport from HEAD)
-rw-r--r--NEWS3
-rw-r--r--lib/Xconfig/xfree.pm9
2 files changed, 12 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 8a829e3..3d03b85 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- XFdrake:
+ o never write a ModeLine when using fglrx driver (#30934)
+
Version 0.37.1 - 2 December 2007, by Anssi Hannula
- handle fglrx driver in non-free/backports that has fglrx_dri.so using
diff --git a/lib/Xconfig/xfree.pm b/lib/Xconfig/xfree.pm
index 1b47902..dfa4d5a 100644
--- a/lib/Xconfig/xfree.pm
+++ b/lib/Xconfig/xfree.pm
@@ -61,6 +61,7 @@ sub write {
#- keep it for old programs still using this name
symlink basename($file), "$::prefix/etc/X11/XF86Config";
}
+ no_ModeLine_on_fglrx($raw_X); #- HACK
set_Revision($raw_X);
Xconfig::parse::write_XF86Config($raw_X->{raw}, $file);
}
@@ -431,6 +432,14 @@ sub add_gtf_ModeLines {
1;
}
+#- HACK for fglrx (#30934)
+sub no_ModeLine_on_fglrx {
+ my ($raw_X) = @_;
+
+ if (get_Driver($raw_X) eq 'fglrx') {
+ delete $_->{ModeLine} foreach $raw_X->get_Sections('Monitor');
+ }
+}
################################################################################
# screens ######################################################################