diff options
| -rw-r--r-- | games-arcade/conveysdl/ChangeLog | 8 | ||||
| -rw-r--r-- | games-arcade/conveysdl/Manifest | 16 | ||||
| -rw-r--r-- | games-arcade/conveysdl/conveysdl-1.3.ebuild | 8 | ||||
| -rw-r--r-- | games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch | 29 | ||||
| -rw-r--r-- | games-arcade/conveysdl/files/conveysdl-1.3-speed.patch | 56 |
5 files changed, 101 insertions, 16 deletions
diff --git a/games-arcade/conveysdl/ChangeLog b/games-arcade/conveysdl/ChangeLog index f23a8bffa97d..ad2a872a488a 100644 --- a/games-arcade/conveysdl/ChangeLog +++ b/games-arcade/conveysdl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/conveysdl -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/conveysdl/ChangeLog,v 1.8 2009/05/31 01:41:23 nyhm Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-arcade/conveysdl/ChangeLog,v 1.9 2010/08/14 05:50:18 mr_bones_ Exp $ + + 14 Aug 2010; Michael Sterrett <mr_bones_@gentoo.org> conveysdl-1.3.ebuild, + +files/conveysdl-1.3-arrays.patch, +files/conveysdl-1.3-speed.patch: + Compile warnings and segfault fixes from Jyrki Launonen via bug #330161 31 May 2009; Tristan Heaven <nyhm@gentoo.org> conveysdl-1.3.ebuild: Fix LICENSE: as-is -> GPL-2 diff --git a/games-arcade/conveysdl/Manifest b/games-arcade/conveysdl/Manifest index bbce897cde7a..a9d980ebb033 100644 --- a/games-arcade/conveysdl/Manifest +++ b/games-arcade/conveysdl/Manifest @@ -1,14 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX conveysdl-1.3-arrays.patch 993 RMD160 908ed12594ded88cfede3c2d07983add1d4372a9 SHA1 92f154b093cad7809f95f768ed2da938df70ad71 SHA256 23d0e20cbda8f6c9940c8630e1bd8a0360cb590b7a0ea1dd0c8347d758c137b6 +AUX conveysdl-1.3-speed.patch 1410 RMD160 98cff032e2280cc544fcd184f29e59ee36d2e4b3 SHA1 232b7768d970d962fcb0aad41252c399ee586936 SHA256 1d2ab47ae86fb134abbcf6fb34448ea651aa7372cbe772f5eb7ed26be44c748f DIST conveysdl.1.3.tar 429568 RMD160 dc214567c3d5dd349c03d02005a9b50bc52901e9 SHA1 b4d406b9c837457c3da488c8bae0e3ea6254bf94 SHA256 d0de3f8435b6189d2f40fbe5a28f903fbd46d94b53daf10efa53b879346c81cf -EBUILD conveysdl-1.3.ebuild 1339 RMD160 c06bde5d66302087fcecaa01acf7e583a3a4fc7f SHA1 fec21f55a7408607666b0c357ac22aab55b5d6d9 SHA256 95e53439a44dc37903abc700824c60b7af63148b9c539ad6e5fd9bbd7b5e9bab -MISC ChangeLog 1214 RMD160 6d9688c7b41422de12dab4ace9e9a05a51f55ec9 SHA1 e40d4f9ae8889eba6df501e3199295fc3297fccb SHA256 6c801ed8f479fdcc36d96940b979c9bfe2b234cabc0261ce8833eccc3341c5f0 +EBUILD conveysdl-1.3.ebuild 1424 RMD160 3a0856e41dc0638124ea3e85bff0afe438593117 SHA1 0bc1f7558a4334772193d97807de002d0ba9778c SHA256 956c9971e41739a9fc36c49122e6cdda5588b639551b19a94e1a33ff2de09cf4 +MISC ChangeLog 1442 RMD160 d80cc730a201b5a5c4a61617ac4564d06671dd6c SHA1 729f7bb46d16c8f4d4929c582f1ee09915247168 SHA256 2a8eb015ed34a883159fbc33b86e4bfa9b8235d096d34dd51b95294c1fbcbb66 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkoh4EwACgkQdz7hIScOURHhwgCePpTopdu/ZiMujdIuqqnjffEo -89IAn2pljugGyozAN9S2HqFjRiyxvO+i -=u8jt ------END PGP SIGNATURE----- diff --git a/games-arcade/conveysdl/conveysdl-1.3.ebuild b/games-arcade/conveysdl/conveysdl-1.3.ebuild index e0d29c6b0f0e..ee9e6917dd9a 100644 --- a/games-arcade/conveysdl/conveysdl-1.3.ebuild +++ b/games-arcade/conveysdl/conveysdl-1.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/conveysdl/conveysdl-1.3.ebuild,v 1.6 2009/05/31 01:41:23 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/conveysdl/conveysdl-1.3.ebuild,v 1.7 2010/08/14 05:50:18 mr_bones_ Exp $ EAPI=2 inherit eutils toolchain-funcs games @@ -30,6 +30,10 @@ src_prepare() { -e 's:SDL_Mi:SDL_mi:' \ main.c \ || die "sed failed" + + epatch \ + "${FILESDIR}"/${P}-arrays.patch \ + "${FILESDIR}"/${P}-speed.patch } src_compile() { diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch b/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch new file mode 100644 index 000000000000..a3894e58d3d3 --- /dev/null +++ b/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch @@ -0,0 +1,29 @@ +--- main.c.org 2010-07-28 13:16:20.552161148 +0300 ++++ main.c 2010-07-29 20:43:14.714543259 +0300 +@@ -22,7 +22,7 @@ + + SDL_Surface *bletters; + SDL_Surface *letters[100]; +-SDL_Surface *tiles[9]; ++SDL_Surface *tiles[10]; + SDL_Surface *btiles; + SDL_Surface *blob; + SDL_Surface *jblob; +@@ -51,7 +51,7 @@ + FILE *file_ptr; + + +-int bpointx,bpointy,pointx,pointy,jug,death,goose,jump,jumpf,blibs,spr[1000][8],leveldone,level,lives,totallevels,blobx[7],bloby[7],blobp[7],score,bak,bok,buk,bik,start,blibo,blibs,die,jumpoo=12,speed=4,arse,highscore; ++int bpointx,bpointy,pointx,pointy,jug,death,goose,jump,jumpf,blibs,spr[1000][8],leveldone,level,lives,totallevels,blobx[8],bloby[8],blobp[8],score,bak,bok,buk,bik,start,blibo,blibs,die,jumpoo=12,speed=4,arse,highscore; + /* Keys */ + int quit = 0; + int spacebar = 0; +@@ -452,7 +452,7 @@ + static void info(void) + { + int monkey=70,munk; +- char scoremonkey[10]; ++ char scoremonkey[16]; + if (lives>1) { + for (munk=1 ; munk<lives ; munk++ ) + { diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch b/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch new file mode 100644 index 000000000000..2b5a6205650c --- /dev/null +++ b/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch @@ -0,0 +1,56 @@ +--- org/main.c 2010-07-30 10:41:21.392783010 +0300 ++++ main.c 2010-07-30 10:44:35.791690958 +0300 +@@ -52,6 +52,7 @@ + + + int bpointx,bpointy,pointx,pointy,jug,death,goose,jump,jumpf,blibs,spr[1000][8],leveldone,level,lives,totallevels,blobx[8],bloby[8],blobp[8],score,bak,bok,buk,bik,start,blibo,blibs,die,jumpoo=12,speed=4,arse,highscore; ++int realspeed; + /* Keys */ + int quit = 0; + int spacebar = 0; +@@ -140,6 +141,7 @@ + char path[256],jib[50]; + int lvspx,lvspy; + bpointx=200;bpointy=400;pointx=200;pointy=400;jug=1;death=0;jump=0;jumpf=0;jug=0;blibs=0;blibo=0;die=0;speed=4; ++ realspeed=speed; + strcpy(path, DATA_PREFIX); + sprintf(jib,"levels/level%d",level); + strcat(path, jib); +@@ -212,15 +214,16 @@ + if (jumpf==jumpoo) { jump=0; } + if (jumpf==jumpoo*2) { jumpf=0; } + } +- score+=speed; ++ score+=realspeed; + /*crap*/ + } + + static void plotfloor(void) + { ++ if (bpointy==400) realspeed=speed; + int nob,nx,nobx=48,ek,ej,el; +- bpointx-=speed*2; +- bpointy+=speed; ++ bpointx-=realspeed*2; ++ bpointy+=realspeed; + pointx=bpointx; + pointy=bpointy; + imageplot(bb, blobx[6], bloby[6] ); +@@ -542,7 +545,7 @@ + } + while ( jump_down==0 ); + leveldone=3; +- speed=4; ++ speed=4; realspeed=speed; + blankscreen(); + } + +@@ -563,7 +566,7 @@ + if (quit>0) break; + } + while ( jump_down==0 ); +- speed=4; ++ speed=4; realspeed=speed; + lives+=1; + level+=1; + getlevel(); |