Add patch fixing fgpanel support, bug 443766.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xB1E955DB

5 files changed, 48 insertions, 21 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/Manifest b/games-simulation/flightgear/Manifest
index 49e94ff7cedb..a03db79e8b2e 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -3,22 +3,19 @@ Hash: SHA256
 
 AUX flightgear-2.0.0-sdl.patch 388 SHA256 30b75c4cd89bb443ff6c6f8415dea096ba32245840772a8e0f2c554845815b50 SHA512 7f13289c1aad5cdab4181b87e289feec9f977a2c9eaf4d25eebff8fcaf9f2d5f47eab238cb7f643162f2d9a6eee771e73d1af27ec271dcab29c3930a58fc51ed WHIRLPOOL f53cbaf9dce2c0c07381ad1585164c25ad6a259e6381f0f2de7d80c69c41b28b6305ad29fde98c38416f48b85b2026356b9ef0d8531b33730b0c4d8b400f744c
 AUX flightgear-2.4.0-svn.patch 328 SHA256 317fa1ba9dd98f124880db56a660c5b83ec655743b59ae2dd7cf1fadd467c6dd SHA512 56142e9d85d94689cef468004e355ea151506dc6f537c644e565ab77ed816b15f80c0db2ae013d2aca02d2fbe8d898c89d9eae4cd25c019475597f060c84813d WHIRLPOOL d5334b96a969c38ba2be037092ca45cb1a8e73b724d82a0c122628a8575964efa2848734dde97226d0523b6dcfa86de0b6fea852c77ed0bd06fdd549802c3fca
+AUX flightgear-2.8.0-fgpanel-linking.patch 1205 SHA256 346ac442c31b6fb3a55fdb841ac9527372f7f4d81d3c24e68b6e55a64ab58a76 SHA512 f253419c25a0b0034afa1810db516dfe05bd57eab4ea4a1fb2ae30e3400573322842ddbf2e6914147839cfc334effd3203d7b9fd876952489dd0e4044b5c411a WHIRLPOOL 2bdc4df635195a1ac5842d2a1bd881f74c43751436927b10177832167b4bc02f8b834f94ab99782b32b978f86d76b26f214cfaaa535df24bc992990af28c1378
 DIST FlightGear-data-2.4.0.tar.bz2 431295521 SHA256 9f88a37ec2e21746c01f9b441bd58df4b95817e676fae13e481e73ee91bfe67e SHA512 c1eb22bced1bab5e53f46c62a0815ceae4d449164d3fea37b1ed9ad272dd8660ef6857dd095c65fc80a6df887fd0af858db0e8ada7519c01f8049670ac43a8b4 WHIRLPOOL 57c85514bb53da8be2fcb5788d0637ccc29caedbb2465e164b47a8f84cbd31b10beaed69951fe996a1d571afb101fc4b6c77f407b0b6f8f5db81b7fe513696e2
 DIST FlightGear-data-2.8.0.tar.bz2 685330156 SHA256 ad9ba1d12b5c771193561d452ec300e4c9321749d478dd6c1f59976932ba8d74 SHA512 ef86b636ed0393ead8e67ad13e3170790bc2373bd77556fe8ec45e55f70d6dc6380be47b8c882299bb5665362352c61c9f3d142fe17e1b76a5e5ae3d6d43dea3 WHIRLPOOL e087cf04429430d3dbcbe88c950feea054e066343d6753dc083806f959cf323bd7044a7f47222ed787af21b1d9ccbaae4aecbd2b84ec244b14050935398955d9
 DIST flightgear-2.4.0.tar.bz2 1909473 SHA256 3f2fdad171b86746b0dfa67510aabfb0c24731951a6d5646c6f0a4f98f01dbe1 SHA512 e1a2618891606f16d35db501cc7f08f226fb53da25a669f0b426fbec84a36538b483c7178dbdc35f988f0b0344d3dbd7c403601afcdba6d465255f827fc4a8f0 WHIRLPOOL b7c5f1585693b9d74e18c4ded6a21fb8db18e6083450a4956c17cc6710c94cf56c25759aff947f5d1c0b20b6c2adbfc61c4814f7c0586c513f1dc9734ff036cc
 DIST flightgear-2.8.0.tar.bz2 2311023 SHA256 bfda4f269d90128f4e4cb828de692a49dc0b93db41fe20a2b5272f3f271f3a01 SHA512 4d9b2584dd7c2fa4ad28d9769a9429809e420c7bf858967a5bb461f8ecb78dd079ff01c78febb95b7c3edce40dbf01e077bf7423324958e0b0a3cc74df12e1c1 WHIRLPOOL 615467c08d7b5f4f9e85d8248359452f2b9dc438e2184a7f8d126e57369f9b5d16b49c3779f0f58915236435f83610b3c76671cf049e5dffcb9428cd4bf82823
 EBUILD flightgear-2.4.0.ebuild 1477 SHA256 4c1ecebbd0c97aa443a68515f9fbe455e1edd58b455985e0e2ff769dcba66ddf SHA512 ddb19d194cdbb2b5aff0b81350993506495d63c6f6ae80379753bc5d281bf99205d9497beca9d59a2620107a53516e2baf7eee0165d1a1190fb4e95f9d07e9d9 WHIRLPOOL 153c84f2ec6d1cb7d0730b00b15f6f1d122a53d7ebf012a62163994f59866b92f18e782ee76e2d4e46e372d7c17184ac2ae57449707184d8b265d34d19b7702e
