diff options
author | Alfredo Tupone <tupone@gentoo.org> | 2014-05-15 11:46:33 +0000 |
---|---|---|
committer | Alfredo Tupone <tupone@gentoo.org> | 2014-05-15 11:46:33 +0000 |
commit | 5664d571ddd1f65429d195e92896994f745ccadc (patch) | |
tree | 77f1b6fc2329d035e034825cd156db43d31ca114 /games-sports | |
parent | Remove accidental HPPA keywording. (diff) | |
download | historical-5664d571ddd1f65429d195e92896994f745ccadc.tar.gz historical-5664d571ddd1f65429d195e92896994f745ccadc.tar.bz2 historical-5664d571ddd1f65429d195e92896994f745ccadc.zip |
Fix build with sci-physics/bullet-2.82. Bug #501016
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x0145142D
Diffstat (limited to 'games-sports')
-rw-r--r-- | games-sports/vdrift/ChangeLog | 6 | ||||
-rw-r--r-- | games-sports/vdrift/Manifest | 11 | ||||
-rw-r--r-- | games-sports/vdrift/files/vdrift-20111022-bullet282.patch | 11 | ||||
-rw-r--r-- | games-sports/vdrift/vdrift-20111022.ebuild | 7 |
4 files changed, 26 insertions, 9 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/Manifest b/games-sports/vdrift/Manifest index f38723134f2a..53ca5f06fa7b 100644 --- a/games-sports/vdrift/Manifest +++ b/games-sports/vdrift/Manifest @@ -3,16 +3,17 @@ Hash: SHA256 AUX vdrift-20090615-ldflags.patch 876 SHA256 7e4a0992213e2f472edbf7f79f1a67583de8a308d848b9cbd9ee27845b853aa0 SHA512 f23f4c0e3c33dfe699b382749b49642b724347d11f5110bf4a954938f1ce0c38a7efcda3fed096d2cf874b514221de18826168e2fb4e29a248282050b1d016ee WHIRLPOOL 4a27e5a6e8f4fa74939a27a95623d585b77f4cbe9998d9935433b8a743f1ff949b9aee2c2d27d5f3673b62dc802bc5075d4368ca33ce813c8d47480a24b022b8 AUX vdrift-20111022-build.patch 1274 SHA256 fd443f5207c025ff5d89ff35596ecf7da8ae54eceb5a2fded2bb4f30eb68994e SHA512 c0a2fe15fd3df7f71e1d081befedec06f312c6dc72a19419e13d997ad4a69a902926116ba8fc252bb95b224ac9610b0542291bab64b9e9d1266432a4a7160023 WHIRLPOOL ed94bb22a643c8eb038e899be161f6e27cb1538b97dd982955bb989b2c8c728c9073ced8d5e0f21269fd33278c1e6a881237f45acbf2a1abd1054ff180fb57d3 +AUX vdrift-20111022-bullet282.patch 381 SHA256 af1d1f165960a3299077e951fe83fb0a55e96e0972600c4ecf7c9a5432d0ffc7 SHA512 0dc9af2b0abee445d7216a1224e6854c471e50f867411b10f37e7bed076cf643737bfeb79df4c37f2c36cb5aa101dc37343a521df8006d3dcf6035d7820ac6ba WHIRLPOOL acea570458ef48fc1b48e23d6945026e6b0f17d289303d05ea619ff4f83b3359a8b502b7eec441cff11a23f5f07f3be411ea2a86665a0e7baf3ba937885b5800 DIST vdrift-2009-06-15-src.tar.bz2 502507126 SHA256 14c87f25e9dea2dc51f991a6c14e5f7122ec5b56df416327ba3ca383e20c11b9 SHA512 53b91da0f772c18cecd2ea5be81fbea99cfc093ee15443b13704f1603b429e2e61daf43f4f111005286c0861601fc547648931b8e0c6a4baac1df38430596a7b WHIRLPOOL 247475fff234d1d6028bf8feff5446fc29a577e65a72372844a0e1129b0ad62f0eff863b6199d347a351e28f40933545dcd5a2344d8d439b50eed34d3b0da8fc DIST vdrift-2011-10-22.tar.bz2 591243241 SHA256 1a0dff7aa003276c0984d34f329e619bb2e7b4b07d9a21a6b17449904ad8e16d SHA512 de036f97e0f24af2602765801aff2057ce5b6398b93927655417fafcc37b7e03b809681765a10edba8edd532c0b6dbba12538021721a4f411708d3717d0736b8 WHIRLPOOL 29fc955f600256296b99f906d7de52feebf1efa0afc4b089d784f079c627da93cbde3ad22dbe8b2a87dd514915d8bc69c5060c3d8aac15b7025c880ac07cc703 EBUILD vdrift-20090615.ebuild 1654 SHA256 59546c1ecc55ed122f2403e06c0c46086183c1c9d0510be7efcc6514a2a29fc6 SHA512 82244743e9c294f4020c395092276aa3aaa8d2b40607a4c4bd3076d740e9df4f41da8e5a8029681393cf4bdb030a939470f508e6709c4adce2ba7a1592984dd7 WHIRLPOOL a1248d308101d53d4ee1b9de0991af36b5ba06dc848dd1d0864f033a8fb2627065fa14e8078bbc1c75c54b7c83241568f674d56b6f7266ee25c59a96e5157f68 -EBUILD vdrift-20111022.ebuild 1461 SHA256 ae19895b9c4f9055b91ea13db1f634a05a6e76e2f74806a1ae7be44e4bb5318a SHA512 50d6a9f76fb3edae5c14437837672ca52eaa8d6526cc4086388a3ea68d336da75a4894b307ac48b5714730f61bce5673720a0d5afa7ece53f50be6b66befee13 WHIRLPOOL ee84f23dca6fc4384458539952a9fb7acd7f01b5b3905a0ef0004f5a704b6e197aaa0b00b70c2204f7b72558f24208384542197eb62a5a5dbc443de53ed0b739 -MISC ChangeLog 2946 SHA256 3f35995ec333c0fc6779fcd06bceb385871b3dfdb1af78cd5e64e218865c8ec2 SHA512 1f094d4c891888854787a815a21bd4091b927b055c6333748cf79cd438cfa51fdf69a3c5cba1e0631f7d2e57068f2c95f1312fa0bfafc87002ace5aa42cc18f9 WHIRLPOOL 34f7fc5ee40e0e33f2a87475907a8755f633792a725c99a64c423bdc9bfe82e70a2a1ddd0a8f175f6e4d7b5bee276b94ea49d621223a28e2a0bd4fa7b9b2e17a +EBUILD vdrift-20111022.ebuild 1497 SHA256 43e42afee1713fc99ec46ab8356ea42d9c04f8796a6ecf19ae9137b2874f4287 SHA512 aff615a10e44ede62cfbd826cf4eb4f423443098df70b69f73472f8caec13fefd4424eb3e57acfbd40ae31f24c4873c5de766a8ec8a9fb261b690ed56abb0008 WHIRLPOOL a340280a67f1d03e6ae9a7357d12975032fb6eaee6bd2eb695381c59d5adad727de8a574ce580a81f15499941d5ce5a4bcf97800cbd7fc70ab1ca65b21f1dbe7 +MISC ChangeLog 3135 SHA256 1ba2c1853a3fe27e914494a0547e05a3cdcaf5830b34d596103f772498a4e446 SHA512 ea57bcd0700c3e0904b9c19451f3eb82bdeadcf5c740920b1bf52af2512bcd9070a6c0e30f263424ee900c4fd0453cf9307df9fcbe34c776b1bd9698058cd98d WHIRLPOOL 783b6a95da45ba30d5138aa5ad6390e15c889fec56a74ee18e9fe53f128cc29bbb933f0f469e8bfd4c3e53ef09c931b8234ccd22ba470630723cce2aac0d722e MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlN0omMACgkQIY77eQFFFC2E9gCaAr1MRehzuNJzZEuXs5ad/Om8 -Vn0AoODh4alFmosOUKISHXUDGWVfWjkk -=ht2A +iEYEAREIAAYFAlN0qRYACgkQIY77eQFFFC0s/QCgj1dLf8i7yScEzuCxR7Ko6GSp ++IwAoN0ltYnTMQKSfZR8GzpzjhgXIpQT +=r1Cp -----END PGP SIGNATURE----- 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() { |