1 |
commit: 343943a7e3476ff60a4249954548509788cbfdd7 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 26 07:31:32 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 26 07:38:58 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=343943a7 |
7 |
|
8 |
games-sports/vdrift: Remove last-rited pkg |
9 |
|
10 |
Closes: https://bugs.gentoo.org/735540 |
11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
12 |
|
13 |
games-sports/vdrift/Manifest | 2 - |
14 |
.../vdrift/files/vdrift-20120722-build.patch | 28 ------ |
15 |
.../vdrift/files/vdrift-20120722-bullet.patch | 100 --------------------- |
16 |
games-sports/vdrift/metadata.xml | 11 --- |
17 |
games-sports/vdrift/vdrift-20120722.ebuild | 70 --------------- |
18 |
profiles/package.mask | 1 - |
19 |
6 files changed, 212 deletions(-) |
20 |
|
21 |
diff --git a/games-sports/vdrift/Manifest b/games-sports/vdrift/Manifest |
22 |
deleted file mode 100644 |
23 |
index 7fc27d8f2fb..00000000000 |
24 |
--- a/games-sports/vdrift/Manifest |
25 |
+++ /dev/null |
26 |
@@ -1,2 +0,0 @@ |
27 |
-DIST vdrift-2012-07-22.tar.bz2 589288618 BLAKE2B ccdd6358f7d753a87eb8d9d0603001ab3ca6f5c8572348c300a75961f58eb624f4cd7df18b6d892554e0f6e96982de5d5d8aca4f59d8db7e95926d772a6d963f SHA512 eb6f243fd28e5fe46e856c37cb528c8ec903bdec91b6aa86681add79a333077a3a8874f694255913ae8492b965884f02057a95a98e37027ff67c082a8ca5527e |
28 |
-DIST vdrift-2012-07-22c_patch.diff 21689 BLAKE2B de7575df09d434f41a4dd02554dd39f7b6ae13d676ae33c692c7aabc49764c25805efdf5cb89e0b5fb016e02b5e33b93977d588df87ff0923421b57cf2796026 SHA512 7b82ba53f3c19ccd01de9ea64e0b7e15224219c0c614a6505b2a3f552ce78565fdedf7781a198c58606d3e9b94e594dee79097d46687e7d4fc763868204b761d |
29 |
|
30 |
diff --git a/games-sports/vdrift/files/vdrift-20120722-build.patch b/games-sports/vdrift/files/vdrift-20120722-build.patch |
31 |
deleted file mode 100644 |
32 |
index 16b6fe4c9ba..00000000000 |
33 |
--- a/games-sports/vdrift/files/vdrift-20120722-build.patch |
34 |
+++ /dev/null |
35 |
@@ -1,28 +0,0 @@ |
36 |
---- VDrift.orig/SConstruct |
37 |
-+++ VDrift/SConstruct |
38 |
-@@ -44,6 +44,7 @@ |
39 |
- LIBPATH = ['.', '#lib', LOCALBASE + '/lib'], |
40 |
- LINKFLAGS = ['-pthread','-lintl'], |
41 |
- options = opts) |
42 |
-+ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) |
43 |
- check_headers = ['GL/gl.h', 'GL/glu.h', 'SDL/SDL.h', 'SDL/SDL_image.h', 'SDL/SDL_rotozoom.h', 'vorbis/vorbisfile.h', 'GL/glew.h', 'bullet/btBulletCollisionCommon.h'] |
44 |
- check_libs = [] |
45 |
- if 'CC' in os.environ: |
46 |
-@@ -380,7 +381,7 @@ |
47 |
- if env['release']: |
48 |
- # release build, debugging off, optimizations on |
49 |
- if (sys.platform != 'freebsd6') and (sys.platform != 'freebsd7') and (sys.platform != 'freebsd8') and (sys.platform != 'freebsd9') and (sys.platform != 'win32') and (sys.platform != 'cygwin'): |
50 |
-- env.Append(CCFLAGS = ['-O1', '-pipe']) |
51 |
-+ env.Append(CCFLAGS = ['-pipe']) |
52 |
- else: |
53 |
- # debug build, lots of debugging, no optimizations |
54 |
- env.Append(CCFLAGS = ['-g3']) |
55 |
-@@ -399,7 +400,6 @@ |
56 |
- env.Append(CCFLAGS = ['-pg']) |
57 |
- env.Append(LINKFLAGS = ['-pg']) |
58 |
- env.Append(CCFLAGS = ['-g3']) |
59 |
-- env.Append(CCFLAGS = ['-O1']) |
60 |
- |
61 |
- #------------------------------------# |
62 |
- # compile-time efficiency assessment # |
63 |
- |
64 |
|
65 |
diff --git a/games-sports/vdrift/files/vdrift-20120722-bullet.patch b/games-sports/vdrift/files/vdrift-20120722-bullet.patch |
66 |
deleted file mode 100644 |
67 |
index 907433417ee..00000000000 |
68 |
--- a/games-sports/vdrift/files/vdrift-20120722-bullet.patch |
69 |
+++ /dev/null |
70 |
@@ -1,100 +0,0 @@ |
71 |
---- src/cardynamics.cpp Mon Jan 19 23:26:36 1970 |
72 |
-+++ src/cardynamics.cpp Mon Jan 19 23:26:36 1970 |
73 |
-@@ -1791,23 +1791,29 @@ |
74 |
- |
75 |
- bool CARDYNAMICS::WheelContactCallback( |
76 |
- btManifoldPoint& cp, |
77 |
-- const btCollisionObject* colObj0, |
78 |
-- int partId0, |
79 |
-+ const btCollisionObjectWrapper* col0, |
80 |
-+ int part0, |
81 |
- int index0, |
82 |
-- const btCollisionObject* colObj1, |
83 |
-- int partId1, |
84 |
-+ const btCollisionObjectWrapper* col1, |
85 |
-+ int part1, |
86 |
- int index1) |
87 |
- { |
88 |
-- // cars are fracture bodies, wheel is a cylinder shape |
89 |
-- const btCollisionShape* shape = colObj0->getCollisionShape(); |
90 |
-- if ((colObj0->getInternalType() & CO_FRACTURE_TYPE) && |
91 |
-+#if (BT_BULLET_VERSION < 281) |
92 |
-+ const btCollisionObject* obj = col0; |
93 |
-+ const btCollisionShape* shape = obj->getCollisionShape(); |
94 |
-+ const btCollisionShape* rootshape = obj->getRootCollisionShape(); |
95 |
-+#else |
96 |
-+ const btCollisionObject* obj = col0->getCollisionObject(); |
97 |
-+ const btCollisionShape* shape = col0->getCollisionShape(); |
98 |
-+ const btCollisionShape* rootshape = obj->getCollisionShape(); |
99 |
-+#endif |
100 |
-+ if ((obj->getInternalType() & CO_FRACTURE_TYPE) && |
101 |
- (shape->getShapeType() == CYLINDER_SHAPE_PROXYTYPE)) |
102 |
- { |
103 |
-- // is contact within contact patch? |
104 |
-- const btCompoundShape* car = static_cast<const btCompoundShape*>(colObj0->getRootCollisionShape()); |
105 |
-- const btCylinderShapeX* wheel = static_cast<const btCylinderShapeX*>(shape); |
106 |
-- btVector3 contactPoint = cp.m_localPointA - car->getChildTransform(cp.m_index0).getOrigin(); |
107 |
-- if (-direction::up.dot(contactPoint) > 0.5 * wheel->getRadius()) |
108 |
-+ const btCompoundShape* carshape = static_cast<const btCompoundShape*>(rootshape); |
109 |
-+ const btCylinderShapeX* wheelshape = static_cast<const btCylinderShapeX*>(shape); |
110 |
-+ btVector3 contactPoint = cp.m_localPointA - carshape->getChildTransform(cp.m_index0).getOrigin(); |
111 |
-+ if (-direction::up.dot(contactPoint) > 0.5 * wheelshape->getRadius()) |
112 |
- { |
113 |
- // break contact (hack) |
114 |
- cp.m_normalWorldOnB = btVector3(0, 0, 0); |
115 |
---- src/cardynamics.h Mon Jan 19 23:26:36 1970 |
116 |
-+++ src/cardynamics.h Mon Jan 19 23:26:36 1970 |
117 |
-@@ -25,6 +25,12 @@ |
118 |
- class FractureBody; |
119 |
- class PTree; |
120 |
- |
121 |
-+#if (BT_BULLET_VERSION < 281) |
122 |
-+#define btCollisionObjectWrapper btCollisionObject |
123 |
-+#else |
124 |
-+struct btCollisionObjectWrapper; |
125 |
-+#endif |
126 |
-+ |
127 |
- class CARDYNAMICS : public btActionInterface |
128 |
- { |
129 |
- friend class PERFORMANCE_TESTING; |
130 |
-@@ -151,11 +157,11 @@ |
131 |
- |
132 |
- static bool WheelContactCallback( |
133 |
- btManifoldPoint& cp, |
134 |
-- const btCollisionObject* colObj0, |
135 |
-- int partId0, |
136 |
-+ const btCollisionObjectWrapper* col0, |
137 |
-+ int part0, |
138 |
- int index0, |
139 |
-- const btCollisionObject* colObj1, |
140 |
-- int partId1, |
141 |
-+ const btCollisionObjectWrapper* col1, |
142 |
-+ int part1, |
143 |
- int index1); |
144 |
- |
145 |
- protected: |
146 |
---- src/dynamicsworld.cpp Mon Jan 19 23:26:36 1970 |
147 |
-+++ src/dynamicsworld.cpp Mon Jan 19 23:26:36 1970 |
148 |
-@@ -105,7 +105,7 @@ |
149 |
- int patch_id = -1; |
150 |
- const BEZIER * b = 0; |
151 |
- const TRACKSURFACE * s = TRACKSURFACE::None(); |
152 |
-- btCollisionObject * c = 0; |
153 |
-+ const btCollisionObject * c = 0; |
154 |
- |
155 |
- MyRayResultCallback ray(origin, p, caster); |
156 |
- rayTest(origin, p, ray); |
157 |
-@@ -221,6 +221,7 @@ |
158 |
- |
159 |
- void DynamicsWorld::fractureCallback() |
160 |
- { |
161 |
-+#if (BT_BULLET_VERSION < 281) |
162 |
- m_activeConnections.resize(0); |
163 |
- |
164 |
- int numManifolds = getDispatcher()->getNumManifolds(); |
165 |
-@@ -268,4 +269,5 @@ |
166 |
- btRigidBody* child = body->updateConnection(con_id); |
167 |
- if (child) addRigidBody(child); |
168 |
- } |
169 |
-+#endif |
170 |
- } |
171 |
\ No newline at end of file |
172 |
|
173 |
diff --git a/games-sports/vdrift/metadata.xml b/games-sports/vdrift/metadata.xml |
174 |
deleted file mode 100644 |
175 |
index 873fcd84214..00000000000 |
176 |
--- a/games-sports/vdrift/metadata.xml |
177 |
+++ /dev/null |
178 |
@@ -1,11 +0,0 @@ |
179 |
-<?xml version="1.0" encoding="UTF-8"?> |
180 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
181 |
-<pkgmetadata> |
182 |
- <maintainer type="project"> |
183 |
- <email>games@g.o</email> |
184 |
- <name>Gentoo Games Project</name> |
185 |
- </maintainer> |
186 |
- <upstream> |
187 |
- <remote-id type="sourceforge">vdrift</remote-id> |
188 |
- </upstream> |
189 |
-</pkgmetadata> |
190 |
|
191 |
diff --git a/games-sports/vdrift/vdrift-20120722.ebuild b/games-sports/vdrift/vdrift-20120722.ebuild |
192 |
deleted file mode 100644 |
193 |
index c863bdfbb2c..00000000000 |
194 |
--- a/games-sports/vdrift/vdrift-20120722.ebuild |
195 |
+++ /dev/null |
196 |
@@ -1,70 +0,0 @@ |
197 |
-# Copyright 1999-2015 Gentoo Foundation |
198 |
-# Distributed under the terms of the GNU General Public License v2 |
199 |
- |
200 |
-EAPI=5 |
201 |
-inherit eutils scons-utils games |
202 |
- |
203 |
-MY_P=${PN}-${PV:0:4}-${PV:4:2}-${PV:6:2} |
204 |
-DESCRIPTION="A driving simulation made with drift racing in mind" |
205 |
-HOMEPAGE="http://vdrift.net/" |
206 |
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2 |
207 |
- mirror://sourceforge/${PN}/${MY_P}c_patch.diff" |
208 |
- |
209 |
-LICENSE="GPL-3 ZLIB LGPL-2.1+" |
210 |
-SLOT="0" |
211 |
-KEYWORDS="~amd64 ~x86" |
212 |
-IUSE="" |
213 |
- |
214 |
-RDEPEND="app-arch/libarchive |
215 |
- media-libs/glew |
216 |
- media-libs/libsdl[opengl,video] |
217 |
- media-libs/sdl-gfx |
218 |
- media-libs/sdl-image[png] |
219 |
- media-libs/libvorbis |
220 |
- net-misc/curl |
221 |
- sci-physics/bullet[-double-precision] |
222 |
- virtual/opengl |
223 |
- virtual/glu" |
224 |
-DEPEND="${RDEPEND} |
225 |
- dev-cpp/asio |
226 |
- dev-libs/boost |
227 |
- virtual/pkgconfig" |
228 |
- |
229 |
-S=${WORKDIR}/VDrift |
230 |
- |
231 |
-src_unpack() { |
232 |
- unpack ${MY_P}.tar.bz2 |
233 |
-} |
234 |
- |
235 |
-src_prepare() { |
236 |
- epatch \ |
237 |
- "${DISTDIR}"/${MY_P}c_patch.diff \ |
238 |
- "${FILESDIR}"/${P}-build.patch \ |
239 |
- "${FILESDIR}"/${P}-bullet.patch |
240 |
-} |
241 |
- |
242 |
-src_compile() { |
243 |
- escons \ |
244 |
- force_feedback=1 \ |
245 |
- destdir="${D}" \ |
246 |
- bindir="${GAMES_BINDIR}" \ |
247 |
- datadir="${GAMES_DATADIR}"/${PN} \ |
248 |
- prefix= \ |
249 |
- use_binreloc=0 \ |
250 |
- release=1 \ |
251 |
- os_cc=1 \ |
252 |
- os_cxx=1 \ |
253 |
- os_cxxflags=1 \ |
254 |
- || die |
255 |
-} |
256 |
- |
257 |
-src_install() { |
258 |
- dogamesbin build/vdrift |
259 |
- insinto "${GAMES_DATADIR}/${PN}" |
260 |
- doins -r data/* |
261 |
- newicon data/textures/icons/vdrift-64x64.png ${PN}.png |
262 |
- make_desktop_entry ${PN} VDrift |
263 |
- find "${D}" -name "SCon*" -exec rm \{\} + |
264 |
- keepdir "${GAMES_DATADIR}"/${PN}/{music,settings/replays,settings/screenshots} |
265 |
- prepgamesdirs |
266 |
-} |
267 |
|
268 |
diff --git a/profiles/package.mask b/profiles/package.mask |
269 |
index 0ee44c9ea3b..c1905a14a00 100644 |
270 |
--- a/profiles/package.mask |
271 |
+++ b/profiles/package.mask |
272 |
@@ -262,7 +262,6 @@ dev-python/singledispatch |
273 |
dev-libs/mongo-cxx-driver |
274 |
games-action/btanks |
275 |
games-emulation/gambatte |
276 |
-games-sports/vdrift |
277 |
|
278 |
# Michał Górny <mgorny@g.o> (2020-09-25) |
279 |
# PyPy3.7 alpha. Known to break a few packages. Masked until it |