diff options
| author |   Tristan Heaven <nyhm@gentoo.org> | 2009-06-13 16:25:34 +0000 |
|---|---|---|
| committer | Tristan Heaven <nyhm@gentoo.org> | 2009-06-13 16:25:34 +0000 |
| commit | 94bd9b008ea7fdf5c0bf2fc3b8e48251243ec2be (patch) | |
| tree | 0e6ed04dcea8229f56cb869810536fc8a955e4bb /games-fps/avp | |
| parent | Revbump. Fixes bug 188405 and bug 274017 (diff) | |
| download | gentoo-2-94bd9b008ea7fdf5c0bf2fc3b8e48251243ec2be.tar.gz gentoo-2-94bd9b008ea7fdf5c0bf2fc3b8e48251243ec2be.tar.bz2 gentoo-2-94bd9b008ea7fdf5c0bf2fc3b8e48251243ec2be.zip | |
Fix building with glibc-2.10, bug #273588
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'games-fps/avp')
| -rw-r--r-- | games-fps/avp/ChangeLog | 8 | ||||
| -rw-r--r-- | games-fps/avp/avp-20070130-r1.ebuild | 20 | ||||
| -rw-r--r-- | games-fps/avp/files/avp-20070130-glibc2.10.patch | 11 |
3 files changed, 30 insertions, 9 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/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) + { |