diff options
| -rw-r--r-- | perl-install/ChangeLog | 6 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 17 | ||||
| -rwxr-xr-x | perl-install/live_install | 20 | ||||
| -rw-r--r-- | perl-install/share/compssList | 16 |
4 files changed, 37 insertions, 22 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 43c501ebc..ab75445ee 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -3,8 +3,12 @@ * 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 50) for + * install_any.pm: added automatic installation (up 60) for OpenGL games if a graphic card MAY BE accelerated. + * live_install: fixed perl idioms in pure shell script and added + packdrake symlink if not already installed. + * share/compssList: changed level to -1 for all needing 3D hw + acceleration packages. 2000-09-26 dam's <damien@mandrakesoft.com> diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index f3d56f596..7ca6d11a6 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -314,8 +314,10 @@ 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. + my @gl = (); 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) ') || @@ -324,15 +326,14 @@ sub setPackages($) { 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"; + push @gl, "xscreensaver-gl", "Mesa-demos", "xmms-mesa"; + push @gl, "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 @gl, "csmash", "gltron" if (!detect_devices::matching_desc('Rage 128')); #- does not work well on transparancy. + push @gl, "spacecup", "chromium"; } - - $_->{values} = [ map { $_ + 50 } @{$_->{values}} ] foreach grep {$_} map { pkgs::packageByName($o->{packages}, $_) } @l; + $_->{values} = [ map { $_ + 60 } @{$_->{values}} ] foreach grep {$_} map { pkgs::packageByName($o->{packages}, $_) } @gl; } else { #- this has to be done to make sure necessary files for urpmi are #- present. diff --git a/perl-install/live_install b/perl-install/live_install index a9440db3e..dcd211ea7 100755 --- a/perl-install/live_install +++ b/perl-install/live_install @@ -15,19 +15,29 @@ done /bin/cp -a "$dir/../../Mandrake/mdkinst" "/tmp/drakx" if [ -x "/tmp/drakx/mdkinst/usr/bin/perl-install/live_install2" ]; then - $perlcoredir=/usr/lib/perl5/5.6.0/i386-linux/CORE + perlcoredir=/usr/lib/perl5/5.6.0/i386-linux/CORE cd /tmp/drakx/mdkinst/usr/bin/perl-install if [ -x $perlcoredir/libperl.so ]; then mv $perlcoredir/libperl.so /tmp/drakx/mdkinst - else - mkdir -p $perlcoredir - ln -sf /tmp/drakx/mdkinst/$perlcoredir/libperl.so $perlcoredir/libperl.so fi + mkdir -p $perlcoredir + ln -sf /tmp/drakx/mdkinst/$perlcoredir/libperl.so $perlcoredir/libperl.so + if [ -x /usr/bin/packdrake ]; then + mv /usr/bin/packdrake /tmp/drakx/mdkinst + fi + ln -sf /tmp/drakx/mdkinst/usr/bin/packdrake /usr/bin/packdrake + + # start DrakX ../../../lib/ld-linux.so.2 ../perl ./live_install2 + rm -f /usr/bin/packdrake + if [ -x /tmp/drakx/mdkinst/packdrake ]; then + mv /tmp/drakx/mdkinst/packdrake.so /usr/bin/packdrake + fi + rm -f $perlcoredir/libperl.so - if [ -x /tmp/drakx/mdkinst ]; then + if [ -x /tmp/drakx/mdkinst/libperl.so ]; then mv /tmp/drakx/mdkinst/libperl.so $perlcoredir/libperl.so fi else diff --git a/perl-install/share/compssList b/perl-install/share/compssList index 9e0508126..bcf8654b4 100644 --- a/perl-install/share/compssList +++ b/perl-install/share/compssList @@ -57,7 +57,7 @@ MandrakeUpdate 82 0 80 Mesa 30 0 70 Mesa-common 30 0 70 Mesa-common-devel 0 0 70 -Mesa-demos 30 0 55 +Mesa-demos 10 0 15 MySQL 2 55 15 MySQL-bench 2 50 10 MySQL-client 2 52 11 @@ -221,7 +221,7 @@ bonobo-devel 0 0 35 bootparamd 20 78 0 bug-buddy 0 0 20 byacc 16 0 80 -bzflag 0 0 0 +bzflag -1 -1 -1 bzip2 41 85 75 caching-nameserver 0 70 0 cbb 55 0 13 @@ -237,7 +237,7 @@ cervisia 12 0 10 cfengine 0 30 0 chkconfig 0 65 10 chkfontpath 0 0 50 -chromium 0 0 0 +chromium -1 -1 -1 clanbomber 65 0 25 cleanfeed 24 65 21 clisp 0 0 15 @@ -256,7 +256,7 @@ cracklib 10 85 35 cracklib-devel 0 0 15 cracklib-dicts 10 82 35 crontabs 95 95 95 -csmash 10 0 10 +csmash -1 -1 -1 ctags 10 0 80 cttex -15 -30 -15 cups 0 75 39 @@ -433,7 +433,7 @@ glib-devel 10 0 87 glibc 1 99 96 glibc-devel 25 0 96 glibc-profile 1 0 54 -gltron 0 0 0 +gltron -1 -1 -1 gmc 68 0 59 gmp 17 0 71 gmp-devel 10 0 71 @@ -1230,7 +1230,7 @@ sndconfig 70 40 70 sox 41 32 80 sox-devel 13 0 70 space_sounds 52 0 55 -spacecup 0 0 0 +spacecup -1 -1 -1 spec-helper 0 0 35 spellutils 0 0 0 spruce 0 0 0 @@ -1387,7 +1387,7 @@ xmms-devel 0 0 15 xmms-esd 46 0 41 xmms-gnome 62 0 52 xmms-kjofol-skins 50 0 50 -xmms-mesa 0 0 0 +xmms-mesa -1 -1 -1 xmms-mikmod 43 0 38 xmms-more-vis-plugins 55 0 55 xmms-oggvorbis 64 0 57 @@ -1412,7 +1412,7 @@ xpuzzles 50 0 43 xrally 5 0 5 xrn 55 0 49 xscreensaver 55 0 57 -xscreensaver-gl 0 0 0 +xscreensaver-gl -1 -1 -1 xsoldier 51 0 45 xsysinfo 55 0 56 xterm 87 0 80 |