From ab60b3a941f7f932792bd3dd4e22b1b9354e0a37 Mon Sep 17 00:00:00 2001 From: Maciej Mrozowski Date: Tue, 4 Dec 2012 22:58:35 +0000 Subject: Add patch fixing fgpanel support, bug 443766. (Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key B1E955DB) --- games-simulation/flightgear/flightgear-2.8.0.ebuild | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'games-simulation/flightgear/flightgear-2.8.0.ebuild') diff --git a/games-simulation/flightgear/flightgear-2.8.0.ebuild b/games-simulation/flightgear/flightgear-2.8.0.ebuild index 92ff3deee5d0..a20b4d91f7d1 100644 --- a/games-simulation/flightgear/flightgear-2.8.0.ebuild +++ b/games-simulation/flightgear/flightgear-2.8.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-2.8.0.ebuild,v 1.6 2012/12/02 22:41:35 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-2.8.0.ebuild,v 1.7 2012/12/04 22:58:35 reavertm Exp $ EAPI=4 @@ -13,12 +13,7 @@ SRC_URI="mirror://flightgear/Source/${P}.tar.bz2 mirror://flightgear/Shared/Flig LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ppc x86" -IUSE="debug jpeg +jsbsim oldfdm subversion test +udev +yasim" -#fgpanel - disabled for now, doesn't link -#fgpanel? ( -# media-libs/freeglut -# media-libs/libpng -# ) +IUSE="debug fgpanel jpeg +jsbsim oldfdm subversion test +udev +yasim" COMMON_DEPEND=" >=dev-games/openscenegraph-3.0.1[png] @@ -26,6 +21,10 @@ COMMON_DEPEND=" sys-libs/zlib virtual/opengl udev? ( virtual/udev ) + fgpanel? ( + media-libs/freeglut + media-libs/libpng + ) " # Most entries below are just buildsystem bugs (deps unconditionally # inherited from static version of simgear) @@ -42,6 +41,10 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND}" +PATCHES=( + "${FILESDIR}/${P}-fgpanel-linking.patch" +) + DOCS=(AUTHORS ChangeLog NEWS README Thanks) src_configure() { @@ -51,7 +54,7 @@ src_configure() { -DENABLE_RTI=OFF -DFG_DATA_DIR="${GAMES_DATADIR}"/${PN} -DSIMGEAR_SHARED=ON - -DWITH_FGPANEL=OFF + $(cmake-utils_use_with fgpanel) $(cmake-utils_use jpeg JPEG_FACTORY) $(cmake-utils_use_enable jsbsim) $(cmake-utils_use_enable oldfdm LARCSIM) @@ -62,7 +65,6 @@ src_configure() { $(cmake-utils_use udev EVENT_INPUT) $(cmake-utils_use_enable yasim) ) - #$(cmake-utils_use_with fgpanel) cmake-utils_src_configure } -- cgit v1.2.3-65-gdbad