summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2017-02-04 17:17:34 +0100
committerMaciej Mrozowski <reavertm@gentoo.org>2017-02-07 00:01:57 +0100
commit9c51f2971df92b9732494b7ec13e19173d13e585 (patch)
tree280c242d6141a8c3f24758f72d9e77e1f5851a40 /games-simulation
parentsys-kernel/ck-sources: remove elog msg (dead forum thread) (diff)
downloadgentoo-9c51f2971df92b9732494b7ec13e19173d13e585.tar.gz
gentoo-9c51f2971df92b9732494b7ec13e19173d13e585.tar.bz2
gentoo-9c51f2971df92b9732494b7ec13e19173d13e585.zip
games-simulation/flightgear: sync ebuilds with CMake (wrt options, also for simgear)
Diffstat (limited to 'games-simulation')
-rw-r--r--games-simulation/flightgear/flightgear-2016.4.4.ebuild8
-rw-r--r--games-simulation/flightgear/flightgear-9999.ebuild13
2 files changed, 18 insertions, 3 deletions
diff --git a/games-simulation/flightgear/flightgear-2016.4.4.ebuild b/games-simulation/flightgear/flightgear-2016.4.4.ebuild
index c0949ff80e9..5104182f3e3 100644
--- a/games-simulation/flightgear/flightgear-2016.4.4.ebuild
+++ b/games-simulation/flightgear/flightgear-2016.4.4.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
KEYWORDS="amd64 ~ppc x86"
IUSE="dbus debug examples qt5 test +udev +utils vim-syntax"
+# zlib is some strange auto-dep from simgear
COMMON_DEPEND="
dev-db/sqlite:3
>=dev-games/openscenegraph-3.2.0[png]
@@ -38,10 +39,14 @@ COMMON_DEPEND="
virtual/opengl
)
"
+# libXi and libXmu are build-only-deps according to FindGLUT.cmake
DEPEND="${COMMON_DEPEND}
>=dev-libs/boost-1.44
>=media-libs/plib-1.8.5
- utils? ( x11-libs/libXmu )
+ utils? (
+ x11-libs/libXi
+ x11-libs/libXmu
+ )
"
RDEPEND="${COMMON_DEPEND}
~games-simulation/${PN}-data-${PV}
@@ -73,7 +78,6 @@ src_configure() {
-DFG_DATA_DIR=/usr/share/${PN}
-DJSBSIM_TERRAIN=ON
-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
- -DSIMGEAR_SHARED=ON
-DSP_FDMS=ON
-DSYSTEM_FLITE=ON
-DSYSTEM_HTS_ENGINE=ON
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index 8d7628f03ea..5d50a564214 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -17,6 +17,7 @@ SLOT="0"
KEYWORDS=""
IUSE="dbus debug examples qt5 test +udev +utils vim-syntax"
+# zlib is some strange auto-dep from simgear
COMMON_DEPEND="
dev-db/sqlite:3
>=dev-games/openscenegraph-3.2.0[png]
@@ -25,6 +26,7 @@ COMMON_DEPEND="
media-libs/speex
media-sound/gsm
sys-libs/zlib
+ virtual/glu
x11-libs/libX11
dbus? ( >=sys-apps/dbus-1.6.18-r1 )
qt5? (
@@ -35,13 +37,20 @@ COMMON_DEPEND="
udev? ( virtual/udev )
utils? (
media-libs/freeglut
+ media-libs/freetype:2
+ media-libs/glew:0
media-libs/libpng:0
virtual/opengl
)
"
+# libXi and libXmu are build-only-deps according to FindGLUT.cmake
DEPEND="${COMMON_DEPEND}
>=dev-libs/boost-1.44
>=media-libs/plib-1.8.5
+ utils? (
+ x11-libs/libXi
+ x11-libs/libXmu
+ )
"
RDEPEND="${COMMON_DEPEND}
~games-simulation/${PN}-data-${PV}
@@ -51,6 +60,7 @@ DOCS=(AUTHORS ChangeLog NEWS README Thanks)
src_configure() {
local mycmakeargs=(
+ -DENABLE_FGCANVAS=$(usex qt5 && usex utils)
-DENABLE_FGCOM=$(usex utils)
-DENABLE_FGELEV=$(usex utils)
-DENABLE_FGJS=$(usex utils)
@@ -65,15 +75,16 @@ src_configure() {
-DENABLE_PROFILE=OFF
-DENABLE_QT=$(usex qt5)
-DENABLE_RTI=OFF
+ -DENABLE_SIMD=OFF # NOTE dead codepath in Gentoo anyway
-DENABLE_TERRASYNC=$(usex utils)
-DENABLE_TESTS=$(usex test)
+ -DENABLE_TRAFFIC=$(usex utils)
-DENABLE_UIUC_MODEL=ON
-DENABLE_YASIM=ON
-DEVENT_INPUT=$(usex udev)
-DFG_DATA_DIR=/usr/share/${PN}
-DJSBSIM_TERRAIN=ON
-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
- -DSIMGEAR_SHARED=ON
-DSP_FDMS=ON
-DSYSTEM_FLITE=ON
-DSYSTEM_HTS_ENGINE=ON