diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2009-01-06 21:45:42 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2009-01-06 21:45:42 +0000 |
commit | 2d2e040542cabe9fad73b89b77f013a506dcf758 (patch) | |
tree | 2eafcd7cc69046259f8a4a21e1984f609dbb247f | |
parent | old (diff) | |
download | gentoo-2-2d2e040542cabe9fad73b89b77f013a506dcf758.tar.gz gentoo-2-2d2e040542cabe9fad73b89b77f013a506dcf758.tar.bz2 gentoo-2-2d2e040542cabe9fad73b89b77f013a506dcf758.zip |
old
(Portage version: 2.1.6.4/cvs/Linux 2.6.27.8 i686)
-rw-r--r-- | games-action/bzflag/Manifest | 3 | ||||
-rw-r--r-- | games-action/bzflag/bzflag-2.0.8.ebuild | 85 | ||||
-rw-r--r-- | games-action/bzflag/files/bzflag-2.0.8-gcc4.patch | 94 |
3 files changed, 0 insertions, 182 deletions
diff --git a/games-action/bzflag/Manifest b/games-action/bzflag/Manifest index 9b1a720f4aa8..6bdbfaf009ac 100644 --- a/games-action/bzflag/Manifest +++ b/games-action/bzflag/Manifest @@ -1,7 +1,4 @@ -AUX bzflag-2.0.8-gcc4.patch 2290 RMD160 f2e8ada13d09c965173e18282418835a673b3057 SHA1 be45ab2e9ccd5499d85ad2d265e0becbf709db5e SHA256 408b59c6fd1bcde89144e8684e23a7e68e37b32ed28a1b8c733480dd23c64e07 DIST bzflag-2.0.12.tar.bz2 11397403 RMD160 d7e808e1ff24d5e98dbe4f6fac26691b36d2da56 SHA1 846e5cc2d94f9be2aac5960469c56d5ba9f4f565 SHA256 e6c9edc128e481f73572c4648e919036c6bc484c1a63f9cdd9740118f39d689a -DIST bzflag-2.0.8.tar.bz2 11330988 RMD160 8458df60f23b0192885835f6ac6d01e4d57b7d80 SHA1 de4fb0c55c106711d1c213b50edeeedcbbea9da0 SHA256 8d120aef46ad92d2699e582b32c44daac76bd274cf30c8be72223210cbdd9a20 EBUILD bzflag-2.0.12.ebuild 1812 RMD160 ede2c2d9cec46262f9bf9992bc7d05ca8ba31e64 SHA1 a4120827481de9169c482739a7c8c2b1e119bdcd SHA256 7f4473a2dcbb51010415c4182418419f30f22272ac67c60a158532dab7220d35 -EBUILD bzflag-2.0.8.ebuild 1900 RMD160 074c4d00fd58cbd090a0c52d429f8eb4a18ea74b SHA1 16ed9a13ba9b4fbfd7322901ef2ef5013e03c170 SHA256 3820a20bd771bb53d483a14b005d5bf753cd18d88b8f16618eb3da3bc5f0fa60 MISC ChangeLog 7173 RMD160 c9bcb296b8b0c0eabe35ce09501b758fd273e4df SHA1 6ac04a0960701a63e58529630583520def870d2e SHA256 2217d33567a93a2a1b8653107b5d2bd9a7fb3f0b8a6a8792aecdbf636b393937 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-action/bzflag/bzflag-2.0.8.ebuild b/games-action/bzflag/bzflag-2.0.8.ebuild deleted file mode 100644 index 3dab685b16aa..000000000000 --- a/games-action/bzflag/bzflag-2.0.8.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/bzflag/bzflag-2.0.8.ebuild,v 1.8 2008/02/29 18:21:15 carlo Exp $ - -inherit eutils flag-o-matic games - -DESCRIPTION="3D tank combat simulator game" -HOMEPAGE="http://www.bzflag.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~x86-fbsd" -IUSE="dedicated sdl" - -UIDEPEND="virtual/opengl - virtual/glu - media-libs/libsdl - media-libs/sdl-image - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXt - x11-libs/libXxf86vm" - -DEPEND=">=net-misc/curl-7.15.0 - sys-libs/ncurses - net-dns/c-ares - sdl? ( ${UIDEPEND} ) - !sdl? ( !dedicated? ( ${UIDEPEND} ) )" - -pkg_setup() { - # Only do the libsdl checks for !dedicated - bug #107792 - use dedicated || GAMES_USE_SDL="nojoystick" - games_pkg_setup -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${P}"-gcc4.patch - sed -i configure \ - -e 's:^CFLAGS=.*::' \ - -e 's:^CXXFLAGS=.*::' \ - -e 's:-mcpu=$host_cpu::' \ - -e 's:-mcpu=k8::' \ - -e 's:-mtune=$host_cpu::' \ - -e 's:-mtune=k8::' \ - || die "sed failed" - filter-flags -fno-default-inline -} - -src_compile() { - local myconf - - if use dedicated && ! use sdl ; then - ewarn - ewarn "You are building a server-only copy of BZFlag" - ewarn - myconf="--disable-client --without-SDL" - fi - egamesconf \ - --disable-dependency-tracking \ - ${myconf} \ - || die "egamesconf failed" - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS TODO ChangeLog BUGS PORTING DEVINFO NEWS README* RELNOTES - - if use sdl || ! use dedicated ; then - doicon "data/bzflag-48x48.png" - make_desktop_entry ${PN} "BZFlag" ${PN}-48x48 - fi - - prepgamesdirs -} diff --git a/games-action/bzflag/files/bzflag-2.0.8-gcc4.patch b/games-action/bzflag/files/bzflag-2.0.8-gcc4.patch deleted file mode 100644 index 99bffc7070d1..000000000000 --- a/games-action/bzflag/files/bzflag-2.0.8-gcc4.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- src/net/Pack.cxx.old 2006-12-22 21:45:34.000000000 +0100 -+++ src/net/Pack.cxx 2006-12-22 21:45:42.000000000 +0100 -@@ -17,6 +17,15 @@ - - #define ADV(_b, _t) ((void*)(((char*)(_b)) + sizeof(_t))) - -+// -+// Unions -+// -+ -+union floatintuni { -+ float floatval; -+ uint32_t intval; -+}; -+ - - // - // Buffer Overrun Checks -@@ -93,23 +102,27 @@ - void* nboPackFloat(void* b, float v) - { - // hope that float is a 4 byte IEEE 754 standard encoding -- uint32_t x = htonl(*((uint32_t*)&v)); -- ::memcpy(b, &x, sizeof(float)); -- return ADV(b, float); -+ floatintuni u; -+ u.floatval = v; -+ -+ uint32_t x = (uint32_t)htonl(u.intval); -+ ::memcpy(b, &x, sizeof(uint32_t)); -+ return ADV(b, uint32_t); - } - - void* nboPackVector(void* b, const float *v) - { - // hope that float is a 4 byte IEEE 754 standard encoding -- uint32_t data[3]; -- uint32_t *pV = (uint32_t *)v; -- uint32_t *pB = (uint32_t *)data; -- -- *(pB++) = htonl(*(pV++)); -- *(pB++) = htonl(*(pV++)); -- *pB = htonl(*pV); -- ::memcpy( b, data, 3*sizeof(float)); -- return (void*) (((char*)b)+3*sizeof(float)); -+ floatintuni u; -+ uint32_t data[3]; -+ -+ for (int i=0; i<3; i++) { -+ u.floatval = v[i]; -+ data[i] = (uint32_t)htonl(u.intval); -+ } -+ -+ ::memcpy( b, data, 3*sizeof(uint32_t)); -+ return (void*) (((char*)b)+3*sizeof(uint32_t)); - } - - void* nboPackString(void* b, const void* m, int len) -@@ -229,9 +242,10 @@ - // hope that float is a 4 byte IEEE 754 standard encoding - uint32_t x; - ::memcpy(&x, b, sizeof(uint32_t)); -- const uint32_t y = (uint32_t)ntohl(x); -- v = *((float*)&y); -- return ADV(b, float); -+ floatintuni u; -+ u.intval = (uint32_t)ntohl(x); -+ v = u.floatval; -+ return ADV(b, uint32_t); - } - - void* nboUnpackVector(void* b, float *v) -@@ -247,13 +261,14 @@ - } - // hope that float is a 4 byte IEEE 754 standard encoding - uint32_t data[3]; -- ::memcpy( data, b, 3*sizeof(float)); -- uint32_t *pV = (uint32_t *)v; -- uint32_t *pB = (uint32_t *)data; -- -- *(pV++) = (uint32_t)ntohl(*(pB++)); -- *(pV++) = (uint32_t)ntohl(*(pB++)); -- *pV = (uint32_t)ntohl(*pB); -+ floatintuni u; -+ ::memcpy( data, b, 3*sizeof(uint32_t)); -+ -+ for (int i=0; i<3; i++) { -+ u.intval = (uint32_t)ntohl(data[i]); -+ v[i] = u.floatval; -+ } -+ - return (void *) (((char*)b) + 3*sizeof(float)); - } - |