summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-10-06 14:33:47 +0000
committerFrancois Pons <fpons@mandriva.com>2000-10-06 14:33:47 +0000
commitad2a91fd8d19c15813d47c064e8da37f7b614d9c (patch)
treef0f9b43dc6db73930e37f68b5a5194293338c5bc
parent8d0497bd2dc5854b021c08c9f9cacdba54618357 (diff)
downloaddrakx-backup-do-not-use-ad2a91fd8d19c15813d47c064e8da37f7b614d9c.tar
drakx-backup-do-not-use-ad2a91fd8d19c15813d47c064e8da37f7b614d9c.tar.gz
drakx-backup-do-not-use-ad2a91fd8d19c15813d47c064e8da37f7b614d9c.tar.bz2
drakx-backup-do-not-use-ad2a91fd8d19c15813d47c064e8da37f7b614d9c.tar.xz
drakx-backup-do-not-use-ad2a91fd8d19c15813d47c064e8da37f7b614d9c.zip
*** empty log message ***
-rw-r--r--perl-install/ChangeLog3
-rw-r--r--perl-install/Xconfigurator.pm3
-rw-r--r--perl-install/any.pm3
-rw-r--r--perl-install/install_any.pm4
4 files changed, 9 insertions, 4 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 9415087b1..1e6c1a95a 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -9,7 +9,8 @@
* Xconfigurator.pm: removed Matrox G200/G400 3D acceleration by
DRI, use only Mesa with Utah GLX, fixed autologin for avoiding
- drakres and no wm available.
+ drakres and no wm available, moved Riva128 card from experimental
+ to stable.
* pci_probing/pcitable: fixed Cirrus Logic sound card.
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 2a9d0ce10..e804c160a 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -187,13 +187,14 @@ 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} =~ /Riva.*128/ ||
$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).
- $card->{type} =~ /RIVA128/ ||
+ #$card->{type} =~ /RIVA128/ ||
$card->{type} =~ /GeForce 256/ ||
$card->{type} =~ /S3 Savage3D/ || #- only this one is evoluting (expect a stable release ?)
#- $card->{type} =~ /S3 ViRGE/ || #- 15bits only
diff --git a/perl-install/any.pm b/perl-install/any.pm
index a269393ce..495d802e9 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -381,6 +381,7 @@ END
'~--' ''
END
close CHAT;
+ chmod 0600, $chat;
if ($modem->{auth} eq 'PAP') {
#- need to create a secrets file for the connection.
@@ -406,7 +407,7 @@ END
commands::mkdir_("-p", "$prefix/usr/share/config");
local *KPPPRC;
open KPPPRC, ">$prefix/usr/share/config/kppprc" or die "Can't open $prefix/usr/share/config/kppprc: $!";
- chmod 0600, "$prefix/usr/share/config/kppprc";
+ #chmod 0600, "$prefix/usr/share/config/kppprc";
print KPPPRC <<END;
# KDE Config File
[Account0]
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index bccc49e85..9fdd43a41 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -322,6 +322,7 @@ sub setPackages($) {
#- add OpenGL games that are only usefull if a 3D accelerated card is installed.
my @gl = ();
if (detect_devices::matching_desc('Matrox.* G[24]00') ||
+ detect_devices::matching_desc('Riva.*128') ||
detect_devices::matching_desc('Rage X[CL]') ||
detect_devices::matching_desc('Rage Mobility (?:P\/M|L) ') ||
detect_devices::matching_desc('3D Rage (?:LT|Pro)') ||
@@ -330,7 +331,8 @@ sub setPackages($) {
detect_devices::matching_desc('8281[05].* CGC') ||
detect_devices::matching_desc('Rage 128')) {
push @gl, "xscreensaver-gl", "Mesa-demos", "xmms-mesa";
- push @gl, "bzflag" if (!detect_devices::matching_desc('Rage X[CL]') &&
+ push @gl, "bzflag" if (!detect_devices::matching_desc('Riva.*128') &&
+ !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 @gl, "csmash", "gltron" if (!detect_devices::matching_desc('Rage 128')); #- does not work well on transparancy.