games-simulation/flightgear: Version bump 2017.1.2, fix speexdps, bug 611674, enable SIMD intrinsics, sync live ebuild a bit. Drop PPC.

7 files changed, 29 insertions, 21 deletions

diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index 999baea96a31..f644b68fc2a9 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1,2 +1,2 @@
 DIST FlightGear-2016.4.4-data.tar.bz2 1654119067 SHA256 3dfd4b82c99a8bf4b81dd31846efce52ed417be180eaa71020ccc914f9a49668 SHA512 e9a8dfb17c03fb2961e4d031ef63d56c580f029a7ceee816e67c3944a3a79f476ee1c6ad40ce8af530c8551497d9e1329b00805499ad85c4610c07bfaf22d3aa WHIRLPOOL 249ba21e7ad58c885a92094ec403d99bc8879e9c6638b8ebc2e48053c5524c62383c95ddb9bac3039ddbcd50a90b4a690676df642125e4219fc3c7e94f793717
-DIST FlightGear-2017.1.1-data.tar.bz2 1460031625 SHA256 873c0906934b3d795db9fd78889a5c6badc2fe15229bef549974b1492042fd80 SHA512 7f6f0bbe5807d45a2613a164d3111383c7bab330b05367f064974719f0a7bfceb13146852bf061ced284e57c86aa7eec74a1cb6869616f45d0a48e51abfc1607 WHIRLPOOL 2186387798b22bb7c30bcb503ae219477eaae380a76537a6ea1bc3e16a790626f32d64dc7837941d58799d063773228f0c37239b6217e35bcb54c43f60a95d32
+DIST FlightGear-2017.1.2-data.tar.bz2 1460657435 SHA256 99d38d0478a8c8031f59376112bd54a6f996e1d363807b3bb45786384cfb2753 SHA512 0498b662a26c03dd08a1861d63e982adeded1a01db34ccf09d2acd9420a0b0343242216c58fa2a2ce215806690eb4d1796114f15f3adbd391fa18421629d4f97 WHIRLPOOL 45a1898ed0ca108d501f3bd35153a2107c4e4f682e3b49a7e8f49015fa5a6b6468d5177cc79458e23f5ae9b3ee2744540ab82a48561d9ba994cb147adc898650
diff --git a/games-simulation/flightgear-data/flightgear-data-2017.1.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2017.1.2.ebuild
index 084c65ea5c49..084c65ea5c49 100644
--- a/games-simulation/flightgear-data/flightgear-data-2017.1.1.ebuild
+++ b/games-simulation/flightgear-data/flightgear-data-2017.1.2.ebuild
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 858334003100..c3aa9fb9e438 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,2 +1,2 @@
 DIST flightgear-2016.4.4.tar.bz2 7560911 SHA256 d51992cbe40f1812f9821ab27b838d52e04c10551772d57fc2e815f4444dfafc SHA512 3f3d5a72adea9cb9a22b7b355a18492c1c58634e6203d6ae364d7a89f1af0fcc3df446c72c3c83ac9a1f51e05a6cd83c7d7af5f7bc3a5e8e75e3b80f709394a0 WHIRLPOOL 0a3fc48c5ec440cdcc7f2a99b860c51310fd9f256e5577458ccd9fa5202c26751b982918752326c68b5c6d9554eb902c4789df4a6221752870d3eaf263756226
-DIST flightgear-2017.1.1.tar.bz2 8057285 SHA256 8f98bbdc027164564cddf660856e0b2f4924c5c9b6a32735b14cd57b4338a028 SHA512 97421940c10e0afa3ecabeb3b3f676a262ed715ac47174cecceaef6962bc3f4a20c3bbc8505f4d600c6099940294d912148e9adb908ce6dc4546a5d2f2508a01 WHIRLPOOL 18b34c1dad47cd519fed095a000f5f532751f8c3902f2c7170b927c2dbe1c1227c74f270eb8fbc27e6d258373b8f288a96db4f864d1d512a42ebc0ae285832fc
+DIST flightgear-2017.1.2.tar.bz2 8056697 SHA256 41fe2a4ab0c14ed10436026c2edbb83148bf603691487976aaf2a5314f524659 SHA512 26466d6bd567c06cec7744dccba5c4a70d01c5169153c3c660175e9b400b9d1b5cc0d067e4d53d102ba5c20ceffb2217afcc54a0e86bf8aa7b3e7ee5a60aaf07 WHIRLPOOL f7b8a7884d4738a6e803a27b0dd3a5ad7bfc65d25b6c19baca0b0244222b967963ff3663298a8659ff01fd6aa52c4d7ed91f29792c8b77dded36ec6ba687200c
diff --git a/games-simulation/flightgear/flightgear-2016.4.4.ebuild b/games-simulation/flightgear/flightgear-2016.4.4.ebuild
index 631551696360..e1245c6f6579 100644
--- a/games-simulation/flightgear/flightgear-2016.4.4.ebuild
+++ b/games-simulation/flightgear/flightgear-2016.4.4.ebuild
@@ -20,7 +20,13 @@ COMMON_DEPEND="
 	>=dev-games/openscenegraph-3.2.0[png]
 	~dev-games/simgear-${PV}
 	media-libs/openal
-	media-libs/speex
+	|| (
+		(
+			>=media-libs/speex-1.2.0:0
+			media-libs/speexdsp:0
+		)
+		<media-libs/speex-1.2.0:0
+	)
 	media-sound/gsm
 	sys-libs/zlib
 	virtual/glu