-EBUILD flightgear-2.8.0.ebuild 2037 SHA256 924eeaba7fce075aa26578e1f3a58a8d01fb7a2e072f355fe19897e6919cfdf8 SHA512 e95584899843d41c77382aa900d64746d21963c47a57941022beb9b96cd51fe59d90d179907438059d9d9d670657fdecf061a0a61c7d00505afdc94a38f81212 WHIRLPOOL fe9ab44fae9d5b9b1e22d53fd77d68361c53c97a26d87a2c00e1f23954424318dc617bcd6e26c50d65202544cc193216050d12131cf5e346796a9537e3706991
-MISC ChangeLog 10455 SHA256 d1b1da2e7401a49b4a0760ac87879e9f5013a886957896b852a85a3481fb627c SHA512 ce2478a53429f0922c943a962afa16369038b47cac023d31d64764d14b1b4da6debeabefeb5d46d0c53b464a480e3a70d59c97bdbc8e3a4bc3991dd0295ab64a WHIRLPOOL 5ee1b43298ebf9171ef50da9da04a4db02817807633764588272ecde29c915e252daffe6109db26dee34ffc816fb114ce462e94af458bd452a7d34ae68e5ceb2
-MISC metadata.xml 745 SHA256 73e460789e00a333df138473510315291acef1eb9cc604e099000692d6523d42 SHA512 1c0c05bae651a70cb798f04c175ab82754fff80eb26112f83c5098864e97760435fd8b8f2dc2a39f5f252a79283d73d6fcb374643fc4833d011992bc3b044536 WHIRLPOOL a65056d26bfad59ce3792642d39146726cbb9b74ad732da8da11ee2db7e8aa63132992223202d37b02d2d29d3641368291c542a3170b1537819bc9740372dd4e
+EBUILD flightgear-2.8.0.ebuild 2033 SHA256 62ddf608291ade9f5012fa385386f70d86e3073974f3ce938d4a085764830abe SHA512 c2c393b7bd5e6e53da238766bde76ceff8350af9893614e7bfd99933492850f3808378a84e814f072516d59e3138767769f0636dd6a9643a3e1b81a9e524e2fb WHIRLPOOL fe05b6216a5aad734fe641741437e23f81e044115aa1d0c02a91a219e2ae62cf57591e847d09bdcb366a666e832c05d71ed7146526a61bf97152be2e072c8a28
+MISC ChangeLog 10647 SHA256 f14e07e5081e000e19575fca2e2b96eeb41f90f1934f09ec39cf6927af67b465 SHA512 b6dbd49050604ca4db1e57d580ac199e6f0d18f535262019aa3cd7abefe24fec6670af544594e29ecb34e2dd52f32b8f540efc3333d89bba542195e3af0f9776 WHIRLPOOL 9bde7dce075397ef9313c0375c3d4d9ce81536bba2fd841a4a0cba7ec968a3b233dd7838352038c8786c9547034de460cf004ba622687b1b894804a246e85d23
+MISC metadata.xml 737 SHA256 8b1f0b469fb95c0ee8e3670c70e33fb1aa91bbf9952324c5da3e797afd00c8d6 SHA512 8d677a57ef29be3d7f511c4efd39c33a04773c3af6f67433ac7d8cf34050ed4032b8f4d37f4587467017d51fb1a6b5f906ef30647e955ad02df4f45a90492d73 WHIRLPOOL 5c85da0c84f07521dbb37ac090ce1fff7d10293676672e1a6eadfc6eaf70dd5bc46b6cd6a3ee55e3720ed789d87e617f7390699754333a0163e4928b08c1a153
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQu9kgAAoJEEdUh39IaPFNHjAIAJamefUi7iQubXjaBfftXLj0
-mR47u5N+7HB5NJejJszR8eZdB087YfXW6QT3c+tHqf4cX7Zg2F6/liu4cWkLVie6
-imvQCB+iIuHE1AOZ7ORxmAqEJTS5mM+RpxVxjzBbt0x2trAfkp0ErYjbJT201YiL
-u27qEY9sWUI1TE6Iy5F3MXh6fGPCtTt1ydDi7ju3EaOngAfKxFsh4cW96E6TTNAV
-Eiy9yaHZTXfk2EzwMedSIXLCjzihYh3kEX8jNckExH0CLZeEPGPtz1iafT4O6hk+
-iK0wAk8zalzJUbP7qrEM6lSwz7j0jyi00WzOBlYNBkYPCH9zlngsvMVWlBsRaV8=
-=i0aE
+iEYEAREIAAYFAlC+gBwACgkQFuHa/bHpVdu+4wCdHrco2AkQZ8V419SMOI2qjMWl
+5R8An3QlFySNM3ffc1PNXJVVECqzN4Wv
+=m+4Q
 -----END PGP SIGNATURE-----
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>