diff options
| -rw-r--r-- | perl-install/ChangeLog | 8 | ||||
| -rw-r--r-- | perl-install/Xconfigurator.pm | 12 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 23 |
3 files changed, 37 insertions, 6 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index c7c06258f..0208fb521 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,3 +1,11 @@ +2000-09-26 François Pons <fpons@mandrakesoft.com> + + * Xconfigurator.pm: added more 3D Rage Pro card for 3D + acceleration with Utah-GLX (Rage Mobility, Rage XC/XL), + modified identification for checking acceleration. + * install_any.pm: added automatic installation (up to 49) for + OpenGL games if a graphic card MAY BE accelerated. + 2000-09-26 dam's <damien@mandrakesoft.com> * network.pm (write_resolv_conf): write temp dns line to be used diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index f8ad163f0..e24b8ebba 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -187,7 +187,9 @@ sub cardConfiguration(;$$$) { #- 3D acceleration configuration for XFree 3.3 using Utah-GLX. $card->{Utah_glx} = ($card->{identifier} =~ /Matrox.* G[24]00/ || #- 8bpp does not work. - $card->{identifier} =~ /3D Rage Pro AGP/); #- by default only such card are supported, with AGP ? + $card->{identifier} =~ /Rage X[CL]/ || + $card->{identifier} =~ /Rage Mobility (?:P\/M|L) / || + $card->{identifier} =~ /3D Rage (?:LT|Pro)/); #- NOT WORKING $card->{type} =~ /Intel 810/); #- 3D acceleration configuration for XFree 3.3 using Utah-GLX but EXPERIMENTAL that may freeze the machine (FOR INFO NOT USED). $card->{Utah_glx_EXPERIMENTAL} = ($card->{type} =~ /RIVA TNT/ || #- all RIVA/GeForce comes from NVIDIA and may freeze (gltron). @@ -199,8 +201,8 @@ sub cardConfiguration(;$$$) { #- 3D acceleration configuration for XFree 4.0 using DRI. $card->{DRI_glx} = ($card->{identifier} =~ /Voodoo [35]/ || $card->{identifier} =~ /Voodoo Banshee/ || #- 16bit only $card->{identifier} =~ /Matrox.* G[24]00/ || #- prefer 16bit (24bit not well tested according to DRI) - $card->{type} =~ /Intel 810/ || #- 16bit - $card->{type} =~ /ATI Rage 128/); #- 16 and 32 bits, prefer 16bit as no DMA. + $card->{identifier} =~ /8281[05].* CGC/ || #- 16bit (Intel 810 & 815). + $card->{identifier} =~ /Rage 128/); #- 16 and 32 bits, prefer 16bit as no DMA. #- check to use XFree 4.0 or XFree 3.3. $card->{use_xf4} = $card->{driver} && !$card->{flags}{unsupported}; @@ -298,7 +300,9 @@ NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.", $xf3_ver)) . " #- hack for ATI Mach64 card where two options should be used if using Utah-GLX. - if ($card->{identifier} =~ /3D Rage Pro AGP/) { + if ($card->{identifier} =~ /Rage X[CL]/ || + $card->{identifier} =~ /Rage Mobility (?:P\/M|L) / || + $card->{identifier} =~ /3D Rage (?:LT|Pro)/) { $card->{options_xf3}{no_font_cache} = $card->{Utah_glx}; $card->{options_xf3}{no_pixmap_cache} = $card->{Utah_glx}; } diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 9ee692fd2..f3d56f596 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -293,7 +293,9 @@ sub setPackages($) { pkgs::selectPackage($o->{packages}, pkgs::packageByName($o->{packages}, 'basesystem') || die("missing basesystem package"), 1); #- some program that may be crazy on some conditions (hack waiting for Aurora to work if no fb). - $o->{allowFB} or push @pkgs::skip_list, 'Aurora'; + $o->{allowFB} && (!detect_devices::matching_desc('Rage LT') && + !detect_devices::matching_desc('Rage Mobility')) + or push @pkgs::skip_list, 'Aurora'; #- must be done after selecting base packages (to save memory) pkgs::getProvides($o->{packages}); @@ -312,8 +314,25 @@ sub setPackages($) { require timezone; require lang; push @l, "isdn4k-utils" if ($o->{timezone}{timezone} || timezone::bestTimezone(lang::lang2text($o->{lang}))) =~ /Europe/; - $_->{values} = [ map { $_ + 50 } @{$_->{values}} ] foreach grep {$_} map { pkgs::packageByName($o->{packages}, $_) } @l; + #- add OpenGL games that are only usefull if a 3D accelerated card is installed. + if (detect_devices::matching_desc('Matrox.* G[24]00') || + detect_devices::matching_desc('Rage X[CL]') || + detect_devices::matching_desc('Rage Mobility (?:P\/M|L) ') || + detect_devices::matching_desc('3D Rage (?:LT|Pro)') || + detect_devices::matching_desc('Voodoo [35]') || + detect_devices::matching_desc('Voodoo Banshee') || + detect_devices::matching_desc('8281[05].* CGC') || + detect_devices::matching_desc('Rage 128')) { + push @l, "xscreensaver-gl", "Mesa-demos", "xmms-mesa"; + push @l, "bzflag" if (!detect_devices::matching_desc('Rage X[CL]') && + !detect_devices::matching_desc('Rage Mobility (?:P\/M|L) ') && + !detect_devices::matching_desc('3D Rage (?:LT|Pro)')); + push @l, "csmash", "gltron" if (!detect_devices::matching_desc('Rage 128')); #- does not work well on transparancy. + push @l, "spacecup", "chromium"; + } + + $_->{values} = [ map { $_ + 50 } @{$_->{values}} ] foreach grep {$_} map { pkgs::packageByName($o->{packages}, $_) } @l; } else { #- this has to be done to make sure necessary files for urpmi are #- present. |