summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2017-06-15 05:36:55 +0200
committerMaciej Mrozowski <reavertm@gentoo.org>2017-06-15 05:45:08 +0200
commitc4ad6b25be4e46fe9f36968d2b32cbf707d42fd9 (patch)
tree20c132141b16176aa4b50552820bc59cad900fc2 /games-simulation
parentsystemd.eclass: Improve systemd_install_serviced documentation (diff)
downloadgentoo-c4ad6b25be4e46fe9f36968d2b32cbf707d42fd9.tar.gz
gentoo-c4ad6b25be4e46fe9f36968d2b32cbf707d42fd9.tar.bz2
gentoo-c4ad6b25be4e46fe9f36968d2b32cbf707d42fd9.zip
games-simulation/flightgear: Version bump 2017.2.1
Diffstat (limited to 'games-simulation')
-rw-r--r--games-simulation/flightgear-data/Manifest1
-rw-r--r--games-simulation/flightgear-data/flightgear-data-2017.2.1.ebuild26
-rw-r--r--games-simulation/flightgear/Manifest1
-rw-r--r--games-simulation/flightgear/flightgear-2017.2.1.ebuild155
-rw-r--r--games-simulation/flightgear/flightgear-9999.ebuild17
-rw-r--r--games-simulation/flightgear/metadata.xml8
6 files changed, 198 insertions, 10 deletions
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index 5da7d5b023d..e897d0b0c71 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1,3 +1,4 @@
DIST FlightGear-2016.4.4-data.tar.bz2 1654119067 SHA256 3dfd4b82c99a8bf4b81dd31846efce52ed417be180eaa71020ccc914f9a49668 SHA512 e9a8dfb17c03fb2961e4d031ef63d56c580f029a7ceee816e67c3944a3a79f476ee1c6ad40ce8af530c8551497d9e1329b00805499ad85c4610c07bfaf22d3aa WHIRLPOOL 249ba21e7ad58c885a92094ec403d99bc8879e9c6638b8ebc2e48053c5524c62383c95ddb9bac3039ddbcd50a90b4a690676df642125e4219fc3c7e94f793717
DIST FlightGear-2017.1.2-data.tar.bz2 1460657435 SHA256 99d38d0478a8c8031f59376112bd54a6f996e1d363807b3bb45786384cfb2753 SHA512 0498b662a26c03dd08a1861d63e982adeded1a01db34ccf09d2acd9420a0b0343242216c58fa2a2ce215806690eb4d1796114f15f3adbd391fa18421629d4f97 WHIRLPOOL 45a1898ed0ca108d501f3bd35153a2107c4e4f682e3b49a7e8f49015fa5a6b6468d5177cc79458e23f5ae9b3ee2744540ab82a48561d9ba994cb147adc898650
DIST FlightGear-2017.1.3-data.tar.bz2 1460527272 SHA256 bf35d9a15be9e7bd1c286eee879251e0907a3fb5cca4e7d1fdfbe67690345365 SHA512 eb6140612920b190cec7f2879e4789cfb1ab41ab3c2d463948c592347bfd8f042bb62b499abf94d51e550bc472afe334c77ad750930d954067dc1f6bab66efac WHIRLPOOL c2de9906a0d4f88bafd85edb9b217b1ee766f128c0b6e95f82a6c6a98313c63e26113e5798b5be7e8714831db94bb5c95afc0cbdd570b0c2313dcf856e944523
+DIST FlightGear-2017.2.1-data.tar.bz2 1590727949 SHA256 c9350e4500a1d97ebc515e7bb9e74081a8726a8fa244966543c9c67bcdacd1a4 SHA512 a6f6ff55d5ff866626b98fdfd77610fcde567aa53f74ccffb22c0580d1b6cc7c50fbc65b9c8b1f75ccfb07434b830b230c73a165c095f9367b67cd37b60018fc WHIRLPOOL dec850a9c1db5d6dec1682671f12b7d8015b29590100ce43f20724eb3d907da37b114f76f51cca4f1cde9e2c0e365cd913d9a42a2f51f91d8a32eef5e98146bc
diff --git a/games-simulation/flightgear-data/flightgear-data-2017.2.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2017.2.1.ebuild
new file mode 100644
index 00000000000..f835ef53253
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-2017.2.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="FlightGear data files"
+HOMEPAGE="http://www.flightgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# data files split to separate package since 2.10.0
+RDEPEND="
+ !<games-simulation/flightgear-2.10.0
+"
+
+S=${WORKDIR}/fgdata
+
+src_install() {
+ insinto /usr/share/flightgear
+ rm -fr .git
+ doins -r *
+}
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index aedece7152a..470ee1a646d 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,3 +1,4 @@
DIST flightgear-2016.4.4.tar.bz2 7560911 SHA256 d51992cbe40f1812f9821ab27b838d52e04c10551772d57fc2e815f4444dfafc SHA512 3f3d5a72adea9cb9a22b7b355a18492c1c58634e6203d6ae364d7a89f1af0fcc3df446c72c3c83ac9a1f51e05a6cd83c7d7af5f7bc3a5e8e75e3b80f709394a0 WHIRLPOOL 0a3fc48c5ec440cdcc7f2a99b860c51310fd9f256e5577458ccd9fa5202c26751b982918752326c68b5c6d9554eb902c4789df4a6221752870d3eaf263756226
DIST flightgear-2017.1.2.tar.bz2 8056697 SHA256 41fe2a4ab0c14ed10436026c2edbb83148bf603691487976aaf2a5314f524659 SHA512 26466d6bd567c06cec7744dccba5c4a70d01c5169153c3c660175e9b400b9d1b5cc0d067e4d53d102ba5c20ceffb2217afcc54a0e86bf8aa7b3e7ee5a60aaf07 WHIRLPOOL f7b8a7884d4738a6e803a27b0dd3a5ad7bfc65d25b6c19baca0b0244222b967963ff3663298a8659ff01fd6aa52c4d7ed91f29792c8b77dded36ec6ba687200c
DIST flightgear-2017.1.3.tar.bz2 8056402 SHA256 3d7cb2b4b1d60b80b0613222b1fc7b6db665eddaf68d7080c07cdedcb544b0ad SHA512 93aa27a976bcdd79c76eb9751ba90a79a6146d8f3961c3bdf1db136a99cb9a0ab644c7409a26267181be0476fa455bf739b78cb7028e3e12d5509f96a1d3f303 WHIRLPOOL 55592116f730eaefb57f1d1eb684629c3cfa4e4167ed4f3a17203b1ce7eacb9885f389cb934a4e3f9d10230ce45410ec09dd2b81220a5077f4c4c545dd8a116c
+DIST flightgear-2017.2.1.tar.bz2 8054033 SHA256 c7d9a63736cafd02236707d0f8e1bb36884a1a989cf49575bad13b4cbb311f5b SHA512 d4063d93d70046532c061cc6e09e0c6514cd8138c3baac1652b098a9196e5b435eee4e5ed19082a9e1994f95738114d13fe043290e7efb1539c70b107bbd33ea WHIRLPOOL 63e0c461551a361a2204f66fb0460d1884b3b078afc86681983ad843fb0a1fb944f26d23926563785211f2cd87b237adc5776c9d1eea4cb30fb0bd6d9907ed27
diff --git a/games-simulation/flightgear/flightgear-2017.2.1.ebuild b/games-simulation/flightgear/flightgear-2017.2.1.ebuild
new file mode 100644
index 00000000000..058c18d7f7b
--- /dev/null
+++ b/games-simulation/flightgear/flightgear-2017.2.1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="Open Source Flight Simulator"
+HOMEPAGE="http://www.flightgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax"
+
+# zlib is some strange auto-dep from simgear
+COMMON_DEPEND="
+ dev-db/sqlite:3
+ >=dev-games/openscenegraph-3.2.0[png]
+ ~dev-games/simgear-${PV}[gdal=]
+ media-libs/openal
+ >=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/qtdeclarative-5.4.1:5
+ >=dev-qt/qtgui-5.4.1:5
+ >=dev-qt/qtnetwork-5.4.1:5
+ >=dev-qt/qtwidgets-5.4.1:5
+ )
+ 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
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/boost-1.44
+ >=media-libs/plib-1.8.5
+ utils? (
+ x11-libs/libXi
+ x11-libs/libXmu
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ ~games-simulation/${PN}-data-${PV}
+"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+pkg_pretend() {
+ use openmp && tc-check-openmp
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -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_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=Release
+ -DFG_DATA_DIR=/usr/share/${PN}
+ -DJSBSIM_TERRAIN=ON
+ -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
+ -DSP_FDMS=ON
+ -DSYSTEM_FLITE=ON
+ -DSYSTEM_HTS_ENGINE=ON
+ -DSYSTEM_SPEEX=ON
+ -DSYSTEM_GSM=ON
+ -DSYSTEM_SQLITE=ON
+ -DUSE_AEONWAVE=OFF
+ -DUSE_DBUS=$(usex dbus)
+ -DWITH_FGPANEL=$(usex utils)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # Install icons and menu entry
+ local s
+ for s in 16 22 24 32 48 64 128; do
+ doicon -s ${s} icons/${s}x${s}/apps/${PN}.png
+ use utils && doicon -s ${s} icons/${s}x${s}/apps/fgcom.png
+ done
+ doicon -s scalable icons/scalable/${PN}.svg
+ use utils && doicon -s scalable icons/scalable/fgcom.svg
+
+ domenu package/org.flightgear.FlightGear.desktop
+
+ # Install bash completion (TODO zsh)
+ # Uncomment below when scripts stops writing files...
+# sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
+# -i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT'
+# newbashcomp scripts/completion/fg-completion.bash ${PN}
+
+ # Install examples and other misc files
+ if use examples; then
+ insinto /usr/share/doc/"${PF}"/examples
+ doins -r scripts/java scripts/perl scripts/python
+ insinto /usr/share/doc/"${PF}"/examples/c++
+ doins -r scripts/example/*
+ insinto /usr/share/doc/"${PF}"/tools
+ doins -r scripts/atis scripts/tools/*
+ fi
+
+ # Install nasal script syntax
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/syntax
+ doins scripts/syntax/{ac3d,nasal}.vim
+ insinto /usr/share/vim/vimfiles/ftdetect/
+ doins "${FILESDIR}"/{ac3d,nasal}.vim
+ fi
+}
+
+pkg_postinst() {
+ einfo "Please note that data files location changed to /usr/share/flightgear"
+ if use qt5; then
+ einfo "To use launcher, run fgfs with '--launcher' parameter"
+ fi
+}
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index 30b2cbd0177..a4ad24d989c 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit cmake-utils bash-completion-r1 git-r3
+inherit cmake-utils bash-completion-r1 toolchain-funcs git-r3
DESCRIPTION="Open Source Flight Simulator"
HOMEPAGE="http://www.flightgear.org/"
@@ -12,16 +12,15 @@ EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/${PN}
EGIT_BRANCH="next"
LICENSE="GPL-2"
-SLOT="0"
KEYWORDS=""
+SLOT="0"
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}
+ ~dev-games/simgear-${PV}[gdal=]
media-libs/openal
>=media-libs/speex-1.2.0:0
media-libs/speexdsp:0
@@ -33,7 +32,9 @@ COMMON_DEPEND="
gdal? ( >=sci-libs/gdal-2.0.0:0 )
qt5? (
>=dev-qt/qtcore-5.4.1:5
+ >=dev-qt/qtdeclarative-5.4.1:5
>=dev-qt/qtgui-5.4.1:5
+ >=dev-qt/qtnetwork-5.4.1:5
>=dev-qt/qtwidgets-5.4.1:5
)
udev? ( virtual/udev )
@@ -61,6 +62,10 @@ RDEPEND="${COMMON_DEPEND}
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+pkg_pretend() {
+ use openmp && tc-check-openmp
+}
+
src_configure() {
local mycmakeargs=(
-DENABLE_DEMCONVERT=$(usex gdal && usex utils)
@@ -87,7 +92,7 @@ src_configure() {
-DENABLE_UIUC_MODEL=ON
-DENABLE_YASIM=ON
-DEVENT_INPUT=$(usex udev)
- -DFG_BUILD_TYPE=Dev
+ -DFG_BUILD_TYPE=Nightly
-DFG_DATA_DIR=/usr/share/${PN}
-DJSBSIM_TERRAIN=ON
-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
@@ -117,7 +122,7 @@ src_install() {
doicon -s scalable icons/scalable/${PN}.svg
use utils && doicon -s scalable icons/scalable/fgcom.svg
- newmenu package/${PN}.desktop ${PN}.desktop
+ domenu package/org.flightgear.FlightGear.desktop
# Install bash completion (TODO zsh)
# Uncomment below when scripts stops writing files...
diff --git a/games-simulation/flightgear/metadata.xml b/games-simulation/flightgear/metadata.xml
index 4641d2589a7..2f0f827b884 100644
--- a/games-simulation/flightgear/metadata.xml
+++ b/games-simulation/flightgear/metadata.xml
@@ -11,10 +11,10 @@
</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>
+ <flag name="gdal">Enable alternative terrain engine based on pagedLOD using <pkg>sci-libs/gdal</pkg></flag>
+ <flag name="qt5">Build Qt5 launcher application</flag>
+ <flag name="udev">Enable event-based Input devices through <pkg>virtual/udev</pkg></flag>
+ <flag name="utils">Build various utilities (fgpanel, fgviewer among others)</flag>
</use>
<upstream>
<remote-id type="sourceforge">flightgear</remote-id>