diff options
| author |   Tristan Heaven <tristan@gentoo.org> | 2009-06-13 16:25:34 +0000 |
|---|---|---|
| committer | Tristan Heaven <tristan@gentoo.org> | 2009-06-13 16:25:34 +0000 |
| commit | 919c927e20316e12052efac01a5c51e1f694f100 (patch) | |
| tree | d342483d7d203df68376a2326f00ef0aa3184d7e | |
| parent | Revbump. Fixes bug 188405 and bug 274017 (diff) | |
| download | historical-919c927e20316e12052efac01a5c51e1f694f100.tar.gz historical-919c927e20316e12052efac01a5c51e1f694f100.tar.bz2 historical-919c927e20316e12052efac01a5c51e1f694f100.zip | |
Fix building with glibc-2.10, bug #273588
Package-Manager: portage-2.2_rc33/cvs/Linux i686
| -rw-r--r-- | games-fps/avp/ChangeLog | 8 | ||||
| -rw-r--r-- | games-fps/avp/Manifest | 15 | ||||
| -rw-r--r-- | games-fps/avp/avp-20070130-r1.ebuild | 20 | ||||
| -rw-r--r-- | games-fps/avp/files/avp-20070130-glibc2.10.patch | 11 |
4 files changed, 43 insertions, 11 deletions
diff --git a/games-fps/avp/ChangeLog b/games-fps/avp/ChangeLog index e42ab0b0a0e8..78039d84e7ce 100644 --- a/games-fps/avp/ChangeLog +++ b/games-fps/avp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/avp -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/avp/ChangeLog,v 1.11 2008/01/19 05:05:52 nyhm Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/avp/ChangeLog,v 1.12 2009/06/13 16:25:34 nyhm Exp $ + + 13 Jun 2009; Tristan Heaven <nyhm@gentoo.org> avp-20070130-r1.ebuild, + +files/avp-20070130-glibc2.10.patch: + Fix building with glibc-2.10, bug #273588 19 Jan 2008; Tristan Heaven <nyhm@gentoo.org> avp-20070130-r1.ebuild: Fix deps for amd64, bug #206380 diff --git a/games-fps/avp/Manifest b/games-fps/avp/Manifest index 02450faaf7a0..3a03e6432f53 100644 --- a/games-fps/avp/Manifest +++ b/games-fps/avp/Manifest @@ -1,5 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX avp-20070130-gcc42.patch 632 RMD160 3010e4b0486a187487b9d494f4d47b0a6d9f0a2e SHA1 ffb197af0e02dc0a1b2b121d47d9030222d1a47a SHA256 248345971831e739aecbe474ebaf8cb8fb6a5d43805356dff4916bc4c1c0eefa +AUX avp-20070130-glibc2.10.patch 226 RMD160 d0d192a2a82dda91204fcf715c38cab9067b5ede SHA1 7a5b7ec1e2094fe24bcffc8dddb5344051e0bd38 SHA256 423161a9c5ac90737d5621b78300e5cc91033edf70a0ee8ab90312c258217cbe DIST avp-20070130.tar.bz2 1523270 RMD160 3ad032b2489ccddf1bd4ae60a602eefe9da121a1 SHA1 768bccd025123be88b834b351d255f4a8de533b4 SHA256 f857040fc591ff7e8983be4e0d1ca44ea290e6b954ba9a234a6664ff01b4be58 -EBUILD avp-20070130-r1.ebuild 999 RMD160 6b1dcfce564109eed9f4869128d8501e0c993eaa SHA1 33807ac42f8c9de14ddb4b4304ed2b5f4a4af1ab SHA256 0074ebe88da4822aabec25335cefec8109ac8a1c3085881a2c67ba74c14f3e01 -MISC ChangeLog 3255 RMD160 aff33d636b171ee40e67ec10534e2797c2376261 SHA1 832ed954dc2cdf76f4a8147ba49dfb6c7f6f8a11 SHA256 198e6c379ffbec1f283a7194f3438316f0fe1477dd1f18434da3da3d25d472ef +EBUILD avp-20070130-r1.ebuild 1158 RMD160 90d550b8e83802b9ab938716ddb75cbde2cf79ab SHA1 c479d2b7ff85342584992ee32ea787f97ab65bae SHA256 579bd85b1cd9eaf08b8ad7c30d35d67bf8a224c7aa4a6461198acbf1b268394c +MISC ChangeLog 3411 RMD160 b8de05c5948d631a944f25b4f39dd40ba821f962 SHA1 3781ddd9643c91a2fde447eb4d1cd66da93d87f7 SHA256 0fe695009c4931bcd1dd6c26301d8a87b1bd49617d38d4a4e6d3e539c8334f1d MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAkoz0wQACgkQdz7hIScOURGyFQCcDTpKWCR4GG4AgaP+klUzT0Hd +oGgAoLF4Ucq7uLB5BaV/fKBHlp55b/2H +=oUDV +-----END PGP SIGNATURE----- diff --git a/games-fps/avp/avp-20070130-r1.ebuild b/games-fps/avp/avp-20070130-r1.ebuild index 4f8c718229d3..058a728e47bd 100644 --- a/games-fps/avp/avp-20070130-r1.ebuild +++ b/games-fps/avp/avp-20070130-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/avp/avp-20070130-r1.ebuild,v 1.3 2008/01/19 05:05:52 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/avp/avp-20070130-r1.ebuild,v 1.4 2009/06/13 16:25:34 nyhm Exp $ +EAPI=2 inherit eutils games DESCRIPTION="Linux port of Aliens vs Predator" @@ -13,20 +14,25 @@ SLOT="0" KEYWORDS="~amd64 x86" IUSE="" -DEPEND="virtual/opengl +RDEPEND="virtual/opengl media-libs/openal media-libs/libsdl amd64? ( app-emulation/emul-linux-x86-sdl )" +DEPEND="${RDEPEND} + dev-util/pkgconfig" S=${WORKDIR}/${PN} -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-gcc42.patch +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-gcc42.patch \ + "${FILESDIR}"/${P}-glibc2.10.patch sed -i \ + -e '/^CC /s:=:?=:' \ + -e '/^CXX /s:=:?=:' \ -e "/^CFLAGS/s/-g.*/${CFLAGS}/" \ -e "/^LDLIBS/s/$/${LDFLAGS}/" \ + -e 's:openal-config:pkg-config openal:' \ Makefile \ || die "sed failed" } diff --git a/games-fps/avp/files/avp-20070130-glibc2.10.patch b/games-fps/avp/files/avp-20070130-glibc2.10.patch new file mode 100644 index 000000000000..908f1a6c047e --- /dev/null +++ b/games-fps/avp/files/avp-20070130-glibc2.10.patch @@ -0,0 +1,11 @@ +--- avp/win95/jsndsup.cpp ++++ avp/win95/jsndsup.cpp +@@ -109,7 +109,7 @@ + { + if(!SoundSwitchedOn) return (0); + +- char * wavname = strrchr (fname, '\\'); ++ char * wavname = strrchr ((char *)fname, '\\'); + + if (wavname) + { |