1 |
commit: afe11bf20c89d8e917f81930761d94f7fa754050 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 1 02:07:13 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 1 02:07:24 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afe11bf2 |
7 |
|
8 |
games-arcade/jvgs: unbundle tinyxml |
9 |
|
10 |
Closes: https://bugs.gentoo.org/739084 |
11 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
.../jvgs/files/jvgs-0.5-unbundle-tinyxml.patch | 333 +++++++++++++++++++++ |
15 |
games-arcade/jvgs/jvgs-0.5-r100.ebuild | 29 +- |
16 |
2 files changed, 357 insertions(+), 5 deletions(-) |
17 |
|
18 |
diff --git a/games-arcade/jvgs/files/jvgs-0.5-unbundle-tinyxml.patch b/games-arcade/jvgs/files/jvgs-0.5-unbundle-tinyxml.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..fd9c0d8702a |
21 |
--- /dev/null |
22 |
+++ b/games-arcade/jvgs/files/jvgs-0.5-unbundle-tinyxml.patch |
23 |
@@ -0,0 +1,333 @@ |
24 |
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
25 |
+index 87b28ab..2ec725c 100644 |
26 |
+--- a/src/CMakeLists.txt |
27 |
++++ b/src/CMakeLists.txt |
28 |
+@@ -1,10 +1,14 @@ |
29 |
+ SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTIXML_USE_STL" ) |
30 |
+ |
31 |
++find_package(PkgConfig REQUIRED) |
32 |
++pkg_check_modules(TinyXml REQUIRED tinyxml) |
33 |
++ |
34 |
+ INCLUDE_DIRECTORIES( |
35 |
+ ${SDL_INCLUDE_DIR} |
36 |
+ ${LUA_INCLUDE_DIR} |
37 |
+ ${FREETYPE_INCLUDE_DIRS} |
38 |
+ ${SDLMIXER_INCLUDE_DIR} |
39 |
++ ${TINYXML_INCLUDE_DIRS} |
40 |
+ ${ZLIB_INCLUDE_DIRS} |
41 |
+ ) |
42 |
+ |
43 |
+@@ -12,7 +16,6 @@ ADD_SUBDIRECTORY( input ) |
44 |
+ ADD_SUBDIRECTORY( core ) |
45 |
+ ADD_SUBDIRECTORY( game ) |
46 |
+ ADD_SUBDIRECTORY( math ) |
47 |
+-ADD_SUBDIRECTORY( tinyxml ) |
48 |
+ ADD_SUBDIRECTORY( video ) |
49 |
+ ADD_SUBDIRECTORY( audio ) |
50 |
+ ADD_SUBDIRECTORY( sketch ) |
51 |
+@@ -25,5 +28,5 @@ ADD_EXECUTABLE( |
52 |
+ ) |
53 |
+ |
54 |
+ TARGET_LINK_LIBRARIES( |
55 |
+- jvgs bind input |
56 |
++ jvgs bind input ${TINYXML_LIBRARIES} |
57 |
+ ) |
58 |
+diff --git a/src/core/PropertyMap.cpp b/src/core/PropertyMap.cpp |
59 |
+index 190b317..3f7dd1a 100644 |
60 |
+--- a/src/core/PropertyMap.cpp |
61 |
++++ b/src/core/PropertyMap.cpp |
62 |
+@@ -1,7 +1,7 @@ |
63 |
+ #include "PropertyMap.h" |
64 |
+ #include "LogManager.h" |
65 |
+ |
66 |
+-#include "../tinyxml/tinyxml.h" |
67 |
++#include "tinyxml.h" |
68 |
+ using namespace std; |
69 |
+ |
70 |
+ namespace jvgs |
71 |
+diff --git a/src/core/XMLLoadable.cpp b/src/core/XMLLoadable.cpp |
72 |
+index f5cbc46..b819184 100644 |
73 |
+--- a/src/core/XMLLoadable.cpp |
74 |
++++ b/src/core/XMLLoadable.cpp |
75 |
+@@ -1,7 +1,7 @@ |
76 |
+ #include "XMLLoadable.h" |
77 |
+ #include "LogManager.h" |
78 |
+ |
79 |
+-#include "../tinyxml/tinyxml.h" |
80 |
++#include "tinyxml.h" |
81 |
+ |
82 |
+ using namespace std; |
83 |
+ |
84 |
+diff --git a/src/game/AbstractCamera.cpp b/src/game/AbstractCamera.cpp |
85 |
+index b349418..725a2e2 100644 |
86 |
+--- a/src/game/AbstractCamera.cpp |
87 |
++++ b/src/game/AbstractCamera.cpp |
88 |
+@@ -5,7 +5,7 @@ using namespace jvgs::video; |
89 |
+ |
90 |
+ using namespace jvgs::math; |
91 |
+ |
92 |
+-#include "../tinyxml/tinyxml.h" |
93 |
++#include "tinyxml.h" |
94 |
+ |
95 |
+ namespace jvgs |
96 |
+ { |
97 |
+diff --git a/src/game/Animation.cpp b/src/game/Animation.cpp |
98 |
+index ac563a6..6aa3b10 100644 |
99 |
+--- a/src/game/Animation.cpp |
100 |
++++ b/src/game/Animation.cpp |
101 |
+@@ -7,7 +7,7 @@ using namespace jvgs::sketch; |
102 |
+ #include "../core/LogManager.h" |
103 |
+ using namespace jvgs::core; |
104 |
+ |
105 |
+-#include "../tinyxml/tinyxml.h" |
106 |
++#include "tinyxml.h" |
107 |
+ |
108 |
+ using namespace std; |
109 |
+ |
110 |
+diff --git a/src/game/BullController.cpp b/src/game/BullController.cpp |
111 |
+index 78f81af..56930b4 100644 |
112 |
+--- a/src/game/BullController.cpp |
113 |
++++ b/src/game/BullController.cpp |
114 |
+@@ -8,7 +8,7 @@ using namespace jvgs::core; |
115 |
+ #include "../math/Vector2D.h" |
116 |
+ using namespace jvgs::math; |
117 |
+ |
118 |
+-#include "../tinyxml/tinyxml.h" |
119 |
++#include "tinyxml.h" |
120 |
+ |
121 |
+ using namespace std; |
122 |
+ |
123 |
+diff --git a/src/game/CollisionResponsePositioner.cpp b/src/game/CollisionResponsePositioner.cpp |
124 |
+index 8065efe..657c1c6 100644 |
125 |
+--- a/src/game/CollisionResponsePositioner.cpp |
126 |
++++ b/src/game/CollisionResponsePositioner.cpp |
127 |
+@@ -15,7 +15,7 @@ using namespace jvgs::sketch; |
128 |
+ #include "../math/QuadTree.h" |
129 |
+ using namespace jvgs::math; |
130 |
+ |
131 |
+-#include "../tinyxml/tinyxml.h" |
132 |
++#include "tinyxml.h" |
133 |
+ |
134 |
+ #include <iostream> |
135 |
+ using namespace std; |
136 |
+diff --git a/src/game/DefaultInputController.cpp b/src/game/DefaultInputController.cpp |
137 |
+index a05aec9..c6da502 100644 |
138 |
+--- a/src/game/DefaultInputController.cpp |
139 |
++++ b/src/game/DefaultInputController.cpp |
140 |
+@@ -7,7 +7,7 @@ |
141 |
+ #include "../input/InputManager.h" |
142 |
+ using namespace jvgs::input; |
143 |
+ |
144 |
+-#include "../tinyxml/tinyxml.h" |
145 |
++#include "tinyxml.h" |
146 |
+ |
147 |
+ using namespace jvgs::math; |
148 |
+ |
149 |
+diff --git a/src/game/Entity.cpp b/src/game/Entity.cpp |
150 |
+index 914297f..f353541 100644 |
151 |
+--- a/src/game/Entity.cpp |
152 |
++++ b/src/game/Entity.cpp |
153 |
+@@ -27,7 +27,7 @@ using namespace jvgs::video; |
154 |
+ #include "../bind/ScriptManager.h" |
155 |
+ using namespace jvgs::bind; |
156 |
+ |
157 |
+-#include "../tinyxml/tinyxml.h" |
158 |
++#include "tinyxml.h" |
159 |
+ |
160 |
+ using namespace std; |
161 |
+ using namespace jvgs::math; |
162 |
+diff --git a/src/game/FlyStraightController.cpp b/src/game/FlyStraightController.cpp |
163 |
+index 1217b62..62f8c1a 100644 |
164 |
+--- a/src/game/FlyStraightController.cpp |
165 |
++++ b/src/game/FlyStraightController.cpp |
166 |
+@@ -5,7 +5,7 @@ |
167 |
+ #include "../math/Vector2D.h" |
168 |
+ using namespace jvgs::math; |
169 |
+ |
170 |
+-#include "../tinyxml/tinyxml.h" |
171 |
++#include "tinyxml.h" |
172 |
+ |
173 |
+ namespace jvgs |
174 |
+ { |
175 |
+diff --git a/src/game/FollowCamera.cpp b/src/game/FollowCamera.cpp |
176 |
+index 4a1006b..4b1fe2c 100644 |
177 |
+--- a/src/game/FollowCamera.cpp |
178 |
++++ b/src/game/FollowCamera.cpp |
179 |
+@@ -12,7 +12,7 @@ using namespace jvgs::video; |
180 |
+ |
181 |
+ using namespace jvgs::math; |
182 |
+ |
183 |
+-#include "../tinyxml/tinyxml.h" |
184 |
++#include "tinyxml.h" |
185 |
+ |
186 |
+ namespace jvgs |
187 |
+ { |
188 |
+diff --git a/src/game/InputController.cpp b/src/game/InputController.cpp |
189 |
+index 0d76dd7..1e07609 100644 |
190 |
+--- a/src/game/InputController.cpp |
191 |
++++ b/src/game/InputController.cpp |
192 |
+@@ -5,7 +5,7 @@ |
193 |
+ #include "../input/InputManager.h" |
194 |
+ using namespace jvgs::input; |
195 |
+ |
196 |
+-#include "../tinyxml/tinyxml.h" |
197 |
++#include "tinyxml.h" |
198 |
+ |
199 |
+ using namespace jvgs::math; |
200 |
+ |
201 |
+diff --git a/src/game/Level.cpp b/src/game/Level.cpp |
202 |
+index a02e818..bf0c485 100644 |
203 |
+--- a/src/game/Level.cpp |
204 |
++++ b/src/game/Level.cpp |
205 |
+@@ -14,7 +14,7 @@ using namespace jvgs::video; |
206 |
+ #include "../audio/AudioManager.h" |
207 |
+ using namespace jvgs::audio; |
208 |
+ |
209 |
+-#include "../tinyxml/tinyxml.h" |
210 |
++#include "tinyxml.h" |
211 |
+ |
212 |
+ using namespace jvgs::sketch; |
213 |
+ using namespace jvgs::math; |
214 |
+diff --git a/src/game/PatrollingController.cpp b/src/game/PatrollingController.cpp |
215 |
+index 74e5171..7d56754 100644 |
216 |
+--- a/src/game/PatrollingController.cpp |
217 |
++++ b/src/game/PatrollingController.cpp |
218 |
+@@ -5,7 +5,7 @@ |
219 |
+ #include "../math/MathManager.h" |
220 |
+ using namespace jvgs::math; |
221 |
+ |
222 |
+-#include "../tinyxml/tinyxml.h" |
223 |
++#include "tinyxml.h" |
224 |
+ |
225 |
+ namespace jvgs |
226 |
+ { |
227 |
+diff --git a/src/game/Positioner.cpp b/src/game/Positioner.cpp |
228 |
+index 6297c09..5fb2f37 100644 |
229 |
+--- a/src/game/Positioner.cpp |
230 |
++++ b/src/game/Positioner.cpp |
231 |
+@@ -1,7 +1,7 @@ |
232 |
+ #include "Positioner.h" |
233 |
+ #include "Entity.h" |
234 |
+ |
235 |
+-#include "../tinyxml/tinyxml.h" |
236 |
++#include "tinyxml.h" |
237 |
+ |
238 |
+ using namespace jvgs::math; |
239 |
+ |
240 |
+diff --git a/src/game/SillyController.cpp b/src/game/SillyController.cpp |
241 |
+index 25070e5..4954091 100644 |
242 |
+--- a/src/game/SillyController.cpp |
243 |
++++ b/src/game/SillyController.cpp |
244 |
+@@ -1,7 +1,7 @@ |
245 |
+ #include "SillyController.h" |
246 |
+ #include "Entity.h" |
247 |
+ |
248 |
+-#include "../tinyxml/tinyxml.h" |
249 |
++#include "tinyxml.h" |
250 |
+ |
251 |
+ using namespace jvgs::math; |
252 |
+ |
253 |
+diff --git a/src/game/SimpleBirdController.cpp b/src/game/SimpleBirdController.cpp |
254 |
+index 54b95bc..82f371f 100644 |
255 |
+--- a/src/game/SimpleBirdController.cpp |
256 |
++++ b/src/game/SimpleBirdController.cpp |
257 |
+@@ -1,7 +1,7 @@ |
258 |
+ #include "SimpleBirdController.h" |
259 |
+ #include "Entity.h" |
260 |
+ |
261 |
+-#include "../tinyxml/tinyxml.h" |
262 |
++#include "tinyxml.h" |
263 |
+ |
264 |
+ using namespace std; |
265 |
+ using namespace jvgs::math; |
266 |
+diff --git a/src/game/SimpleCamera.cpp b/src/game/SimpleCamera.cpp |
267 |
+index 00deb92..e640481 100644 |
268 |
+--- a/src/game/SimpleCamera.cpp |
269 |
++++ b/src/game/SimpleCamera.cpp |
270 |
+@@ -2,7 +2,7 @@ |
271 |
+ |
272 |
+ using namespace jvgs::math; |
273 |
+ |
274 |
+-#include "../tinyxml/tinyxml.h" |
275 |
++#include "tinyxml.h" |
276 |
+ |
277 |
+ namespace jvgs |
278 |
+ { |
279 |
+diff --git a/src/game/Sprite.cpp b/src/game/Sprite.cpp |
280 |
+index 19caa35..ee314df 100644 |
281 |
+--- a/src/game/Sprite.cpp |
282 |
++++ b/src/game/Sprite.cpp |
283 |
+@@ -1,7 +1,7 @@ |
284 |
+ #include "Sprite.h" |
285 |
+ #include "Animation.h" |
286 |
+ |
287 |
+-#include "../tinyxml/tinyxml.h" |
288 |
++#include "tinyxml.h" |
289 |
+ |
290 |
+ using namespace std; |
291 |
+ |
292 |
+diff --git a/src/math/Vector2D.cpp b/src/math/Vector2D.cpp |
293 |
+index ba8a05e..61673b3 100644 |
294 |
+--- a/src/math/Vector2D.cpp |
295 |
++++ b/src/math/Vector2D.cpp |
296 |
+@@ -2,7 +2,7 @@ |
297 |
+ #include <cmath> |
298 |
+ #include "MathManager.h" |
299 |
+ |
300 |
+-#include "../tinyxml/tinyxml.h" |
301 |
++#include "tinyxml.h" |
302 |
+ |
303 |
+ namespace jvgs |
304 |
+ { |
305 |
+diff --git a/src/sketch/GroupParser.cpp b/src/sketch/GroupParser.cpp |
306 |
+index 0924f95..58d5584 100644 |
307 |
+--- a/src/sketch/GroupParser.cpp |
308 |
++++ b/src/sketch/GroupParser.cpp |
309 |
+@@ -3,7 +3,7 @@ |
310 |
+ #include "Group.h" |
311 |
+ #include "SketchElement.h" |
312 |
+ |
313 |
+-#include "../tinyxml/tinyxml.h" |
314 |
++#include "tinyxml.h" |
315 |
+ |
316 |
+ #include "../core/LogManager.h" |
317 |
+ using namespace jvgs::core; |
318 |
+diff --git a/src/sketch/Parser.cpp b/src/sketch/Parser.cpp |
319 |
+index 2b55c16..390f9ae 100644 |
320 |
+--- a/src/sketch/Parser.cpp |
321 |
++++ b/src/sketch/Parser.cpp |
322 |
+@@ -13,7 +13,7 @@ using namespace jvgs::core; |
323 |
+ #include "../math/Vector2D.h" |
324 |
+ using namespace jvgs::math; |
325 |
+ |
326 |
+-#include "../tinyxml/tinyxml.h" |
327 |
++#include "tinyxml.h" |
328 |
+ |
329 |
+ namespace jvgs |
330 |
+ { |
331 |
+diff --git a/src/sketch/PathParser.cpp b/src/sketch/PathParser.cpp |
332 |
+index 1eb2027..eb63cf2 100644 |
333 |
+--- a/src/sketch/PathParser.cpp |
334 |
++++ b/src/sketch/PathParser.cpp |
335 |
+@@ -3,7 +3,7 @@ |
336 |
+ #include "Path.h" |
337 |
+ #include "PathDataParser.h" |
338 |
+ |
339 |
+-#include "../tinyxml/tinyxml.h" |
340 |
++#include "tinyxml.h" |
341 |
+ |
342 |
+ #include "../core/LogManager.h" |
343 |
+ using namespace jvgs::core; |
344 |
+diff --git a/src/sketch/SketchElementParser.cpp b/src/sketch/SketchElementParser.cpp |
345 |
+index b7c4968..fc40dfb 100644 |
346 |
+--- a/src/sketch/SketchElementParser.cpp |
347 |
++++ b/src/sketch/SketchElementParser.cpp |
348 |
+@@ -3,7 +3,7 @@ |
349 |
+ #include "SketchElement.h" |
350 |
+ #include "Parser.h" |
351 |
+ |
352 |
+-#include "../tinyxml/tinyxml.h" |
353 |
++#include "tinyxml.h" |
354 |
+ |
355 |
+ #include "../core/LogManager.h" |
356 |
+ using namespace jvgs::core; |
357 |
|
358 |
diff --git a/games-arcade/jvgs/jvgs-0.5-r100.ebuild b/games-arcade/jvgs/jvgs-0.5-r100.ebuild |
359 |
index cad51405476..7d3b9b8eb69 100644 |
360 |
--- a/games-arcade/jvgs/jvgs-0.5-r100.ebuild |
361 |
+++ b/games-arcade/jvgs/jvgs-0.5-r100.ebuild |
362 |
@@ -1,4 +1,4 @@ |
363 |
-# Copyright 1999-2020 Gentoo Authors |
364 |
+# Copyright 1999-2021 Gentoo Authors |
365 |
# Distributed under the terms of the GNU General Public License v2 |
366 |
|
367 |
EAPI=7 |
368 |
@@ -10,6 +10,7 @@ inherit cmake desktop lua-single |
369 |
DESCRIPTION="An open-source platform game with a sketched and minimalistic look" |
370 |
HOMEPAGE="http://jvgs.sourceforge.net/" |
371 |
SRC_URI="mirror://sourceforge/jvgs/${P}-src.tar.gz" |
372 |
+S="${WORKDIR}/${P}-src" |
373 |
|
374 |
LICENSE="WTFPL-2" |
375 |
SLOT="0" |
376 |
@@ -18,19 +19,37 @@ KEYWORDS="~amd64 ~x86" |
377 |
REQUIRED_USE="${LUA_REQUIRED_USE}" |
378 |
|
379 |
RDEPEND="${LUA_DEPS} |
380 |
+ dev-libs/tinyxml[stl] |
381 |
media-libs/libsdl[video] |
382 |
media-libs/sdl-mixer[vorbis] |
383 |
media-libs/freetype:2 |
384 |
sys-libs/zlib:= |
385 |
- virtual/opengl" |
386 |
+ x11-libs/libICE |
387 |
+ x11-libs/libSM |
388 |
+ x11-libs/libX11 |
389 |
+ x11-libs/libXext |
390 |
+ virtual/opengl |
391 |
+ virtual/glu |
392 |
+" |
393 |
DEPEND="${RDEPEND}" |
394 |
BDEPEND="dev-lang/swig" |
395 |
|
396 |
-S=${WORKDIR}/${P}-src |
397 |
-PATCHES=( "${FILESDIR}"/${PN}-0.5-fix-build-system.patch ) |
398 |
+PATCHES=( |
399 |
+ "${FILESDIR}"/${PN}-0.5-fix-build-system.patch |
400 |
+ "${FILESDIR}"/${PN}-0.5-unbundle-tinyxml.patch |
401 |
+) |
402 |
+ |
403 |
+src_prepare() { |
404 |
+ sed -i "s:main.lua:/usr/share/${PN}/&:" src/main.cpp || die |
405 |
+ |
406 |
+ # Make sure we don't use bundled copy |
407 |
+ rm -r src/tinyxml/ || die |
408 |
+ |
409 |
+ cmake_src_prepare |
410 |
+} |
411 |
|
412 |
src_install() { |
413 |
- dobin src/${PN} |
414 |
+ dobin "${BUILD_DIR}"/src/${PN} |
415 |
|
416 |
insinto /usr/share/${PN} |
417 |
doins -r main.lua resources |