*** empty log message ***

3 files changed, 21 insertions, 9 deletions

diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 810ec8ba4..f0beaed5a 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,6 +1,11 @@
 2000-08-01  François Pons  <fpons@mandrakesoft.com>
 
 	* pkgs.pm: fixed the below fixe, now ok.
+	* Xconfigurator.pm: fixed a bug for using default card flags
+	setting, add support for GeForce DDR for both 3.3 and 4.0.
+	* pci_probing/pcitable: fixed NV15 (GeForce2) card entry, now use
+	XFree 3.3 as unsupported in XFree 4.0.
+	* share/Cards+: added "NVIDIA GeForce2 DDR (generic)".
 
 2000-07-31  François Pons  <fpons@mandrakesoft.com>
 
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 0af8531c8..ddfbfab2e 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -42,6 +42,7 @@ sub readCardsDB {
 	},
 	CHIPSET => sub {
 	    $card->{chipset} = $val;
+	    $card->{flags}{needChipset} = 1 if $val eq 'GeForce DDR';
 	    $card->{flags}{needVideoRam} = 1 if member($val, qw(mgag10 mgag200 RIVA128));
 	},
 	SERVER => sub { $card->{server} = $val; },
@@ -83,9 +84,13 @@ sub cardName2RealName {
     }
     $name;
 }
-sub cardName2card {
-    my ($name) = @_;
-    readCardsDB("/usr/X11R6/lib/X11/Cards+")->{$name};
+sub updateCardAccordingName {
+    my ($card, $name) = @_;
+    my $cards = readCardsDB("/usr/X11R6/lib/X11/Cards+");
+
+    add2hash($card->{flags}, $cards->{$name}{flags});
+    add2hash($card, $cards->{$name});
+    $card;
 }
 
 sub readMonitorsDB {
@@ -165,14 +170,14 @@ sub cardConfiguration(;$$$) {
     my ($card, $noauto, $allowFB) = @_;
     $card ||= {};
 
-    add2hash($card, cardName2card($card->{type})) if $card->{type}; #- try to get info from given type
+    updateCardAccordingName($card, $card->{type}) if $card->{type}; #- try to get info from given type
     undef $card->{type} unless $card->{server}; #- bad type as we can't find the server
     add2hash($card, cardConfigurationAuto()) unless $card->{server} || $noauto;
     $card->{server} = 'FBDev' unless !$allowFB || $card->{server} || $card->{type} || $noauto;
     $card->{type} = cardName2RealName($in->ask_from_treelist(_("Graphic card"), _("Select a graphic card"), '|', ['Unlisted', readCardsNames()])) unless $card->{type} || $card->{server};
     undef $card->{type}, $card->{server} = $in->ask_from_list(_("X server"), _("Choose a X server"), $allowFB ? \@allservers : \@allbutfbservers ) if $card->{type} eq "Unlisted";
 
-    add2hash($card, cardName2card($card->{type})) if $card->{type};
+    updateCardAccordingName($card, $card->{type}) if $card->{type};
     add2hash($card, { vendor => "Unknown", board => "Unknown" });
 
     #- 3D acceleration configuration for XFree 3.3 using Utah-GLX.
@@ -190,13 +195,13 @@ sub cardConfiguration(;$$$) {
 
     #- try to figure if 3D acceleration is supported
     #- by XFree 3.3 but not XFree 4.0 then ask user to keep XFree 3.3 ?
+    !$::force_xf3 && $card->{driver} && !$card->{flags}{unsupported} or $card->{driver} = ''; #- disable XFree 4.0
     if ($card->{driver} && $card->{Utah_glx} && !$card->{DRI_glx}) {
 	$::beginner || $in->ask_yesorno('',
 					_("Your card can have 3D acceleration but only with XFree 3.3.
 Do You want to use XFree 3.3 instead of XFree 4.0?"), 1) and $card->{driver} = '';
     }
 
-    !$::force_xf3 && $card->{driver} && !$card->{flags}{unsupported} or $card->{driver} = ''; #- disable XFree 4.0
     $card->{prog} = "/usr/X11R6/bin/" . ($card->{driver} ? 'XFree86' : $card->{server} =~ /Sun (.*)/x ?
 					 "Xsun$1" : "XF86_$card->{server}");
 
@@ -830,7 +835,9 @@ EndSection
     print F qq(    BoardName   "$O->{board}"\n);
     print G qq(    BoardName   "$O->{board}"\n);
 
-    print G qq(    Driver   "$O->{driver}"\n);
+    print F "#" if $O->{chipset} && !$O->{flags}{needChipset};
+    print F qq(    Chipset     "$O->{chipset}"\n) if $O->{chipset};
+    print G qq(    Driver      "$O->{driver}"\n);
 
     print F "#" if $O->{memory} && !$O->{flags}{needVideoRam};
     print G "#" if $O->{memory} && !$O->{flags}{needVideoRam};
@@ -858,7 +865,7 @@ EndSection
 
     # Uncomment following option if you see a big white block        
     # instead of the cursor!                                          
-    #Option	"sw_cursor"
+    #    Option      "sw_cursor"
 
 ); 
     print F map { (!$O->{options}{$_} && '#') . qq(    Option      "$_"\n) } keys %{$O->{options} || {}};
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 36be9877c..e1b00d381 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -78,7 +78,7 @@ sub new($$) {
 	    if (arch() eq "alpha") {
 		require Xconfigurator;
 		my $card = Xconfigurator::cardConfigurationAuto();
-		add2hash($card, Xconfigurator::cardName2card($card->{type})) if $card && $card->{type};
+		Xconfigurator::updateCardAccordingName($card, $card->{type}) if $card && $card->{type};
 		@servers = $card->{server} || "TGA";
 		#-@servers = qw(SVGA 3DLabs TGA) 
 	    } elsif (arch() =~ /^sparc/) {