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 | 00d53ffe3b2699a60842040a0ade3f01fba71d0f (patch) | |
tree | a786ff4b0a627bc3597bd4d44cef83dd13473ff5 /games-fps | |
parent | Fix this category's dependencies to work with modular X. (diff) | |
download | gentoo-2-00d53ffe3b2699a60842040a0ade3f01fba71d0f.tar.gz gentoo-2-00d53ffe3b2699a60842040a0ade3f01fba71d0f.tar.bz2 gentoo-2-00d53ffe3b2699a60842040a0ade3f01fba71d0f.zip |
Add patch to fix compilation with gcc-4; bug #119208
(Portage version: 2.1_pre4)
Diffstat (limited to 'games-fps')
-rw-r--r-- | games-fps/wolfgl/ChangeLog | 6 | ||||
-rw-r--r-- | games-fps/wolfgl/Manifest | 31 | ||||
-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 | ||||
-rw-r--r-- | games-fps/wolfgl/wolfgl-0.93-r1.ebuild | 5 |
5 files changed, 113 insertions, 15 deletions
diff --git a/games-fps/wolfgl/ChangeLog b/games-fps/wolfgl/ChangeLog index 24fef3030024..97fc95c7d18e 100644 --- a/games-fps/wolfgl/ChangeLog +++ b/games-fps/wolfgl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/wolfgl # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/wolfgl/ChangeLog,v 1.7 2006/01/22 17:49:54 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/wolfgl/ChangeLog,v 1.8 2006/01/29 00:01:17 halcy0n Exp $ + + 29 Jan 2006; Mark Loeser <halcy0n@gentoo.org> +files/0.93-gcc4.patch, + wolfgl-0.93-r1.ebuild: + Add patch to fix compilation with gcc-4; bug #119208 22 Jan 2006; <chainsaw@gentoo.org> metadata.xml, wolfgl-0.93-r1.ebuild: diff --git a/games-fps/wolfgl/Manifest b/games-fps/wolfgl/Manifest index 983a1ef1ff9b..88523fbdb5c4 100644 --- a/games-fps/wolfgl/Manifest +++ b/games-fps/wolfgl/Manifest @@ -1,17 +1,24 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 5c119c250fa7555a901354dbab1b2d93 ChangeLog 1035 +RMD160 84d8cfa9510e86d05071f4ed5fc9d45e8357a811 ChangeLog 1035 +SHA256 6fbee174254e1fb4e08b9a10a9a1a5352061a1556ecff644b4120d9b33715ca9 ChangeLog 1035 MD5 bdf14265188a44d2ad2e2ba26985767a files/0.93-gcc.patch 5571 +RMD160 b399797cefea183c97ba5a8aa22246e10be9865a files/0.93-gcc.patch 5571 +SHA256 ceea7a431b1c234d2b99f205cbb852430ce4eba176109ded840673cf7eab5804 files/0.93-gcc.patch 5571 +MD5 a2906c300e2b3453d0331f6a3e362182 files/0.93-gcc4.patch 2095 +RMD160 7d82ce7645bad900f921d4d86105e775954d3bcb files/0.93-gcc4.patch 2095 +SHA256 6c92aee8c73ad80988b45994411fbb7cc049c1bb151f0787f4727077dc06295d files/0.93-gcc4.patch 2095 MD5 25782479460bbc5030e527cab7abe564 files/0.93-sample-rate.patch 345 +RMD160 b2640e8dd6f80f7f1035e2ea89e72eb939e3a633 files/0.93-sample-rate.patch 345 +SHA256 741b2efc5a146097fd9712ef63b49f559df745fc2d09ad92cd31e8c274697e4e files/0.93-sample-rate.patch 345 MD5 37e2f5d86bf9d3c54d15cdef39cf4897 files/0.93-sprite.patch 2320 -MD5 e3146c33c3c344e98242dd631155657e files/digest-wolfgl-0.93-r1 174 +RMD160 402255faa1e38e549e60b6a6f86f04c29c4caa1f files/0.93-sprite.patch 2320 +SHA256 201a42b7bcbc3a680d98588cc512bb678f8c30948acdbc6b356939c00a6106dd files/0.93-sprite.patch 2320 +MD5 98e9945dbb0b2952fb88e6bc1e6aedc2 files/digest-wolfgl-0.93-r1 660 +RMD160 f0776571ec823d2e1dc8f852b71645ae4247a940 files/digest-wolfgl-0.93-r1 660 +SHA256 db826200195d6525fa29d5320134be75fc9fac49a02b87607b368beea03a9e92 files/digest-wolfgl-0.93-r1 660 MD5 7f1f3c0172523729641ba9bc11dcbe55 metadata.xml 248 -MD5 8bda468789be81f2d63a293d1759f8ca wolfgl-0.93-r1.ebuild 1632 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux) - -iD8DBQFD08Yxp5vW4rUFj5oRAi9ZAJ4uMm3+t3KDq92K1qsuDtfWzPbA5wCcCDQM -s5xn6BIxpZsd3FoOvuNTrFA= -=q8+T ------END PGP SIGNATURE----- +RMD160 d4562154529dcf1e58b2c050579e5f11c19f3c2d metadata.xml 248 +SHA256 cfd252fa1e830c4089fda2c205539500d6b2134b3fb65a4021ba1010b50185a3 metadata.xml 248 +MD5 9876b628976b5b1959d928bb3fa4a23b wolfgl-0.93-r1.ebuild 1667 +RMD160 0452de8faddb29e329db49af11940323b4aeca27 wolfgl-0.93-r1.ebuild 1667 +SHA256 f81a8e4b765afc1e6754cd57912eea90784cd0cea1cb118c27cda26e7113daad wolfgl-0.93-r1.ebuild 1667 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 diff --git a/games-fps/wolfgl/wolfgl-0.93-r1.ebuild b/games-fps/wolfgl/wolfgl-0.93-r1.ebuild index e4d31915939c..383e683b31d5 100644 --- a/games-fps/wolfgl/wolfgl-0.93-r1.ebuild +++ b/games-fps/wolfgl/wolfgl-0.93-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/wolfgl/wolfgl-0.93-r1.ebuild,v 1.6 2006/01/22 17:49:54 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/wolfgl/wolfgl-0.93-r1.ebuild,v 1.7 2006/01/29 00:01:17 halcy0n Exp $ #ECVS_SERVER="cvs.sourceforge.net:/cvsroot/wolfgl" #ECVS_MODULE="wolfgl" @@ -33,7 +33,8 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${PV}-gcc.patch \ "${FILESDIR}"/${PV}-sample-rate.patch \ - "${FILESDIR}"/${PV}-sprite.patch + "${FILESDIR}"/${PV}-sprite.patch \ + "${FILESDIR}"/${PV}-gcc4.patch } src_compile() { |