* [gentoo-commits] repo/gentoo:master commit in: dev-games/simgear/, games-simulation/flightgear/, ...
@ 2016-02-24 0:19 Maciej Mrozowski
0 siblings, 0 replies; 5+ messages in thread
From: Maciej Mrozowski @ 2016-02-24 0:19 UTC (permalink / raw
To: gentoo-commits
commit: c0699c6e3a394050c27ca86db20b183219e1a016
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 24 00:15:02 2016 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 00:18:45 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0699c6e
games-simulation/flightgear: Add live ebuilds
dev-games/simgear/simgear-9999.ebuild | 50 ++++++++
.../flightgear-data/flightgear-data-9999.ebuild | 29 +++++
games-simulation/flightgear/flightgear-9999.ebuild | 134 +++++++++++++++++++++
3 files changed, 213 insertions(+)
diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild
new file mode 100644
index 0000000..f151217
--- /dev/null
+++ b/dev-games/simgear/simgear-9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CMAKE_WARN_UNUSED_CLI=1
+inherit eutils cmake-utils git-r3
+
+DESCRIPTION="Development library for simulation games"
+HOMEPAGE="http://www.simgear.org/"
+EGIT_REPO_URI="git://git.code.sf.net/p/flightgear/${PN}
+ git://mapserver.flightgear.org/${PN}"
+EGIT_BRANCH="next"
+
+LICENSE="GPL-2"
+KEYWORDS=""
+SLOT="0"
+IUSE="curl debug subversion test"
+
+COMMON_DEPEND="
+ dev-libs/expat
+ >=dev-games/openscenegraph-3.2.0
+ media-libs/openal
+ sys-libs/zlib
+ virtual/opengl
+ curl? ( net-misc/curl )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/boost-1.44
+"
+RDEPEND="${COMMON_DEPEND}
+ subversion? ( dev-vcs/subversion )
+"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_CURL=$(usex curl)
+ -DENABLE_PKGUTIL=ON
+ -DENABLE_RTI=OFF
+ -DENABLE_SOUND=ON
+ -DENABLE_TESTS=$(usex test)
+ -DSIMGEAR_HEADLESS=OFF
+ -DSIMGEAR_SHARED=ON
+ -DSYSTEM_EXPAT=ON
+ )
+ cmake-utils_src_configure
+}
diff --git a/games-simulation/flightgear-data/flightgear-data-9999.ebuild b/games-simulation/flightgear-data/flightgear-data-9999.ebuild
new file mode 100644
index 0000000..e261f2e
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit git-r3
+
+DESCRIPTION="FlightGear data files"
+HOMEPAGE="http://www.flightgear.org/"
+EGIT_REPO_URI="git://git.code.sf.net/p/flightgear/fgdata
+ git://mapserver.flightgear.org/fgdata"
+EGIT_BRANCH="next"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+# data files split to separate package since 2.10.0
+RDEPEND="
+ !<games-simulation/flightgear-2.10.0
+"
+
+src_install() {
+ insinto /usr/share/flightgear
+ rm -fr .git
+ doins -r *
+}
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
new file mode 100644
index 0000000..2d73c20
--- /dev/null
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CMAKE_WARN_UNUSED_CLI=1
+inherit cmake-utils bash-completion-r1 git-r3
+
+DESCRIPTION="Open Source Flight Simulator"
+HOMEPAGE="http://www.flightgear.org/"
+EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/${PN}
+ git://mapserver.flightgear.org/${PN}"
+EGIT_BRANCH="next"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="dbus debug examples qt5 test +udev +utils vim-syntax"
+
+COMMON_DEPEND="
+ dev-db/sqlite:3
+ >=dev-games/openscenegraph-3.2.0[png]
+ ~dev-games/simgear-${PV}
+ media-libs/openal
+ media-libs/speex
+ media-sound/gsm
+ sys-libs/zlib
+ x11-libs/libX11
+ dbus? ( >=sys-apps/dbus-1.6.18-r1 )
+ qt5? (
+ >=dev-qt/qtcore-5.4.1:5
+ >=dev-qt/qtgui-5.4.1:5
+ >=dev-qt/qtwidgets-5.4.1:5
+ )
+ udev? ( virtual/udev )
+ utils? (
+ media-libs/freeglut
+ media-libs/libpng:0
+ virtual/opengl
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/boost-1.44
+ >=media-libs/plib-1.8.5
+"
+RDEPEND="${COMMON_DEPEND}
+ ~games-simulation/${PN}-data-${PV}
+"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_FGCOM=$(usex utils)
+ -DENABLE_FGELEV=$(usex utils)
+ -DENABLE_FGJS=$(usex utils)
+ -DENABLE_FGVIEWER=$(usex utils)
+ -DENABLE_FLITE=OFF
+ -DENABLE_GPSSMOOTH=$(usex utils)
+ -DENABLE_JS_DEMO=$(usex utils)
+ -DENABLE_JSBSIM=ON
+ -DENABLE_LARCSIM=ON
+ -DENABLE_LOGGING=$(usex test)
+ -DENABLE_METAR=$(usex utils)
+ -DENABLE_PROFILE=OFF
+ -DENABLE_QT=$(usex qt5)
+ -DENABLE_RTI=OFF
+ -DENABLE_TERRASYNC=$(usex utils)
+ -DENABLE_TESTS=$(usex test)
+ -DENABLE_UIUC_MODEL=ON
+ -DENABLE_YASIM=ON
+ -DEVENT_INPUT=$(usex udev)
+ -DFG_DATA_DIR=/usr/share/${PN}
+ -DJSBSIM_TERRAIN=ON
+ -DSIMGEAR_SHARED=ON
+ -DSP_FDMS=ON
+ -DSYSTEM_FLITE=ON
+ -DSYSTEM_HTS_ENGINE=ON
+ -DSYSTEM_SPEEX=ON
+ -DSYSTEM_GSM=ON
+ -DSYSTEM_SQLITE=ON
+ -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
+
+ newmenu package/${PN}.desktop ${PN}.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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/simgear/, games-simulation/flightgear/, ...
@ 2017-03-05 23:25 Maciej Mrozowski
0 siblings, 0 replies; 5+ messages in thread
From: Maciej Mrozowski @ 2017-03-05 23:25 UTC (permalink / raw
To: gentoo-commits
commit: d647eba30bef1720b55aeddf89f6670b9cdda475
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 5 23:20:17 2017 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 5 23:24:30 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d647eba3
games-simulation/flightgear: Version bump 2017.1.2, fix speexdps, bug 611674, enable SIMD intrinsics, sync live ebuild a bit. Drop PPC.
dev-games/simgear/Manifest | 2 +-
...gear-2017.1.1.ebuild => simgear-2017.1.2.ebuild} | 2 +-
dev-games/simgear/simgear-9999.ebuild | 2 +-
games-simulation/flightgear-data/Manifest | 2 +-
...7.1.1.ebuild => flightgear-data-2017.1.2.ebuild} | 0
games-simulation/flightgear/Manifest | 2 +-
.../flightgear/flightgear-2016.4.4.ebuild | 8 +++++++-
...r-2017.1.1.ebuild => flightgear-2017.1.2.ebuild} | 16 ++++++++--------
games-simulation/flightgear/flightgear-9999.ebuild | 21 +++++++++++----------
games-simulation/flightgear/metadata.xml | 1 +
10 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 82c27afd6bd..6bacd45efb2 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,2 +1,2 @@
DIST simgear-2016.4.4.tar.bz2 1200320 SHA256 5514fd0006bbfcdbdc0e2dab7da41eae491ea03a6246cc6a009590032b2fc1dc SHA512 f7b9124e40dba347cd73304fc1b20a5b6d09eb476bc41949d5be615be968a6a66f64141b87819bfa357bd1fd376b2e1fc18334eb1d4df2d4f1e3f95ef4a1928d WHIRLPOOL 3fb4d580d84633a6a852f6a8ab5e708afde9616b636bb5b49d30b56ed232d9938606f602d473e51855605d2544b364691ae362ec974f56b34e32507a37752221
-DIST simgear-2017.1.1.tar.bz2 1236106 SHA256 1815f6a2c3f43bb6121b2394e68f8e6e341c14a7a40e4163c0bcc105ee06ccbc SHA512 8920b41127eac40e3633444eae2cd7b61ac8a386164571a5f1205c92da7f555d54824fc39ab2e1af40860cb507eb358679282adede371c9a81c858bbcaadc9dd WHIRLPOOL 2b1fcce13c5919ac8fe248320a0289ac1dd317224f9a9b9ab9fd000e627ea726b1b2abf5e0fec6f924bc8561f408281dffd907081f82cd0b0e48ab5be8e97169
+DIST simgear-2017.1.2.tar.bz2 1235662 SHA256 69c8223051b039b00038aabbb8660cecce1866e3f854dadd9543db824d232f6b SHA512 5746262873f9ca9183bf5bcfbff1493637faa68c8d070a5683f991b414b69b0e432f181394db0c39c939b3d6e433288a143eb3489a407c38f3d26c9033027404 WHIRLPOOL a6b18db36078e1e26c8915ef72a5bb890bcef7433c6c641f314533c637cbcd3a626e4146ddbf7551fc179b9b07989baba04559a0f1684c4b00e94760ddace2cb
diff --git a/dev-games/simgear/simgear-2017.1.1.ebuild b/dev-games/simgear/simgear-2017.1.2.ebuild
similarity index 98%
rename from dev-games/simgear/simgear-2017.1.1.ebuild
rename to dev-games/simgear/simgear-2017.1.2.ebuild
index ddd8ca08d24..d1fdac8b30b 100644
--- a/dev-games/simgear/simgear-2017.1.1.ebuild
+++ b/dev-games/simgear/simgear-2017.1.2.ebuild
@@ -37,7 +37,7 @@ src_configure() {
-DENABLE_DNS=$(usex dns)
-DENABLE_PKGUTIL=ON
-DENABLE_RTI=OFF
- -DENABLE_SIMD=OFF
+ -DENABLE_SIMD=ON
-DENABLE_SOUND=ON
-DENABLE_TESTS=$(usex test)
-DSIMGEAR_HEADLESS=OFF
diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild
index e1e26cab473..b18a51cc4e3 100644
--- a/dev-games/simgear/simgear-9999.ebuild
+++ b/dev-games/simgear/simgear-9999.ebuild
@@ -39,7 +39,7 @@ src_configure() {
-DENABLE_DNS=$(usex dns)
-DENABLE_PKGUTIL=ON
-DENABLE_RTI=OFF
- -DENABLE_SIMD=OFF
+ -DENABLE_SIMD=ON
-DENABLE_SOUND=ON
-DENABLE_TESTS=$(usex test)
-DSIMGEAR_HEADLESS=OFF
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index 999baea96a3..f644b68fc2a 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
similarity index 100%
rename from games-simulation/flightgear-data/flightgear-data-2017.1.1.ebuild
rename to games-simulation/flightgear-data/flightgear-data-2017.1.2.ebuild
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 85833400310..c3aa9fb9e43 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 63155169636..e1245c6f657 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
similarity index 93%
rename from games-simulation/flightgear/flightgear-2017.1.1.ebuild
rename to games-simulation/flightgear/flightgear-2017.1.2.ebuild
index 74fd2237a07..caf3f423149 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 746af698999..30b2cbd0177 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 50f99784e5f..519cdc02d1e 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>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/simgear/, games-simulation/flightgear/, ...
@ 2017-04-19 3:29 Maciej Mrozowski
0 siblings, 0 replies; 5+ messages in thread
From: Maciej Mrozowski @ 2017-04-19 3:29 UTC (permalink / raw
To: gentoo-commits
commit: 73c16ff5bb65c91a4fc825f9aeae2c6a5319a39d
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 03:04:36 2017 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 03:28:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73c16ff5
games-simulation/flightgear: Version bump 2017.1.3
dev-games/simgear/Manifest | 1 +
dev-games/simgear/simgear-2017.1.3.ebuild | 51 ++++++++
games-simulation/flightgear-data/Manifest | 1 +
.../flightgear-data-2017.1.3.ebuild | 26 ++++
games-simulation/flightgear/Manifest | 1 +
.../flightgear/flightgear-2017.1.3.ebuild | 144 +++++++++++++++++++++
6 files changed, 224 insertions(+)
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 6bacd45efb2..353ae86b693 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,2 +1,3 @@
DIST simgear-2016.4.4.tar.bz2 1200320 SHA256 5514fd0006bbfcdbdc0e2dab7da41eae491ea03a6246cc6a009590032b2fc1dc SHA512 f7b9124e40dba347cd73304fc1b20a5b6d09eb476bc41949d5be615be968a6a66f64141b87819bfa357bd1fd376b2e1fc18334eb1d4df2d4f1e3f95ef4a1928d WHIRLPOOL 3fb4d580d84633a6a852f6a8ab5e708afde9616b636bb5b49d30b56ed232d9938606f602d473e51855605d2544b364691ae362ec974f56b34e32507a37752221
DIST simgear-2017.1.2.tar.bz2 1235662 SHA256 69c8223051b039b00038aabbb8660cecce1866e3f854dadd9543db824d232f6b SHA512 5746262873f9ca9183bf5bcfbff1493637faa68c8d070a5683f991b414b69b0e432f181394db0c39c939b3d6e433288a143eb3489a407c38f3d26c9033027404 WHIRLPOOL a6b18db36078e1e26c8915ef72a5bb890bcef7433c6c641f314533c637cbcd3a626e4146ddbf7551fc179b9b07989baba04559a0f1684c4b00e94760ddace2cb
+DIST simgear-2017.1.3.tar.bz2 1235062 SHA256 85304d985b4fc0dc00d9f7603b02d096e3c24ca4c98adc18dc9af1e2d0e3c310 SHA512 600f883ad92d37bf76d5e6beb066da340c7af927b0f2d51ce290cccaf23d1f3289b1aa31d3aa6cc17a4b9bc57c7180f03e234e08601e4169f26624678bf551aa WHIRLPOOL 377caa9327be22f10e0c45a64db7747d66dc7498b425ae5cf330544e727248b84f907b9eebb7c6b8e6a3272d1929a2b2ae1eaf8a4a542469d1e3615e9a2b7966
diff --git a/dev-games/simgear/simgear-2017.1.3.ebuild b/dev-games/simgear/simgear-2017.1.3.ebuild
new file mode 100644
index 00000000000..d3914e9c36c
--- /dev/null
+++ b/dev-games/simgear/simgear-2017.1.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils cmake-utils
+
+DESCRIPTION="Development library for simulation games"
+HOMEPAGE="http://www.simgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="+dns debug subversion test"
+
+COMMON_DEPEND="
+ dev-libs/expat
+ >=dev-games/openscenegraph-3.2.0
+ media-libs/openal
+ net-misc/curl
+ sys-libs/zlib
+ virtual/opengl
+ dns? ( net-libs/udns )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/boost-1.44
+"
+RDEPEND="${COMMON_DEPEND}
+ subversion? ( dev-vcs/subversion )
+"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_DNS=$(usex dns)
+ -DENABLE_PKGUTIL=ON
+ -DENABLE_RTI=OFF
+ -DENABLE_SIMD=ON
+ -DENABLE_SOUND=ON
+ -DENABLE_TESTS=$(usex test)
+ -DSIMGEAR_HEADLESS=OFF
+ -DSIMGEAR_SHARED=ON
+ -DSYSTEM_EXPAT=ON
+ -DSYSTEM_UDNS=ON
+ -DUSE_AEONWAVE=OFF
+ -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
+ )
+ cmake-utils_src_configure
+}
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index f644b68fc2a..5da7d5b023d 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1,2 +1,3 @@
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
diff --git a/games-simulation/flightgear-data/flightgear-data-2017.1.3.ebuild b/games-simulation/flightgear-data/flightgear-data-2017.1.3.ebuild
new file mode 100644
index 00000000000..f835ef53253
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-2017.1.3.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 c3aa9fb9e43..aedece7152a 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,2 +1,3 @@
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
diff --git a/games-simulation/flightgear/flightgear-2017.1.3.ebuild b/games-simulation/flightgear/flightgear-2017.1.3.ebuild
new file mode 100644
index 00000000000..caf3f423149
--- /dev/null
+++ b/games-simulation/flightgear/flightgear-2017.1.3.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils bash-completion-r1
+
+DESCRIPTION="Open Source Flight Simulator"
+HOMEPAGE="http://www.flightgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus debug examples 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}
+ 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 )
+ qt5? (
+ >=dev-qt/qtcore-5.4.1:5
+ >=dev-qt/qtgui-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)
+
+src_configure() {
+ local mycmakeargs=(
+ -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)
+ -DENABLE_JS_DEMO=$(usex utils)
+ -DENABLE_JSBSIM=ON
+ -DENABLE_LARCSIM=ON
+ -DENABLE_LOGGING=$(usex test)
+ -DENABLE_METAR=$(usex utils)
+ -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_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
+
+ newmenu package/${PN}.desktop ${PN}.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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/simgear/, games-simulation/flightgear/, ...
@ 2018-12-19 1:47 Maciej Mrozowski
0 siblings, 0 replies; 5+ messages in thread
From: Maciej Mrozowski @ 2018-12-19 1:47 UTC (permalink / raw
To: gentoo-commits
commit: 53fb31434533e0376e428c6dfba49b274b8c293d
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 18 02:44:16 2018 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 19 01:38:20 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53fb3143
games-simulation/flightgear: Version bump 2018.3.1
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>
dev-games/simgear/Manifest | 1 +
dev-games/simgear/simgear-2018.3.1.ebuild | 60 ++++++++++++++++++++++
games-simulation/flightgear-data/Manifest | 1 +
.../flightgear-data-2018.3.1.ebuild | 26 ++++++++++
games-simulation/flightgear/Manifest | 1 +
...gear-9999.ebuild => flightgear-2018.3.1.ebuild} | 35 +++++++++----
games-simulation/flightgear/flightgear-9999.ebuild | 25 +++++++--
7 files changed, 133 insertions(+), 16 deletions(-)
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index e61b6afba8f..f8d3fc6505b 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,2 +1,3 @@
DIST simgear-2018.1.1.tar.bz2 1303653 BLAKE2B 44b98c2ba8ae292c3736d04813869df528d7ca14bbdc1773e1f4bd4b7b4899b5fd8605a7ada5dcc2d5e863e82ee2f1e1d2b980d3bd775c92325ad3ca834306c3 SHA512 3de7a15dc7b60e9e7466950c1b466d0daefea84b4730a9b8cf5e26c41cece5fd03ccf57b0f3cb977093482beb734560812e347003e19e0bb4b40d81820a11563
DIST simgear-2018.2.1.tar.bz2 1314943 BLAKE2B 60e44896d466085014020874a1be6ab3f6f87e472f985237404dffb5dfbd5c25f0d330701276e0b8d075830695872eb7521bb4eb5b0107edac5977c3aab85bf7 SHA512 6756994e0688a1f3699c33548ea90b19e99a439ea2f2002cf524629370cd1161a1556ee966fc3a781141fc7a08e7574adc0ecbe6dec67e72d631c6c4d744e4dd
+DIST simgear-2018.3.1.tar.bz2 1330322 BLAKE2B 5b350ddce726d8ea15c4a1a64a28b9e4307647378c52989231daa7b4a0e53730dc754c239660d0f5ec33189ece6629448b37f61ca7578c21c3aa4147d4565a26 SHA512 673ee76e9f4f9c9adb25a2523bad5b70a079d821391cb8fc9f9e651ad6c195356ac9a8ba18a65df365dc66990406de287099fb249ca23eefc111ebba884f7289
diff --git a/dev-games/simgear/simgear-2018.3.1.ebuild b/dev-games/simgear/simgear-2018.3.1.ebuild
new file mode 100644
index 00000000000..6c5c009057e
--- /dev/null
+++ b/dev-games/simgear/simgear-2018.3.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils toolchain-funcs
+
+DESCRIPTION="Development library for simulation games"
+HOMEPAGE="http://www.simgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dns debug gdal openmp subversion test"
+
+COMMON_DEPEND="
+ dev-libs/expat
+ >=dev-games/openscenegraph-3.2.0
+ media-libs/openal
+ net-misc/curl
+ sys-libs/zlib
+ virtual/opengl
+ dns? ( net-libs/udns )
+ gdal? ( sci-libs/gdal )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/boost-1.44
+"
+RDEPEND="${COMMON_DEPEND}
+ subversion? ( dev-vcs/subversion )
+"
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_DNS=$(usex dns)
+ -DENABLE_GDAL=$(usex gdal)
+ -DENABLE_OPENMP=$(usex openmp)
+ -DENABLE_PKGUTIL=ON
+ -DENABLE_RTI=OFF
+ -DENABLE_SIMD=ON
+ -DENABLE_SOUND=ON
+ -DENABLE_TESTS=$(usex test)
+ -DSIMGEAR_HEADLESS=OFF
+ -DSIMGEAR_SHARED=ON
+ -DSYSTEM_EXPAT=ON
+ -DSYSTEM_UDNS=ON
+ -DUSE_AEONWAVE=OFF
+ -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
+ )
+ cmake-utils_src_configure
+}
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index 4b2df599cd3..a638f22b8ea 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1,2 +1,3 @@
DIST FlightGear-2018.1.1-data.tar.bz2 1576049981 BLAKE2B cfcf028ca04ed785ba7c65979e6566ab773d8af869a9b62050969295eafecf7d1f5b6162f498af96786fa23a46e886390f240b56c83e7107473f59552a1155a5 SHA512 022f102f95c9cd8b153d991dad55ecd182e71aa0f3ecfe1502a35d6dcda0746a1fd183f808e59aba8c7f3a0cc9ae1f2f91ff49565bff4c7bc5a1c4889fcc127f
DIST FlightGear-2018.2.1-data.tar.bz2 1624676603 BLAKE2B baecea2002fc3c256205e70c6692102f9bccd04c839902353b0e6d803a97221479e8b54095530dc7af366d842c487d04447f0fd775527e6f5ea0ac32ed602dd6 SHA512 93690703965dd83b610ea0ba67938c0d3fb2d5f6d8c842851a979f352387431eacafb4d181a56dad6def474b2ab84f412cf5531570ce18c1ec80076fe92e4d05
+DIST FlightGear-2018.3.1-data.tar.bz2 1735407015 BLAKE2B e076e0096656c607cd32c7f86999685bc65bc1d8a28a260e0e7d760a5d4ea645f3a84f8410f9091e9767fcc143d0910f3e2ac2546e9408a49032b864bdd3c742 SHA512 495ef2dc87244c10cbca6deed7731e84f07c4a495e6d70ea7a88581e655b366c17900603f2388d2d21c4fe5cc4279820ae2a112376deeba4d37a53cd3495c102
diff --git a/games-simulation/flightgear-data/flightgear-data-2018.3.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2018.3.1.ebuild
new file mode 100644
index 00000000000..5e2859ac4b4
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-2018.3.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 8501b33c552..5aa37127dd3 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,2 +1,3 @@
DIST flightgear-2018.1.1.tar.bz2 8158999 BLAKE2B 5d7ca65c0b2627c7b34681e0af8e060f67cbed80d7e313c056fb92f026bc2355af66bbb6b377573db32f5101c63f1fa04521ba7fdffd584a56ae1049d1bcce83 SHA512 962be602a8c294081109ee1893383ac22dd83a0511fdb600d24d5dc9eca24d19687eaeed545695259502431e6d8c8bcdafe26846636ad40be28f5c2e4b0cfe93
DIST flightgear-2018.2.1.tar.bz2 8344999 BLAKE2B fc5fbd43bcc2e40ed3245aa5059b0e5a40918a707cbddc8383de191e29f6cdfaa6960f6cfffb201b20ad10f5da0f343a693768d38be2788fd2582f7b5dc2419c SHA512 d308eebf6d6017794c086d534f6543c03a54e55bd7f48caf8359d5a84776406eac8cd8f32252efb2cd8bbb82c9c15fe4d7e3229ff2483e7a9772bd532331be03
+DIST flightgear-2018.3.1.tar.bz2 8404294 BLAKE2B b90d64bc7381baef3adf3f2b77acb6822562d76319e85bebeda977754c281cd48b4ce137d910cc9f96947cfe1b7612c6ff45f2ed49775348b651944bb8796ba4 SHA512 ad07cdf90b1890519a22a1f79374b2d11e70191d85bc76d50913708a250801c3e091228999011367e374572a46c60f572f8b138d6a7c9fd2155f63107667d93c
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-2018.3.1.ebuild
similarity index 80%
copy from games-simulation/flightgear/flightgear-9999.ebuild
copy to games-simulation/flightgear/flightgear-2018.3.1.ebuild
index 10e2e7113b3..6ae489b664d 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-2018.3.1.ebuild
@@ -1,20 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit cmake-utils bash-completion-r1 toolchain-funcs git-r3
+inherit cmake-utils bash-completion-r1 toolchain-funcs
DESCRIPTION="Open Source Flight Simulator"
HOMEPAGE="http://www.flightgear.org/"
-EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/${PN}
- git://mapserver.flightgear.org/${PN}"
-EGIT_BRANCH="next"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
SLOT="0"
-IUSE="dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax"
+IUSE="dbus debug examples gdal openmp qt5 +udev +utils vim-syntax"
+
+# Needs --fg-root with path to flightgear-data passed to test runner passed,
+# not really worth patching
+RESTRICT="test"
# zlib is some strange auto-dep from simgear
COMMON_DEPEND="
@@ -68,11 +70,10 @@ pkg_pretend() {
src_configure() {
local mycmakeargs=(
- -DENABLE_DEMCONVERT=$(usex gdal && usex utils)
+ -DENABLE_AUTOTESTING=OFF
-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)
@@ -83,20 +84,22 @@ src_configure() {
-DENABLE_LARCSIM=ON
-DENABLE_METAR=$(usex utils)
-DENABLE_OPENMP=$(usex openmp)
+ -DENABLE_PLIB_JOYSTICK=ON # NOTE look for defaults changes in CMake
-DENABLE_PROFILE=OFF
-DENABLE_QT=$(usex qt5)
-DENABLE_RTI=OFF
+ -DENABLE_STGMERGE=ON
-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=Nightly
+ -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_CPPUNIT=OFF # NOTE we do not build tests anyway
-DSYSTEM_FLITE=ON
-DSYSTEM_HTS_ENGINE=ON
-DSYSTEM_SPEEX=ON
@@ -106,6 +109,16 @@ src_configure() {
-DUSE_DBUS=$(usex dbus)
-DWITH_FGPANEL=$(usex utils)
)
+ if use gdal && use utils; then
+ mycmakeargs+=(-DENABLE_DEMCONVERT=ON)
+ else
+ mycmakeargs+=(-DENABLE_DEMCONVERT=OFF)
+ fi
+ if use qt5 && use utils; then
+ mycmakeargs+=(-DENABLE_FGQCANVAS=ON)
+ else
+ mycmakeargs+=(-DENABLE_FGQCANVAS=OFF)
+ fi
cmake-utils_src_configure
}
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index 10e2e7113b3..c3a046d8574 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,11 @@ EGIT_BRANCH="next"
LICENSE="GPL-2"
KEYWORDS=""
SLOT="0"
-IUSE="dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax"
+IUSE="dbus debug examples gdal openmp qt5 +udev +utils vim-syntax"
+
+# Needs --fg-root with path to flightgear-data passed to test runner passed,
+# not really worth patching
+RESTRICT="test"
# zlib is some strange auto-dep from simgear
COMMON_DEPEND="
@@ -68,11 +72,10 @@ pkg_pretend() {
src_configure() {
local mycmakeargs=(
- -DENABLE_DEMCONVERT=$(usex gdal && usex utils)
+ -DENABLE_AUTOTESTING=OFF
-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)
@@ -83,11 +86,12 @@ src_configure() {
-DENABLE_LARCSIM=ON
-DENABLE_METAR=$(usex utils)
-DENABLE_OPENMP=$(usex openmp)
+ -DENABLE_PLIB_JOYSTICK=ON # NOTE look for defaults changes in CMake
-DENABLE_PROFILE=OFF
-DENABLE_QT=$(usex qt5)
-DENABLE_RTI=OFF
+ -DENABLE_STGMERGE=ON
-DENABLE_TERRASYNC=$(usex utils)
- -DENABLE_TESTS=$(usex test)
-DENABLE_TRAFFIC=$(usex utils)
-DENABLE_UIUC_MODEL=ON
-DENABLE_YASIM=ON
@@ -97,6 +101,7 @@ src_configure() {
-DJSBSIM_TERRAIN=ON
-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
-DSP_FDMS=ON
+ -DSYSTEM_CPPUNIT=OFF # NOTE we do not build tests anyway
-DSYSTEM_FLITE=ON
-DSYSTEM_HTS_ENGINE=ON
-DSYSTEM_SPEEX=ON
@@ -106,6 +111,16 @@ src_configure() {
-DUSE_DBUS=$(usex dbus)
-DWITH_FGPANEL=$(usex utils)
)
+ if use gdal && use utils; then
+ mycmakeargs+=(-DENABLE_DEMCONVERT=ON)
+ else
+ mycmakeargs+=(-DENABLE_DEMCONVERT=OFF)
+ fi
+ if use qt5 && use utils; then
+ mycmakeargs+=(-DENABLE_FGQCANVAS=ON)
+ else
+ mycmakeargs+=(-DENABLE_FGQCANVAS=OFF)
+ fi
cmake-utils_src_configure
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/simgear/, games-simulation/flightgear/, ...
@ 2021-01-25 21:23 Maciej Mrozowski
0 siblings, 0 replies; 5+ messages in thread
From: Maciej Mrozowski @ 2021-01-25 21:23 UTC (permalink / raw
To: gentoo-commits
commit: 1ca6bf08659b1470837f1a6cd44e4826bfa315ce
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 21:21:30 2021 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 21:22:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ca6bf08
games-simulation/flightgear: version bump, remove old
Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>
Closes: https://bugs.gentoo.org/763198
dev-games/simgear/Manifest | 2 +-
dev-games/simgear/{simgear-2020.3.5.ebuild => simgear-2020.3.6.ebuild} | 0
games-simulation/flightgear-data/Manifest | 2 +-
...{flightgear-data-2020.3.5.ebuild => flightgear-data-2020.3.6.ebuild} | 0
games-simulation/flightgear/Manifest | 2 +-
.../{flightgear-2020.3.5.ebuild => flightgear-2020.3.6.ebuild} | 0
6 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 10404d80732..ef72d263f36 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1 +1 @@
-DIST simgear-2020.3.5.tar.bz2 1408888 BLAKE2B 8775d0ed869a64dd8fe353ce3b9412fc069ca62c619a3d2e25bf8732779f663dc1235f952d3698b1544cd1280256d0f1723152c0d933fac09ef22c7696bbaf5c SHA512 208a2ac38c9b2403624412c23949b73ae1a880f6423c431fe7ab56e8e2544478cefca2e4a0b77de2870f74f77f37da0ff2d9d37a1e7c476e65b63b053c3c1dad
+DIST simgear-2020.3.6.tar.bz2 1408963 BLAKE2B 55583e9a7463bb16bfa2ff6bbcd60b8160adf57246b3820371cd262a7376425fbed75ecc18396782eb9e62ddf540c352ad3417d38cf62c42e2a24b9439da958a SHA512 eaa8e3663c5fb486ea0fdad26c490fa49472596157d8d19e60426d5a1d340dfda4e5e3d82f68542bb6d9689abb8e867dc33761ea578b9c8f6c07aeb4b942880e
diff --git a/dev-games/simgear/simgear-2020.3.5.ebuild b/dev-games/simgear/simgear-2020.3.6.ebuild
similarity index 100%
rename from dev-games/simgear/simgear-2020.3.5.ebuild
rename to dev-games/simgear/simgear-2020.3.6.ebuild
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index a5298674f72..7064a400870 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1 +1 @@
-DIST FlightGear-2020.3.5-data.tar.bz2 1991750471 BLAKE2B 5a31009dc0a3b4053613e81649e6e31ad8f93a678e94563ac613c8f7be4865bff47fb21be2279ef327bc33df52e225a4a9047ba21475a63317bacd6bfb06be1c SHA512 2e48e2213cdf5b379673033c5abe93de0d0b61020a2e37a812b4ee21f1eadab80653b0fab08c1b3b3e2b68e980a9c8403365e66c105a4634c057165674a54269
+DIST FlightGear-2020.3.6-data.tar.bz2 2009894075 BLAKE2B 5f8ed7c7290ede6c4b0a902d3d3ace515c2713ec237542c7f3537bfb48d99e480958344b8b5897e350ef800258408a2fe9c3058786c522402e4d88b18dfd5a72 SHA512 d29ff4feb72be167b57b9baae461c810aef537085084bfb0c0ffbb2d1575ced38a951478fa1fd395c219919528af7e050a6c5199c337592cf607da5a3c682017
diff --git a/games-simulation/flightgear-data/flightgear-data-2020.3.5.ebuild b/games-simulation/flightgear-data/flightgear-data-2020.3.6.ebuild
similarity index 100%
rename from games-simulation/flightgear-data/flightgear-data-2020.3.5.ebuild
rename to games-simulation/flightgear-data/flightgear-data-2020.3.6.ebuild
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 9b7fce3145a..78a719620d5 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1 +1 @@
-DIST flightgear-2020.3.5.tar.bz2 8831096 BLAKE2B 6648c52947642ee6d6d11d8bcb72cfc24ab3484e038d0136e1707936ab7db38a167ab221a67eaba47d3e507ce0c82612a47c574c37c17e2cbd8787fad46edb97 SHA512 7bd807daea330bf0e12fd0b797c54895dc9ceda98a67dbf36377bf6a4ab74c0e3cff218c4e9796c87fcac886436f1810848e0f4a8ab272fc516178f6d2d6fd0f
+DIST flightgear-2020.3.6.tar.bz2 8837251 BLAKE2B 28b8032bd2b6da91f72ae19d4c0c3a6d38122ec2ce7e2e8d1bc3022003551c6c5887711d67868fd9546d79eb6def6c0f0571e62361e73deb6f0edc9c3159c8fa SHA512 b0bfa6e02cf5c2e64aea85fb7433e583141471e15a7dff69dbc12c227835c6e52dcf5b2947a30847c2b291442878eee6265217311e441abb32c5f95bbf7df990
diff --git a/games-simulation/flightgear/flightgear-2020.3.5.ebuild b/games-simulation/flightgear/flightgear-2020.3.6.ebuild
similarity index 100%
rename from games-simulation/flightgear/flightgear-2020.3.5.ebuild
rename to games-simulation/flightgear/flightgear-2020.3.6.ebuild
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-01-25 21:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-19 3:29 [gentoo-commits] repo/gentoo:master commit in: dev-games/simgear/, games-simulation/flightgear/, Maciej Mrozowski
-- strict thread matches above, loose matches on Subject: below --
2021-01-25 21:23 Maciej Mrozowski
2018-12-19 1:47 Maciej Mrozowski
2017-03-05 23:25 Maciej Mrozowski
2016-02-24 0:19 Maciej Mrozowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox