diff options
| author |   Mark Loeser <halcy0n@gentoo.org> | 2006-01-29 00:01:17 +0000 |
|---|---|---|
| committer | Mark Loeser <halcy0n@gentoo.org> | 2006-01-29 00:01:17 +0000 |
| commit | a807cd18d669f78ba887bfb38aa827b81bcf3153 (patch) | |
| tree | 5fd54066bda40d1585e8aed80887d6232f6c5182 /games-fps/wolfgl/files | |
| parent | Fix this category's dependencies to work with modular X. (diff) | |
| download | historical-a807cd18d669f78ba887bfb38aa827b81bcf3153.tar.gz historical-a807cd18d669f78ba887bfb38aa827b81bcf3153.tar.bz2 historical-a807cd18d669f78ba887bfb38aa827b81bcf3153.zip | |
Add patch to fix compilation with gcc-4; bug #119208
Package-Manager: portage-2.1_pre4
Diffstat (limited to 'games-fps/wolfgl/files')
| -rw-r--r-- | games-fps/wolfgl/files/0.93-gcc4.patch | 80 | ||||
| -rw-r--r-- | games-fps/wolfgl/files/digest-wolfgl-0.93-r1 | 6 |
2 files changed, 86 insertions, 0 deletions
diff --git a/games-fps/wolfgl/files/0.93-gcc4.patch b/games-fps/wolfgl/files/0.93-gcc4.patch new file mode 100644 index 000000000000..5dcccd76049b --- /dev/null +++ b/games-fps/wolfgl/files/0.93-gcc4.patch @@ -0,0 +1,80 @@ +diff -ur wolfgl-0.93-orig/common/id_ca.c wolfgl-0.93/common/id_ca.c +--- wolfgl-0.93-orig/common/id_ca.c 2006-01-28 16:59:10.000000000 -0500 ++++ wolfgl-0.93/common/id_ca.c 2006-01-28 17:04:26.000000000 -0500 +@@ -252,6 +252,7 @@ + { + unsigned short ch,chhigh,count,offset; + unsigned short *copyptr, *inptr, *outptr; ++ unsigned char *uc_inptr; + + length/=2; + +@@ -268,13 +269,17 @@ + if (!count) + { + // have to insert a word containing the tag byte +- ch |= *((unsigned char*)inptr)++; ++ uc_inptr = (unsigned char*)inptr; ++ ch |= *(uc_inptr)++; ++ inptr = (unsigned short *)uc_inptr; + *outptr++ = ch; + length--; + } + else + { +- offset = *((unsigned char*)inptr)++; ++ uc_inptr = (unsigned char*)inptr; ++ offset = *(uc_inptr)++; ++ inptr = (unsigned short *)uc_inptr; + copyptr = outptr - offset; + length -= count; + while (count--) +@@ -287,7 +292,9 @@ + if (!count) + { + // have to insert a word containing the tag byte +- ch |= *((unsigned char*)inptr)++; ++ uc_inptr = (unsigned char*)inptr; ++ ch |= *(uc_inptr)++; ++ inptr = (unsigned short *)uc_inptr; + *outptr++ = ch; + length --; + } +@@ -806,7 +813,7 @@ + + for (i=0;i<NUMCHUNKS;i++) + if (grsegs[i]) +- MM_SetPurge (&(memptr)grsegs[i],3); ++ MM_SetPurge ((memptr)&grsegs[i],3); + ca_levelbit<<=1; + ca_levelnum++; + } +@@ -862,7 +869,7 @@ + + for (i = 0; i < NUMCHUNKS; i++) + if (grsegs[i]) +- MM_SetPurge (&(memptr)grsegs[i],3); ++ MM_SetPurge ((memptr)&grsegs[i],3); + } + + //=========================================================================== +diff -ur wolfgl-0.93-orig/common/wl_game.c wolfgl-0.93/common/wl_game.c +--- wolfgl-0.93-orig/common/wl_game.c 2006-01-28 16:59:10.000000000 -0500 ++++ wolfgl-0.93/common/wl_game.c 2006-01-28 17:07:08.000000000 -0500 +@@ -545,13 +545,13 @@ + { + // solid wall + tilemap[x][y] = tile; +- (unsigned short)actorat[x][y] = tile; ++ actorat[x][y] = tile; + } + else + { + // area floor + tilemap[x][y] = 0; +- (unsigned short)actorat[x][y] = 0; ++ actorat[x][y] = 0; + } + } + + diff --git a/games-fps/wolfgl/files/digest-wolfgl-0.93-r1 b/games-fps/wolfgl/files/digest-wolfgl-0.93-r1 index 6bc161f35246..b337f0663f70 100644 --- a/games-fps/wolfgl/files/digest-wolfgl-0.93-r1 +++ b/games-fps/wolfgl/files/digest-wolfgl-0.93-r1 @@ -1,3 +1,9 @@ MD5 0aa1f89a8f5ddef700613b0f428fd8b0 sdmdata.zip 557147 +RMD160 bf314c95d09bbfb5f3716767cbeb68f86deaf716 sdmdata.zip 557147 +SHA256 054590923cd35ce7c0bfae98c23be81ab70c28e11fd0e562b5253523fcd7b91f sdmdata.zip 557147 MD5 bc4564940cae816aec0f4af0b8436baf wolfdata.zip 564771 +RMD160 d9cd78b52702a7c3ad6f246e892cee9a4940de9c wolfdata.zip 564771 +SHA256 a32ee97c515b6e182597a06f2326d15cc4c343ddc70558ce5fe76c870b7a0027 wolfdata.zip 564771 MD5 58259bb463c3f8dd2786685b90b8ed0f wolfgl-0.93.tbz2 146132 +RMD160 ee48b2519cb8c103067cd9433da1949ae950d556 wolfgl-0.93.tbz2 146132 +SHA256 137b311edabc7bdde462cfb51bcfd468e35398828d33f0d99fcc024ceece3739 wolfgl-0.93.tbz2 146132 |