Add patch fixing fgpanel support, bug 443766.

(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key B1E955DB)

4 files changed, 41 insertions, 11 deletions

diff --git a/games-simulation/flightgear/ChangeLog b/games-simulation/flightgear/ChangeLog
index db2722fa68e6..29f88acac55f 100644
--- a/games-simulation/flightgear/ChangeLog
+++ b/games-simulation/flightgear/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-simulation/flightgear
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/ChangeLog,v 1.60 2012/12/02 22:41:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/ChangeLog,v 1.61 2012/12/04 22:58:35 reavertm Exp $
+
+  04 Dec 2012; Maciej Mrozowski <reavertm@gentoo.org>
+  +files/flightgear-2.8.0-fgpanel-linking.patch, flightgear-2.8.0.ebuild,
+  metadata.xml:
+  Add patch fixing fgpanel support, bug 443766.
 
   02 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> flightgear-2.8.0.ebuild,
   metadata.xml:
diff --git a/games-simulation/flightgear/files/flightgear-2.8.0-fgpanel-linking.patch b/games-simulation/flightgear/files/flightgear-2.8.0-fgpanel-linking.patch
new file mode 100644
index 000000000000..3952b48cf0b5
--- /dev/null
+++ b/games-simulation/flightgear/files/flightgear-2.8.0-fgpanel-linking.patch
@@ -0,0 +1,23 @@
+X-Git-Url: http://mapserver.flightgear.org/git/gitweb.pl?p=flightgear;a=blobdiff_plain;f=CMakeModules%2FFindPLIB.cmake;h=99d2780cfc7396b17029b3b29b9d4c8ede276f45;hp=da5463612aaf72eb7dec88449058e8195979a2fb;hb=dd6c220fd705644faf8df71cded01492ff7af18a;hpb=779a9ae415c58f6d28332b0f9901522e93694129
+
+diff --git a/CMakeModules/FindPLIB.cmake b/CMakeModules/FindPLIB.cmake
+index da54636..99d2780 100644
+--- a/CMakeModules/FindPLIB.cmake
++++ b/CMakeModules/FindPLIB.cmake
+@@ -132,7 +132,7 @@ if(${PLIB_LIBRARIES} STREQUAL "PLIB_LIBRARIES-NOTFOUND")
+         if (${c} STREQUAL "pu")
+             # handle MSVC confusion over pu/pui naming, by removing
+             # 'pu' and then adding it back
+-            list(REMOVE_ITEM outDeps "pu")
++            list(REMOVE_ITEM outDeps "pu" "fnt" "sg")
+             list(APPEND outDeps ${PUNAME} "fnt" "sg")
+         elseif (${c} STREQUAL "puaux")
+             list(APPEND outDeps ${PUNAME} "fnt" "sg")
+@@ -144,7 +144,6 @@ if(${PLIB_LIBRARIES} STREQUAL "PLIB_LIBRARIES-NOTFOUND")
+     list(APPEND outDeps "ul") # everything needs ul
+     list(REMOVE_DUPLICATES outDeps) # clean up
+ 
+-    
+ 
+     # look for traditional static libraries
+     foreach(component ${outDeps})
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
 }
diff --git a/games-simulation/flightgear/metadata.xml b/games-simulation/flightgear/metadata.xml
index 7afe5ace9ce9..cacf124445d5 100644
--- a/games-simulation/flightgear/metadata.xml
+++ b/games-simulation/flightgear/metadata.xml
@@ -7,7 +7,7 @@
 	<name>Maciej Mrozowski</name>
 </maintainer>
 <use>
-	<!--	<flag name="fgpanel">Enables standalone lightweight 2D-panel rendering utility</flag>-->
+	<flag name="fgpanel">Enables standalone lightweight 2D-panel rendering utility</flag>
 	<flag name="jsbsim">Enables JSBSim Flight Dynamics Model (default)</flag>
 	<flag name="oldfdm">Enables deprecated Flight Dynamics Models (LaRCsim, UIUC)</flag>
 	<flag name="subversion">Enables terrasync scenery downloader</flag>