diff --git a/games-simulation/flightgear/flightgear-2017.1.1.ebuild b/games-simulation/flightgear/flightgear-2017.1.2.ebuild
index 74fd2237a07d..caf3f423149a 100644
--- a/games-simulation/flightgear/flightgear-2017.1.1.ebuild
+++ b/games-simulation/flightgear/flightgear-2017.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dbus debug examples qt5 test +udev +utils vim-syntax"
 
 # zlib is some strange auto-dep from simgear
@@ -20,13 +20,8 @@ COMMON_DEPEND="
 	>=dev-games/openscenegraph-3.2.0[png]
 	~dev-games/simgear-${PV}
 	media-libs/openal
-	|| (
-		(
-			>=media-libs/speex-1.2.0
-			media-libs/speexdsp
-		)
-		<media-libs/speex-1.2.0
-	)
+	>=media-libs/speex-1.2.0:0
+	media-libs/speexdsp:0
 	media-sound/gsm
 	sys-libs/zlib
 	virtual/glu
@@ -40,8 +35,11 @@ COMMON_DEPEND="
 	udev? ( virtual/udev )
 	utils? (
 		media-libs/freeglut
+		media-libs/freetype:2
+		media-libs/glew:0
 		media-libs/libpng:0
 		virtual/opengl
+		qt5? ( >=dev-qt/qtwebsockets-5.4.1:5 )
 	)
 "
 # libXi and libXmu are build-only-deps according to FindGLUT.cmake
@@ -64,6 +62,7 @@ src_configure() {
 		-DENABLE_FGCOM=$(usex utils)
 		-DENABLE_FGELEV=$(usex utils)
 		-DENABLE_FGJS=$(usex utils)
+		-DENABLE_FGQCANVAS=$(usex qt5 && usex utils)
 		-DENABLE_FGVIEWER=$(usex utils)
 		-DENABLE_FLITE=OFF
 		-DENABLE_GPSSMOOTH=$(usex utils)
@@ -77,6 +76,7 @@ src_configure() {
 		-DENABLE_RTI=OFF
 		-DENABLE_TERRASYNC=$(usex utils)
 		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TRAFFIC=$(usex utils)
 		-DENABLE_UIUC_MODEL=ON
 		-DENABLE_YASIM=ON
 		-DEVENT_INPUT=$(usex udev)
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index 746af6989996..30b2cbd01775 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -14,26 +14,23 @@ EGIT_BRANCH="next"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="dbus debug examples qt5 test +udev +utils vim-syntax"
+IUSE="dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax"
 
 # zlib is some strange auto-dep from simgear
+# TODO openmp
 COMMON_DEPEND="
 	dev-db/sqlite:3
 	>=dev-games/openscenegraph-3.2.0[png]
 	~dev-games/simgear-${PV}
 	media-libs/openal
-	|| (
-		(
-			>=media-libs/speex-1.2.0
-			media-libs/speexdsp
-		)
-		<media-libs/speex-1.2.0
-	)
+	>=media-libs/speex-1.2.0:0
+	media-libs/speexdsp:0
 	media-sound/gsm
 	sys-libs/zlib
 	virtual/glu
 	x11-libs/libX11
 	dbus? ( >=sys-apps/dbus-1.6.18-r1 )
+	gdal? ( >=sci-libs/gdal-2.0.0:0 )
 	qt5? (
 		>=dev-qt/qtcore-5.4.1:5
 		>=dev-qt/qtgui-5.4.1:5
@@ -46,6 +43,7 @@ COMMON_DEPEND="
 		media-libs/glew:0
 		media-libs/libpng:0
 		virtual/opengl
+		qt5? ( >=dev-qt/qtwebsockets-5.4.1:5 )
 	)
 "
 # libXi and libXmu are build-only-deps according to FindGLUT.cmake
@@ -65,28 +63,31 @@ DOCS=(AUTHORS ChangeLog NEWS README Thanks)
 
 src_configure() {
 	local mycmakeargs=(
-		-DENABLE_FGCANVAS=$(usex qt5 && usex utils)
+		-DENABLE_DEMCONVERT=$(usex gdal && usex utils)
 		-DENABLE_FGCOM=$(usex utils)
 		-DENABLE_FGELEV=$(usex utils)
 		-DENABLE_FGJS=$(usex utils)
+		-DENABLE_FGQCANVAS=$(usex qt5 && usex utils)
 		-DENABLE_FGVIEWER=$(usex utils)
 		-DENABLE_FLITE=OFF
+		-DENABLE_GDAL=$(usex gdal)
 		-DENABLE_GPSSMOOTH=$(usex utils)
 		-DENABLE_JS_DEMO=$(usex utils)
 		-DENABLE_JSBSIM=ON
 		-DENABLE_LARCSIM=ON
 		-DENABLE_LOGGING=$(usex test)
 		-DENABLE_METAR=$(usex utils)
+		-DENABLE_OPENMP=$(usex openmp)
 		-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_BUILD_TYPE=Dev
 		-DFG_DATA_DIR=/usr/share/${PN}
 		-DJSBSIM_TERRAIN=ON
 		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
diff --git a/games-simulation/flightgear/metadata.xml b/games-simulation/flightgear/metadata.xml
index 50f99784e5fe..519cdc02d1e3 100644
--- a/games-simulation/flightgear/metadata.xml
+++ b/games-simulation/flightgear/metadata.xml
@@ -11,6 +11,7 @@
 </maintainer>
 <use>
 	<flag name="dbus">Enable screensaver DBus interaction</flag>
+	<flag name="gdal">Builds alternative terrain engine based on pagedLOD using <pkg>sci-libs/gdal</pkg></flag>
 	<flag name="qt5">Builds Qt5 launcher application</flag>
 	<flag name="udev">Enables event-based Input devices through <pkg>virtual/udev</pkg></flag>
 	<flag name="utils">Builds various utilities (fgpanel, fgviewer among others)</flag>