- %standard_monitors are now in Cards+, dropping them

- multi head support generalized, now based on Cards+ MULTI_HEAD
- fix some ModeLines being written twice in XF86Config
- remove setting DefaultFbBpp to 32
  (since it is the default in all my tests)

1 files changed, 26 insertions, 0 deletions

diff --git a/perl-install/Xconfig.pm b/perl-install/Xconfig.pm
index e235e5311..b724f3591 100644
--- a/perl-install/Xconfig.pm
+++ b/perl-install/Xconfig.pm
@@ -275,6 +275,7 @@ sub readCardsDB {
 	UTAH_GLX => sub { $card->{UTAH_GLX} = 1 },
 	DRI_GLX_EXPERIMENTAL => sub { $card->{DRI_GLX_EXPERIMENTAL} = 1 },
 	UTAH_GLX_EXPERIMENTAL => sub { $card->{UTAH_GLX_EXPERIMENTAL} = 1 },
+	MULTI_HEAD => sub { $card->{MULTI_HEAD} = $val },
 	UNSUPPORTED => sub { delete $card->{driver} },
 
 	#- Obsolete stuff, no existing card still need this
@@ -301,4 +302,29 @@ sub readCardsDB {
     \%cards;
 }
 
+sub install_matrox_proprietary_hal {
+    my ($prefix) = @_;
+    my $tmpdir = "$prefix/root/tmp";
+
+    my $tar = "mgadrivers-2.0.tgz";
+    my $dir_in_tar = "mgadrivers";
+    my $dest_dir = "$prefix/usr/X11R6/lib/modules/drivers";
+
+    #- already installed
+    return if -e "$dest_dir/mga_hal_drv.o";
+
+    system("wget -O $tmpdir/$tar ftp://ftp.matrox.com/pub/mga/archive/linux/2002/$tar") if !-e "$tmpdir/$tar";
+    system("tar xzC $tmpdir -f $tmpdir/$tar");
+
+    my $src_dir = "$tmpdir/$dir_in_tar/xfree86/4.2.0/drivers";
+    foreach (all($src_dir)) {
+	my $src = "$src_dir/$_";
+	my $dest = "$dest_dir/$_";
+	rename $dest, "$dest.non_hal";
+	cp_af($src, $dest_dir);
+    }
+    rm_rf("$tmpdir/$tar");
+    rm_rf("$tmpdir/$dir_in_tar");
+}
+
 1;