| 1 |
commit: 0e23b9b8a512616e60193fbd3dc1499867ec05c5 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 29 20:59:28 2016 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 29 21:45:50 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e23b9b8 |
| 7 |
|
| 8 |
dev-games/vamos: Version bump to 0.8.2 |
| 9 |
|
| 10 |
Gentoo-bug: 600774 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 13 |
|
| 14 |
dev-games/vamos/Manifest | 1 + |
| 15 |
.../vamos/files/vamos-0.8.2-fix-buildsystem.patch | 378 +++++++++++++++++++++ |
| 16 |
dev-games/vamos/files/vamos-0.8.2-fix-c++14.patch | 25 ++ |
| 17 |
dev-games/vamos/vamos-0.8.2.ebuild | 62 ++++ |
| 18 |
4 files changed, 466 insertions(+) |
| 19 |
|
| 20 |
diff --git a/dev-games/vamos/Manifest b/dev-games/vamos/Manifest |
| 21 |
index af87d15..4882352 100644 |
| 22 |
--- a/dev-games/vamos/Manifest |
| 23 |
+++ b/dev-games/vamos/Manifest |
| 24 |
@@ -1 +1,2 @@ |
| 25 |
DIST vamos-0.7.1.tar.gz 1681074 SHA256 c81930b5ea376431c0abf868bf23153440eb6c44c1c47e3d9a53a5a15ab35824 SHA512 7560911e12636a4c530b6eeedc942be7121e39312d58f736a72d3b7fa2f632c962e9ccf714709f8f2e4335fa6d718f6870e7ba9e0c84f55c572e7915b4bf03e2 WHIRLPOOL 925b0038ae1638d270f54b7fee81526589bb4e2a67817834d17678063d2587da753d4e75237d610c4c111fabb1fcdb6b6e42417893f78245cd5f04100d7ada09 |
| 26 |
+DIST vamos-0.8.2.tar.gz 2148278 SHA256 d4c2d16b4947b5afc46b4f5dcf797d11173ed86b4a599e78223c227a882b8f1d SHA512 bbc5b71790983b3db60c633f21b15b86c232a560f05ddc407c805d5bc39cf7a90bf556b9c59b4683a187961be755b1578a0a02b8b42599c6a634bd0f5936e880 WHIRLPOOL 75173076be9739282d56713517a1083155f57b2c4cf5a5379a61de952613671a0fd03820a48682082d29c98c7b44bebfef86d17ab9164b5d8b43e1a522bab36e |
| 27 |
|
| 28 |
diff --git a/dev-games/vamos/files/vamos-0.8.2-fix-buildsystem.patch b/dev-games/vamos/files/vamos-0.8.2-fix-buildsystem.patch |
| 29 |
new file mode 100644 |
| 30 |
index 00000000..f78ac1c |
| 31 |
--- /dev/null |
| 32 |
+++ b/dev-games/vamos/files/vamos-0.8.2-fix-buildsystem.patch |
| 33 |
@@ -0,0 +1,378 @@ |
| 34 |
+Fix buildsystem: |
| 35 |
+* Prevent pollution of python site-packages root dir |
| 36 |
+* Fix underlinking in modules |
| 37 |
+* Remove broken AX_* macros |
| 38 |
+* Add workaround for parallel install issue with automake |
| 39 |
+ |
| 40 |
+--- a/body/Makefile.am |
| 41 |
++++ b/body/Makefile.am |
| 42 |
+@@ -21,6 +21,10 @@ |
| 43 |
+ Tire.cc \ |
| 44 |
+ Transmission.cc \ |
| 45 |
+ Wheel.cc |
| 46 |
++libvamos_body_la_LIBADD = \ |
| 47 |
++ -l$(BOOST_PYTHON_LIB) \ |
| 48 |
++ ../geometry/libvamos-geometry.la \ |
| 49 |
++ ../media/libvamos-media.la |
| 50 |
+ |
| 51 |
+ pkginclude_HEADERS = \ |
| 52 |
+ Aerodynamic_Device.h \ |
| 53 |
+@@ -46,24 +50,23 @@ |
| 54 |
+ |
| 55 |
+ EXTRA_DIST = $(pkginclude_HEADERS) |
| 56 |
+ |
| 57 |
+-AM_CXXFLAGS = -fPIC -Wall -pedantic |
| 58 |
++AM_CXXFLAGS = -Wall -pedantic |
| 59 |
++AM_CPPFLAGS = $(PYTHON_CPPFLAGS) |
| 60 |
+ |
| 61 |
+ # Python Module |
| 62 |
+ if HAVE_PYTHON |
| 63 |
+-pyexec_LTLIBRARIES = body.la |
| 64 |
++pkgpyexec_LTLIBRARIES = body.la |
| 65 |
+ else |
| 66 |
+-pyexec_LTLIBRARIES = |
| 67 |
++pkgpyexec_LTLIBRARIES = |
| 68 |
+ endif |
| 69 |
+ |
| 70 |
+ body_la_SOURCES = bp-body.cc |
| 71 |
+-body_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR) |
| 72 |
+ body_la_LDFLAGS = -avoid-version -module |
| 73 |
+ body_la_LIBADD = \ |
| 74 |
+- $(top_srcdir)/body/libvamos-body.la \ |
| 75 |
+- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 76 |
+- $(top_srcdir)/media/libvamos-media.la \ |
| 77 |
+- -l$(PYTHON_LIB) \ |
| 78 |
+- -l$(BOOST_PYTHON_LIB) |
| 79 |
++ libvamos-body.la \ |
| 80 |
++ ../geometry/libvamos-geometry.la \ |
| 81 |
++ ../media/libvamos-media.la \ |
| 82 |
++ $(PYTHON_LIBS) |
| 83 |
+ |
| 84 |
+ if DO_UNIT_TESTS |
| 85 |
+ UNIT_TESTS = \ |
| 86 |
+@@ -81,7 +84,7 @@ |
| 87 |
+ test_Aerodynamic_Device_SOURCES = test_Aerodynamic_Device.cc |
| 88 |
+ test_Aerodynamic_Device_CXXFLAGS = -DBOOST_TEST_DYN_LINK |
| 89 |
+ test_Aerodynamic_Device_LDADD = \ |
| 90 |
+- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 91 |
++ ../geometry/libvamos-geometry.la \ |
| 92 |
+ Frame.lo \ |
| 93 |
+ Particle.lo \ |
| 94 |
+ Aerodynamic_Device.lo \ |
| 95 |
+@@ -89,35 +92,35 @@ |
| 96 |
+ test_Car_SOURCES = test_Car.cc |
| 97 |
+ test_Car_CXXFLAGS = -DBOOST_TEST_DYN_LINK |
| 98 |
+ test_Car_LDADD = \ |
| 99 |
+- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 100 |
+- $(top_srcdir)/media/libvamos-media.la \ |
| 101 |
+- $(top_srcdir)/body/libvamos-body.la \ |
| 102 |
++ ../geometry/libvamos-geometry.la \ |
| 103 |
++ ../media/libvamos-media.la \ |
| 104 |
++ ../body/libvamos-body.la \ |
| 105 |
+ -lboost_unit_test_framework |
| 106 |
+ test_Frame_SOURCES = test_Frame.cc |
| 107 |
+ test_Frame_CXXFLAGS = -DBOOST_TEST_DYN_LINK |
| 108 |
+ test_Frame_LDADD = \ |
| 109 |
+- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 110 |
++ ../geometry/libvamos-geometry.la \ |
| 111 |
+ Frame.lo \ |
| 112 |
+ -lboost_unit_test_framework |
| 113 |
+ test_Particle_SOURCES = test_Particle.cc |
| 114 |
+ test_Particle_CXXFLAGS = -DBOOST_TEST_DYN_LINK |
| 115 |
+ test_Particle_LDADD = \ |
| 116 |
+- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 117 |
++ ../geometry/libvamos-geometry.la \ |
| 118 |
+ Frame.lo \ |
| 119 |
+ Particle.lo \ |
| 120 |
+ -lboost_unit_test_framework |
| 121 |
+ test_Rigid_Body_SOURCES = test_Rigid_Body.cc |
| 122 |
+ test_Rigid_Body_CXXFLAGS = -DBOOST_TEST_DYN_LINK |
| 123 |
+ test_Rigid_Body_LDADD = \ |
| 124 |
+- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 125 |
+- $(top_srcdir)/media/libvamos-media.la \ |
| 126 |
+- $(top_srcdir)/body/libvamos-body.la \ |
| 127 |
++ ../geometry/libvamos-geometry.la \ |
| 128 |
++ ../media/libvamos-media.la \ |
| 129 |
++ ../body/libvamos-body.la \ |
| 130 |
+ -lboost_unit_test_framework |
| 131 |
+ |
| 132 |
+ if DO_UNIT_TESTS |
| 133 |
+ check-local: $(UNIT_TESTS) |
| 134 |
+ for test in $(UNIT_TESTS); do \ |
| 135 |
+ echo $$test; \ |
| 136 |
+- $(top_srcdir)/body/$$test; \ |
| 137 |
++ ../body/$$test; \ |
| 138 |
+ done |
| 139 |
+ endif |
| 140 |
+--- a/configure.ac |
| 141 |
++++ b/configure.ac |
| 142 |
+@@ -19,7 +19,7 @@ |
| 143 |
+ AC_PROG_INSTALL |
| 144 |
+ AC_PROG_MAKE_SET |
| 145 |
+ |
| 146 |
+-AC_PROG_LIBTOOL |
| 147 |
++LT_INIT |
| 148 |
+ |
| 149 |
+ AC_PATH_X |
| 150 |
+ |
| 151 |
+@@ -28,9 +28,6 @@ |
| 152 |
+ |
| 153 |
+ AC_CONFIG_FILES([vamos/vamos], [chmod +x vamos/vamos]) |
| 154 |
+ |
| 155 |
+-dnl Python |
| 156 |
+-AX_PYTHON |
| 157 |
+- |
| 158 |
+ dnl Boost |
| 159 |
+ AX_BOOST_BASE([1.46.0],, AC_MSG_ERROR([Boost >= v1.46.0 is required.])) |
| 160 |
+ AX_BOOST_PYTHON([1.46.0]) |
| 161 |
+--- a/geometry/Makefile.am |
| 162 |
++++ b/geometry/Makefile.am |
| 163 |
+@@ -15,6 +15,7 @@ |
| 164 |
+ Three_Vector.cc \ |
| 165 |
+ Two_Vector.cc \ |
| 166 |
+ Parameter.cc |
| 167 |
++libvamos_geometry_la_LIBADD = -l$(BOOST_PYTHON_LIB) |
| 168 |
+ |
| 169 |
+ pkginclude_HEADERS = \ |
| 170 |
+ Calculations.h \ |
| 171 |
+@@ -39,22 +40,21 @@ |
| 172 |
+ |
| 173 |
+ EXTRA_DIST = $(pkginclude_HEADERS) |
| 174 |
+ |
| 175 |
+-AM_CXXFLAGS = -fPIC -Wall -pedantic |
| 176 |
++AM_CXXFLAGS = -Wall -pedantic |
| 177 |
++AM_CPPFLAGS = $(PYTHON_CPPFLAGS) |
| 178 |
+ |
| 179 |
+ # Python Module |
| 180 |
+ if HAVE_PYTHON |
| 181 |
+-pyexec_LTLIBRARIES = geometry.la |
| 182 |
++pkgpyexec_LTLIBRARIES = geometry.la |
| 183 |
+ else |
| 184 |
+-pyexec_LTLIBRARIES = |
| 185 |
++pkgpyexec_LTLIBRARIES = |
| 186 |
+ endif |
| 187 |
+ |
| 188 |
+ geometry_la_SOURCES = bp-geometry.cc |
| 189 |
+-geometry_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR) |
| 190 |
+ geometry_la_LDFLAGS = -avoid-version -module |
| 191 |
+ geometry_la_LIBADD = \ |
| 192 |
+- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 193 |
+- -l$(PYTHON_LIB) \ |
| 194 |
+- -l$(BOOST_PYTHON_LIB) |
| 195 |
++ libvamos-geometry.la \ |
| 196 |
++ $(PYTHON_LIBS) |
| 197 |
+ |
| 198 |
+ # Unit Tests |
| 199 |
+ if DO_UNIT_TESTS |
| 200 |
+@@ -110,6 +110,6 @@ |
| 201 |
+ check-local: $(UNIT_TESTS) |
| 202 |
+ for test in $(UNIT_TESTS); do \ |
| 203 |
+ echo $$test; \ |
| 204 |
+- $(top_srcdir)/geometry/$$test; \ |
| 205 |
++ ../geometry/$$test; \ |
| 206 |
+ done |
| 207 |
+ endif |
| 208 |
+--- a/media/Makefile.am |
| 209 |
++++ b/media/Makefile.am |
| 210 |
+@@ -7,6 +7,7 @@ |
| 211 |
+ Texture_Image.cc \ |
| 212 |
+ Two_D.cc \ |
| 213 |
+ XML_Parser.cc |
| 214 |
++libvamos_media_la_LIBADD = ../geometry/libvamos-geometry.la |
| 215 |
+ |
| 216 |
+ pkginclude_HEADERS = \ |
| 217 |
+ Ac3d.h \ |
| 218 |
+@@ -19,23 +20,27 @@ |
| 219 |
+ |
| 220 |
+ EXTRA_DIST = $(pkginclude_HEADERS) |
| 221 |
+ |
| 222 |
+-AM_CXXFLAGS = -fPIC -Wall -pedantic |
| 223 |
++AM_CXXFLAGS = -Wall -pedantic |
| 224 |
++AM_CPPFLAGS = $(PYTHON_CPPFLAGS) |
| 225 |
+ |
| 226 |
+ # Python Module |
| 227 |
+ if HAVE_PYTHON |
| 228 |
+-pyexec_LTLIBRARIES = media.la |
| 229 |
++pkgpyexec_LTLIBRARIES = media.la |
| 230 |
+ else |
| 231 |
+-pyexec_LTLIBRARIES = |
| 232 |
++pkgpyexec_LTLIBRARIES = |
| 233 |
+ endif |
| 234 |
+ |
| 235 |
+ media_la_SOURCES = bp-media.cc |
| 236 |
+-media_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR) |
| 237 |
+ media_la_LDFLAGS = -avoid-version -module |
| 238 |
+ media_la_LIBADD = \ |
| 239 |
+- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 240 |
+- $(top_srcdir)/media/libvamos-media.la \ |
| 241 |
+- -l$(PYTHON_LIB) \ |
| 242 |
+- -l$(BOOST_PYTHON_LIB) |
| 243 |
++ ../geometry/libvamos-geometry.la \ |
| 244 |
++ libvamos-media.la \ |
| 245 |
++ $(PYTHON_LIBS) |
| 246 |
++ |
| 247 |
++# workaround for broken parallel install support in automake with LTLIBRARIES |
| 248 |
++# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328 |
| 249 |
++install_pkgpyexecLTLIBRARIES = install-pkgpyexecLTLIBRARIES |
| 250 |
++$(install_pkgpyexecLTLIBRARIES): install-libLTLIBRARIES |
| 251 |
+ |
| 252 |
+ # Unit Tests |
| 253 |
+ if DO_UNIT_TESTS |
| 254 |
+@@ -54,6 +59,6 @@ |
| 255 |
+ check-local: $(UNIT_TESTS) |
| 256 |
+ for test in $(UNIT_TESTS); do \ |
| 257 |
+ echo $$test; \ |
| 258 |
+- $(top_srcdir)/media/$$test; \ |
| 259 |
++ ../media/$$test; \ |
| 260 |
+ done |
| 261 |
+ endif |
| 262 |
+--- a/track/Makefile.am |
| 263 |
++++ b/track/Makefile.am |
| 264 |
+@@ -6,6 +6,9 @@ |
| 265 |
+ Road_Segment.cc \ |
| 266 |
+ Strip_Track.cc \ |
| 267 |
+ Strip_Track_Reader.cc |
| 268 |
++libvamos_track_la_LIBADD = \ |
| 269 |
++ ../geometry/libvamos-geometry.la \ |
| 270 |
++ ../media/libvamos-media.la |
| 271 |
+ |
| 272 |
+ pkginclude_HEADERS = \ |
| 273 |
+ Gl_Road_Segment.h \ |
| 274 |
+@@ -17,24 +20,23 @@ |
| 275 |
+ |
| 276 |
+ EXTRA_DIST = $(pkginclude_HEADERS) |
| 277 |
+ |
| 278 |
+-AM_CXXFLAGS = -fPIC -Wall -pedantic |
| 279 |
++AM_CXXFLAGS = -Wall -pedantic |
| 280 |
++AM_CPPFLAGS = $(PYTHON_CPPFLAGS) |
| 281 |
+ |
| 282 |
+ # Python Module |
| 283 |
+ if HAVE_PYTHON |
| 284 |
+-pyexec_LTLIBRARIES = track.la |
| 285 |
++pkgpyexec_LTLIBRARIES = track.la |
| 286 |
+ else |
| 287 |
+-pyexec_LTLIBRARIES = |
| 288 |
++pkgpyexec_LTLIBRARIES = |
| 289 |
+ endif |
| 290 |
+ |
| 291 |
+ track_la_SOURCES = bp-track.cc |
| 292 |
+-track_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR) |
| 293 |
+ track_la_LDFLAGS = -avoid-version -module |
| 294 |
+ track_la_LIBADD = \ |
| 295 |
+- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 296 |
+- $(top_srcdir)/media/libvamos-media.la \ |
| 297 |
+- $(top_srcdir)/track/libvamos-track.la \ |
| 298 |
+- -l$(PYTHON_LIB) \ |
| 299 |
+- -l$(BOOST_PYTHON_LIB) |
| 300 |
++ ../geometry/libvamos-geometry.la \ |
| 301 |
++ ../media/libvamos-media.la \ |
| 302 |
++ libvamos-track.la \ |
| 303 |
++ $(PYTHON_LIBS) |
| 304 |
+ |
| 305 |
+ # Unit Tests |
| 306 |
+ if DO_UNIT_TESTS |
| 307 |
+@@ -50,14 +52,14 @@ |
| 308 |
+ test_Road_Segment_SOURCES = test_Road_Segment.cc |
| 309 |
+ test_Road_Segment_CXXFLAGS = -DBOOST_TEST_DYN_LINK |
| 310 |
+ test_Road_Segment_LDADD = \ |
| 311 |
+- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 312 |
++ ../geometry/libvamos-geometry.la \ |
| 313 |
+ Road_Segment.lo \ |
| 314 |
+ -lboost_unit_test_framework |
| 315 |
+ test_Strip_Track_SOURCES = test_Strip_Track.cc |
| 316 |
+ test_Strip_Track_CXXFLAGS = -DBOOST_TEST_DYN_LINK |
| 317 |
+ test_Strip_Track_LDADD = \ |
| 318 |
+- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 319 |
+- $(top_srcdir)/media/libvamos-media.la \ |
| 320 |
++ ../geometry/libvamos-geometry.la \ |
| 321 |
++ ../media/libvamos-media.la \ |
| 322 |
+ Road_Segment.lo \ |
| 323 |
+ Gl_Road_Segment.lo \ |
| 324 |
+ Strip_Track.lo \ |
| 325 |
+@@ -68,6 +70,6 @@ |
| 326 |
+ check-local: $(UNIT_TESTS) |
| 327 |
+ for test in $(UNIT_TESTS); do \ |
| 328 |
+ echo $$test; \ |
| 329 |
+- $(top_srcdir)/track/$$test; \ |
| 330 |
++ ../track/$$test; \ |
| 331 |
+ done |
| 332 |
+ endif |
| 333 |
+--- a/vamos/Makefile.am |
| 334 |
++++ b/vamos/Makefile.am |
| 335 |
+@@ -9,12 +9,12 @@ |
| 336 |
+ EXTRA_DIST = Options.h |
| 337 |
+ |
| 338 |
+ cvamos_LDADD = \ |
| 339 |
+- $(top_srcdir)/world/libvamos-world.la \ |
| 340 |
+- $(top_srcdir)/body/libvamos-body.la \ |
| 341 |
+- $(top_srcdir)/track/libvamos-track.la \ |
| 342 |
+- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 343 |
+- $(top_srcdir)/media/libvamos-media.la \ |
| 344 |
++ ../world/libvamos-world.la \ |
| 345 |
++ ../body/libvamos-body.la \ |
| 346 |
++ ../track/libvamos-track.la \ |
| 347 |
++ ../geometry/libvamos-geometry.la \ |
| 348 |
++ ../media/libvamos-media.la \ |
| 349 |
+ -lboost_system \ |
| 350 |
+ -lboost_filesystem |
| 351 |
+ |
| 352 |
+-AM_CXXFLAGS = -fPIC -Wall -pedantic -DDATADIR=\"$(pkgdatadir)\" |
| 353 |
++AM_CXXFLAGS = -Wall -pedantic -DDATADIR=\"$(pkgdatadir)\" |
| 354 |
+--- a/world/Makefile.am |
| 355 |
++++ b/world/Makefile.am |
| 356 |
+@@ -10,6 +10,10 @@ |
| 357 |
+ Sounds.cc \ |
| 358 |
+ Timing_Info.cc \ |
| 359 |
+ World.cc |
| 360 |
++libvamos_world_la_LIBADD = \ |
| 361 |
++ ../geometry/libvamos-geometry.la \ |
| 362 |
++ ../track/libvamos-track.la \ |
| 363 |
++ ../body/libvamos-body.la |
| 364 |
+ |
| 365 |
+ pkginclude_HEADERS = \ |
| 366 |
+ Atmosphere.h \ |
| 367 |
+@@ -26,26 +30,25 @@ |
| 368 |
+ |
| 369 |
+ EXTRA_DIST = $(pkginclude_HEADERS) |
| 370 |
+ |
| 371 |
+-AM_CXXFLAGS = -fPIC -Wall -pedantic |
| 372 |
++AM_CXXFLAGS = -Wall -pedantic |
| 373 |
++AM_CPPFLAGS = $(PYTHON_CPPFLAGS) |
| 374 |
+ |
| 375 |
+ # Python Module |
| 376 |
+ if HAVE_PYTHON |
| 377 |
+-pyexec_LTLIBRARIES = world.la |
| 378 |
++pkgpyexec_LTLIBRARIES = world.la |
| 379 |
+ else |
| 380 |
+-pyexec_LTLIBRARIES = |
| 381 |
++pkgpyexec_LTLIBRARIES = |
| 382 |
+ endif |
| 383 |
+ |
| 384 |
+ world_la_SOURCES = bp-world.cc |
| 385 |
+-world_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR) |
| 386 |
+ world_la_LDFLAGS = -avoid-version -module |
| 387 |
+ world_la_LIBADD = \ |
| 388 |
+- $(top_srcdir)/body/libvamos-body.la \ |
| 389 |
+- $(top_srcdir)/geometry/libvamos-geometry.la \ |
| 390 |
+- $(top_srcdir)/media/libvamos-media.la \ |
| 391 |
+- $(top_srcdir)/track/libvamos-track.la \ |
| 392 |
+- $(top_srcdir)/world/libvamos-world.la \ |
| 393 |
+- -l$(PYTHON_LIB) \ |
| 394 |
+- -l$(BOOST_PYTHON_LIB) |
| 395 |
++ ../body/libvamos-body.la \ |
| 396 |
++ ../geometry/libvamos-geometry.la \ |
| 397 |
++ ../media/libvamos-media.la \ |
| 398 |
++ ../track/libvamos-track.la \ |
| 399 |
++ libvamos-world.la \ |
| 400 |
++ $(PYTHON_LIBS) |
| 401 |
+ |
| 402 |
+ # Unit Tests |
| 403 |
+ if DO_UNIT_TESTS |
| 404 |
+@@ -67,6 +70,6 @@ |
| 405 |
+ check-local: $(UNIT_TESTS) |
| 406 |
+ for test in $(UNIT_TESTS); do \ |
| 407 |
+ echo $$test; \ |
| 408 |
+- $(top_srcdir)/world/$$test; \ |
| 409 |
++ ../world/$$test; \ |
| 410 |
+ done |
| 411 |
+ endif |
| 412 |
|
| 413 |
diff --git a/dev-games/vamos/files/vamos-0.8.2-fix-c++14.patch b/dev-games/vamos/files/vamos-0.8.2-fix-c++14.patch |
| 414 |
new file mode 100644 |
| 415 |
index 00000000..95c9099 |
| 416 |
--- /dev/null |
| 417 |
+++ b/dev-games/vamos/files/vamos-0.8.2-fix-c++14.patch |
| 418 |
@@ -0,0 +1,25 @@ |
| 419 |
+Fix building in C++14 mode. |
| 420 |
+See also: https://bugs.gentoo.org/show_bug.cgi?id=600774 |
| 421 |
+ |
| 422 |
+--- a/media/Ac3d.cc |
| 423 |
++++ b/media/Ac3d.cc |
| 424 |
+@@ -892,7 +892,7 @@ |
| 425 |
+ m_rotation (rotation) |
| 426 |
+ { |
| 427 |
+ std::ifstream is (m_file.c_str ()); |
| 428 |
+- if (is == 0) |
| 429 |
++ if (!is) |
| 430 |
+ { |
| 431 |
+ throw No_File (m_file); |
| 432 |
+ } |
| 433 |
+--- a/media/XML_Parser.cc |
| 434 |
++++ b/media/XML_Parser.cc |
| 435 |
+@@ -391,7 +391,7 @@ |
| 436 |
+ { |
| 437 |
+ m_file = file; |
| 438 |
+ mp_stream = new std::ifstream (file.c_str ()); |
| 439 |
+- if ((mp_stream == 0) || (*mp_stream == 0)) |
| 440 |
++ if ((mp_stream == NULL) || (!(*mp_stream))) |
| 441 |
+ { |
| 442 |
+ throw No_XML_File (m_file); |
| 443 |
+ } |
| 444 |
|
| 445 |
diff --git a/dev-games/vamos/vamos-0.8.2.ebuild b/dev-games/vamos/vamos-0.8.2.ebuild |
| 446 |
new file mode 100644 |
| 447 |
index 00000000..9ed292f |
| 448 |
--- /dev/null |
| 449 |
+++ b/dev-games/vamos/vamos-0.8.2.ebuild |
| 450 |
@@ -0,0 +1,62 @@ |
| 451 |
+# Copyright 1999-2016 Gentoo Foundation |
| 452 |
+# Distributed under the terms of the GNU General Public License v2 |
| 453 |
+# $Id$ |
| 454 |
+ |
| 455 |
+EAPI=6 |
| 456 |
+ |
| 457 |
+PYTHON_COMPAT=( python3_{4,5} ) |
| 458 |
+ |
| 459 |
+inherit autotools python-single-r1 |
| 460 |
+ |
| 461 |
+DESCRIPTION="An automotive simulation framework" |
| 462 |
+HOMEPAGE="http://vamos.sourceforge.net/" |
| 463 |
+SRC_URI="mirror://sourceforge/vamos/${P}.tar.gz" |
| 464 |
+ |
| 465 |
+LICENSE="GPL-2" |
| 466 |
+SLOT="0" |
| 467 |
+KEYWORDS="~amd64 ~x86" |
| 468 |
+IUSE="test" |
| 469 |
+ |
| 470 |
+RDEPEND=" |
| 471 |
+ ${PYTHON_DEPS} |
| 472 |
+ dev-libs/boost:=[python,${PYTHON_USEDEP}] |
| 473 |
+ media-libs/freealut |
| 474 |
+ media-libs/freeglut |
| 475 |
+ media-libs/libpng:0= |
| 476 |
+ media-libs/libsdl[joystick,video] |
| 477 |
+ media-libs/openal |
| 478 |
+ virtual/glu |
| 479 |
+ virtual/opengl" |
| 480 |
+DEPEND="${RDEPEND} |
| 481 |
+ >=sys-devel/autoconf-archive-2016.09.16 |
| 482 |
+ virtual/pkgconfig" |
| 483 |
+ |
| 484 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 485 |
+ |
| 486 |
+PATCHES=( |
| 487 |
+ "${FILESDIR}"/${PN}-0.8.2-fix-buildsystem.patch |
| 488 |
+ "${FILESDIR}"/${PN}-0.8.2-fix-c++14.patch |
| 489 |
+) |
| 490 |
+ |
| 491 |
+src_prepare() { |
| 492 |
+ default |
| 493 |
+ eautoreconf |
| 494 |
+} |
| 495 |
+ |
| 496 |
+src_configure() { |
| 497 |
+ econf \ |
| 498 |
+ --with-x \ |
| 499 |
+ --disable-static \ |
| 500 |
+ --with-boost-python="${EPYTHON#python}" \ |
| 501 |
+ $(use_enable test unit-tests) \ |
| 502 |
+ PYTHON="${EPYTHON}" |
| 503 |
+} |
| 504 |
+ |
| 505 |
+src_install() { |
| 506 |
+ default |
| 507 |
+ |
| 508 |
+ dobin caelum/.libs/caelum |
| 509 |
+ newdoc caelum/README README.caelum |
| 510 |
+ |
| 511 |
+ find "${D}" -name '*.la' -delete || die |
| 512 |
+} |
Archives