From 3b39132f9eac3baafb2f70fe4afa3f9e60c771ed Mon Sep 17 00:00:00 2001 From: Kai Schwenzfeier Date: Mon, 13 Dec 2004 16:44:12 +0000 Subject: [PATCH] Kai Schwenzfeier: * updates: allegro 4.1.14 -> 4.1.17 asc 1.15.0.0 -> 1.15.2.1 crimson 0.4.2 -> 0.4.5 flightgear 0.9.4 -> 0.9.6 flightgear-base 0.9.4 ->0.9.6 lbreakout2 2.4.1 -> 2.5.1 lgeneral 1.1.3 -> 1.2beta-2 lmarbles 1.0.6 -> 1.0.7 ltris 1.0.6 -> 1.0.7 powermanga 0.78 -> 0.79 rocksndiamonds 3.0.8 -> 3.1.0 scilab 2.7 -> 3.0 simgear 0.3.5 -> 0.3.7 simutrans 0_82_15_7 -> 0_84_16_2 * clean ups: lots of new download urls remove obsolete crimson_vidinit.patch (crimson) remove obsolete hotfix-binutils-gcc.patch (flightgear) lgeneral build procedure clean up lgeneral now includes original panzer general(dos) missions remove obsolete configure-fix.patch (scilab) [2004120912081513798] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5174 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/kasc/allegro/allegro.desc | 4 +- package/kasc/asc/asc.desc | 4 +- package/kasc/crimson/crimson.desc | 4 +- package/kasc/crimson/crimson_vidinit.patch | 41 ------------------- .../kasc/flightgear-base/flightgear-base.desc | 6 +-- package/kasc/flightgear/flightgear.desc | 6 +-- .../kasc/flightgear/hotfix-binutils-gcc.patch | 33 --------------- package/kasc/lbreakout2/lbreakout2.desc | 4 +- package/kasc/lgeneral/lgeneral.conf | 8 ++++ package/kasc/lgeneral/lgeneral.desc | 13 +++--- package/kasc/lmarbles/lmarbles.desc | 4 +- package/kasc/ltris/ltris.desc | 4 +- package/kasc/powermanga/powermanga.desc | 6 +-- .../kasc/rocksndiamonds/rocksndiamonds.desc | 4 +- package/kasc/scilab/configure-fix.patch | 37 ----------------- package/kasc/scilab/scilab.desc | 4 +- package/kasc/simgear/simgear.desc | 4 +- package/kasc/simutrans/simutrans.conf | 4 +- package/kasc/simutrans/simutrans.desc | 6 +-- 19 files changed, 47 insertions(+), 149 deletions(-) delete mode 100644 package/kasc/crimson/crimson_vidinit.patch delete mode 100644 package/kasc/flightgear/hotfix-binutils-gcc.patch delete mode 100644 package/kasc/scilab/configure-fix.patch diff --git a/package/kasc/allegro/allegro.desc b/package/kasc/allegro/allegro.desc index 0c83fbae5..dcc1371ee 100644 --- a/package/kasc/allegro/allegro.desc +++ b/package/kasc/allegro/allegro.desc @@ -40,8 +40,8 @@ [L] OpenSource [S] Beta -[V] 4.1.14 +[V] 4.1.17 [P] X -?---5---9 213.700 -[D] 1119592042 allegro-4.1.14.tar.gz http://dl.sourceforge.net/sourceforge/alleg/ +[D] 1520970529 allegro-4.1.17.tar.gz http://dl.sourceforge.net/sourceforge/alleg/ diff --git a/package/kasc/asc/asc.desc b/package/kasc/asc/asc.desc index cfc57f22a..87258e4bb 100644 --- a/package/kasc/asc/asc.desc +++ b/package/kasc/asc/asc.desc @@ -36,8 +36,8 @@ [L] GPL [S] Stable -[V] 1.15.0.0 +[V] 1.15.2.1 [P] X -?---5---9 216.200 -[D] 836149839 asc-source-1.15.0.0.tar.gz http://dl.sourceforge.net/sourceforge/asc-hq/ +[D] 2495960712 asc-source-1.15.2.1.tar.gz http://dl.sourceforge.net/sourceforge/asc-hq/ diff --git a/package/kasc/crimson/crimson.desc b/package/kasc/crimson/crimson.desc index 78ecb042e..70ebb4c85 100644 --- a/package/kasc/crimson/crimson.desc +++ b/package/kasc/crimson/crimson.desc @@ -48,8 +48,8 @@ [L] GPL [S] Beta -[V] 0.4.2 +[V] 0.4.5 [P] X -?---5---9 212.500 -[D] 2413045170 crimson-0.4.2.tar.bz2 http://crimson.seul.org/files/ +[D] 1589075317 crimson-0.4.5.tar.bz2 http://crimson.seul.org/files/ diff --git a/package/kasc/crimson/crimson_vidinit.patch b/package/kasc/crimson/crimson_vidinit.patch deleted file mode 100644 index 92cf3b802..000000000 --- a/package/kasc/crimson/crimson_vidinit.patch +++ /dev/null @@ -1,41 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/kasc/crimson/crimson_vidinit.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- /home/fizz/dev/games/crimson/tools/cfed.cpp Fri Apr 16 17:56:33 2004 -+++ ./tools/cfed.cpp Mon May 17 18:57:12 2004 -@@ -105,7 +105,7 @@ - char *uset = NULL, *tset = NULL; - string outname; - -- if ( SDL_Init( SDL_INIT_VIDEO ) < 0 ) { -+ if ( SDL_Init( 0 ) < 0 ) { - cerr << "Error: Could not init SDL. " << SDL_GetError() << endl; - return 1; - } ---- /home/fizz/dev/games/crimson/src/common/surface.cpp Fri Feb 27 19:54:12 2004 -+++ ./src/common/surface.cpp Mon May 17 18:59:50 2004 -@@ -91,7 +91,7 @@ - int Surface::DisplayFormat( void ) { - SDL_Surface *new_s; - -- if ( s_surface == 0 ) return -1; -+ if ( s_surface == 0 || !SDL_WasInit( SDL_INIT_VIDEO ) ) return -1; - if ( (new_s = SDL_DisplayFormat( s_surface )) == 0 ) return -1; - SDL_FreeSurface( s_surface ); - s_surface = new_s; diff --git a/package/kasc/flightgear-base/flightgear-base.desc b/package/kasc/flightgear-base/flightgear-base.desc index c632966fe..e4e516aa0 100644 --- a/package/kasc/flightgear-base/flightgear-base.desc +++ b/package/kasc/flightgear-base/flightgear-base.desc @@ -38,9 +38,9 @@ [L] GPL [S] Stable -[V] 0.9.4 +[V] 0.9.6 [P] X -?---5---9 218.500 -#[D] 3425022557 fgfs-base-0.9.3.tar.bz2 ftp://ftp.de.flightgear.org/pub/fgfs/Shared/ -[D] 3331340687 fgfs-base-0.9.4.tar.bz2 ftp://ftp.sunsite.org.uk/sites/ftp.flightgear.org/flightgear-ftp/Shared/ +[D] 1051493933 fgfs-base-0.9.6.tar.bz2 ftp://ftp.flightgear.org/pub/fgfs/Shared/ +#[D] 3331340687 fgfs-base-0.9.4.tar.bz2 ftp://ftp.sunsite.org.uk/sites/ftp.flightgear.org/flightgear-ftp/Shared/ diff --git a/package/kasc/flightgear/flightgear.desc b/package/kasc/flightgear/flightgear.desc index ffd910124..84968fbf5 100644 --- a/package/kasc/flightgear/flightgear.desc +++ b/package/kasc/flightgear/flightgear.desc @@ -46,9 +46,9 @@ [L] GPL [S] Stable -[V] 0.9.4 +[V] 0.9.6 [P] X -?---5---9 212.600 -#[D] 3511579760 FlightGear-0.9.4.tar.gz ftp://ftp.de.flightgear.org/pub/fgfs/Source/ -[D] 653113521 FlightGear-0.9.4.tar.gz ftp://ftp.sunsite.org.uk/sites/ftp.flightgear.org/flightgear-ftp/Source/ +[D] 2055998466 FlightGear-0.9.6.tar.gz ftp://ftp.flightgear.org/pub/fgfs/Source/ +#[D] 653113521 FlightGear-0.9.4.tar.gz ftp://ftp.sunsite.org.uk/sites/ftp.flightgear.org/flightgear-ftp/Source/ diff --git a/package/kasc/flightgear/hotfix-binutils-gcc.patch b/package/kasc/flightgear/hotfix-binutils-gcc.patch deleted file mode 100644 index 15d385577..000000000 --- a/package/kasc/flightgear/hotfix-binutils-gcc.patch +++ /dev/null @@ -1,33 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/kasc/flightgear/hotfix-binutils-gcc.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -Hotfix needed for new binutils (bug is in gcc) -(see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=16625) - ---- ./src/FDM/JSBSim/FGState.h.orig 2004-09-05 15:36:43.760672000 +0200 -+++ ./src/FDM/JSBSim/FGState.h 2004-09-05 15:37:01.976902712 +0200 -@@ -258,6 +258,8 @@ - vLastArray[1] = vLastArray[0]; - vLastArray[0] = vTDeriv; - break; -+ } -+ switch (type) { - case AM3: - vResult = (delta_t/12.0)*( 5.0 * vTDeriv - + 8.0 * vLastArray[0] diff --git a/package/kasc/lbreakout2/lbreakout2.desc b/package/kasc/lbreakout2/lbreakout2.desc index 7500fb9c3..3c7c0e192 100644 --- a/package/kasc/lbreakout2/lbreakout2.desc +++ b/package/kasc/lbreakout2/lbreakout2.desc @@ -42,8 +42,8 @@ [L] GPL [S] Stable -[V] 2.4.1 +[V] 2.5.1 [P] X -?---5---9 214.700 -[D] 1495072676 lbreakout2-2.4.1.tar.gz http://ftp1.sourceforge.net/lgames/ +[D] 819757410 lbreakout2-2.5.1.tar.gz http://dl.sourceforge.net/sourceforge/lgames/ diff --git a/package/kasc/lgeneral/lgeneral.conf b/package/kasc/lgeneral/lgeneral.conf index da6509580..62bb26fdb 100644 --- a/package/kasc/lgeneral/lgeneral.conf +++ b/package/kasc/lgeneral/lgeneral.conf @@ -24,3 +24,11 @@ bindir=$root/$ROCKCFG_PKG_GAMES_BINDIR datadir=$root/$ROCKCFG_PKG_GAMES_DATADIR +lgeneral_pm() { + tar $taropt $archdir/pg-data.tar.bz2 + $bindir/lgc-pg -s pg-data -d $datadir/lgeneral + rm -Rf pg-data +} + +hook_add postmake 3 lgeneral_pm + diff --git a/package/kasc/lgeneral/lgeneral.desc b/package/kasc/lgeneral/lgeneral.desc index 15e22860e..e1daa5dbe 100644 --- a/package/kasc/lgeneral/lgeneral.desc +++ b/package/kasc/lgeneral/lgeneral.desc @@ -40,13 +40,14 @@ #[C] extra/game/strategy [L] GPL -[S] Stable -[V] 1.1.3 +[S] Beta +[V] 1.2beta-2 [P] X -?---5---9 214.800 -[D] 178616783 lgeneral-1.1.1.tar.gz http://ftp1.sourceforge.net/lgeneral/ -[D] 2926180326 lgeneral-data-1.1.3.tar.gz http://ftp1.sourceforge.net/lgeneral/ -[D] 1234823107 lgc-pg-0.32.tar.gz http://ftp1.sourceforge.net/lgeneral/ +[D] 3052851582 lgeneral-1.2beta-2.tar.gz http://dl.sourceforge.net/sourceforge/lgeneral/ +[D] 3175493967 pg-data.tar.gz http://dl.sourceforge.net/sourceforge/lgeneral/ +#[D] 2926180326 lgeneral-data-1.1.3.tar.gz http://dl.sourceforge.net/sourceforge/lgeneral/ +#[D] 1234823107 lgc-pg-0.32.tar.gz http://dl.sourceforge.net/sourceforge/lgeneral/ -[SRC] lgeneral-1.1.1 lgeneral-data-1.1.3 lgc-pg-0.32 +#[SRC] lgeneral-1.1.1 lgeneral-data-1.1.3 lgc-pg-0.32 diff --git a/package/kasc/lmarbles/lmarbles.desc b/package/kasc/lmarbles/lmarbles.desc index 15a328e6d..696bad098 100644 --- a/package/kasc/lmarbles/lmarbles.desc +++ b/package/kasc/lmarbles/lmarbles.desc @@ -43,8 +43,8 @@ [L] GPL [S] Stable -[V] 1.0.6 +[V] 1.0.7 [P] X -?---5---9 214.900 -[D] 186720732 lmarbles-1.0.6.tar.gz http://ftp1.sourceforge.net/lgames/ +[D] 3154432462 lmarbles-1.0.7.tar.gz http://dl.sourceforge.net/sourceforge/lgames/ diff --git a/package/kasc/ltris/ltris.desc b/package/kasc/ltris/ltris.desc index 25690215f..64a69a99f 100644 --- a/package/kasc/ltris/ltris.desc +++ b/package/kasc/ltris/ltris.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 1.0.6 +[V] 1.0.7 [P] X -?---5---9 215.100 -[D] 1533982730 ltris-1.0.6.tar.gz http://ftp1.sourceforge.net/lgames/ +[D] 2274428598 ltris-1.0.7.tar.gz http://dl.sourceforge.net/sourceforge/lgames/ diff --git a/package/kasc/powermanga/powermanga.desc b/package/kasc/powermanga/powermanga.desc index 8c4fc621f..43d28aec4 100644 --- a/package/kasc/powermanga/powermanga.desc +++ b/package/kasc/powermanga/powermanga.desc @@ -35,12 +35,12 @@ [C] extra/game #[C] extra/game/arcade -[R] + x86 +[R] + x86 powerpc [L] GPL [S] Stable -[V] 0.78 +[V] 0.79 [P] X -?---5---9 215.500 -[D] 545128608 powermanga-0.78.tar.gz !http://www.tlk.fr/lesjeux/powermanga.tar.gz +[D] 4001643338 powermanga-0.79.tgz http://linux.tlk.fr/games/Powermanga/download/ diff --git a/package/kasc/rocksndiamonds/rocksndiamonds.desc b/package/kasc/rocksndiamonds/rocksndiamonds.desc index 7f1255877..ef62dcdfc 100644 --- a/package/kasc/rocksndiamonds/rocksndiamonds.desc +++ b/package/kasc/rocksndiamonds/rocksndiamonds.desc @@ -49,8 +49,8 @@ [L] GPL [S] Stable -[V] 3.0.8 +[V] 3.1.0 [P] X -?---5---9 215.600 -[D] 3196100935 rocksndiamonds-3.0.8.tar.gz http://www.artsoft.org/RELEASES/unix/rocksndiamonds/ +[D] 189693764 rocksndiamonds-3.1.0.tar.gz http://www.artsoft.org/RELEASES/unix/rocksndiamonds/ diff --git a/package/kasc/scilab/configure-fix.patch b/package/kasc/scilab/configure-fix.patch deleted file mode 100644 index a7386a73b..000000000 --- a/package/kasc/scilab/configure-fix.patch +++ /dev/null @@ -1,37 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/kasc/scilab/configure-fix.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - - -For some (outdated?) reason the damn configure does want to have a --pc- in the host type specified - which we do not have anymore (for -professionality reasons). - - - Rene Rebe - ---- scilab-2.7/configure.orig 2003-02-06 08:42:04.000000000 +0100 -+++ scilab-2.7/configure 2004-03-04 15:09:18.000000000 +0100 -@@ -7362,7 +7362,7 @@ - MAKEFILE_TARGET=Makefile.linux - ;; - # Linux ELF: all standard distributions -- *-pc-linux-gnu) -+ *-*-linux-gnu) - LIEEELIB= - echo "$as_me:7367: checking for main in -lieee" >&5 - echo $ECHO_N "checking for main in -lieee... $ECHO_C" >&6 diff --git a/package/kasc/scilab/scilab.desc b/package/kasc/scilab/scilab.desc index 5f4bf9427..e9214d2a8 100644 --- a/package/kasc/scilab/scilab.desc +++ b/package/kasc/scilab/scilab.desc @@ -42,8 +42,8 @@ [L] GPL [S] Stable -[V] 2.7 +[V] 3.0 [P] X -?---5---9 208.700 -[D] 962056511 scilab-2.7.src.tar.gz ftp://ftp.inria.fr/INRIA/Scilab/distributions/ +[D] 602351447 scilab-3.0.src.tar.gz http://scilabsoft.inria.fr/download/stable/ diff --git a/package/kasc/simgear/simgear.desc b/package/kasc/simgear/simgear.desc index a50c9ba65..6e6f168c9 100644 --- a/package/kasc/simgear/simgear.desc +++ b/package/kasc/simgear/simgear.desc @@ -40,8 +40,8 @@ [L] GPL [S] Stable -[V] 0.3.5 +[V] 0.3.7 [P] X -?---5---9 211.300 -[D] 976864394 SimGear-0.3.5.tar.gz ftp://ftp.de.simgear.org/pub/simgear/Source/ +[D] 1663234817 SimGear-0.3.7.tar.gz ftp://ftp.simgear.org/pub/simgear/Source/ diff --git a/package/kasc/simutrans/simutrans.conf b/package/kasc/simutrans/simutrans.conf index 6a8905c8e..b0887420a 100644 --- a/package/kasc/simutrans/simutrans.conf +++ b/package/kasc/simutrans/simutrans.conf @@ -31,8 +31,8 @@ createdocs=0 simutrans_main() { cd $datadir - tar $taropt $archdir/simulinux-${ver}exp.tar.bz2 - unzip -u -o $archdir/simubase-${ver}exp.zip + tar $taropt $archdir/simulinux-${ver}.tar.bz2 + unzip -u -o $archdir/simubase-${ver}.zip echo "#!/bin/bash" >$bindir/simutrans echo "cd $datadir/simutrans" >>$bindir/simutrans echo "./simutrans \"\$@\"" >>$bindir/simutrans diff --git a/package/kasc/simutrans/simutrans.desc b/package/kasc/simutrans/simutrans.desc index 1caab1499..609ef903a 100644 --- a/package/kasc/simutrans/simutrans.desc +++ b/package/kasc/simutrans/simutrans.desc @@ -51,9 +51,9 @@ [L] GPL [S] Stable -[V] 0_82_15_7 +[V] 0_84_16_2 [P] X -?---5---9 215.900 -[D] 3695520101 simulinux-0_82_15_7exp.tar.gz http://www.s-line.de/homepages/simutrans/data/ -[D] 3379565924 simubase-0_82_15_7exp.zip http://www.s-line.de/homepages/simutrans/data/ +[D] 4050273777 simulinux-0_84_16_2.tar.gz http://hajo.simutrans.com/download/ +[D] 1209531354 simubase-0_84_16_2.zip http://hajo.simutrans.com/download/