| 1 |
commit: 9c51f2971df92b9732494b7ec13e19173d13e585 |
| 2 |
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 4 16:17:34 2017 +0000 |
| 4 |
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 6 23:01:57 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c51f297 |
| 7 |
|
| 8 |
games-simulation/flightgear: sync ebuilds with CMake (wrt options, also for simgear) |
| 9 |
|
| 10 |
dev-games/simgear/simgear-2016.4.4.ebuild | 1 + |
| 11 |
dev-games/simgear/simgear-9999.ebuild | 1 + |
| 12 |
games-simulation/flightgear/flightgear-2016.4.4.ebuild | 8 ++++++-- |
| 13 |
games-simulation/flightgear/flightgear-9999.ebuild | 13 ++++++++++++- |
| 14 |
4 files changed, 20 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-games/simgear/simgear-2016.4.4.ebuild b/dev-games/simgear/simgear-2016.4.4.ebuild |
| 17 |
index 18dac11..82da537 100644 |
| 18 |
--- a/dev-games/simgear/simgear-2016.4.4.ebuild |
| 19 |
+++ b/dev-games/simgear/simgear-2016.4.4.ebuild |
| 20 |
@@ -38,6 +38,7 @@ src_configure() { |
| 21 |
-DENABLE_DNS=$(usex dns) |
| 22 |
-DENABLE_PKGUTIL=ON |
| 23 |
-DENABLE_RTI=OFF |
| 24 |
+ -DENABLE_SIMD=OFF |
| 25 |
-DENABLE_SOUND=ON |
| 26 |
-DENABLE_TESTS=$(usex test) |
| 27 |
-DSIMGEAR_HEADLESS=OFF |
| 28 |
|
| 29 |
diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild |
| 30 |
index 2436583..11f3809 100644 |
| 31 |
--- a/dev-games/simgear/simgear-9999.ebuild |
| 32 |
+++ b/dev-games/simgear/simgear-9999.ebuild |
| 33 |
@@ -40,6 +40,7 @@ src_configure() { |
| 34 |
-DENABLE_DNS=$(usex dns) |
| 35 |
-DENABLE_PKGUTIL=ON |
| 36 |
-DENABLE_RTI=OFF |
| 37 |
+ -DENABLE_SIMD=OFF |
| 38 |
-DENABLE_SOUND=ON |
| 39 |
-DENABLE_TESTS=$(usex test) |
| 40 |
-DSIMGEAR_HEADLESS=OFF |
| 41 |
|
| 42 |
diff --git a/games-simulation/flightgear/flightgear-2016.4.4.ebuild b/games-simulation/flightgear/flightgear-2016.4.4.ebuild |
| 43 |
index c0949ff..5104182 100644 |
| 44 |
--- a/games-simulation/flightgear/flightgear-2016.4.4.ebuild |
| 45 |
+++ b/games-simulation/flightgear/flightgear-2016.4.4.ebuild |
| 46 |
@@ -15,6 +15,7 @@ SLOT="0" |
| 47 |
KEYWORDS="amd64 ~ppc x86" |
| 48 |
IUSE="dbus debug examples qt5 test +udev +utils vim-syntax" |
| 49 |
|
| 50 |
+# zlib is some strange auto-dep from simgear |
| 51 |
COMMON_DEPEND=" |
| 52 |
dev-db/sqlite:3 |
| 53 |
>=dev-games/openscenegraph-3.2.0[png] |
| 54 |
@@ -38,10 +39,14 @@ COMMON_DEPEND=" |
| 55 |
virtual/opengl |
| 56 |
) |
| 57 |
" |
| 58 |
+# libXi and libXmu are build-only-deps according to FindGLUT.cmake |
| 59 |
DEPEND="${COMMON_DEPEND} |
| 60 |
>=dev-libs/boost-1.44 |
| 61 |
>=media-libs/plib-1.8.5 |
| 62 |
- utils? ( x11-libs/libXmu ) |
| 63 |
+ utils? ( |
| 64 |
+ x11-libs/libXi |
| 65 |
+ x11-libs/libXmu |
| 66 |
+ ) |
| 67 |
" |
| 68 |
RDEPEND="${COMMON_DEPEND} |
| 69 |
~games-simulation/${PN}-data-${PV} |
| 70 |
@@ -73,7 +78,6 @@ src_configure() { |
| 71 |
-DFG_DATA_DIR=/usr/share/${PN} |
| 72 |
-DJSBSIM_TERRAIN=ON |
| 73 |
-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear |
| 74 |
- -DSIMGEAR_SHARED=ON |
| 75 |
-DSP_FDMS=ON |
| 76 |
-DSYSTEM_FLITE=ON |
| 77 |
-DSYSTEM_HTS_ENGINE=ON |
| 78 |
|
| 79 |
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild |
| 80 |
index 8d7628f..5d50a56 100644 |
| 81 |
--- a/games-simulation/flightgear/flightgear-9999.ebuild |
| 82 |
+++ b/games-simulation/flightgear/flightgear-9999.ebuild |
| 83 |
@@ -17,6 +17,7 @@ SLOT="0" |
| 84 |
KEYWORDS="" |
| 85 |
IUSE="dbus debug examples qt5 test +udev +utils vim-syntax" |
| 86 |
|
| 87 |
+# zlib is some strange auto-dep from simgear |
| 88 |
COMMON_DEPEND=" |
| 89 |
dev-db/sqlite:3 |
| 90 |
>=dev-games/openscenegraph-3.2.0[png] |
| 91 |
@@ -25,6 +26,7 @@ COMMON_DEPEND=" |
| 92 |
media-libs/speex |
| 93 |
media-sound/gsm |
| 94 |
sys-libs/zlib |
| 95 |
+ virtual/glu |
| 96 |
x11-libs/libX11 |
| 97 |
dbus? ( >=sys-apps/dbus-1.6.18-r1 ) |
| 98 |
qt5? ( |
| 99 |
@@ -35,13 +37,20 @@ COMMON_DEPEND=" |
| 100 |
udev? ( virtual/udev ) |
| 101 |
utils? ( |
| 102 |
media-libs/freeglut |
| 103 |
+ media-libs/freetype:2 |
| 104 |
+ media-libs/glew:0 |
| 105 |
media-libs/libpng:0 |
| 106 |
virtual/opengl |
| 107 |
) |
| 108 |
" |
| 109 |
+# libXi and libXmu are build-only-deps according to FindGLUT.cmake |
| 110 |
DEPEND="${COMMON_DEPEND} |
| 111 |
>=dev-libs/boost-1.44 |
| 112 |
>=media-libs/plib-1.8.5 |
| 113 |
+ utils? ( |
| 114 |
+ x11-libs/libXi |
| 115 |
+ x11-libs/libXmu |
| 116 |
+ ) |
| 117 |
" |
| 118 |
RDEPEND="${COMMON_DEPEND} |
| 119 |
~games-simulation/${PN}-data-${PV} |
| 120 |
@@ -51,6 +60,7 @@ DOCS=(AUTHORS ChangeLog NEWS README Thanks) |
| 121 |
|
| 122 |
src_configure() { |
| 123 |
local mycmakeargs=( |
| 124 |
+ -DENABLE_FGCANVAS=$(usex qt5 && usex utils) |
| 125 |
-DENABLE_FGCOM=$(usex utils) |
| 126 |
-DENABLE_FGELEV=$(usex utils) |
| 127 |
-DENABLE_FGJS=$(usex utils) |
| 128 |
@@ -65,15 +75,16 @@ src_configure() { |
| 129 |
-DENABLE_PROFILE=OFF |
| 130 |
-DENABLE_QT=$(usex qt5) |
| 131 |
-DENABLE_RTI=OFF |
| 132 |
+ -DENABLE_SIMD=OFF # NOTE dead codepath in Gentoo anyway |
| 133 |
-DENABLE_TERRASYNC=$(usex utils) |
| 134 |
-DENABLE_TESTS=$(usex test) |
| 135 |
+ -DENABLE_TRAFFIC=$(usex utils) |
| 136 |
-DENABLE_UIUC_MODEL=ON |
| 137 |
-DENABLE_YASIM=ON |
| 138 |
-DEVENT_INPUT=$(usex udev) |
| 139 |
-DFG_DATA_DIR=/usr/share/${PN} |
| 140 |
-DJSBSIM_TERRAIN=ON |
| 141 |
-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear |
| 142 |
- -DSIMGEAR_SHARED=ON |
| 143 |
-DSP_FDMS=ON |
| 144 |
-DSYSTEM_FLITE=ON |
| 145 |
-DSYSTEM_HTS_ENGINE=ON |
Archives