summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Schmitt <chris@ilovelinux.de>2012-11-15 14:13:33 +0100
committerChristian Schmitt <chris@ilovelinux.de>2012-11-15 15:59:12 +0100
commitbfe4afccf372c3a1fe8cfef73c85bd75aa059e53 (patch)
treef8f1e805da500c744b9544bc63ce0c1c121d3fd6 /games-simulation
parent[games-simulation/fgrun] fix git URL (diff)
downloadgamerlay-bfe4afccf372c3a1fe8cfef73c85bd75aa059e53.tar.gz
gamerlay-bfe4afccf372c3a1fe8cfef73c85bd75aa059e53.tar.bz2
gamerlay-bfe4afccf372c3a1fe8cfef73c85bd75aa059e53.zip
[games-simulation/flightgear] Sync with portage. Enable fgpanel
Diffstat (limited to 'games-simulation')
-rw-r--r--games-simulation/flightgear/flightgear-9999.ebuild39
-rw-r--r--games-simulation/flightgear/metadata.xml4
2 files changed, 22 insertions, 21 deletions
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index 1f04cca..eaaef4c 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -17,7 +17,7 @@ EGIT_REPO_URI="git://gitorious.org/fg/flightgear.git
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="debug +jsbsim larcsim +subversion test uiuc +yasim"
+IUSE="debug fgpanel +jsbsim oldfdm +subversion test +yasim"
COMMON_DEPEND="
dev-db/sqlite:3
@@ -32,6 +32,10 @@ DEPEND="${COMMON_DEPEND}
>=dev-libs/boost-1.37
media-libs/openal
>=media-libs/plib-1.8.5
+ fgpanel? (
+ media-libs/freeglut
+ media-libs/libpng
+ )
subversion? (
dev-libs/apr
dev-vcs/subversion
@@ -43,24 +47,21 @@ RDEPEND="${COMMON_DEPEND}"
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
src_configure() {
- if use uiuc || use larcsim; then
- mycmakeargs=(-DENABLE_LARCSIM=ON -DENABLE_UIUC_MODEL=ON)
- else
- mycmakeargs=(-DENABLE_LARCSIM=OFF -DENABLE_UIUC_MODEL=OFF)
- fi
-
- mycmakeargs+=(
- -DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}
- -DFG_DATA_DIR="${GAMES_DATADIR}"/${PN}-live
- -DENABLE_FGADMIN=OFF
- -DENABLE_RTI=OFF
- -DSIMGEAR_SHARED=ON
- -DSYSTEM_SQLITE=ON
- -DWITH_FGPANEL=OFF
- $(cmake-utils_use_enable jsbsim)
- $(cmake-utils_use_enable subversion LIBSVN)
- $(cmake-utils_use_enable test TESTS)
- $(cmake-utils_use_enable yasim)
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}
+ -DFG_DATA_DIR="${GAMES_DATADIR}"/${PN}-live
+ -DENABLE_FGADMIN=OFF
+ -DENABLE_PROFILE=OFF
+ -DENABLE_RTI=OFF
+ -DSIMGEAR_SHARED=ON
+ -DSYSTEM_SQLITE=ON
+ $(cmake-utils_use_with fgpanel)
+ $(cmake-utils_use_enable jsbsim)
+ $(cmake-utils_use_enable oldfdm LARCSIM)
+ $(cmake-utils_use_enable oldfdm UIUC_MODEL)
+ $(cmake-utils_use_enable subversion LIBSVN)
+ $(cmake-utils_use_enable test TESTS)
+ $(cmake-utils_use_enable yasim)
)
cmake-utils_src_configure
diff --git a/games-simulation/flightgear/metadata.xml b/games-simulation/flightgear/metadata.xml
index bd524f5..05de519 100644
--- a/games-simulation/flightgear/metadata.xml
+++ b/games-simulation/flightgear/metadata.xml
@@ -3,10 +3,10 @@
<pkgmetadata>
<herd>games</herd>
<use>
+ <flag name="fgpanel">Enable the standalone panel utility</flag>
<flag name="jsbsim">Enable the JSBSim flight dynamics model</flag>
- <flag name="larcsim">Enable the LaRCsim flight dynamics model</flag>
+ <flag name="oldfdm">Enable the UIUC/LaRCsim flight dynamics model</flag>
<flag name="subversion">Enable Flightgear's Terrasync to link against libsvn</flag>
- <flag name="uiuc">Enable the UIUC flight dynamics model</flag>
<flag name="yasim">Enable the YASim flight dynamics model</flag>
</use>
<maintainer>