games-simulation/flightgear: sync ebuilds with CMake (wrt options, also for simgear)

diff --git a/dev-games/simgear/simgear-2016.4.4.ebuild b/dev-games/simgear/simgear-2016.4.4.ebuild
index 18dac11a048e26d122a2115f972f1bc85ea25f07..82da537e562e91e47100f933b57e5912585ff934 100644 (file)
--- a/dev-games/simgear/simgear-2016.4.4.ebuild
+++ b/dev-games/simgear/simgear-2016.4.4.ebuild
@@ -38,6 +38,7 @@ src_configure() {
                -DENABLE_DNS=$(usex dns)
                -DENABLE_PKGUTIL=ON
                -DENABLE_RTI=OFF
+               -DENABLE_SIMD=OFF
                -DENABLE_SOUND=ON
                -DENABLE_TESTS=$(usex test)
                -DSIMGEAR_HEADLESS=OFF

diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild
index 24365830b3b1500d94166f17b00119d0e5f904a0..11f3809cc4a539bb2cf14a8107fc0fd40b2430ce 100644 (file)
--- a/dev-games/simgear/simgear-9999.ebuild
+++ b/dev-games/simgear/simgear-9999.ebuild
@@ -40,6 +40,7 @@ src_configure() {
                -DENABLE_DNS=$(usex dns)
                -DENABLE_PKGUTIL=ON
                -DENABLE_RTI=OFF
+               -DENABLE_SIMD=OFF
                -DENABLE_SOUND=ON
                -DENABLE_TESTS=$(usex test)
                -DSIMGEAR_HEADLESS=OFF

diff --git a/games-simulation/flightgear/flightgear-2016.4.4.ebuild b/games-simulation/flightgear/flightgear-2016.4.4.ebuild
index c0949ff80e9e69548f50bccae48757060ba24a32..5104182f3e34c2b5a0135627b27145bac8b5a6eb 100644 (file)
--- 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 8d7628f03eace12ccb48f3e1edcb81829051ad0e..5d50a5642144e38f15d380215010e852a6e46b5d 100644 (file)
--- 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