diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2014-05-15 11:46:29 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2014-05-15 11:46:29 +0000 |
| commit | d3f86259820f581e48cbd7ff64105eaeb15d3633 (patch) | |
| tree | d37fcf469fefd62c5eb7dc79b7fba84ab7caa98e /games-sports/vdrift | |
| parent | Remove accidental HPPA keywording. (diff) | |
| download | gentoo-2-d3f86259820f581e48cbd7ff64105eaeb15d3633.tar.gz gentoo-2-d3f86259820f581e48cbd7ff64105eaeb15d3633.tar.bz2 gentoo-2-d3f86259820f581e48cbd7ff64105eaeb15d3633.zip | |
Fix build with sci-physics/bullet-2.82. Bug #501016
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0145142D)
Diffstat (limited to 'games-sports/vdrift')
| -rw-r--r-- | games-sports/vdrift/ChangeLog | 6 | ||||
| -rw-r--r-- | games-sports/vdrift/files/vdrift-20111022-bullet282.patch | 11 | ||||
| -rw-r--r-- | games-sports/vdrift/vdrift-20111022.ebuild | 7 |
3 files changed, 20 insertions, 4 deletions
diff --git a/games-sports/vdrift/ChangeLog b/games-sports/vdrift/ChangeLog index 7bf892c7bbf6..bac0d96af899 100644 --- a/games-sports/vdrift/ChangeLog +++ b/games-sports/vdrift/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-sports/vdrift # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-sports/vdrift/ChangeLog,v 1.21 2014/05/15 11:17:50 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-sports/vdrift/ChangeLog,v 1.22 2014/05/15 11:46:29 tupone Exp $ + + 15 May 2014; Tupone Alfredo <tupone@gentoo.org> vdrift-20111022.ebuild, + +files/vdrift-20111022-bullet282.patch: + Fix build with sci-physics/bullet-2.82. Bug #501016 by Andrei Slavoiu 15 May 2014; Tupone Alfredo <tupone@gentoo.org> files/vdrift-20090615-ldflags.patch: diff --git a/games-sports/vdrift/files/vdrift-20111022-bullet282.patch b/games-sports/vdrift/files/vdrift-20111022-bullet282.patch new file mode 100644 index 000000000000..a16dd42f8365 --- /dev/null +++ b/games-sports/vdrift/files/vdrift-20111022-bullet282.patch @@ -0,0 +1,11 @@ +--- src/dynamicsworld.cpp.old 2014-05-15 13:23:06.584092773 +0200 ++++ src/dynamicsworld.cpp 2014-05-15 13:23:13.748948512 +0200 +@@ -101,7 +101,7 @@ + int patch_id = -1; + const BEZIER * b = 0; + const TRACKSURFACE * s = TRACKSURFACE::None(); +- btCollisionObject * c = 0; ++ const btCollisionObject * c = 0; + + MyRayResultCallback ray(origin, p, caster); + rayTest(origin, p, ray); diff --git a/games-sports/vdrift/vdrift-20111022.ebuild b/games-sports/vdrift/vdrift-20111022.ebuild index c0db1947bd33..0e320dca0f50 100644 --- a/games-sports/vdrift/vdrift-20111022.ebuild +++ b/games-sports/vdrift/vdrift-20111022.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-sports/vdrift/vdrift-20111022.ebuild,v 1.5 2012/07/24 16:52:50 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-sports/vdrift/vdrift-20111022.ebuild,v 1.6 2014/05/15 11:46:29 tupone Exp $ EAPI=2 inherit eutils scons-utils games @@ -33,7 +33,8 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} src_prepare() { - epatch "${FILESDIR}"/${P}-build.patch + epatch "${FILESDIR}"/${P}-build.patch \ + "${FILESDIR}"/${P}-bullet282.patch } src_compile() { |