[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: 0bf450f5e4fae70aea1615b1ef6885e750c904c8
Author: Eli Schwartz gentoo org>
AuthorDate: Mon Aug 12 00:59:12 2024 +
Commit: Eli Schwartz gentoo org>
CommitDate: Mon Aug 12 01:16:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bf450f5
games-simulation/flightgear: use https for git clones in live
Using git:// is a really bad idea and the eclass yells at you for it.
And the second uri does not actually exist (anymore).
Note: the live ebuild still doesn't actually build. The patch is stale
and then there are a bunch of weird "XXX does not name a type" and
"YYY was not declared in this scope" errors that I have no patience to
debug. Perhaps an upstream bug. I was able to determine that existing
LTO errors are still present and then gave up. Baby steps... :D
Signed-off-by: Eli Schwartz gentoo.org>
games-simulation/flightgear/flightgear-.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/games-simulation/flightgear/flightgear-.ebuild
b/games-simulation/flightgear/flightgear-.ebuild
index b35e56b521a8..ec1215fc6d90 100644
--- a/games-simulation/flightgear/flightgear-.ebuild
+++ b/games-simulation/flightgear/flightgear-.ebuild
@@ -7,8 +7,7 @@ inherit cmake toolchain-funcs git-r3
DESCRIPTION="Open Source Flight Simulator"
HOMEPAGE="https://www.flightgear.org/";
-EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/${PN}
- git://mapserver.flightgear.org/${PN}"
+EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/${PN}";
EGIT_BRANCH="next"
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: cdcfeb1855998c43033042d3980d38f5f695bd91
Author: Eli Schwartz gentoo org>
AuthorDate: Mon Aug 12 01:08:47 2024 +
Commit: Eli Schwartz gentoo org>
CommitDate: Mon Aug 12 01:16:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdcfeb18
games-simulation/flightgear: mark as LTO-unsafe
Closes: https://bugs.gentoo.org/859217
Signed-off-by: Eli Schwartz gentoo.org>
games-simulation/flightgear/flightgear-2020.3.19.ebuild | 7 ++-
games-simulation/flightgear/flightgear-.ebuild | 7 ++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/games-simulation/flightgear/flightgear-2020.3.19.ebuild
b/games-simulation/flightgear/flightgear-2020.3.19.ebuild
index fffe97177e82..9d6373a47ddb 100644
--- a/games-simulation/flightgear/flightgear-2020.3.19.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.3.19.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cmake toolchain-funcs
+inherit cmake flag-o-matic toolchain-funcs
DESCRIPTION="Open Source Flight Simulator"
HOMEPAGE="https://www.flightgear.org/";
@@ -79,6 +79,11 @@ pkg_setup() {
}
src_configure() {
+ # -Werror=lto-type-mismatch, -Werror=odr
+ # https://bugs.gentoo.org/859217
+ # https://sourceforge.net/p/flightgear/codetickets/2908/
+ filter-lto
+
local mycmakeargs=(
-DBUILD_SHARED_LIBS=OFF
-DENABLE_AUTOTESTING=OFF
diff --git a/games-simulation/flightgear/flightgear-.ebuild
b/games-simulation/flightgear/flightgear-.ebuild
index ec1215fc6d90..720c1042bbd6 100644
--- a/games-simulation/flightgear/flightgear-.ebuild
+++ b/games-simulation/flightgear/flightgear-.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cmake toolchain-funcs git-r3
+inherit cmake flag-o-matic toolchain-funcs git-r3
DESCRIPTION="Open Source Flight Simulator"
HOMEPAGE="https://www.flightgear.org/";
@@ -80,6 +80,11 @@ pkg_setup() {
}
src_configure() {
+ # -Werror=lto-type-mismatch, -Werror=odr
+ # https://bugs.gentoo.org/859217
+ # https://sourceforge.net/p/flightgear/codetickets/2908/
+ filter-lto
+
local mycmakeargs=(
-DBUILD_SHARED_LIBS=OFF
-DENABLE_AUTOTESTING=OFF
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: 7c5dc3d2150337fd3c94bec53752507c67fba1d8
Author: Maciej Mrozowski gentoo org>
AuthorDate: Tue Jun 4 01:48:04 2024 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Tue Jun 4 01:50:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c5dc3d2
games-simulation/flightgear: add missing xorg build deps
Signed-off-by: Maciej Mrozowski gentoo.org>
games-simulation/flightgear/flightgear-2020.3.19.ebuild | 1 +
games-simulation/flightgear/flightgear-.ebuild | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/games-simulation/flightgear/flightgear-2020.3.19.ebuild
b/games-simulation/flightgear/flightgear-2020.3.19.ebuild
index 43a92a150e43..fffe97177e82 100644
--- a/games-simulation/flightgear/flightgear-2020.3.19.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.3.19.ebuild
@@ -53,6 +53,7 @@ COMMON_DEPEND="
# libXi and libXmu are build-only-deps according to FindGLUT.cmake
DEPEND="${COMMON_DEPEND}
dev-libs/boost
+ x11-base/xorg-proto
utils? (
x11-libs/libXi
x11-libs/libXmu
diff --git a/games-simulation/flightgear/flightgear-.ebuild
b/games-simulation/flightgear/flightgear-.ebuild
index 119c8bb2db0c..b35e56b521a8 100644
--- a/games-simulation/flightgear/flightgear-.ebuild
+++ b/games-simulation/flightgear/flightgear-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -55,6 +55,7 @@ COMMON_DEPEND="
# libXi and libXmu are build-only-deps according to FindGLUT.cmake
DEPEND="${COMMON_DEPEND}
dev-libs/boost
+ x11-base/xorg-proto
utils? (
x11-libs/libXi
x11-libs/libXmu
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/, games-simulation/flightgear-data/, ...
commit: f5a2fbce5f39e4b57689a277046ccb81d043cef0
Author: Maciej Mrozowski gentoo org>
AuthorDate: Sat Dec 9 00:48:52 2023 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Sat Dec 9 00:52:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5a2fbce
games-simulation/flightgear: version bump, remove old
Signed-off-by: Maciej Mrozowski gentoo.org>
dev-games/simgear/Manifest | 2 +-
...ar-2020.3.18.ebuild => simgear-2020.3.19.ebuild} | 2 +-
games-simulation/flightgear-data/Manifest | 3 +--
.../flightgear-data-2020.3.17.ebuild| 21 -
...3.18.ebuild => flightgear-data-2020.3.19.ebuild} | 0
games-simulation/flightgear/Manifest| 2 +-
...2020.3.18.ebuild => flightgear-2020.3.19.ebuild} | 0
7 files changed, 4 insertions(+), 26 deletions(-)
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 7e25b1b722c8..4b9a4b11d829 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1 +1 @@
-DIST simgear-2020.3.18.tar.bz2 1423264 BLAKE2B
5013d25819713e1a3de1d8e42aba68bbc70c60ebad45f0d3475392188f5fc9db7266536ef365ab60a183a3998edf0941d093ee1ee50a9293b32bcfafe5da57d0
SHA512
8101ea073e3e701759b4cea77ebf376897d7e02d4f9ebf0248dcba7dc9186f11cfd7921b2ed8f77e0168a851fff0904107881087ce4e12597c1fdc63b34eef25
+DIST simgear-2020.3.19.tar.bz2 1427799 BLAKE2B
a3c90756053d01fdbb7f7518cbf58018b21a1e7acfbee523ffda0ba27682113c67c531b2f0c0678d7e962f365411811b7044e0df9b995e0d3eabef2ede431757
SHA512
b5c2acb9b843c48e573764c1474bc8723167376546d2fe01246ea936d348abf7e26c8778037680dc76fad5e514209ccce03f8c49cdd90ff0fb44f86759f9ec64
diff --git a/dev-games/simgear/simgear-2020.3.18.ebuild
b/dev-games/simgear/simgear-2020.3.19.ebuild
similarity index 97%
rename from dev-games/simgear/simgear-2020.3.18.ebuild
rename to dev-games/simgear/simgear-2020.3.19.ebuild
index d6d0a2a4d7b7..b610d305f4cb 100644
--- a/dev-games/simgear/simgear-2020.3.18.ebuild
+++ b/dev-games/simgear/simgear-2020.3.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/games-simulation/flightgear-data/Manifest
b/games-simulation/flightgear-data/Manifest
index 524dc38fe77d..3526353df994 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1,2 +1 @@
-DIST FlightGear-2020.3.17-data.txz 1789324280 BLAKE2B
abb1384be2922a80a4abf1c5a540e160c94e74c63ec1ce337f2be253a49c54ee499b9cea752bead41ee4ff1a235b7f78c9143579b602b4a911f46bdb7766e15c
SHA512
b15a8ae46709594d9aca5442c51b0cf5b2a804f5b39135bfa9c413ce4aca74db1955a399eb93abf38f1e265199e09ac0ecf05e518a23eeb35aeaa5cbc09277a0
-DIST FlightGear-2020.3.18-data.txz 1789347748 BLAKE2B
0c6507ab2eaf10a3b9559dfca41818a66354da163b3ee64ecedcc3f49c0847cebe337982b8622618dc1710702754ac57cc17d96a954221543c8599ce5734c3d3
SHA512
0c0ec7246bc894c6b34a1a0862ed0199666f47ea1f0ad8c54ce08aab48eb47601296356e5a090ad2f118230eccb9ccb86823e948abad0fe05a706c38249d2196
+DIST FlightGear-2020.3.19-data.txz 1789370768 BLAKE2B
2fa77d7821dc866e871ad92587204e82cb8bd2a961055b32a880285163505cd17b0044425a3b9d58cf181f32d94fdddbf4abc6e9e81d1264cf3d0173b9d65554
SHA512
054efd8a77f55b16e955d6489f34c671d927b3c4c6ea1d15e244189b1852215cee36de927a1a82d04e81d9afc3e8af8575724935c2113dfba919426be5f0eb95
diff --git a/games-simulation/flightgear-data/flightgear-data-2020.3.17.ebuild
b/games-simulation/flightgear-data/flightgear-data-2020.3.17.ebuild
deleted file mode 100644
index 5eb3beaef789..
--- a/games-simulation/flightgear-data/flightgear-data-2020.3.17.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="FlightGear data files"
-HOMEPAGE="https://www.flightgear.org/";
-SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.txz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/fgdata
-
-src_install() {
- insinto /usr/share/flightgear
- rm -fr .git
- doins -r *
-}
diff --git a/games-simulation/flightgear-data/flightgear-data-2020.3.18.ebuild
b/games-simulation/flightgear-data/flightgear-data-2020.3.19.ebuild
similarity index 100%
rename from games-simulation/flightgear-data/flightgear-data-2020.3.18.ebuild
rename to games-simulation/flightgear-data/flightgear-data-2020.3.19.ebuild
diff --git a/games-simulation/flightgear/Manifest
b/games-simulation/flightgear/Manifest
index ff9c56aeb1ec..4c646ab93dec 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1 +1 @@
-DIST flightgear-2020.3.18.tar.bz2 8936579 BLAKE2B
3d404f7b32f1eb6f065e9aaa5f9a5750ac0e870828d4942abb04b4a56c6941b2b282b481fffea5826c532de5cb6c78b8752d048ab527ea637c7e87227590ad96
SHA512
189e3fa637ae30662cd60cd
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: ce611383dd1505d7a0ac30813293f96a4a4f3b4d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jul 27 18:56:18 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jul 27 19:42:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce611383
games-simulation/flightgear: drop 2020.3.17-r1
Signed-off-by: Andreas Sturmlechner gentoo.org>
games-simulation/flightgear/Manifest | 1 -
.../flightgear/flightgear-2020.3.17-r1.ebuild | 170 -
2 files changed, 171 deletions(-)
diff --git a/games-simulation/flightgear/Manifest
b/games-simulation/flightgear/Manifest
index 0e1c03605c27..ff9c56aeb1ec 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,2 +1 @@
-DIST flightgear-2020.3.17.tar.bz2 8934871 BLAKE2B
e9cb4a18c119c813531af3d47f6378b0b8cb68a2b33453fedc0c5c1c68160b3d887eb497955118bb99b7297ed72714ee2ecc1c956599d1dbf0e8ca864eedefe0
SHA512
f083f91094b01ee78ad06c24a3ff784d119f27aebdf41d0a0f2ce41948acc3dc9b337ddce7aab3731eb3b2d7ae5fc6244505b019b6d49a8df61297453c291430
DIST flightgear-2020.3.18.tar.bz2 8936579 BLAKE2B
3d404f7b32f1eb6f065e9aaa5f9a5750ac0e870828d4942abb04b4a56c6941b2b282b481fffea5826c532de5cb6c78b8752d048ab527ea637c7e87227590ad96
SHA512
189e3fa637ae30662cd60cd473c9540e1e7f2b49cf29afe720794a278f09c7d788a458a6ddac843121958aa25f78f2528f1c5c8303c2a1e5cfc5478b1591df89
diff --git a/games-simulation/flightgear/flightgear-2020.3.17-r1.ebuild
b/games-simulation/flightgear/flightgear-2020.3.17-r1.ebuild
deleted file mode 100644
index 43ca5eb5109a..
--- a/games-simulation/flightgear/flightgear-2020.3.17-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs
-
-DESCRIPTION="Open Source Flight Simulator"
-HOMEPAGE="https://www.flightgear.org/";
-SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="cpu_flags_x86_sse2 dbus debug examples gdal openmp qt5 +udev +utils"
-
-# 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="
- dev-db/sqlite:3
- dev-games/openscenegraph[jpeg,png]
- ~dev-games/simgear-${PV}[gdal=]
- media-libs/openal
- >=media-libs/plib-1.8.5
- >=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:= )
- qt5? (
- >=dev-qt/qtcore-5.7.1:5
- >=dev-qt/qtdeclarative-5.7.1:5
- >=dev-qt/qtgui-5.7.1:5
- >=dev-qt/qtnetwork-5.7.1:5
- >=dev-qt/qtwidgets-5.7.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.7.1:5 )
- )
-"
-# libXi and libXmu are build-only-deps according to FindGLUT.cmake
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
- utils? (
- x11-libs/libXi
- x11-libs/libXmu
- )
-"
-RDEPEND="${COMMON_DEPEND}
- ~games-simulation/${PN}-data-${PV}
-"
-BDEPEND="qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2020.3.8-cmake.patch"
-)
-
-DOCS=(AUTHORS ChangeLog NEWS README Thanks)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=OFF
- -DENABLE_AUTOTESTING=OFF
- -DENABLE_COMPOSITOR=OFF
- -DENABLE_FGCOM=$(usex utils)
- -DENABLE_FGELEV=$(usex utils)
- -DENABLE_FGJS=$(usex utils)
- -DENABLE_FGVIEWER=$(usex utils)
- -DENABLE_GDAL=$(usex gdal)
- -DENABLE_GPSSMOOTH=$(usex utils)
- -DENABLE_HID_INPUT=$(usex udev)
- -DENABLE_IAX=$(usex utils)
- -DENABLE_JS_DEMO=$(usex utils)
- -DENABLE_JSBSIM=ON
- -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_SIMD=$(usex cpu_flags_x86_sse2)
- -DENABLE_STGMERGE=ON
- -DENABLE_SWIFT=OFF # swift pilo
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: e3dcb9024e9dc74d5075769431d5417f05634f40 Author: Sam James gentoo org> AuthorDate: Wed Apr 26 04:04:07 2023 + Commit: Sam James gentoo org> CommitDate: Wed Apr 26 04:04:07 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3dcb902 games-simulation/flightgear: crank copyright Signed-off-by: Sam James gentoo.org> games-simulation/flightgear/flightgear-2020.3.18.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-simulation/flightgear/flightgear-2020.3.18.ebuild b/games-simulation/flightgear/flightgear-2020.3.18.ebuild index 43ca5eb5109a..eed1f6471442 100644 --- a/games-simulation/flightgear/flightgear-2020.3.18.ebuild +++ b/games-simulation/flightgear/flightgear-2020.3.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear-data/
commit: 32674397033ca0d0a187d24f3ccc1c6f03b13a3d Author: Sam James gentoo org> AuthorDate: Wed Apr 26 04:04:15 2023 + Commit: Sam James gentoo org> CommitDate: Wed Apr 26 04:04:15 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32674397 games-simulation/flightgear-data: crank copyright Signed-off-by: Sam James gentoo.org> games-simulation/flightgear-data/flightgear-data-2020.3.18.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-simulation/flightgear-data/flightgear-data-2020.3.18.ebuild b/games-simulation/flightgear-data/flightgear-data-2020.3.18.ebuild index 5eb3beaef789..d22234309783 100644 --- a/games-simulation/flightgear-data/flightgear-data-2020.3.18.ebuild +++ b/games-simulation/flightgear-data/flightgear-data-2020.3.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: 15ea1279a7e25ba92bdf26823f7330aa852ac9f4
Author: Michal Privoznik gmail com>
AuthorDate: Wed Apr 19 07:57:15 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Apr 26 04:02:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15ea1279
games-simulation/flightgear: Version bump to 2020.3.18
Signed-off-by: Michal Privoznik gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30648
Signed-off-by: Sam James gentoo.org>
games-simulation/flightgear/Manifest | 1 +
.../flightgear/flightgear-2020.3.18.ebuild | 170 +
2 files changed, 171 insertions(+)
diff --git a/games-simulation/flightgear/Manifest
b/games-simulation/flightgear/Manifest
index 229eec39eb6a..0e1c03605c27 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1 +1,2 @@
DIST flightgear-2020.3.17.tar.bz2 8934871 BLAKE2B
e9cb4a18c119c813531af3d47f6378b0b8cb68a2b33453fedc0c5c1c68160b3d887eb497955118bb99b7297ed72714ee2ecc1c956599d1dbf0e8ca864eedefe0
SHA512
f083f91094b01ee78ad06c24a3ff784d119f27aebdf41d0a0f2ce41948acc3dc9b337ddce7aab3731eb3b2d7ae5fc6244505b019b6d49a8df61297453c291430
+DIST flightgear-2020.3.18.tar.bz2 8936579 BLAKE2B
3d404f7b32f1eb6f065e9aaa5f9a5750ac0e870828d4942abb04b4a56c6941b2b282b481fffea5826c532de5cb6c78b8752d048ab527ea637c7e87227590ad96
SHA512
189e3fa637ae30662cd60cd473c9540e1e7f2b49cf29afe720794a278f09c7d788a458a6ddac843121958aa25f78f2528f1c5c8303c2a1e5cfc5478b1591df89
diff --git a/games-simulation/flightgear/flightgear-2020.3.18.ebuild
b/games-simulation/flightgear/flightgear-2020.3.18.ebuild
new file mode 100644
index ..43ca5eb5109a
--- /dev/null
+++ b/games-simulation/flightgear/flightgear-2020.3.18.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="Open Source Flight Simulator"
+HOMEPAGE="https://www.flightgear.org/";
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="cpu_flags_x86_sse2 dbus debug examples gdal openmp qt5 +udev +utils"
+
+# 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="
+ dev-db/sqlite:3
+ dev-games/openscenegraph[jpeg,png]
+ ~dev-games/simgear-${PV}[gdal=]
+ media-libs/openal
+ >=media-libs/plib-1.8.5
+ >=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:= )
+ qt5? (
+ >=dev-qt/qtcore-5.7.1:5
+ >=dev-qt/qtdeclarative-5.7.1:5
+ >=dev-qt/qtgui-5.7.1:5
+ >=dev-qt/qtnetwork-5.7.1:5
+ >=dev-qt/qtwidgets-5.7.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.7.1:5 )
+ )
+"
+# libXi and libXmu are build-only-deps according to FindGLUT.cmake
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+ utils? (
+ x11-libs/libXi
+ x11-libs/libXmu
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ ~games-simulation/${PN}-data-${PV}
+"
+BDEPEND="qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2020.3.8-cmake.patch"
+)
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=OFF
+ -DENABLE_AUTOTESTING=OFF
+ -DENABLE_COMPOSITOR=OFF
+ -DENABLE_FGCOM=$(usex utils)
+ -DENABLE_FGELEV=$(usex utils)
+ -DENABLE_FGJS=$(usex utils)
+ -DENABLE_FGVIEWER=$(usex utils)
+ -DENABLE_GDAL=$(usex gdal)
+ -DENABLE_GPSSMOOTH=$(usex utils)
+ -DENABLE_HID_INPUT=$(usex udev)
+ -DENABLE_IAX=$(usex utils)
+ -DENABLE_JS_DEMO=$(usex utils)
+ -DENABLE_JSBSIM=ON
+ -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_SIMD=$(usex cpu_flags_x86_sse2)
+ -DE
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear-data/
commit: 40a94dd75e18492a95edfd649a889bf256160291
Author: Michal Privoznik gmail com>
AuthorDate: Wed Apr 19 07:42:29 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Apr 26 04:02:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40a94dd7
games-simulation/flightgear-data: Version bump to 2020.3.18
Signed-off-by: Michal Privoznik gmail.com>
Signed-off-by: Sam James gentoo.org>
games-simulation/flightgear-data/Manifest | 1 +
.../flightgear-data-2020.3.18.ebuild| 21 +
2 files changed, 22 insertions(+)
diff --git a/games-simulation/flightgear-data/Manifest
b/games-simulation/flightgear-data/Manifest
index 0dbe1ca1f82b..524dc38fe77d 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1 +1,2 @@
DIST FlightGear-2020.3.17-data.txz 1789324280 BLAKE2B
abb1384be2922a80a4abf1c5a540e160c94e74c63ec1ce337f2be253a49c54ee499b9cea752bead41ee4ff1a235b7f78c9143579b602b4a911f46bdb7766e15c
SHA512
b15a8ae46709594d9aca5442c51b0cf5b2a804f5b39135bfa9c413ce4aca74db1955a399eb93abf38f1e265199e09ac0ecf05e518a23eeb35aeaa5cbc09277a0
+DIST FlightGear-2020.3.18-data.txz 1789347748 BLAKE2B
0c6507ab2eaf10a3b9559dfca41818a66354da163b3ee64ecedcc3f49c0847cebe337982b8622618dc1710702754ac57cc17d96a954221543c8599ce5734c3d3
SHA512
0c0ec7246bc894c6b34a1a0862ed0199666f47ea1f0ad8c54ce08aab48eb47601296356e5a090ad2f118230eccb9ccb86823e948abad0fe05a706c38249d2196
diff --git a/games-simulation/flightgear-data/flightgear-data-2020.3.18.ebuild
b/games-simulation/flightgear-data/flightgear-data-2020.3.18.ebuild
new file mode 100644
index ..5eb3beaef789
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-2020.3.18.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="FlightGear data files"
+HOMEPAGE="https://www.flightgear.org/";
+SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.txz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/fgdata
+
+src_install() {
+ insinto /usr/share/flightgear
+ rm -fr .git
+ doins -r *
+}
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: 958ea03ed00bd5cb5707cb3e5c6e7bbc21d0084f
Author: Sam James gentoo org>
AuthorDate: Fri Dec 16 01:52:57 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Dec 16 01:52:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=958ea03e
games-simulation/flightgear: add gdal subslot dep
new SONAME
Signed-off-by: Sam James gentoo.org>
.../{flightgear-2020.3.17.ebuild => flightgear-2020.3.17-r1.ebuild} | 2 +-
games-simulation/flightgear/flightgear-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-simulation/flightgear/flightgear-2020.3.17.ebuild
b/games-simulation/flightgear/flightgear-2020.3.17-r1.ebuild
similarity index 99%
rename from games-simulation/flightgear/flightgear-2020.3.17.ebuild
rename to games-simulation/flightgear/flightgear-2020.3.17-r1.ebuild
index 52f9aeb065dc..43ca5eb5109a 100644
--- a/games-simulation/flightgear/flightgear-2020.3.17.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.3.17-r1.ebuild
@@ -32,7 +32,7 @@ COMMON_DEPEND="
virtual/glu
x11-libs/libX11
dbus? ( >=sys-apps/dbus-1.6.18-r1 )
- gdal? ( >=sci-libs/gdal-2.0.0:0 )
+ gdal? ( >=sci-libs/gdal-2.0.0:= )
qt5? (
>=dev-qt/qtcore-5.7.1:5
>=dev-qt/qtdeclarative-5.7.1:5
diff --git a/games-simulation/flightgear/flightgear-.ebuild
b/games-simulation/flightgear/flightgear-.ebuild
index 6ca93526d600..119c8bb2db0c 100644
--- a/games-simulation/flightgear/flightgear-.ebuild
+++ b/games-simulation/flightgear/flightgear-.ebuild
@@ -34,7 +34,7 @@ COMMON_DEPEND="
virtual/glu
x11-libs/libX11
dbus? ( >=sys-apps/dbus-1.6.18-r1 )
- gdal? ( >=sci-libs/gdal-2.0.0:0 )
+ gdal? ( >=sci-libs/gdal-2.0.0:= )
qt5? (
>=dev-qt/qtcore-5.7.1:5
>=dev-qt/qtdeclarative-5.7.1:5
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear-data/, games-simulation/flightgear/, ...
commit: 211b81b4a7327a203d8374bbc3619c2607905fa7
Author: Maciej Mrozowski gentoo org>
AuthorDate: Sat Dec 10 17:52:35 2022 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Sat Dec 10 20:30:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=211b81b4
games-simulation/flightgear: version bump, remove old, remove unnecessary USE
flag, compilation of libiaxclient (for fgcom) should be conditional, fixes bug
855542
Bug: https://bugs.gentoo.org/855542
Signed-off-by: Maciej Mrozowski gentoo.org>
dev-games/simgear/Manifest| 2 +-
...{simgear-2020.3.13.ebuild => simgear-2020.3.17.ebuild} | 0
games-simulation/flightgear-data/Manifest | 2 +-
...-2020.3.13.ebuild => flightgear-data-2020.3.17.ebuild} | 0
games-simulation/flightgear/Manifest | 2 +-
...tgear-2020.3.13.ebuild => flightgear-2020.3.17.ebuild} | 15 +++
games-simulation/flightgear/flightgear-.ebuild| 15 +++
7 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 18ba3e11e241..5d85924f4846 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1 +1 @@
-DIST simgear-2020.3.13.tar.bz2 1415729 BLAKE2B
ed8a5daddba84811318ed92acd6a998785c4159b7e9bf39245e3fc0863e75ae8475283e123c7b185cae8d1113b1fc860758f347f3e19c2749322b280445a2a9f
SHA512
1128c6026cebc902f1d411a6013b3d406664ebae5b209248d15c55895823715066d18ca442af2642577d69c6f68d6d02daf64ebbc9bfe43142aae30b9ce1ae62
+DIST simgear-2020.3.17.tar.bz2 1418448 BLAKE2B
d3541c31fcf8571ba73d7fe3952c6d30146f33ffe776962670f9607d5d8e02dc24095e35933887aed3b1dcddb4d6b94e19e5317364f651d69d787afde45a30a5
SHA512
019ea59af6679c4a899a044c38f60c21c15469528d1bab8b0d4388810b045af7812c3c561eee7190a5464adae0c14d16d528f08c69b37291d4e1b35665cbefce
diff --git a/dev-games/simgear/simgear-2020.3.13.ebuild
b/dev-games/simgear/simgear-2020.3.17.ebuild
similarity index 100%
rename from dev-games/simgear/simgear-2020.3.13.ebuild
rename to dev-games/simgear/simgear-2020.3.17.ebuild
diff --git a/games-simulation/flightgear-data/Manifest
b/games-simulation/flightgear-data/Manifest
index eed50f9ba949..0dbe1ca1f82b 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1 +1 @@
-DIST FlightGear-2020.3.13-data.txz 1789344308 BLAKE2B
869ee6fd1d8eb35d6ba4650ea4c1deeafd2e3cc79516711de607c97ade754fcd2a30649f547822778d0599975a71749afa1de5285377a2039c50bea05ef3bad6
SHA512
04a37a0936a8357356147621cff7be2998665356717df13057edb1c3b369c40a389a2fe1a0a35eb5a814b2205ac828bfba2d81a7b844ec1906046a944d65defd
+DIST FlightGear-2020.3.17-data.txz 1789324280 BLAKE2B
abb1384be2922a80a4abf1c5a540e160c94e74c63ec1ce337f2be253a49c54ee499b9cea752bead41ee4ff1a235b7f78c9143579b602b4a911f46bdb7766e15c
SHA512
b15a8ae46709594d9aca5442c51b0cf5b2a804f5b39135bfa9c413ce4aca74db1955a399eb93abf38f1e265199e09ac0ecf05e518a23eeb35aeaa5cbc09277a0
diff --git a/games-simulation/flightgear-data/flightgear-data-2020.3.13.ebuild
b/games-simulation/flightgear-data/flightgear-data-2020.3.17.ebuild
similarity index 100%
rename from games-simulation/flightgear-data/flightgear-data-2020.3.13.ebuild
rename to games-simulation/flightgear-data/flightgear-data-2020.3.17.ebuild
diff --git a/games-simulation/flightgear/Manifest
b/games-simulation/flightgear/Manifest
index 14563fdf8a8c..229eec39eb6a 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1 +1 @@
-DIST flightgear-2020.3.13.tar.bz2 8930824 BLAKE2B
c859614b51d251ce4ac0b5a8a44e80602607902e0bcb00bb35d5b7c419fca9cdde70fccd3013fcced9ef42eafe21d64d91a33525afa0de41f2449d452a59ed82
SHA512
4623af52c0c1fd86ab2bf32bf95bc7be1bc4f867927b7f2ff1d453a4b6e5dbe4c4c094dd23050133e00b3d6b904f77fac396e0d093a99692d18c47823d637f7f
+DIST flightgear-2020.3.17.tar.bz2 8934871 BLAKE2B
e9cb4a18c119c813531af3d47f6378b0b8cb68a2b33453fedc0c5c1c68160b3d887eb497955118bb99b7297ed72714ee2ecc1c956599d1dbf0e8ca864eedefe0
SHA512
f083f91094b01ee78ad06c24a3ff784d119f27aebdf41d0a0f2ce41948acc3dc9b337ddce7aab3731eb3b2d7ae5fc6244505b019b6d49a8df61297453c291430
diff --git a/games-simulation/flightgear/flightgear-2020.3.13.ebuild
b/games-simulation/flightgear/flightgear-2020.3.17.ebuild
similarity index 93%
rename from games-simulation/flightgear/flightgear-2020.3.13.ebuild
rename to games-simulation/flightgear/flightgear-2020.3.17.ebuild
index 49a222d30548..52f9aeb065dc 100644
--- a/games-simulation/flightgear/flightgear-2020.3.13.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.3.17.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cmake bash-completion-r1 toolchain-funcs
+inherit cmake toolchain-funcs
DESCRIPTION="Open Source Flight Simulator"
HOMEPAGE="https://www.flightgear.org/";
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
SLOT="0"
-
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: ad2cec8d920016b2dd2fe9423c618c8847715502
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Aug 11 06:15:38 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Aug 11 07:37:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad2cec8d
games-simulation/flightgear: drop 2020.3.12
Signed-off-by: Ionen Wolkens gentoo.org>
games-simulation/flightgear/Manifest | 1 -
.../flightgear/flightgear-2020.3.12.ebuild | 172 -
2 files changed, 173 deletions(-)
diff --git a/games-simulation/flightgear/Manifest
b/games-simulation/flightgear/Manifest
index 63e6ad1110d2..14563fdf8a8c 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,2 +1 @@
-DIST flightgear-2020.3.12.tar.bz2 8929319 BLAKE2B
e84b0519d69f46d5951372deed59f9b1219739710b3374d0bc0041127f8e4b7869c43b20169a9ac3a89d4e121f9da27d01c6db98e683bc3f80da6b1930e1a7c0
SHA512
91e04ae6dc5d12e799bab10b3c4321e77f8d995469453453fdff26a9858f40056dbe8c095423397fcbef307994042c377eb37532af2732674f39e5624c950e9c
DIST flightgear-2020.3.13.tar.bz2 8930824 BLAKE2B
c859614b51d251ce4ac0b5a8a44e80602607902e0bcb00bb35d5b7c419fca9cdde70fccd3013fcced9ef42eafe21d64d91a33525afa0de41f2449d452a59ed82
SHA512
4623af52c0c1fd86ab2bf32bf95bc7be1bc4f867927b7f2ff1d453a4b6e5dbe4c4c094dd23050133e00b3d6b904f77fac396e0d093a99692d18c47823d637f7f
diff --git a/games-simulation/flightgear/flightgear-2020.3.12.ebuild
b/games-simulation/flightgear/flightgear-2020.3.12.ebuild
deleted file mode 100644
index 749751eb1080..
--- a/games-simulation/flightgear/flightgear-2020.3.12.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="Open Source Flight Simulator"
-HOMEPAGE="https://www.flightgear.org/";
-SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="cpu_flags_x86_sse2 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="
- dev-db/sqlite:3
- dev-games/openscenegraph[jpeg,png]
- ~dev-games/simgear-${PV}[gdal=]
- media-libs/openal
- >=media-libs/plib-1.8.5
- >=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.7.1:5
- >=dev-qt/qtdeclarative-5.7.1:5
- >=dev-qt/qtgui-5.7.1:5
- >=dev-qt/qtnetwork-5.7.1:5
- >=dev-qt/qtwidgets-5.7.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.7.1:5 )
- )
-"
-# libXi and libXmu are build-only-deps according to FindGLUT.cmake
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
- utils? (
- x11-libs/libXi
- x11-libs/libXmu
- )
-"
-RDEPEND="${COMMON_DEPEND}
- ~games-simulation/${PN}-data-${PV}
-"
-BDEPEND="qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2020.3.8-cmake.patch"
-)
-
-DOCS=(AUTHORS ChangeLog NEWS README Thanks)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=OFF
- -DENABLE_AUTOTESTING=OFF
- -DENABLE_COMPOSITOR=OFF
- -DENABLE_FGCOM=$(usex utils)
- -DENABLE_FGELEV=$(usex utils)
- -DENABLE_FGJS=$(usex utils)
- -DENABLE_FGVIEWER=$(usex utils)
- -DENABLE_GDAL=$(usex gdal)
- -DENABLE_GPSSMOOTH=$(usex utils)
- -DENABLE_HID_INPUT=$(usex udev)
- -DENABLE_JS_DEMO=$(usex utils)
- -DENABLE_JSBSIM=ON
- -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_SIMD=$(usex cpu_flags_x86_sse2)
- -DENABLE_STGMERGE=ON
- -DENABLE_SWIFT=OFF # swift pilot client not packaged yet
- -DE
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear-data/
commit: 1062d3c129d341c412efab27d7c5e92b3f513711
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Aug 11 06:15:57 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Aug 11 07:37:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1062d3c1
games-simulation/flightgear-data: drop 2020.3.12
Signed-off-by: Ionen Wolkens gentoo.org>
games-simulation/flightgear-data/Manifest | 1 -
.../flightgear-data-2020.3.12.ebuild| 21 -
2 files changed, 22 deletions(-)
diff --git a/games-simulation/flightgear-data/Manifest
b/games-simulation/flightgear-data/Manifest
index 55a83e4a3ae1..eed50f9ba949 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1,2 +1 @@
-DIST FlightGear-2020.3.12-data.txz 1787955196 BLAKE2B
648994bb8a70416d9fbf9fbb71c91d6652db4f915ce39938ad870f6de4a745c7f6df36025726fe29d67a598f1ce64718d12b7be5b81ebb83318246cd991fac1a
SHA512
7bb97c0b2ee59b300a95f331bfd12e397d3320e33cc4e72ea3c5fae196af52e97d9ed7f6af274162ecdd00642e729d96165df5dcbcb95e2853cf7c1df463
DIST FlightGear-2020.3.13-data.txz 1789344308 BLAKE2B
869ee6fd1d8eb35d6ba4650ea4c1deeafd2e3cc79516711de607c97ade754fcd2a30649f547822778d0599975a71749afa1de5285377a2039c50bea05ef3bad6
SHA512
04a37a0936a8357356147621cff7be2998665356717df13057edb1c3b369c40a389a2fe1a0a35eb5a814b2205ac828bfba2d81a7b844ec1906046a944d65defd
diff --git a/games-simulation/flightgear-data/flightgear-data-2020.3.12.ebuild
b/games-simulation/flightgear-data/flightgear-data-2020.3.12.ebuild
deleted file mode 100644
index f6a2970e8ba8..
--- a/games-simulation/flightgear-data/flightgear-data-2020.3.12.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="FlightGear data files"
-HOMEPAGE="https://www.flightgear.org/";
-SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.txz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/fgdata
-
-src_install() {
- insinto /usr/share/flightgear
- rm -fr .git
- doins -r *
-}
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: 217931310b7294ef26594cd205ccd98a7d22ddbf
Author: David Seifert gentoo org>
AuthorDate: Mon May 16 08:12:09 2022 +
Commit: David Seifert gentoo org>
CommitDate: Mon May 16 08:12:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21793131
games-simulation/flightgear: [QA] use tc-check-openmp correctly
Signed-off-by: David Seifert gentoo.org>
games-simulation/flightgear/flightgear-2020.3.12.ebuild | 12
games-simulation/flightgear/flightgear-2020.3.13.ebuild | 10 +++---
games-simulation/flightgear/flightgear-.ebuild | 12
3 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/games-simulation/flightgear/flightgear-2020.3.12.ebuild
b/games-simulation/flightgear/flightgear-2020.3.12.ebuild
index baafbbda8846..749751eb1080 100644
--- a/games-simulation/flightgear/flightgear-2020.3.12.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.3.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -52,8 +52,7 @@ COMMON_DEPEND="
"
# libXi and libXmu are build-only-deps according to FindGLUT.cmake
DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.44
- qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )
+ dev-libs/boost
utils? (
x11-libs/libXi
x11-libs/libXmu
@@ -62,6 +61,7 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
~games-simulation/${PN}-data-${PV}
"
+BDEPEND="qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )"
PATCHES=(
"${FILESDIR}/${PN}-2020.3.8-cmake.patch"
@@ -70,7 +70,11 @@ PATCHES=(
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
pkg_pretend() {
- use openmp && tc-check-openmp
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
src_configure() {
diff --git a/games-simulation/flightgear/flightgear-2020.3.13.ebuild
b/games-simulation/flightgear/flightgear-2020.3.13.ebuild
index a71789169d16..49a222d30548 100644
--- a/games-simulation/flightgear/flightgear-2020.3.13.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.3.13.ebuild
@@ -52,8 +52,7 @@ COMMON_DEPEND="
"
# libXi and libXmu are build-only-deps according to FindGLUT.cmake
DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.44
- qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )
+ dev-libs/boost
utils? (
x11-libs/libXi
x11-libs/libXmu
@@ -62,6 +61,7 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
~games-simulation/${PN}-data-${PV}
"
+BDEPEND="qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )"
PATCHES=(
"${FILESDIR}/${PN}-2020.3.8-cmake.patch"
@@ -70,7 +70,11 @@ PATCHES=(
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
pkg_pretend() {
- use openmp && tc-check-openmp
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
src_configure() {
diff --git a/games-simulation/flightgear/flightgear-.ebuild
b/games-simulation/flightgear/flightgear-.ebuild
index f48409f1c9d4..19115fd74b49 100644
--- a/games-simulation/flightgear/flightgear-.ebuild
+++ b/games-simulation/flightgear/flightgear-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -54,8 +54,7 @@ COMMON_DEPEND="
"
# libXi and libXmu are build-only-deps according to FindGLUT.cmake
DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.44
- qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )
+ dev-libs/boost
utils? (
x11-libs/libXi
x11-libs/libXmu
@@ -64,6 +63,7 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
~games-simulation/${PN}-data-${PV}
"
+BDEPEND="qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )"
PATCHES=(
"${FILESDIR}/${PN}-2020.3.5-cmake.patch"
@@ -72,7 +72,11 @@ PATCHES=(
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
pkg_pretend() {
- use openmp && tc-check-openmp
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear-data/
commit: 6b6ec6be820dea15e849b6ba262b1ad4792dd37e Author: Sam James gentoo org> AuthorDate: Fri May 13 19:49:01 2022 + Commit: Sam James gentoo org> CommitDate: Fri May 13 19:49:01 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b6ec6be games-simulation/flightgear-data: fix IncorrectCopyright Signed-off-by: Sam James gentoo.org> games-simulation/flightgear-data/flightgear-data-2020.3.13.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-simulation/flightgear-data/flightgear-data-2020.3.13.ebuild b/games-simulation/flightgear-data/flightgear-data-2020.3.13.ebuild index f6a2970e8ba8..5eb3beaef789 100644 --- a/games-simulation/flightgear-data/flightgear-data-2020.3.13.ebuild +++ b/games-simulation/flightgear-data/flightgear-data-2020.3.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: 02b36bc52e8ed5402486c8a417aa25344ca3e4e7 Author: Sam James gentoo org> AuthorDate: Fri May 13 19:48:23 2022 + Commit: Sam James gentoo org> CommitDate: Fri May 13 19:48:23 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02b36bc5 games-simulation/flightgear: fix IncorrectCopyright Signed-off-by: Sam James gentoo.org> games-simulation/flightgear/flightgear-2020.3.13.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-simulation/flightgear/flightgear-2020.3.13.ebuild b/games-simulation/flightgear/flightgear-2020.3.13.ebuild index c052d32d8134..a71789169d16 100644 --- a/games-simulation/flightgear/flightgear-2020.3.13.ebuild +++ b/games-simulation/flightgear/flightgear-2020.3.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear-data/, games-simulation/flightgear/, ...
commit: 58936926ea438ec0f96f2800a91e149656575d99
Author: Michal Privoznik redhat com>
AuthorDate: Wed Mar 23 04:31:29 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri May 13 19:36:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58936926
games-simulation/flightgear: version bump 2020.3.13
Signed-off-by: Michal Privoznik redhat.com>
Closes: https://github.com/gentoo/gentoo/pull/24720
Signed-off-by: Sam James gentoo.org>
dev-games/simgear/Manifest | 1 +
dev-games/simgear/simgear-2020.3.13.ebuild | 68 +
games-simulation/flightgear-data/Manifest | 1 +
.../flightgear-data-2020.3.13.ebuild | 21 +++
games-simulation/flightgear/Manifest | 1 +
.../flightgear/flightgear-2020.3.13.ebuild | 167 +
6 files changed, 259 insertions(+)
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index f1368969e3dd..922b810f5fd1 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1 +1,2 @@
DIST simgear-2020.3.12.tar.bz2 1415062 BLAKE2B
bed00dabb8d2ac937cb2fa7a8782c32568dc106d857dd2e9a7f3d2c99ad1372ffcd3c571b899920122e711ce1e561a9895762fb199f1cac947bb68769066b555
SHA512
2292c5c43b485fdf4b814b25eae8caa2ed16e043a159328aa5e35a27f9a4fd250219e8b506da1361916bd1d314bb857d3bd1343b1b6b34890bf06c63705c8dbc
+DIST simgear-2020.3.13.tar.bz2 1415729 BLAKE2B
ed8a5daddba84811318ed92acd6a998785c4159b7e9bf39245e3fc0863e75ae8475283e123c7b185cae8d1113b1fc860758f347f3e19c2749322b280445a2a9f
SHA512
1128c6026cebc902f1d411a6013b3d406664ebae5b209248d15c55895823715066d18ca442af2642577d69c6f68d6d02daf64ebbc9bfe43142aae30b9ce1ae62
diff --git a/dev-games/simgear/simgear-2020.3.13.ebuild
b/dev-games/simgear/simgear-2020.3.13.ebuild
new file mode 100644
index ..03d49387c0ed
--- /dev/null
+++ b/dev-games/simgear/simgear-2020.3.13.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="Development library for simulation games"
+HOMEPAGE="https://www.flightgear.org/";
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="cpu_flags_x86_sse2 +dns debug gdal openmp subversion test"
+RESTRICT="!test? ( test )"
+
+# TODO aeonwave
+COMMON_DEPEND="
+ app-arch/xz-utils
+ dev-libs/expat
+ dev-games/openscenegraph
+ 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 )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2019.1.1-gdal3.patch"
+ "${FILESDIR}/${PN}-2020.1.2-do-not-assume-libc++-clang.patch"
+)
+
+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=$(usex cpu_flags_x86_sse2)
+ -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_src_configure
+}
diff --git a/games-simulation/flightgear-data/Manifest
b/games-simulation/flightgear-data/Manifest
index dc86542310ac..55a83e4a3ae1 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1 +1,2 @@
DIST FlightGear-2020.3.12-data.txz 1787955196 BLAKE2B
648994bb8a70416d9fbf9fbb71c91d6652db4f915ce39938ad870f6de4a745c7f6df36025726fe29d67a598f1ce64718d12b7be5b81ebb83318246cd991fac1a
SHA512
7bb97c0b2ee59b300a95f331bfd12e397d3320e33cc4e72ea3c5fae196af52e97d9ed7f6af274162ecdd00642e729d96165df5dcbcb95e2853cf7c1df463
+DIST FlightGear-2020.3.13-data.txz 1789344308 BLAKE2B
869ee6fd1d8eb35d6ba4650ea4c1deeafd2e3cc79516711de607c97ade754fcd2a30649f547822778d0599975a71749afa1de5285377a2039c50bea05ef3bad6
SHA512
04a37a0936a8357356147621cff7be2998665356717df13057edb1c3b369c40a389a2fe1a0a35eb5a814b2205ac828bfba2d81a7b844ec1906046a944d65defd
diff --git a/games-simulation/flightgear-data/flightgear-data-2020.3.13.ebuild
b/games-simulation/flightgear-data/flightgear-data-2020.3.13.ebuild
new file mode 100644
index ..f6a2970e8ba8
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-2020.3.13.e
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear-data/, dev-games/simgear/, ...
commit: 8a240d1e4351e16aeaaa779128352198c4ebe503
Author: Maciej Mrozowski gentoo org>
AuthorDate: Thu Sep 16 21:10:24 2021 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Thu Sep 16 21:12:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a240d1e
games-simulation/flightgear: version bump 2020.3.11, remove old
Signed-off-by: Maciej Mrozowski gentoo.org>
dev-games/simgear/Manifest | 2 +-
.../{simgear-2020.3.8.ebuild => simgear-2020.3.11.ebuild}| 0
games-simulation/flightgear-data/Manifest| 2 +-
...data-2020.3.8.ebuild => flightgear-data-2020.3.11.ebuild} | 0
games-simulation/flightgear/Manifest | 2 +-
.../flightgear/files/flightgear-2020.3.11-fix-assert.patch | 12
...lightgear-2020.3.8.ebuild => flightgear-2020.3.11.ebuild} | 1 +
7 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 882c88bd0d9..e7fd9ec900c 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1 +1 @@
-DIST simgear-2020.3.8.tar.bz2 1410292 BLAKE2B
0a8f046f0215d8d142fc191b8f984eed41fb5f3f7afb409eafeb4041cee79b2d43415b808b1e382fa74b06444fe7e6f6efa9fe26b88a68a10efa5f8e3ac88161
SHA512
24d7084145a30bc10e742e87a886f47e3b495c0a037dbea184e526b0230faadaaa23d3b60d782906bed97636d2a35df25201dae01e11a66fa2f94c19bbc53256
+DIST simgear-2020.3.11.tar.bz2 1415047 BLAKE2B
f41391d6d018e7c5bc00897fdbd7ce431b02b0e925a62a2ec8f09a217a79efc3d2a20f247b61c8164f0d154b1202620bd68e76847acfba0c41bdb0b56f284d30
SHA512
e7b7c73a574012f9ee33cc751eca9dc968339d0f8f5ec005386ed6863d96af6d17423dd68eb5180f1c6bf3b05a422de10ce03ea5e745029445edac7919fc1c99
diff --git a/dev-games/simgear/simgear-2020.3.8.ebuild
b/dev-games/simgear/simgear-2020.3.11.ebuild
similarity index 100%
rename from dev-games/simgear/simgear-2020.3.8.ebuild
rename to dev-games/simgear/simgear-2020.3.11.ebuild
diff --git a/games-simulation/flightgear-data/Manifest
b/games-simulation/flightgear-data/Manifest
index 3572a6cdaff..7466237eb0d 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1 +1 @@
-DIST FlightGear-2020.3.8-data.txz 1826816084 BLAKE2B
23ca8cc89662d120b21ac68f7d41fe47b1d17bfe3d23579e3a4ce44136e170682939002a5fe03223e9c92329ec737f0dd9e9f9d5d44604f4ff3ade8d957e5c17
SHA512
76f71873d9c017ef53cf8145886ae00163f95769dfe5b69a85d7a3f104358c3c96bd1e958762201716359097976a77a35b204eb0c78526bea3c50d85216b19bc
+DIST FlightGear-2020.3.11-data.txz 1736954520 BLAKE2B
d5f3fd8facc93fab140171fad04ee0c331c4ab35c893ee762bb0b6250ee632c820e7570de57d2dfd6348fb9aaefdba209e845d00f67737b24eff17b025b30aa4
SHA512
b46193d4e9138ec58da048d9c3a36d47ae7204673fb9524f23b3d52dab02db8ef52fe8d67b7fd648222aac8585dd7e2fa5484317fdd07e07a58f3816f1378702
diff --git a/games-simulation/flightgear-data/flightgear-data-2020.3.8.ebuild
b/games-simulation/flightgear-data/flightgear-data-2020.3.11.ebuild
similarity index 100%
rename from games-simulation/flightgear-data/flightgear-data-2020.3.8.ebuild
rename to games-simulation/flightgear-data/flightgear-data-2020.3.11.ebuild
diff --git a/games-simulation/flightgear/Manifest
b/games-simulation/flightgear/Manifest
index 223daa3527e..0d9ca261c9e 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1 +1 @@
-DIST flightgear-2020.3.8.tar.bz2 8922064 BLAKE2B
b345e8a5e733d48c1e061feb11ed96f130ab2d4832c478e9251092862668007eb7e39b29720c7274b91d63eff34cb21597fa6384b6837a5949feeceb6db62331
SHA512
b2c5afeae65558bf086ce20b22a2802580b3ac177f049a8df3b70437adbc6fee067673372c19c14a1c10ffac81a4a77fb13c68d342094a84605190fd3f5442e9
+DIST flightgear-2020.3.11.tar.bz2 8926212 BLAKE2B
03b3203fb688fe842247f8ac11957f438f02154cbc992bb98076ab3dd6fcac5f3241509cc1c621f3b647487b772257763d154c756792ce8ff738ff5396fe07ef
SHA512
9a7c6f262da8daf3d954df7a2a8a96e555f3212c1d949211d0dbddd08a8f7380fa8f4986d60f48e17db563154d250184ee772b79b10277a2c5819fabec3930ee
diff --git
a/games-simulation/flightgear/files/flightgear-2020.3.11-fix-assert.patch
b/games-simulation/flightgear/files/flightgear-2020.3.11-fix-assert.patch
new file mode 100644
index 000..f35cf2c426a
--- /dev/null
+++ b/games-simulation/flightgear/files/flightgear-2020.3.11-fix-assert.patch
@@ -0,0 +1,12 @@
+diff -ruN flightgear-2020.3.11/src/Navaids/PositionedOctree.cxx
fgfs-my/src/Navaids/PositionedOctree.cxx
+--- flightgear-2020.3.11/src/Navaids/PositionedOctree.cxx 2021-07-29
11:35:40.0 +0200
fgfs-my/src/Navaids/PositionedOctree.cxx 2021-09-16 23:01:20.989931176
+0200
+@@ -148,7 +148,7 @@
+
+ void Leaf::insertChild(FGPositioned::Type ty, PositionedID id)
+ {
+- assert(childrenLoaded);
++ assert(_childrenLoaded);
+ children.insert(children.end(), TypedPositioned(ty, id));
+ }
+
diff --git a/games-simulation/flightgear/flightgear-2020.3.8.ebuild
b/games-simu
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: f71dd8cc7db4d360e80bddd8cfeda43aa42fd08d Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sat Apr 24 22:03:04 2021 + Commit: David Seifert gentoo org> CommitDate: Sat Apr 24 22:03:04 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f71dd8cc games-simulation/flightgear: remove unused eclass Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: David Seifert gentoo.org> games-simulation/flightgear/flightgear-2020.3.6.ebuild | 4 ++-- games-simulation/flightgear/flightgear-.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/games-simulation/flightgear/flightgear-2020.3.6.ebuild b/games-simulation/flightgear/flightgear-2020.3.6.ebuild index 23f6c894ed3..58c4fd7033e 100644 --- a/games-simulation/flightgear/flightgear-2020.3.6.ebuild +++ b/games-simulation/flightgear/flightgear-2020.3.6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake bash-completion-r1 flag-o-matic toolchain-funcs +inherit cmake bash-completion-r1 toolchain-funcs DESCRIPTION="Open Source Flight Simulator" HOMEPAGE="https://www.flightgear.org/"; diff --git a/games-simulation/flightgear/flightgear-.ebuild b/games-simulation/flightgear/flightgear-.ebuild index 551102d90c5..849f3001385 100644 --- a/games-simulation/flightgear/flightgear-.ebuild +++ b/games-simulation/flightgear/flightgear-.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake bash-completion-r1 flag-o-matic toolchain-funcs git-r3 +inherit cmake bash-completion-r1 toolchain-funcs git-r3 DESCRIPTION="Open Source Flight Simulator" HOMEPAGE="https://www.flightgear.org/";
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: 7c2aa5b9133d60406c13d524026582b9b8a75a43 Author: David Seifert gentoo org> AuthorDate: Sat Oct 31 11:11:05 2020 + Commit: David Seifert gentoo org> CommitDate: Sat Oct 31 11:11:05 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c2aa5b9 games-simulation/flightgear: [QA] Inherit flag-o-matic.eclass explicitly Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: David Seifert gentoo.org> games-simulation/flightgear/flightgear-2020.1.2.ebuild | 2 +- games-simulation/flightgear/flightgear-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/games-simulation/flightgear/flightgear-2020.1.2.ebuild b/games-simulation/flightgear/flightgear-2020.1.2.ebuild index b8147e23d51..c472dcc0fa5 100644 --- a/games-simulation/flightgear/flightgear-2020.1.2.ebuild +++ b/games-simulation/flightgear/flightgear-2020.1.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake bash-completion-r1 toolchain-funcs +inherit cmake bash-completion-r1 flag-o-matic toolchain-funcs DESCRIPTION="Open Source Flight Simulator" HOMEPAGE="https://www.flightgear.org/"; diff --git a/games-simulation/flightgear/flightgear-.ebuild b/games-simulation/flightgear/flightgear-.ebuild index 3e6caa57923..2eea53f95a8 100644 --- a/games-simulation/flightgear/flightgear-.ebuild +++ b/games-simulation/flightgear/flightgear-.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake bash-completion-r1 toolchain-funcs git-r3 +inherit cmake bash-completion-r1 flag-o-matic toolchain-funcs git-r3 DESCRIPTION="Open Source Flight Simulator" HOMEPAGE="https://www.flightgear.org/";
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: a5485bfd393b2c84888224d0e9a94407afaad1d7
Author: Maciej Mrozowski gentoo org>
AuthorDate: Tue Oct 6 19:32:53 2020 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Tue Oct 6 19:33:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5485bfd
games-simulation/flightgear: fix QA issue, do not apply patches in live ebuild
Closes: https://bugs.gentoo.org/744940
Bug: https://bugs.gentoo.org/736082
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Maciej Mrozowski gentoo.org>
games-simulation/flightgear/flightgear-2020.1.2.ebuild | 1 -
games-simulation/flightgear/flightgear-.ebuild | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/games-simulation/flightgear/flightgear-2020.1.2.ebuild
b/games-simulation/flightgear/flightgear-2020.1.2.ebuild
index 5ea0ecfd859..b8147e23d51 100644
--- a/games-simulation/flightgear/flightgear-2020.1.2.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.1.2.ebuild
@@ -96,7 +96,6 @@ src_configure() {
-DENABLE_QT=$(usex qt5)
-DENABLE_RTI=OFF
-DENABLE_SIMD=OFF # see CPU_FLAGS
- -DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2)
-DENABLE_STGMERGE=ON
-DENABLE_SWIFT=OFF # swift pilot client not packaged yet
-DENABLE_TERRASYNC=$(usex utils)
diff --git a/games-simulation/flightgear/flightgear-.ebuild
b/games-simulation/flightgear/flightgear-.ebuild
index 85e77a5fdaa..3e6caa57923 100644
--- a/games-simulation/flightgear/flightgear-.ebuild
+++ b/games-simulation/flightgear/flightgear-.ebuild
@@ -66,7 +66,7 @@ RDEPEND="${COMMON_DEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-2020.1.2-cmake.patch"
+# "${FILESDIR}/${PN}-2020.1.2-cmake.patch"
)
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
@@ -97,7 +97,6 @@ src_configure() {
-DENABLE_QT=$(usex qt5)
-DENABLE_RTI=OFF
-DENABLE_SIMD=OFF # see CPU_FLAGS
- -DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2)
-DENABLE_STGMERGE=ON
-DENABLE_SWIFT=OFF # swift pilot client not packaged yet
-DENABLE_TERRASYNC=$(usex utils)
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/files/, games-simulation/flightgear/
commit: d50ea0a6972a176f2f5ef05e9ea39a8ea5ebb436
Author: Maciej Mrozowski gentoo org>
AuthorDate: Sun Sep 27 00:29:09 2020 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Sun Sep 27 00:31:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d50ea0a6
games-simulation/flightgear: fix compilation against >boost-1.73
Closes: https://bugs.gentoo.org/722902
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Maciej Mrozowski gentoo.org>
.../flightgear/files/flightgear-2020.1.2-boost.patch | 11 +++
games-simulation/flightgear/flightgear-2020.1.2.ebuild| 1 +
2 files changed, 12 insertions(+)
diff --git a/games-simulation/flightgear/files/flightgear-2020.1.2-boost.patch
b/games-simulation/flightgear/files/flightgear-2020.1.2-boost.patch
new file mode 100644
index 000..43e2a7d0cb1
--- /dev/null
+++ b/games-simulation/flightgear/files/flightgear-2020.1.2-boost.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -515,7 +515,7 @@
+ set(NOMINMAX 1)
+ endif(WIN32)
+
+-set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION")
++set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION
-DBOOST_NO_STDLIB_CONFIG")
+
+ # append the SIMD flags if requested
+ if (ENABLE_SIMD)
diff --git a/games-simulation/flightgear/flightgear-2020.1.2.ebuild
b/games-simulation/flightgear/flightgear-2020.1.2.ebuild
index 3a428d9e25a..5ea0ecfd859 100644
--- a/games-simulation/flightgear/flightgear-2020.1.2.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.1.2.ebuild
@@ -65,6 +65,7 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-2020.1.2-cmake.patch"
+ "${FILESDIR}/${P}-boost.patch"
)
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: 4eb1125570afc67cd31a076606dee8371ccf6fa6
Author: Maciej Mrozowski gentoo org>
AuthorDate: Tue Aug 4 18:15:47 2020 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Tue Aug 4 20:09:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eb11255
games-simulation/flightgear: Fix QA warnings
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Maciej Mrozowski gentoo.org>
games-simulation/flightgear/flightgear-2020.1.2.ebuild | 13 +++--
games-simulation/flightgear/flightgear-.ebuild | 13 +++--
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/games-simulation/flightgear/flightgear-2020.1.2.ebuild
b/games-simulation/flightgear/flightgear-2020.1.2.ebuild
index d3f932dbf99..3a428d9e25a 100644
--- a/games-simulation/flightgear/flightgear-2020.1.2.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.1.2.ebuild
@@ -146,12 +146,13 @@ src_install() {
# 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/*
+ docompress -x /usr/share/doc/"${PF}"/{examples,tools}
+ docinto examples
+ dodoc -r scripts/java scripts/perl scripts/python
+ docinto examples/c++
+ dodoc -r scripts/example/*
+ docinto tools
+ dodoc -r scripts/atis scripts/tools/*
fi
# Install nasal script syntax
diff --git a/games-simulation/flightgear/flightgear-.ebuild
b/games-simulation/flightgear/flightgear-.ebuild
index fcfdb4a0c9e..85e77a5fdaa 100644
--- a/games-simulation/flightgear/flightgear-.ebuild
+++ b/games-simulation/flightgear/flightgear-.ebuild
@@ -148,12 +148,13 @@ src_install() {
# 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/*
+ docompress -x /usr/share/doc/"${PF}"/{examples,tools}
+ docinto examples
+ dodoc -r scripts/java scripts/perl scripts/python
+ docinto examples/c++
+ dodoc -r scripts/example/*
+ docinto tools
+ dodoc -r scripts/atis scripts/tools/*
fi
# Install nasal script syntax
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear-data/, games-simulation/flightgear/files/, ...
commit: ecfd4818dec077ddfc863298bc209ffdd08a7766
Author: Maciej Mrozowski gentoo org>
AuthorDate: Sun Aug 2 21:02:34 2020 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Sun Aug 2 22:30:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecfd4818
games-simulation/flightgear: Version bump, remove old, fixes
Signed-off-by: Maciej Mrozowski gentoo.org>
Closes: https://bugs.gentoo.org/724694
Bug: https://bugs.gentoo.org/728996
dev-games/simgear/Manifest | 2 +-
...ear-2019.1.1.ebuild => simgear-2020.1.2.ebuild} | 6 +--
dev-games/simgear/simgear-.ebuild | 6 +--
games-simulation/flightgear-data/Manifest | 2 +-
1.1.ebuild => flightgear-data-2020.1.2.ebuild} | 2 +-
.../flightgear-data/flightgear-data-.ebuild| 2 +-
games-simulation/flightgear/Manifest | 2 +-
.../files/flightgear-2018.3.2-cmake.patch | 24
.../files/flightgear-2020.1.2-cmake.patch | 45 ++
...-2019.1.1.ebuild => flightgear-2020.1.2.ebuild} | 19 +
games-simulation/flightgear/flightgear-.ebuild | 14 ---
11 files changed, 76 insertions(+), 48 deletions(-)
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 7e80f426ea0..5662c13e156 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1 +1 @@
-DIST simgear-2019.1.1.tar.bz2 1370523 BLAKE2B
2f61b2b4b7716b7f15852ff68bee6b749b7daa04caa27927a53eb6d6e4346c46c835938c95436250da767efd2e8043aacc0cb444b37dacde78acada98ffdb4e8
SHA512
83fe4330cf27b9298719f53f2fccde2af77bacdc6f430cc22c8bdfb475fe9b6e01578c1225af21e4e1433c7d2f2b00427454064f942359ba4c1e9896e7fe05d2
+DIST simgear-2020.1.2.tar.bz2 1393059 BLAKE2B
62fa15d88368177e23cf52edf51e8c56252399d8f2661e518911c1093a0d7f9f11069da8d65b479f2d4b45792dcd011194e57fa99ac3991f749e8196aaff9552
SHA512
c2e835de471f374a6c33cfd1769b7079d178ee66075bfe87cc9eb1f06dc2648db93c31f62f0ac7a664703406817cb1e909a531812cb76c99cd8751eb7e6782e7
diff --git a/dev-games/simgear/simgear-2019.1.1.ebuild
b/dev-games/simgear/simgear-2020.1.2.ebuild
similarity index 94%
rename from dev-games/simgear/simgear-2019.1.1.ebuild
rename to dev-games/simgear/simgear-2020.1.2.ebuild
index be0ff641626..318b7167413 100644
--- a/dev-games/simgear/simgear-2019.1.1.ebuild
+++ b/dev-games/simgear/simgear-2020.1.2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit cmake-utils toolchain-funcs flag-o-matic
+inherit cmake toolchain-funcs flag-o-matic
DESCRIPTION="Development library for simulation games"
HOMEPAGE="http://www.simgear.org/";
@@ -68,5 +68,5 @@ src_configure() {
append-flags -msse2 -mfpmath=sse
fi
- cmake-utils_src_configure
+ cmake_src_configure
}
diff --git a/dev-games/simgear/simgear-.ebuild
b/dev-games/simgear/simgear-.ebuild
index d5d56055482..b0146cf1b28 100644
--- a/dev-games/simgear/simgear-.ebuild
+++ b/dev-games/simgear/simgear-.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit eutils cmake-utils toolchain-funcs flag-o-matic git-r3
+inherit eutils cmake toolchain-funcs flag-o-matic git-r3
DESCRIPTION="Development library for simulation games"
HOMEPAGE="http://www.simgear.org/";
@@ -70,5 +70,5 @@ src_configure() {
append-flags -msse2 -mfpmath=sse
fi
- cmake-utils_src_configure
+ cmake_src_configure
}
diff --git a/games-simulation/flightgear-data/Manifest
b/games-simulation/flightgear-data/Manifest
index 001e1fa1533..35816de847b 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1 +1 @@
-DIST FlightGear-2019.1.1-data.tar.bz2 1748213475 BLAKE2B
6be5021a666d8363fd97e777e0674d61875e1309a391647f6ecebcc4443d494821a737709c135dc45521ae30401479f6f74c28d7db8da992fa279ae461e16a2c
SHA512
e5697f587c272036d3f5cfd7dcc7464e3eae7251e41425a91c80eabccbf711a6416a4746b5bf39a2806dc3d4f6839359483a0165899eb4ec812308b2b5da060a
+DIST FlightGear-2020.1.2-data.tar.bz2 1954932485 BLAKE2B
e3f06ed6a36d2cfc6518f4a1cac4aaf28df2b7e1fb4720488dd38f3df7dfccb1cc9b48e0f216fa79db5fc3b380dcdd1161325ba0195cc14aadbc2d79fab39031
SHA512
16329d230f8cfd35dbd60aad0afc66225134e5c2f98abb89ca271837f04917f6aa876fc35868783a3a3d56c4ba1d25f429436de516a8086f4b7e296a0d352e03
diff --git a/games-simulation/flightgear-data/flightgear-data-2019.1.1.ebuild
b/games-simulation/flightgear-data/flightgear-data-2020.1.2.ebuild
similarity index 98%
rename from games-simulation/flightgear-data/flightgear-data-2019.1.1.ebuild
rename to games-simulation/flightgear-data/flightgear-data-2020.1.2.ebuild
index 30bc1d192aa..d5d9b497664 100644
--- a/games-simulation/flightgear-data/flightgear-data-2019.1.1.ebuild
+++ b/games-simula
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: e17ea23a40c1fcdb092d14d118ea10352078b34c
Author: Maciej Mrozowski gentoo org>
AuthorDate: Thu Feb 6 01:09:45 2020 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Thu Feb 6 01:12:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e17ea23a
games-simulation/flightgear: Do not add flags unrelated cpu_flags_x86_sse2, fix
live ebuild
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Maciej Mrozowski gentoo.org>
games-simulation/flightgear/flightgear-2019.1.1.ebuild | 4 +++-
games-simulation/flightgear/flightgear-.ebuild | 11 ++-
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/games-simulation/flightgear/flightgear-2019.1.1.ebuild
b/games-simulation/flightgear/flightgear-2019.1.1.ebuild
index 5eb17e2184a..a8847f1ad50 100644
--- a/games-simulation/flightgear/flightgear-2019.1.1.ebuild
+++ b/games-simulation/flightgear/flightgear-2019.1.1.ebuild
@@ -92,6 +92,8 @@ src_configure() {
-DENABLE_PROFILE=OFF
-DENABLE_QT=$(usex qt5)
-DENABLE_RTI=OFF
+ -DENABLE_SIMD=OFF # see CPU_FLAGS
+ -DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2)
-DENABLE_STGMERGE=ON
-DENABLE_TERRASYNC=$(usex utils)
-DENABLE_TRAFFIC=$(usex utils)
@@ -114,7 +116,7 @@ src_configure() {
-DWITH_FGPANEL=$(usex utils)
)
if use cpu_flags_x86_sse2; then
- append-flags -msse2 -mfpmath=sse -ftree-vectorize
-ftree-slp-vectorize
+ append-flags -msse2 -mfpmath=sse
fi
if use gdal && use utils; then
mycmakeargs+=(-DENABLE_DEMCONVERT=ON)
diff --git a/games-simulation/flightgear/flightgear-.ebuild
b/games-simulation/flightgear/flightgear-.ebuild
index 6303c1ab598..ce6c889aeb7 100644
--- a/games-simulation/flightgear/flightgear-.ebuild
+++ b/games-simulation/flightgear/flightgear-.ebuild
@@ -14,7 +14,7 @@ EGIT_BRANCH="next"
LICENSE="GPL-2"
KEYWORDS=""
SLOT="0"
-IUSE="dbus debug examples gdal openmp qt5 +udev +utils vim-syntax"
+IUSE="cpu_flags_x86_sse2 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
@@ -81,7 +81,6 @@ src_configure() {
-DENABLE_FGELEV=$(usex utils)
-DENABLE_FGJS=$(usex utils)
-DENABLE_FGVIEWER=$(usex utils)
- -DENABLE_FLITE=OFF
-DENABLE_GDAL=$(usex gdal)
-DENABLE_GPSSMOOTH=$(usex utils)
-DENABLE_HID_INPUT=$(usex udev)
@@ -94,6 +93,8 @@ src_configure() {
-DENABLE_PROFILE=OFF
-DENABLE_QT=$(usex qt5)
-DENABLE_RTI=OFF
+ -DENABLE_SIMD=OFF # see CPU_FLAGS
+ -DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2)
-DENABLE_STGMERGE=ON
-DENABLE_TERRASYNC=$(usex utils)
-DENABLE_TRAFFIC=$(usex utils)
@@ -106,8 +107,8 @@ src_configure() {
-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_FLITE=OFF
+ -DSYSTEM_HTS_ENGINE=OFF
-DSYSTEM_SPEEX=ON
-DSYSTEM_GSM=ON
-DSYSTEM_SQLITE=ON
@@ -116,7 +117,7 @@ src_configure() {
-DWITH_FGPANEL=$(usex utils)
)
if use cpu_flags_x86_sse2; then
- append-flags -msse2 -mfpmath=sse -ftree-vectorize
-ftree-slp-vectorize
+ append-flags -msse2 -mfpmath=sse
fi
if use gdal && use utils; then
mycmakeargs+=(-DENABLE_DEMCONVERT=ON)
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: 85d10adb3b7e1ce2c3191b718a0b60de53af70da
Author: Maciej Mrozowski gentoo org>
AuthorDate: Sat Feb 1 00:55:50 2020 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Sat Feb 1 00:58:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85d10adb
games-simulation/flightgear: Version bump, remove old
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Maciej Mrozowski gentoo.org>
games-simulation/flightgear/Manifest | 3 +-
.../flightgear/flightgear-2018.3.1.ebuild | 159 -
...-2018.3.2.ebuild => flightgear-2019.1.1.ebuild} | 3 +-
games-simulation/flightgear/flightgear-.ebuild | 6 +-
4 files changed, 8 insertions(+), 163 deletions(-)
diff --git a/games-simulation/flightgear/Manifest
b/games-simulation/flightgear/Manifest
index 006bb29ae93..ea3c7817887 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,2 +1 @@
-DIST flightgear-2018.3.1.tar.bz2 8404294 BLAKE2B
b90d64bc7381baef3adf3f2b77acb6822562d76319e85bebeda977754c281cd48b4ce137d910cc9f96947cfe1b7612c6ff45f2ed49775348b651944bb8796ba4
SHA512
ad07cdf90b1890519a22a1f79374b2d11e70191d85bc76d50913708a250801c3e091228999011367e374572a46c60f572f8b138d6a7c9fd2155f63107667d93c
-DIST flightgear-2018.3.2.tar.bz2 8405351 BLAKE2B
8abc3cc37281f1cc30c51518570e7278722f1d804f6568d7619150e7ddf13eef784314873571ea99d039ca4a94968e8e96779e26d8618eee4b1ed248e88dc52a
SHA512
76a127949351fe48d847a1471002ecbc3daa769952fef7a7a141e83031771e87f4e23c329e9d03ddd2e99b4b96fb6af2ebe5ab90ca50c0111217c62492cd516d
+DIST flightgear-2019.1.1.tar.bz2 8440986 BLAKE2B
da387456aaa6e8b86a8a865989f40c6bbcef4bf378175628c26fb172161cc3b278e4b16a3a270b7ed7fcf70329a88754c9a875a14f919fa90f284a485c909cce
SHA512
edcc464af0bde4766e61137211276d77a6bb297567b0168dfaf3b97fdb9a595e5e8a0b84232680fcc975cf195261b9751edb79ae7312feb31ab3d7215d8c
diff --git a/games-simulation/flightgear/flightgear-2018.3.1.ebuild
b/games-simulation/flightgear/flightgear-2018.3.1.ebuild
deleted file mode 100644
index 6e3aa9ddb61..000
--- a/games-simulation/flightgear/flightgear-2018.3.1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="https://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 +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="
- dev-db/sqlite:3
- =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.7.1:5
- >=dev-qt/qtdeclarative-5.7.1:5
- >=dev-qt/qtgui-5.7.1:5
- >=dev-qt/qtnetwork-5.7.1:5
- >=dev-qt/qtwidgets-5.7.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.7.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_AUTOTESTING=OFF
- -DENABLE_FGCOM=$(usex utils)
- -DENABLE_FGELEV=$(usex utils)
- -DENABLE_FGJS=$(usex utils)
- -DENABLE_FGVIEWER=$(usex utils)
- -DENABLE_FLITE=OFF
- -DENABLE_GDAL=$(usex gdal)
- -DENABLE_GPSSMOOTH=$(usex utils)
- -DENABLE_HID_INPUT=$(usex udev)
- -DENABLE_JS_DEMO=$(usex utils)
- -DENABLE_JSBSIM=ON
- -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=$
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear-data/
commit: f1339290f9eceb787fc0888f52bab1a73cec0747
Author: Maciej Mrozowski gentoo org>
AuthorDate: Sat Feb 1 00:53:46 2020 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Sat Feb 1 00:58:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1339290
games-simulation/flightgear-data: Version bump, remove old
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Maciej Mrozowski gentoo.org>
games-simulation/flightgear-data/Manifest | 3 +--
.../flightgear-data/flightgear-data-2018.3.2.ebuild | 21 -
...8.3.1.ebuild => flightgear-data-2019.1.1.ebuild} | 0
3 files changed, 1 insertion(+), 23 deletions(-)
diff --git a/games-simulation/flightgear-data/Manifest
b/games-simulation/flightgear-data/Manifest
index 9e4437fefde..001e1fa1533 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1,2 +1 @@
-DIST FlightGear-2018.3.1-data.tar.bz2 1735407015 BLAKE2B
e076e0096656c607cd32c7f86999685bc65bc1d8a28a260e0e7d760a5d4ea645f3a84f8410f9091e9767fcc143d0910f3e2ac2546e9408a49032b864bdd3c742
SHA512
495ef2dc87244c10cbca6deed7731e84f07c4a495e6d70ea7a88581e655b366c17900603f2388d2d21c4fe5cc4279820ae2a112376deeba4d37a53cd3495c102
-DIST FlightGear-2018.3.2-data.tar.bz2 1744998558 BLAKE2B
8ce8b34973687df907695c11eb385fc87526e6c6b54a2e1180819a6d0b503f27d0bbce7f400041a4f724e5dc940a84db90faf267e4ab012457ac753f243eb1d1
SHA512
64baa8a42d6a6e930cc2a14e62f6f3488f08cb3121973aece8818275b8f4934a94539e24b95646d7c5bb8bd5eef65ff91d63013c07dabf79f452908b749640bb
+DIST FlightGear-2019.1.1-data.tar.bz2 1748213475 BLAKE2B
6be5021a666d8363fd97e777e0674d61875e1309a391647f6ecebcc4443d494821a737709c135dc45521ae30401479f6f74c28d7db8da992fa279ae461e16a2c
SHA512
e5697f587c272036d3f5cfd7dcc7464e3eae7251e41425a91c80eabccbf711a6416a4746b5bf39a2806dc3d4f6839359483a0165899eb4ec812308b2b5da060a
diff --git a/games-simulation/flightgear-data/flightgear-data-2018.3.2.ebuild
b/games-simulation/flightgear-data/flightgear-data-2018.3.2.ebuild
deleted file mode 100644
index 30bc1d192aa..000
--- a/games-simulation/flightgear-data/flightgear-data-2018.3.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="FlightGear data files"
-HOMEPAGE="https://www.flightgear.org/";
-SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/fgdata
-
-src_install() {
- insinto /usr/share/flightgear
- rm -fr .git
- doins -r *
-}
diff --git a/games-simulation/flightgear-data/flightgear-data-2018.3.1.ebuild
b/games-simulation/flightgear-data/flightgear-data-2019.1.1.ebuild
similarity index 100%
rename from games-simulation/flightgear-data/flightgear-data-2018.3.1.ebuild
rename to games-simulation/flightgear-data/flightgear-data-2019.1.1.ebuild
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear-data/
commit: 0bd227178469cc0e86ea8e1ff4bbe06e091c3ba2
Author: Wim Muskee gmail com>
AuthorDate: Sat Jan 11 15:35:19 2020 +
Commit: David Seifert gentoo org>
CommitDate: Fri Jan 24 18:51:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bd22717
games-simulation/flightgear-data: update HOMEPAGE use https, fix
NonexistentBlocker
Closes: https://github.com/gentoo/gentoo/pull/14307
Signed-off-by: Wim Muskee gmail.com>
Signed-off-by: David Seifert gentoo.org>
games-simulation/flightgear-data/flightgear-data-2018.3.1.ebuild | 9 ++---
games-simulation/flightgear-data/flightgear-data-2018.3.2.ebuild | 9 ++---
games-simulation/flightgear-data/flightgear-data-.ebuild | 9 ++---
3 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/games-simulation/flightgear-data/flightgear-data-2018.3.1.ebuild
b/games-simulation/flightgear-data/flightgear-data-2018.3.1.ebuild
index 5e2859ac4b4..30bc1d192aa 100644
--- a/games-simulation/flightgear-data/flightgear-data-2018.3.1.ebuild
+++ b/games-simulation/flightgear-data/flightgear-data-2018.3.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DESCRIPTION="FlightGear data files"
-HOMEPAGE="http://www.flightgear.org/";
+HOMEPAGE="https://www.flightgear.org/";
SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
LICENSE="GPL-2"
@@ -12,11 +12,6 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-# data files split to separate package since 2.10.0
-RDEPEND="
- !http://www.flightgear.org/";
+HOMEPAGE="https://www.flightgear.org/";
SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
LICENSE="GPL-2"
@@ -12,11 +12,6 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-# data files split to separate package since 2.10.0
-RDEPEND="
- !http://www.flightgear.org/";
+HOMEPAGE="https://www.flightgear.org/";
EGIT_REPO_URI="git://git.code.sf.net/p/flightgear/fgdata
git://mapserver.flightgear.org/fgdata"
EGIT_BRANCH="next"
@@ -16,11 +16,6 @@ SLOT="0"
KEYWORDS=""
IUSE=""
-# data files split to separate package since 2.10.0
-RDEPEND="
- !
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: da8781ff2f4855ce294a2777ce50307ca2bc825e
Author: Wim Muskee gmail com>
AuthorDate: Sat Jan 11 15:28:30 2020 +
Commit: David Seifert gentoo org>
CommitDate: Fri Jan 24 18:51:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da8781ff
games-simulation/flightgear: update HOMEPAGE use https
Signed-off-by: Wim Muskee gmail.com>
Signed-off-by: David Seifert gentoo.org>
games-simulation/flightgear/flightgear-2018.3.1.ebuild | 4 ++--
games-simulation/flightgear/flightgear-2018.3.2.ebuild | 4 ++--
games-simulation/flightgear/flightgear-.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/games-simulation/flightgear/flightgear-2018.3.1.ebuild
b/games-simulation/flightgear/flightgear-2018.3.1.ebuild
index 0a793b2009a..6e3aa9ddb61 100644
--- a/games-simulation/flightgear/flightgear-2018.3.1.ebuild
+++ b/games-simulation/flightgear/flightgear-2018.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
inherit cmake-utils bash-completion-r1 toolchain-funcs
DESCRIPTION="Open Source Flight Simulator"
-HOMEPAGE="http://www.flightgear.org/";
+HOMEPAGE="https://www.flightgear.org/";
SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
LICENSE="GPL-2"
diff --git a/games-simulation/flightgear/flightgear-2018.3.2.ebuild
b/games-simulation/flightgear/flightgear-2018.3.2.ebuild
index ddec50a3ac8..7b68e8112ef 100644
--- a/games-simulation/flightgear/flightgear-2018.3.2.ebuild
+++ b/games-simulation/flightgear/flightgear-2018.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
inherit cmake-utils bash-completion-r1 toolchain-funcs
DESCRIPTION="Open Source Flight Simulator"
-HOMEPAGE="http://www.flightgear.org/";
+HOMEPAGE="https://www.flightgear.org/";
SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
LICENSE="GPL-2"
diff --git a/games-simulation/flightgear/flightgear-.ebuild
b/games-simulation/flightgear/flightgear-.ebuild
index 0243250482c..1dcf521d629 100644
--- a/games-simulation/flightgear/flightgear-.ebuild
+++ b/games-simulation/flightgear/flightgear-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
inherit cmake-utils bash-completion-r1 toolchain-funcs git-r3
DESCRIPTION="Open Source Flight Simulator"
-HOMEPAGE="http://www.flightgear.org/";
+HOMEPAGE="https://www.flightgear.org/";
EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/${PN}
git://mapserver.flightgear.org/${PN}"
EGIT_BRANCH="next"
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/files/, games-simulation/flightgear/
commit: fd9240d1080f5b37dc010df68d7e504e8e1a27ea
Author: Maciej Mrozowski gentoo org>
AuthorDate: Tue Aug 20 23:40:24 2019 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Tue Aug 20 23:42:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd9240d1
games-simulation/flightgear: Fix build dependencies, bug 686904.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Maciej Mrozowski gentoo.org>
.../files/flightgear-2018.3.2-cmake.patch | 24 ++
.../flightgear/flightgear-2018.3.2.ebuild | 3 +++
games-simulation/flightgear/flightgear-.ebuild | 3 +++
3 files changed, 30 insertions(+)
diff --git a/games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch
b/games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch
new file mode 100644
index 000..97747e8b748
--- /dev/null
+++ b/games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch
@@ -0,0 +1,24 @@
+diff -ruN flightgear-2018.3.2/CMakeLists.txt my/CMakeLists.txt
+--- flightgear-2018.3.2/CMakeLists.txt 2019-01-29 14:17:49.0 +0100
my/CMakeLists.txt 2019-08-18 05:29:04.762138013 +0200
+@@ -323,7 +323,7 @@
+ ## Qt5 setup setup
+ if (ENABLE_QT)
+ message(STATUS "Qt launcher enabled, checking for Qt >= 5.4 / qmake")
+-find_package(Qt5 5.4 COMPONENTS Widgets Network Qml Quick Svg)
++find_package(Qt5 5.4 COMPONENTS Widgets Network Qml Quick)
+ if (Qt5Widgets_FOUND)
+ message(STATUS "Will enable Qt launcher GUI")
+ message(STATUS " Qt5Widgets version: ${Qt5Widgets_VERSION_STRING}")
+diff -ruN flightgear-2018.3.2/src/GUI/CMakeLists.txt my/src/GUI/CMakeLists.txt
+--- flightgear-2018.3.2/src/GUI/CMakeLists.txt 2019-01-29 14:17:50.0
+0100
my/src/GUI/CMakeLists.txt 2019-08-18 05:38:19.607822998 +0200
+@@ -127,7 +127,7 @@
+ ${qml_sources})
+
+ set_property(TARGET fglauncher PROPERTY AUTOMOC ON)
+-target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network
Qt5::Qml Qt5::Quick Qt5::Svg SimGearCore)
++target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network
Qt5::Qml Qt5::Quick SimGearCore)
+ target_include_directories(fglauncher PRIVATE
${PROJECT_BINARY_DIR}/src/GUI)
+
+ add_library(fgqmlui QQuickDrawable.cxx
diff --git a/games-simulation/flightgear/flightgear-2018.3.2.ebuild
b/games-simulation/flightgear/flightgear-2018.3.2.ebuild
index 31cb9fe151d..ddec50a3ac8 100644
--- a/games-simulation/flightgear/flightgear-2018.3.2.ebuild
+++ b/games-simulation/flightgear/flightgear-2018.3.2.ebuild
@@ -53,6 +53,7 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
>=dev-libs/boost-1.44
>=media-libs/plib-1.8.5
+ qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )
utils? (
x11-libs/libXi
x11-libs/libXmu
@@ -62,6 +63,8 @@ RDEPEND="${COMMON_DEPEND}
~games-simulation/${PN}-data-${PV}
"
+PATCHES=("${FILESDIR}/${PN}-2018.3.2-cmake.patch")
+
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
pkg_pretend() {
diff --git a/games-simulation/flightgear/flightgear-.ebuild
b/games-simulation/flightgear/flightgear-.ebuild
index e485d9af2d3..0243250482c 100644
--- a/games-simulation/flightgear/flightgear-.ebuild
+++ b/games-simulation/flightgear/flightgear-.ebuild
@@ -55,6 +55,7 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
>=dev-libs/boost-1.44
>=media-libs/plib-1.8.5
+ qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )
utils? (
x11-libs/libXi
x11-libs/libXmu
@@ -64,6 +65,8 @@ RDEPEND="${COMMON_DEPEND}
~games-simulation/${PN}-data-${PV}
"
+PATCHES=("${FILESDIR}/${PN}-2018.3.2-cmake.patch")
+
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
pkg_pretend() {
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/, dev-games/simgear/, ...
commit: 76fbe622c5c4c49cfebfa2d85e42c016ee0366b6
Author: Maciej Mrozowski gentoo org>
AuthorDate: Sun Mar 17 23:35:32 2019 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Sun Mar 17 23:40:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76fbe622
games-simulation/flightgear: Version bump 2018.3.2
Signed-off-by: Maciej Mrozowski gentoo.org>
dev-games/simgear/Manifest | 1 +
...simgear-.ebuild => simgear-2018.3.2.ebuild} | 20 ++---
dev-games/simgear/simgear-.ebuild | 14
games-simulation/flightgear-data/Manifest | 3 +--
.../flightgear-data-2018.1.1.ebuild| 26 --
2.1.ebuild => flightgear-data-2018.3.2.ebuild} | 2 +-
games-simulation/flightgear/Manifest | 1 +
...gear-.ebuild => flightgear-2018.3.2.ebuild} | 17 +++---
games-simulation/flightgear/flightgear-.ebuild | 2 +-
9 files changed, 36 insertions(+), 50 deletions(-)
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index c17226fec25..ae0736f5723 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1 +1,2 @@
DIST simgear-2018.3.1.tar.bz2 1330322 BLAKE2B
5b350ddce726d8ea15c4a1a64a28b9e4307647378c52989231daa7b4a0e53730dc754c239660d0f5ec33189ece6629448b37f61ca7578c21c3aa4147d4565a26
SHA512
673ee76e9f4f9c9adb25a2523bad5b70a079d821391cb8fc9f9e651ad6c195356ac9a8ba18a65df365dc66990406de287099fb249ca23eefc111ebba884f7289
+DIST simgear-2018.3.2.tar.bz2 1329982 BLAKE2B
cc4ee90e0a76db5212ca3bb8f422376d9fd91c261c4aaee1aa0c2dc7438ed589866bdde009fd44c727ae87d7365d4aea67da0cfd32ff26d47e81eb9c027ddf0b
SHA512
3f60df34f22ea84bdb3e0aa0e2c0b73b2fddf15d17ea985aee254bf4c269b7447976629a7e4b022c460c7c406940d0b2669b723c6b899499d064cfe91546f0ba
diff --git a/dev-games/simgear/simgear-.ebuild
b/dev-games/simgear/simgear-2018.3.2.ebuild
similarity index 72%
copy from dev-games/simgear/simgear-.ebuild
copy to dev-games/simgear/simgear-2018.3.2.ebuild
index 10462f88d9f..a65b51665aa 100644
--- a/dev-games/simgear/simgear-.ebuild
+++ b/dev-games/simgear/simgear-2018.3.2.ebuild
@@ -1,20 +1,18 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit eutils cmake-utils toolchain-funcs git-r3
+inherit cmake-utils toolchain-funcs flag-o-matic
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"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
SLOT="0"
-IUSE="+dns debug gdal openmp subversion test"
+IUSE="cpu_flags_x86_sse2 +dns debug gdal openmp subversion test"
COMMON_DEPEND="
dev-libs/expat
@@ -48,7 +46,8 @@ src_configure() {
-DENABLE_OPENMP=$(usex openmp)
-DENABLE_PKGUTIL=ON
-DENABLE_RTI=OFF
- -DENABLE_SIMD=ON
+ -DENABLE_SIMD=OFF # see CPU_FLAGS
+ -DENABLE_SIMD_CODE=OFF
-DENABLE_SOUND=ON
-DENABLE_TESTS=$(usex test)
-DSIMGEAR_HEADLESS=OFF
@@ -58,5 +57,10 @@ src_configure() {
-DUSE_AEONWAVE=OFF
-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
)
+
+ if use cpu_flags_x86_sse2; then
+ append-flags -msse2 -mfpmath=sse -ftree-vectorize
-ftree-slp-vectorize
+ fi
+
cmake-utils_src_configure
}
diff --git a/dev-games/simgear/simgear-.ebuild
b/dev-games/simgear/simgear-.ebuild
index 10462f88d9f..4ef9fc550b6 100644
--- a/dev-games/simgear/simgear-.ebuild
+++ b/dev-games/simgear/simgear-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit eutils cmake-utils toolchain-funcs git-r3
+inherit eutils cmake-utils toolchain-funcs flag-o-matic git-r3
DESCRIPTION="Development library for simulation games"
HOMEPAGE="http://www.simgear.org/";
@@ -14,7 +14,7 @@ EGIT_BRANCH="next"
LICENSE="GPL-2"
KEYWORDS=""
SLOT="0"
-IUSE="+dns debug gdal openmp subversion test"
+IUSE="cpu_flags_x86_sse2 +dns debug gdal openmp subversion test"
COMMON_DEPEND="
dev-libs/expat
@@ -48,7 +48,8 @@ src_configure() {
-DENABLE_OPENMP=$(usex openmp)
-DENABLE_PKGUTIL=ON
-DENABLE_RTI=OFF
- -DENABLE_SIMD=ON
+ -DENABLE_SIMD=OFF # see CPU_FLAGS
+ -DENABLE_SIMD_CODE=OFF
-DENABLE_SOUND=ON
-DENABLE_TESTS=$(usex test)
-DSIMGEAR_HEADLESS=OFF
@@ -58,5 +59,10 @@ src_configure() {
-DUSE_AEONWAVE=OFF
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/, games-simulation/flightgear/files/
commit: cf47a4133927024cd913c2d1fbce221a07025c68
Author: Maciej Mrozowski gentoo org>
AuthorDate: Sat Dec 29 01:20:56 2018 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Sat Dec 29 01:24:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf47a413
games-simulation/flightgear: Restrict >=osg-3.5.6, bug 673822. Remove old.
Signed-off-by: Maciej Mrozowski gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
games-simulation/flightgear/Manifest | 2 -
.../files/flightgear-2018.2.1-cmake.patch | 11 --
.../flightgear/flightgear-2018.1.1.ebuild | 144
.../flightgear/flightgear-2018.2.1.ebuild | 150 -
.../flightgear/flightgear-2018.3.1.ebuild | 2 +-
games-simulation/flightgear/flightgear-.ebuild | 2 +-
6 files changed, 2 insertions(+), 309 deletions(-)
diff --git a/games-simulation/flightgear/Manifest
b/games-simulation/flightgear/Manifest
index 5aa37127dd3..0d282499cf9 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,3 +1 @@
-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/files/flightgear-2018.2.1-cmake.patch
b/games-simulation/flightgear/files/flightgear-2018.2.1-cmake.patch
deleted file mode 100644
index eca04212833..000
--- a/games-simulation/flightgear/files/flightgear-2018.2.1-cmake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN flightgear-2018.2.1/CMakeLists.txt my/CMakeLists.txt
flightgear-2018.2.1/CMakeLists.txt 2018-06-03 09:47:23.0 +0200
-+++ my/CMakeLists.txt 2018-06-07 01:09:14.621303443 +0200
-@@ -596,4 +596,6 @@
-
-
- # The test suite.
--add_subdirectory(test_suite EXCLUDE_FROM_ALL)
-+if(ENABLE_TESTS)
-+add_subdirectory(test_suite EXCLUDE_FROM_ALL)
-+endif()
diff --git a/games-simulation/flightgear/flightgear-2018.1.1.ebuild
b/games-simulation/flightgear/flightgear-2018.1.1.ebuild
deleted file mode 100644
index 596290c956b..000
--- a/games-simulation/flightgear/flightgear-2018.1.1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# 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
-
-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:=[jpeg,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.7.1:5
- >=dev-qt/qtdeclarative-5.7.1:5
- >=dev-qt/qtgui-5.7.1:5
- >=dev-qt/qtnetwork-5.7.1:5
- >=dev-qt/qtwidgets-5.7.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.7.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
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: 07bfc85018624d59e997400ad0966363b939db04
Author: Lars Wendler gentoo org>
AuthorDate: Mon Dec 24 22:03:30 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Mon Dec 24 22:03:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07bfc850
games-simulation/flightgear: Added sub-slot dep for dev-games/openscenegraph
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler gentoo.org>
games-simulation/flightgear/flightgear-2018.1.1.ebuild | 4 ++--
games-simulation/flightgear/flightgear-2018.2.1.ebuild | 4 ++--
games-simulation/flightgear/flightgear-2018.3.1.ebuild | 2 +-
games-simulation/flightgear/flightgear-.ebuild | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/games-simulation/flightgear/flightgear-2018.1.1.ebuild
b/games-simulation/flightgear/flightgear-2018.1.1.ebuild
index f32f93c30b9..596290c956b 100644
--- a/games-simulation/flightgear/flightgear-2018.1.1.ebuild
+++ b/games-simulation/flightgear/flightgear-2018.1.1.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
@@ -17,7 +17,7 @@ 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[jpeg,png]
+ >=dev-games/openscenegraph-3.2.0:=[jpeg,png]
~dev-games/simgear-${PV}[gdal=]
media-libs/openal
>=media-libs/speex-1.2.0:0
diff --git a/games-simulation/flightgear/flightgear-2018.2.1.ebuild
b/games-simulation/flightgear/flightgear-2018.2.1.ebuild
index 15be88e6c57..f9b21c91e09 100644
--- a/games-simulation/flightgear/flightgear-2018.2.1.ebuild
+++ b/games-simulation/flightgear/flightgear-2018.2.1.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
@@ -17,7 +17,7 @@ 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[jpeg,png]
+ >=dev-games/openscenegraph-3.2.0:=[jpeg,png]
~dev-games/simgear-${PV}[gdal=]
media-libs/openal
>=media-libs/speex-1.2.0:0
diff --git a/games-simulation/flightgear/flightgear-2018.3.1.ebuild
b/games-simulation/flightgear/flightgear-2018.3.1.ebuild
index 6ae489b664d..4605cdbeecb 100644
--- a/games-simulation/flightgear/flightgear-2018.3.1.ebuild
+++ b/games-simulation/flightgear/flightgear-2018.3.1.ebuild
@@ -21,7 +21,7 @@ RESTRICT="test"
# zlib is some strange auto-dep from simgear
COMMON_DEPEND="
dev-db/sqlite:3
- >=dev-games/openscenegraph-3.2.0[jpeg,png]
+ >=dev-games/openscenegraph-3.2.0:=[jpeg,png]
~dev-games/simgear-${PV}[gdal=]
media-libs/openal
>=media-libs/speex-1.2.0:0
diff --git a/games-simulation/flightgear/flightgear-.ebuild
b/games-simulation/flightgear/flightgear-.ebuild
index c3a046d8574..2f9f42b418e 100644
--- a/games-simulation/flightgear/flightgear-.ebuild
+++ b/games-simulation/flightgear/flightgear-.ebuild
@@ -23,7 +23,7 @@ RESTRICT="test"
# zlib is some strange auto-dep from simgear
COMMON_DEPEND="
dev-db/sqlite:3
- >=dev-games/openscenegraph-3.2.0[jpeg,png]
+ >=dev-games/openscenegraph-3.2.0:=[jpeg,png]
~dev-games/simgear-${PV}[gdal=]
media-libs/openal
>=media-libs/speex-1.2.0:0
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/, games-simulation/flightgear/files/
commit: 97527901e870dcf1eca6d8651887352c68ed63fa
Author: Maciej Mrozowski gentoo org>
AuthorDate: Wed Jun 6 23:14:47 2018 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Wed Jun 6 23:15:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97527901
games-simulation/flightgear: tests should be optional, fix bug 657350
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../flightgear/files/flightgear-2018.2.1-cmake.patch | 11 +++
games-simulation/flightgear/flightgear-2018.2.1.ebuild| 2 ++
2 files changed, 13 insertions(+)
diff --git a/games-simulation/flightgear/files/flightgear-2018.2.1-cmake.patch
b/games-simulation/flightgear/files/flightgear-2018.2.1-cmake.patch
new file mode 100644
index 000..eca04212833
--- /dev/null
+++ b/games-simulation/flightgear/files/flightgear-2018.2.1-cmake.patch
@@ -0,0 +1,11 @@
+diff -ruN flightgear-2018.2.1/CMakeLists.txt my/CMakeLists.txt
+--- flightgear-2018.2.1/CMakeLists.txt 2018-06-03 09:47:23.0 +0200
my/CMakeLists.txt 2018-06-07 01:09:14.621303443 +0200
+@@ -596,4 +596,6 @@
+
+
+ # The test suite.
+-add_subdirectory(test_suite EXCLUDE_FROM_ALL)
++if(ENABLE_TESTS)
++add_subdirectory(test_suite EXCLUDE_FROM_ALL)
++endif()
diff --git a/games-simulation/flightgear/flightgear-2018.2.1.ebuild
b/games-simulation/flightgear/flightgear-2018.2.1.ebuild
index 69d28c39ce7..15be88e6c57 100644
--- a/games-simulation/flightgear/flightgear-2018.2.1.ebuild
+++ b/games-simulation/flightgear/flightgear-2018.2.1.ebuild
@@ -59,6 +59,8 @@ RDEPEND="${COMMON_DEPEND}
~games-simulation/${PN}-data-${PV}
"
+PATCHES=("${FILESDIR}/${P}-cmake.patch")
+
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
pkg_pretend() {
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/, dev-games/simgear/, ...
commit: c4e6a000a88ee161f778d51640e3013f0be45a8e
Author: Maciej Mrozowski gentoo org>
AuthorDate: Mon Jun 4 01:39:02 2018 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Mon Jun 4 01:41:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4e6a000
games-simulation/flightgear: version bump 2018.2.1
dev-games/simgear/Manifest | 1 +
dev-games/simgear/simgear-2018.2.1.ebuild | 60 +
games-simulation/flightgear-data/Manifest | 1 +
.../flightgear-data-2018.2.1.ebuild| 26
games-simulation/flightgear/Manifest | 1 +
.../flightgear/flightgear-2018.2.1.ebuild | 148 +
6 files changed, 237 insertions(+)
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 79038a8ba4a..e61b6afba8f 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1 +1,2 @@
DIST simgear-2018.1.1.tar.bz2 1303653 BLAKE2B
44b98c2ba8ae292c3736d04813869df528d7ca14bbdc1773e1f4bd4b7b4899b5fd8605a7ada5dcc2d5e863e82ee2f1e1d2b980d3bd775c92325ad3ca834306c3
SHA512
3de7a15dc7b60e9e7466950c1b466d0daefea84b4730a9b8cf5e26c41cece5fd03ccf57b0f3cb977093482beb734560812e347003e19e0bb4b40d81820a11563
+DIST simgear-2018.2.1.tar.bz2 1314943 BLAKE2B
60e44896d466085014020874a1be6ab3f6f87e472f985237404dffb5dfbd5c25f0d330701276e0b8d075830695872eb7521bb4eb5b0107edac5977c3aab85bf7
SHA512
6756994e0688a1f3699c33548ea90b19e99a439ea2f2002cf524629370cd1161a1556ee966fc3a781141fc7a08e7574adc0ecbe6dec67e72d631c6c4d744e4dd
diff --git a/dev-games/simgear/simgear-2018.2.1.ebuild
b/dev-games/simgear/simgear-2018.2.1.ebuild
new file mode 100644
index 000..c8c3453c301
--- /dev/null
+++ b/dev-games/simgear/simgear-2018.2.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 4a6111a05fa..4b2df599cd3 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1 +1,2 @@
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
diff --git a/games-simulation/flightgear-data/flightgear-data-2018.2.1.ebuild
b/games-simulation/flightgear-data/flightgear-data-2018.2.1.ebuild
new file mode 100644
index 000..f364395e847
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-2018.2.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 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 fil
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: 476fde6a007a957d5350487f45ecb5852da5c218
Author: Maciej Mrozowski gentoo org>
AuthorDate: Tue May 22 23:53:16 2018 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Tue May 22 23:53:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=476fde6a
games-simulation/flightgear: add jpeg USE dep on openscenegraph, fixes bug
656256
Package-Manager: Portage-2.3.24, Repoman-2.3.6
games-simulation/flightgear/flightgear-2018.1.1.ebuild | 2 +-
games-simulation/flightgear/flightgear-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-simulation/flightgear/flightgear-2018.1.1.ebuild
b/games-simulation/flightgear/flightgear-2018.1.1.ebuild
index 35f1c329193..f32f93c30b9 100644
--- a/games-simulation/flightgear/flightgear-2018.1.1.ebuild
+++ b/games-simulation/flightgear/flightgear-2018.1.1.ebuild
@@ -17,7 +17,7 @@ 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/openscenegraph-3.2.0[jpeg,png]
~dev-games/simgear-${PV}[gdal=]
media-libs/openal
>=media-libs/speex-1.2.0:0
diff --git a/games-simulation/flightgear/flightgear-.ebuild
b/games-simulation/flightgear/flightgear-.ebuild
index 3807c996da0..10e2e7113b3 100644
--- a/games-simulation/flightgear/flightgear-.ebuild
+++ b/games-simulation/flightgear/flightgear-.ebuild
@@ -19,7 +19,7 @@ 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/openscenegraph-3.2.0[jpeg,png]
~dev-games/simgear-${PV}[gdal=]
media-libs/openal
>=media-libs/speex-1.2.0:0
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/, games-simulation/flightgear-data/, ...
commit: caafd4191dff3213ec89e71ba5eab17d884c61a7
Author: Maciej Mrozowski gentoo org>
AuthorDate: Thu Oct 19 22:39:01 2017 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Thu Oct 19 22:45:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caafd419
games-simulation/flightgear: Version bump 2017.3.1
dev-games/simgear/Manifest | 1 +
...simgear-.ebuild => simgear-2017.3.1.ebuild} | 20 -
dev-games/simgear/simgear-.ebuild | 10 -
games-simulation/flightgear-data/Manifest | 1 +
.../flightgear-data-2017.3.1.ebuild| 26 ++
games-simulation/flightgear/Manifest | 1 +
...gear-.ebuild => flightgear-2017.3.1.ebuild} | 21 -
games-simulation/flightgear/flightgear-.ebuild | 11 -
8 files changed, 47 insertions(+), 44 deletions(-)
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index f5e09310de6..866e7605141 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -2,3 +2,4 @@ DIST simgear-2016.4.4.tar.bz2 1200320 SHA256
5514fd0006bbfcdbdc0e2dab7da41eae491
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
DIST simgear-2017.2.1.tar.bz2 1290780 SHA256
9924592c01cb41ad66a0ff1dc43b7678ceec69fb573d3f4e4637e26c247c7a9e SHA512
168f5e3eab7cdd44643a62e1970c6329ac1121ca98e36c4134d963237e70304a20b7c8df3b438e24c204d51569d6863ef8b16098462d850f72a5f11a10ccbfd5
WHIRLPOOL
dc57cb2b87ec0111b0c555b6b87bcba7ec80c34c2277978c3aac7e71a3df260b4ac32f79698b2ea6d84a3bd6a942dc163aabd80c5f5004c409a189456f812d4a
+DIST simgear-2017.3.1.tar.bz2 1302704 SHA256
0ee08550b737b249dcc91590ec0cb9c5dc9080998f6ba66a7d7209cdfce6e1f4 SHA512
339c9af78e8c0490caec69be34b54f947751a9677cbb1163e73917f6aaa8f3d965ccf8058222c48ca4249cba4bb509205143f846de84595e92abdcd93e64c901
WHIRLPOOL
f26535449fd04c18e3a0f31817411f634be669c14d84b112f9d5662e56aeb800b7c801fab9113acb111c4823ed1fc25d2fc92822479d7e87ce93d6b3beaf2b8c
diff --git a/dev-games/simgear/simgear-.ebuild
b/dev-games/simgear/simgear-2017.3.1.ebuild
similarity index 73%
copy from dev-games/simgear/simgear-.ebuild
copy to dev-games/simgear/simgear-2017.3.1.ebuild
index 00072326c7c..cca44548c83 100644
--- a/dev-games/simgear/simgear-.ebuild
+++ b/dev-games/simgear/simgear-2017.3.1.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit eutils cmake-utils toolchain-funcs git-r3
+inherit cmake-utils toolchain-funcs
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"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS=""
SLOT="0"
+KEYWORDS="~amd64 ~x86"
IUSE="+dns debug gdal openmp subversion test"
COMMON_DEPEND="
@@ -33,12 +31,12 @@ RDEPEND="${COMMON_DEPEND}
subversion? ( dev-vcs/subversion )
"
-PATCHES=( "${FILESDIR}/simgear-2017.2.1-gdal-underlinking.patch" )
-
-DOCS=(AUTHORS ChangeLog NEWS README Thanks)
-
pkg_pretend() {
- use openmp && tc-check-openmp
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
src_configure() {
diff --git a/dev-games/simgear/simgear-.ebuild
b/dev-games/simgear/simgear-.ebuild
index 00072326c7c..6ee236bee6f 100644
--- a/dev-games/simgear/simgear-.ebuild
+++ b/dev-games/simgear/simgear-.ebuild
@@ -33,12 +33,12 @@ RDEPEND="${COMMON_DEPEND}
subversion? ( dev-vcs/subversion )
"
-PATCHES=( "${FILESDIR}/simgear-2017.2.1-gdal-underlinking.patch" )
-
-DOCS=(AUTHORS ChangeLog NEWS README Thanks)
-
pkg_pretend() {
- use openmp && tc-check-openmp
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
src_configure() {
diff --git a/games-simulation/flightgear-data/Manifest
b/games-simulation/fli
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/, dev-games/simgear/, dev-games/simgear/files/, ...
commit: c4ad6b25be4e46fe9f36968d2b32cbf707d42fd9
Author: Maciej Mrozowski gentoo org>
AuthorDate: Thu Jun 15 03:36:55 2017 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Thu Jun 15 03:45:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4ad6b25
games-simulation/flightgear: Version bump 2017.2.1
dev-games/simgear/Manifest | 1 +
.../files/simgear-2017.2.1-gdal-underlinking.patch | 28 ++
dev-games/simgear/metadata.xml | 5 ++--
...simgear-.ebuild => simgear-2017.2.1.ebuild} | 21 ++--
dev-games/simgear/simgear-.ebuild | 13 --
games-simulation/flightgear-data/Manifest | 1 +
.../flightgear-data-2017.2.1.ebuild| 26
games-simulation/flightgear/Manifest | 1 +
...gear-.ebuild => flightgear-2017.2.1.ebuild} | 21 +---
games-simulation/flightgear/flightgear-.ebuild | 17 -
games-simulation/flightgear/metadata.xml | 8 +++
profiles/base/package.use.mask | 5
12 files changed, 117 insertions(+), 30 deletions(-)
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 353ae86b693..f5e09310de6 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,3 +1,4 @@
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
+DIST simgear-2017.2.1.tar.bz2 1290780 SHA256
9924592c01cb41ad66a0ff1dc43b7678ceec69fb573d3f4e4637e26c247c7a9e SHA512
168f5e3eab7cdd44643a62e1970c6329ac1121ca98e36c4134d963237e70304a20b7c8df3b438e24c204d51569d6863ef8b16098462d850f72a5f11a10ccbfd5
WHIRLPOOL
dc57cb2b87ec0111b0c555b6b87bcba7ec80c34c2277978c3aac7e71a3df260b4ac32f79698b2ea6d84a3bd6a942dc163aabd80c5f5004c409a189456f812d4a
diff --git a/dev-games/simgear/files/simgear-2017.2.1-gdal-underlinking.patch
b/dev-games/simgear/files/simgear-2017.2.1-gdal-underlinking.patch
new file mode 100644
index 000..63eb79ed35c
--- /dev/null
+++ b/dev-games/simgear/files/simgear-2017.2.1-gdal-underlinking.patch
@@ -0,0 +1,28 @@
+From 9971d517fdf351e40467c88915d3e30e56f999d4 Mon Sep 17 00:00:00 2001
+From: Maciej Mrozowski
+Date: Thu, 15 Jun 2017 04:58:03 +0200
+Subject: [PATCH] Link shared SimGearScene with libgdal when enabled
+
+---
+ simgear/CMakeLists.txt | 5 +
+ 1 file changed, 5 insertions(+)
+
+diff --git a/simgear/CMakeLists.txt b/simgear/CMakeLists.txt
+index 18c2e04c..6c7cb495 100644
+--- a/simgear/CMakeLists.txt
b/simgear/CMakeLists.txt
+@@ -173,6 +173,11 @@ if(NOT SIMGEAR_HEADLESS)
+ ${OPENGL_LIBRARY}
+ ${JPEG_LIBRARY})
+
++if(ENABLE_GDAL)
++target_link_libraries(SimGearScene
++${GDAL_LIBRARIES})
++endif()
++
+ # only actually needed by canvas/KeyboardEvent.cxx
+ target_include_directories(SimGearScene PRIVATE
${PROJECT_SOURCE_DIR}/3rdparty/utf8/source)
+ endif()
+--
+2.13.0
+
diff --git a/dev-games/simgear/metadata.xml b/dev-games/simgear/metadata.xml
index c852718c8de..8a1ed54ebf7 100644
--- a/dev-games/simgear/metadata.xml
+++ b/dev-games/simgear/metadata.xml
@@ -14,8 +14,9 @@ SimGear is a set of open-source libraries designed to be used
as building blocks
quickly assembling 3d simulations, games, and visualization applications.
- Enables DNS resolver via
net-libs/udns
- Enables terrasync scenery
downloader
+ Enable DNS resolver via
net-libs/udns
+Enable alternative terrain engine based on pagedLOD
via sci-libs/gdal
+ Enable terrasync scenery
downloader
flightgear
diff --git a/dev-games/simgear/simgear-.ebuild
b/dev-games/simgear/simgear-2017.2.1.ebuild
similarity index 68%
copy from dev-games/simgear/simgear-.ebuil
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: 71b37bc783c9d2832d8f910867f59bed4c12c469
Author: Lars Wendler gentoo org>
AuthorDate: Sat Mar 4 16:17:07 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Sat Mar 4 17:09:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71b37bc7
games-simulation/flightgear: Really fix speex dependency.
Package-Manager: Portage-2.3.4, Repoman-2.3.2
games-simulation/flightgear/flightgear-2017.1.1.ebuild | 5 -
games-simulation/flightgear/flightgear-.ebuild | 5 -
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/games-simulation/flightgear/flightgear-2017.1.1.ebuild
b/games-simulation/flightgear/flightgear-2017.1.1.ebuild
index fa8a2926dcb..74fd2237a07 100644
--- a/games-simulation/flightgear/flightgear-2017.1.1.ebuild
+++ b/games-simulation/flightgear/flightgear-2017.1.1.ebuild
@@ -21,7 +21,10 @@ COMMON_DEPEND="
~dev-games/simgear-${PV}
media-libs/openal
|| (
- media-libs/speexdsp
+ (
+ >=media-libs/speex-1.2.0
+ media-libs/speexdsp
+ )
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: a27c8509649928c6a7d49fc208934efe16f48ade
Author: Lars Wendler gentoo org>
AuthorDate: Sat Mar 4 10:50:08 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Sat Mar 4 10:50:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a27c8509
games-simulation/flightgear: Adjusted speex dependency.
Package-Manager: Portage-2.3.4, Repoman-2.3.2
games-simulation/flightgear/flightgear-.ebuild | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/games-simulation/flightgear/flightgear-.ebuild
b/games-simulation/flightgear/flightgear-.ebuild
index 716518317ff..90bfe16d31a 100644
--- a/games-simulation/flightgear/flightgear-.ebuild
+++ b/games-simulation/flightgear/flightgear-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -22,7 +22,10 @@ COMMON_DEPEND="
>=dev-games/openscenegraph-3.2.0[png]
~dev-games/simgear-${PV}
media-libs/openal
- media-libs/speex
+ || (
+ media-libs/speexdsp
+
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: e22d00f178a49f6909965a20c6c908dfb89132cf
Author: Lars Wendler gentoo org>
AuthorDate: Sat Mar 4 10:49:12 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Sat Mar 4 10:50:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e22d00f1
games-simulation/flightgear: Bump to version 2017.1.1
Package-Manager: Portage-2.3.4, Repoman-2.3.2
games-simulation/flightgear/Manifest | 1 +
.../flightgear/flightgear-2017.1.1.ebuild | 141 +
2 files changed, 142 insertions(+)
diff --git a/games-simulation/flightgear/Manifest
b/games-simulation/flightgear/Manifest
index ecb489c5677..85833400310 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1 +1,2 @@
DIST flightgear-2016.4.4.tar.bz2 7560911 SHA256
d51992cbe40f1812f9821ab27b838d52e04c10551772d57fc2e815fdfafc SHA512
3f3d5a72adea9cb9a22b7b355a18492c1c58634e6203d6ae364d7a89f1af0fcc3df446c72c3c83ac9a1f51e05a6cd83c7d7af5f7bc3a5e8e75e3b80f709394a0
WHIRLPOOL
0a3fc48c5ec440cdcc7f2a99b860c51310fd9f256e5577458ccd9fa5202c26751b982918752326c68b5c6d9554eb902c4789df4a6221752870d3eaf263756226
+DIST flightgear-2017.1.1.tar.bz2 8057285 SHA256
8f98bbdc027164564cddf660856e0b2f4924c5c9b6a32735b14cd57b4338a028 SHA512
97421940c10e0afa3ecabeb3b3f676a262ed715ac47174cecceaef6962bc3f4a20c3bbc8505f4d600c6099940294d912148e9adb908ce6dc4546a5d2f2508a01
WHIRLPOOL
18b34c1dad47cd519fed095a000f5f532751f8c3902f2c7170b927c2dbe1c1227c74f270eb8fbc27e6d258373b8f288a96db4f864d1d512a42ebc0ae285832fc
diff --git a/games-simulation/flightgear/flightgear-2017.1.1.ebuild
b/games-simulation/flightgear/flightgear-2017.1.1.ebuild
new file mode 100644
index 000..fa8a2926dcb
--- /dev/null
+++ b/games-simulation/flightgear/flightgear-2017.1.1.ebuild
@@ -0,0 +1,141 @@
+# 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 ~ppc ~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/speexdsp
+ =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
+ )
+"
+# 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_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
+ -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
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear-data/
commit: 3edc59806bf9cb44aa4eb7021f3fc2e270d7f12c
Author: Lars Wendler gentoo org>
AuthorDate: Sat Mar 4 10:34:33 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Sat Mar 4 10:50:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3edc5980
games-simulation/flightgear-data: Bump to version 2017.1.1
Package-Manager: Portage-2.3.4, Repoman-2.3.2
games-simulation/flightgear-data/Manifest | 1 +
.../flightgear-data-2017.1.1.ebuild| 26 ++
2 files changed, 27 insertions(+)
diff --git a/games-simulation/flightgear-data/Manifest
b/games-simulation/flightgear-data/Manifest
index cb6eac30855..999baea96a3 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1 +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
diff --git a/games-simulation/flightgear-data/flightgear-data-2017.1.1.ebuild
b/games-simulation/flightgear-data/flightgear-data-2017.1.1.ebuild
new file mode 100644
index 000..084c65ea5c4
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-2017.1.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 ~ppc ~x86"
+IUSE=""
+
+# data files split to separate package since 2.10.0
+RDEPEND="
+ !
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/, dev-games/simgear/
commit: 9c51f2971df92b9732494b7ec13e19173d13e585
Author: Maciej Mrozowski gentoo org>
AuthorDate: Sat Feb 4 16:17:34 2017 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Mon Feb 6 23:01:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c51f297
games-simulation/flightgear: sync ebuilds with CMake (wrt options, also for
simgear)
dev-games/simgear/simgear-2016.4.4.ebuild | 1 +
dev-games/simgear/simgear-.ebuild | 1 +
games-simulation/flightgear/flightgear-2016.4.4.ebuild | 8 ++--
games-simulation/flightgear/flightgear-.ebuild | 13 -
4 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/dev-games/simgear/simgear-2016.4.4.ebuild
b/dev-games/simgear/simgear-2016.4.4.ebuild
index 18dac11..82da537 100644
--- a/dev-games/simgear/simgear-2016.4.4.ebuild
+++ b/dev-games/simgear/simgear-2016.4.4.ebuild
@@ -38,6 +38,7 @@ src_configure() {
-DENABLE_DNS=$(usex dns)
-DENABLE_PKGUTIL=ON
-DENABLE_RTI=OFF
+ -DENABLE_SIMD=OFF
-DENABLE_SOUND=ON
-DENABLE_TESTS=$(usex test)
-DSIMGEAR_HEADLESS=OFF
diff --git a/dev-games/simgear/simgear-.ebuild
b/dev-games/simgear/simgear-.ebuild
index 2436583..11f3809 100644
--- a/dev-games/simgear/simgear-.ebuild
+++ b/dev-games/simgear/simgear-.ebuild
@@ -40,6 +40,7 @@ src_configure() {
-DENABLE_DNS=$(usex dns)
-DENABLE_PKGUTIL=ON
-DENABLE_RTI=OFF
+ -DENABLE_SIMD=OFF
-DENABLE_SOUND=ON
-DENABLE_TESTS=$(usex test)
-DSIMGEAR_HEADLESS=OFF
diff --git a/games-simulation/flightgear/flightgear-2016.4.4.ebuild
b/games-simulation/flightgear/flightgear-2016.4.4.ebuild
index c0949ff..5104182 100644
--- a/games-simulation/flightgear/flightgear-2016.4.4.ebuild
+++ b/games-simulation/flightgear/flightgear-2016.4.4.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
KEYWORDS="amd64 ~ppc 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]
@@ -38,10 +39,14 @@ COMMON_DEPEND="
virtual/opengl
)
"
+# 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/libXmu )
+ utils? (
+ x11-libs/libXi
+ x11-libs/libXmu
+ )
"
RDEPEND="${COMMON_DEPEND}
~games-simulation/${PN}-data-${PV}
@@ -73,7 +78,6 @@ src_configure() {
-DFG_DATA_DIR=/usr/share/${PN}
-DJSBSIM_TERRAIN=ON
-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
- -DSIMGEAR_SHARED=ON
-DSP_FDMS=ON
-DSYSTEM_FLITE=ON
-DSYSTEM_HTS_ENGINE=ON
diff --git a/games-simulation/flightgear/flightgear-.ebuild
b/games-simulation/flightgear/flightgear-.ebuild
index 8d7628f..5d50a56 100644
--- a/games-simulation/flightgear/flightgear-.ebuild
+++ b/games-simulation/flightgear/flightgear-.ebuild
@@ -17,6 +17,7 @@ SLOT="0"
KEYWORDS=""
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]
@@ -25,6 +26,7 @@ COMMON_DEPEND="
media-libs/speex
media-sound/gsm
sys-libs/zlib
+ virtual/glu
x11-libs/libX11
dbus? ( >=sys-apps/dbus-1.6.18-r1 )
qt5? (
@@ -35,13 +37,20 @@ COMMON_DEPEND="
udev? ( virtual/udev )
utils? (
media-libs/freeglut
+ media-libs/freetype:2
+ media-libs/glew:0
media-libs/libpng:0
virtual/opengl
)
"
+# 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}
@@ -51,6 +60,7 @@ DOCS=(AUTHORS ChangeLog NEWS README Thanks)
src_configure() {
local mycmakeargs=(
+ -DENABLE_FGCANVAS=$(usex qt5 && usex utils)
-DENABLE_FGCOM=$(usex utils)
-DENABLE_FGELEV=$(usex utils)
-DENABLE_FGJS=$(usex utils)
@@ -65,15 +75,16 @@ src_configure() {
-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)
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear-data/
commit: ef2f2cb70285466776f4dd10718fb0851956c31c
Author: Lars Wendler gentoo org>
AuthorDate: Sat Jan 14 01:30:52 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Sat Jan 14 01:33:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef2f2cb7
games-simulation/flightgear-data: Security cleanup (bug #602658).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
games-simulation/flightgear-data/Manifest | 3 ---
.../flightgear-data-2016.3.1.ebuild| 27 ---
.../flightgear-data-2016.4.3.ebuild| 27 ---
.../flightgear-data/flightgear-data-3.4.0.ebuild | 30 --
4 files changed, 87 deletions(-)
diff --git a/games-simulation/flightgear-data/Manifest
b/games-simulation/flightgear-data/Manifest
index 6927372..cb6eac3 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1,4 +1 @@
-DIST FlightGear-2016.3.1-data.tar.bz2 1430257110 SHA256
1eceb36f5b577bb8223ed1520e68179fb9292b95e63ffd9ad695dcc93b814d1c SHA512
ba4d51efc23cf125367815491cdb78153d5b553bae54bae41eb9f01f0749d53d1be9c0a63e998a31f05c0d514d5dcef2a1dfd55267e7698d34738e3dc5559018
WHIRLPOOL
e3f2ba81ad519ba94666cac046ad92563801aac9944f4180566d0e7d8b82849a0ac0c4c670ba64a04862bdd3f94239453cce8ec676c64fb809318632995dfc41
-DIST FlightGear-2016.4.3-data.tar.bz2 1648602662 SHA256
e4f6b26624af3fa6cf874077a8fe2f57fc298d124a7899731946a593cd73c4f3 SHA512
e38728894c676d4ef12a1317e68a4c15289da1c5a313c8ef72bfe53c9ec06c9aac5cceb5d679a362a19540d9fa617211633e7a66a6df96e43ddc876d391efeb1
WHIRLPOOL
82ef7b7c70b9cef12055133a73e0f9e277b824528aaa495e0b751343d9bec1be27558d04ef06dd0d3ee0fcb73deb3ed279ec76351a9fc29b32e52d25af9800aa
DIST FlightGear-2016.4.4-data.tar.bz2 1654119067 SHA256
3dfd4b82c99a8bf4b81dd31846efce52ed417be180eaa71020ccc914f9a49668 SHA512
e9a8dfb17c03fb2961e4d031ef63d56c580f029a7ceee816e67c3944a3a79f476ee1c6ad40ce8af530c8551497d9e1329b00805499ad85c4610c07bfaf22d3aa
WHIRLPOOL
249ba21e7ad58c885a92094ec403d99bc8879e9c6638b8ebc2e48053c5524c62383c95ddb9bac3039ddbcd50a90b4a690676df642125e4219fc3c7e94f793717
-DIST FlightGear-data-3.4.0.tar.bz2 1145893777 SHA256
8cefa7c323d974d8e51fd23c97ae79dc731e65b81e1729cb1bc9bc1f99df128b SHA512
791ff1b1f7f759ccc73f738ba6cb6fd050d1341ae031a872745b4c1145cdb92de62193df7ea6e9fe05a1c95a60fa664da56015d643244d38c7b0b72a2c3146d9
WHIRLPOOL
0abaa4da7e9032469da80500fc23c84d6b696fc596529853a3a614bb3627ef6081c12ea78e6e8c987e6b11b303cca0d8da5c9628164d2a93bed452230302a655
diff --git a/games-simulation/flightgear-data/flightgear-data-2016.3.1.ebuild
b/games-simulation/flightgear-data/flightgear-data-2016.3.1.ebuild
deleted file mode 100644
index 57ece3c..
--- a/games-simulation/flightgear-data/flightgear-data-2016.3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 ~ppc x86"
-IUSE=""
-
-# data files split to separate package since 2.10.0
-RDEPEND="
- !http://www.flightgear.org/";
-SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-# data files split to separate package since 2.10.0
-RDEPEND="
- !http://www.flightgear.org/";
-SRC_URI="mirror://flightgear/Shared/FlightGear-data-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-# data files split to separate package since 2.10.0
-RDEPEND="
- !
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/files/, games-simulation/flightgear/
commit: 8170f20931e723b17be2916cefbcccf71691706d
Author: Lars Wendler gentoo org>
AuthorDate: Sat Jan 14 01:29:44 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Sat Jan 14 01:33:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8170f209
games-simulation/flightgear: Security cleanup (bug #602658).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
games-simulation/flightgear/Manifest | 3 -
.../files/0001-flightgear-3.4.0-cmake.patch| 30 -
.../files/0002-flightgear-3.4.0-cmake.patch| 54
.../flightgear/flightgear-2016.3.1.ebuild | 133
.../flightgear/flightgear-2016.4.3.ebuild | 133
.../flightgear/flightgear-3.4.0.ebuild | 138 -
games-simulation/flightgear/metadata.xml | 3 -
7 files changed, 494 deletions(-)
diff --git a/games-simulation/flightgear/Manifest
b/games-simulation/flightgear/Manifest
index e9b16b9..ecb489c 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,4 +1 @@
-DIST flightgear-2016.3.1.tar.bz2 7542098 SHA256
501d2f59b8f9d221332044346bbbfe195e42d0195945f8bb0fec8b474bc79c31 SHA512
57246144d954e36e330fe5da15ff5c86f810cbd0b09638c2df813a242677eca22e00a9432f6091da6731972699657fee525310f5bcc91cf8dc5e2250c8663e8a
WHIRLPOOL
f9c4809fe5d2981b366a3b2c3d47788843a8abd0bacee37eb8c15dafcfd2c3b855c760065c8f0274c10f96faa84632536a68641e6f80a047409ec944a4b4dd24
-DIST flightgear-2016.4.3.tar.bz2 7559919 SHA256
35a9c439265e4a9caf794458bb42917d93280b2e561cc7b9a02aaba1226d2822 SHA512
4a7bb2322b49a6585671c5f0c52a7206002ada82ec7255536be338e21167d7a28be54a52b5c6b3f5ee8037b18e5626513e6fbc805b4ada49c6ef227c88a81d46
WHIRLPOOL
3e0e9d478af5a978badaaa325837ccf269a05b00994f90a2c1d43c0466e85b3d69a7b8b7dd6a1a1d18070a76c1e0f74879ecaf51bc52530b30b1afa33b42b259
DIST flightgear-2016.4.4.tar.bz2 7560911 SHA256
d51992cbe40f1812f9821ab27b838d52e04c10551772d57fc2e815fdfafc SHA512
3f3d5a72adea9cb9a22b7b355a18492c1c58634e6203d6ae364d7a89f1af0fcc3df446c72c3c83ac9a1f51e05a6cd83c7d7af5f7bc3a5e8e75e3b80f709394a0
WHIRLPOOL
0a3fc48c5ec440cdcc7f2a99b860c51310fd9f256e5577458ccd9fa5202c26751b982918752326c68b5c6d9554eb902c4789df4a6221752870d3eaf263756226
-DIST flightgear-3.4.0.tar.bz2 7522457 SHA256
b5645d05b50728a89f091292bc557f440d8f8719dd9cebf7f5bf3fa8ea795780 SHA512
10626d00b34255753dc5a5c82076909c296219472faf51c38460cc357ac014b40bd127454f28b2d857f1a1a299716430fd8f04dc7881552b3c24dee6eb616b1e
WHIRLPOOL
636ca7e012175141bc4b081cb6137e5348d49b873d241c5d0f1ed0a2581b32d2f23f4fe0ed97d5a1b72440afd14687e5de4e6ebeeaf07b4e854b0ca47875b82f
diff --git
a/games-simulation/flightgear/files/0001-flightgear-3.4.0-cmake.patch
b/games-simulation/flightgear/files/0001-flightgear-3.4.0-cmake.patch
deleted file mode 100644
index e14920b..
--- a/games-simulation/flightgear/files/0001-flightgear-3.4.0-cmake.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 06a260822c0eb10f47533a2cbf5cbbc968878c17 Mon Sep 17 00:00:00 2001
-From: James Turner
-Date: Tue, 17 Mar 2015 23:33:57 +
-Subject: [PATCH] Make 3.2.1 fix: make thread check platform specific.
-
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8847614..c881c32 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -109,6 +109,8 @@ IF(APPLE)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.7")
- elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR
- ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-+find_package(Threads REQUIRED)
-+
- set(USE_DBUS_DEFAULT 1)
-
- find_package(UDev)
-@@ -230,7 +232,6 @@ endif(EVENT_INPUT)
- # check required dependencies
- find_package(Boost REQUIRED)
- find_package(ZLIBREQUIRED)
--find_package(Threads REQUIRED)
- find_package(OpenGL REQUIRED)
- find_package(OpenAL REQUIRED)
- find_package(OpenSceneGraph 3.2.0 REQUIRED
diff --git
a/games-simulation/flightgear/files/0002-flightgear-3.4.0-cmake.patch
b/games-simulation/flightgear/files/0002-flightgear-3.4.0-cmake.patch
deleted file mode 100644
index 2151acd..
--- a/games-simulation/flightgear/files/0002-flightgear-3.4.0-cmake.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 14405fe2e397b9a6ab9b004cb8c7459eeb41ec59 Mon Sep 17 00:00:00 2001
-From: "Rebecca N. Palmer"
-Date: Fri, 3 Apr 2015 19:15:52 +0100
-Subject: [PATCH] Fix compile with CMake 3.2.1, by Kevin Seroux
-
-Explicitly link X11, as this no longer comes with OpenGL
- CMakeLists.txt| 1 +
- src/Main/CMakeLists.txt | 4 +++-
- utils/fgviewer/CMakeLists.txt | 4
- 3 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c881c32..c443f58 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -110,6 +110,7 @@ IF(APPLE)
- elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR
- ${CMAKE_SYSTEM_NAME} MATCHE
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: aa481db6c211b002023ed2b0c54c9deefce74948
Author: Lars Wendler gentoo org>
AuthorDate: Wed Jan 11 17:42:52 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Wed Jan 11 17:45:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa481db6
games-simulation/flightgear: Fixed dependencies (bug #605386).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
games-simulation/flightgear/flightgear-2016.4.4.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/games-simulation/flightgear/flightgear-2016.4.4.ebuild
b/games-simulation/flightgear/flightgear-2016.4.4.ebuild
index 81f1be8..bc6f412 100644
--- a/games-simulation/flightgear/flightgear-2016.4.4.ebuild
+++ b/games-simulation/flightgear/flightgear-2016.4.4.ebuild
@@ -23,6 +23,7 @@ COMMON_DEPEND="
media-libs/speex
media-sound/gsm
sys-libs/zlib
+ virtual/glu
x11-libs/libX11
dbus? ( >=sys-apps/dbus-1.6.18-r1 )
qt5? (
@@ -40,6 +41,7 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
>=dev-libs/boost-1.44
>=media-libs/plib-1.8.5
+ utils? ( x11-libs/libXmu )
"
RDEPEND="${COMMON_DEPEND}
~games-simulation/${PN}-data-${PV}
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: 009aafdac4f83e44b7047fe45cfd556e838d3343
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Jan 11 16:15:25 2017 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Jan 11 16:15:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=009aafda
games-simulation/flightgear: amd64 stable wrt bug #602658
Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
games-simulation/flightgear/flightgear-2016.4.4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-simulation/flightgear/flightgear-2016.4.4.ebuild
b/games-simulation/flightgear/flightgear-2016.4.4.ebuild
index 14ee221..81f1be8 100644
--- a/games-simulation/flightgear/flightgear-2016.4.4.ebuild
+++ b/games-simulation/flightgear/flightgear-2016.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE="dbus debug examples qt5 test +udev +utils vim-syntax"
COMMON_DEPEND="
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear-data/
commit: 3e6efeff7a1448e8f431a01d2284aea43d681078
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Jan 11 16:15:31 2017 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Jan 11 16:15:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e6efeff
games-simulation/flightgear-data: amd64 stable wrt bug #602658
Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
games-simulation/flightgear-data/flightgear-data-2016.4.4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-simulation/flightgear-data/flightgear-data-2016.4.4.ebuild
b/games-simulation/flightgear-data/flightgear-data-2016.4.4.ebuild
index 1a1745f..18578fc 100644
--- a/games-simulation/flightgear-data/flightgear-data-2016.4.4.ebuild
+++ b/games-simulation/flightgear-data/flightgear-data-2016.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -10,7 +10,7 @@
SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
# data files split to separate package since 2.10.0
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: bd396b3e147e1065c19583747f822afc0ad5058b
Author: Lars Wendler gentoo org>
AuthorDate: Thu Dec 29 18:07:12 2016 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu Dec 29 18:07:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd396b3e
games-simulation/flightgear: Bump to version 2016.4.4
Package-Manager: Portage-2.3.3, Repoman-2.3.1
games-simulation/flightgear/Manifest | 1 +
.../flightgear/flightgear-2016.4.4.ebuild | 133 +
2 files changed, 134 insertions(+)
diff --git a/games-simulation/flightgear/Manifest
b/games-simulation/flightgear/Manifest
index b2a325c..e9b16b9 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,3 +1,4 @@
DIST flightgear-2016.3.1.tar.bz2 7542098 SHA256
501d2f59b8f9d221332044346bbbfe195e42d0195945f8bb0fec8b474bc79c31 SHA512
57246144d954e36e330fe5da15ff5c86f810cbd0b09638c2df813a242677eca22e00a9432f6091da6731972699657fee525310f5bcc91cf8dc5e2250c8663e8a
WHIRLPOOL
f9c4809fe5d2981b366a3b2c3d47788843a8abd0bacee37eb8c15dafcfd2c3b855c760065c8f0274c10f96faa84632536a68641e6f80a047409ec944a4b4dd24
DIST flightgear-2016.4.3.tar.bz2 7559919 SHA256
35a9c439265e4a9caf794458bb42917d93280b2e561cc7b9a02aaba1226d2822 SHA512
4a7bb2322b49a6585671c5f0c52a7206002ada82ec7255536be338e21167d7a28be54a52b5c6b3f5ee8037b18e5626513e6fbc805b4ada49c6ef227c88a81d46
WHIRLPOOL
3e0e9d478af5a978badaaa325837ccf269a05b00994f90a2c1d43c0466e85b3d69a7b8b7dd6a1a1d18070a76c1e0f74879ecaf51bc52530b30b1afa33b42b259
+DIST flightgear-2016.4.4.tar.bz2 7560911 SHA256
d51992cbe40f1812f9821ab27b838d52e04c10551772d57fc2e815fdfafc SHA512
3f3d5a72adea9cb9a22b7b355a18492c1c58634e6203d6ae364d7a89f1af0fcc3df446c72c3c83ac9a1f51e05a6cd83c7d7af5f7bc3a5e8e75e3b80f709394a0
WHIRLPOOL
0a3fc48c5ec440cdcc7f2a99b860c51310fd9f256e5577458ccd9fa5202c26751b982918752326c68b5c6d9554eb902c4789df4a6221752870d3eaf263756226
DIST flightgear-3.4.0.tar.bz2 7522457 SHA256
b5645d05b50728a89f091292bc557f440d8f8719dd9cebf7f5bf3fa8ea795780 SHA512
10626d00b34255753dc5a5c82076909c296219472faf51c38460cc357ac014b40bd127454f28b2d857f1a1a299716430fd8f04dc7881552b3c24dee6eb616b1e
WHIRLPOOL
636ca7e012175141bc4b081cb6137e5348d49b873d241c5d0f1ed0a2581b32d2f23f4fe0ed97d5a1b72440afd14687e5de4e6ebeeaf07b4e854b0ca47875b82f
diff --git a/games-simulation/flightgear/flightgear-2016.4.4.ebuild
b/games-simulation/flightgear/flightgear-2016.4.4.ebuild
new file mode 100644
index ..14ee221
--- /dev/null
+++ b/games-simulation/flightgear/flightgear-2016.4.4.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~x86"
+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
+ -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
+ -DSIMGEAR_SHARED=ON
+ -DSP_FDMS=ON
+ -DSYSTEM_FLITE=ON
+ -DSYSTEM_HTS_ENGINE=
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear-data/
commit: 984d923f2e1edb0e3aea1830c622153059803c06
Author: Lars Wendler gentoo org>
AuthorDate: Thu Dec 29 18:00:28 2016 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu Dec 29 18:07:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=984d923f
games-simulation/flightgear-data: Bump to version 2016.4.4
Package-Manager: Portage-2.3.3, Repoman-2.3.1
games-simulation/flightgear-data/Manifest | 1 +
.../flightgear-data-2016.4.4.ebuild| 27 ++
2 files changed, 28 insertions(+)
diff --git a/games-simulation/flightgear-data/Manifest
b/games-simulation/flightgear-data/Manifest
index 59c96bd..6927372 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1,3 +1,4 @@
DIST FlightGear-2016.3.1-data.tar.bz2 1430257110 SHA256
1eceb36f5b577bb8223ed1520e68179fb9292b95e63ffd9ad695dcc93b814d1c SHA512
ba4d51efc23cf125367815491cdb78153d5b553bae54bae41eb9f01f0749d53d1be9c0a63e998a31f05c0d514d5dcef2a1dfd55267e7698d34738e3dc5559018
WHIRLPOOL
e3f2ba81ad519ba94666cac046ad92563801aac9944f4180566d0e7d8b82849a0ac0c4c670ba64a04862bdd3f94239453cce8ec676c64fb809318632995dfc41
DIST FlightGear-2016.4.3-data.tar.bz2 1648602662 SHA256
e4f6b26624af3fa6cf874077a8fe2f57fc298d124a7899731946a593cd73c4f3 SHA512
e38728894c676d4ef12a1317e68a4c15289da1c5a313c8ef72bfe53c9ec06c9aac5cceb5d679a362a19540d9fa617211633e7a66a6df96e43ddc876d391efeb1
WHIRLPOOL
82ef7b7c70b9cef12055133a73e0f9e277b824528aaa495e0b751343d9bec1be27558d04ef06dd0d3ee0fcb73deb3ed279ec76351a9fc29b32e52d25af9800aa
+DIST FlightGear-2016.4.4-data.tar.bz2 1654119067 SHA256
3dfd4b82c99a8bf4b81dd31846efce52ed417be180eaa71020ccc914f9a49668 SHA512
e9a8dfb17c03fb2961e4d031ef63d56c580f029a7ceee816e67c3944a3a79f476ee1c6ad40ce8af530c8551497d9e1329b00805499ad85c4610c07bfaf22d3aa
WHIRLPOOL
249ba21e7ad58c885a92094ec403d99bc8879e9c6638b8ebc2e48053c5524c62383c95ddb9bac3039ddbcd50a90b4a690676df642125e4219fc3c7e94f793717
DIST FlightGear-data-3.4.0.tar.bz2 1145893777 SHA256
8cefa7c323d974d8e51fd23c97ae79dc731e65b81e1729cb1bc9bc1f99df128b SHA512
791ff1b1f7f759ccc73f738ba6cb6fd050d1341ae031a872745b4c1145cdb92de62193df7ea6e9fe05a1c95a60fa664da56015d643244d38c7b0b72a2c3146d9
WHIRLPOOL
0abaa4da7e9032469da80500fc23c84d6b696fc596529853a3a614bb3627ef6081c12ea78e6e8c987e6b11b303cca0d8da5c9628164d2a93bed452230302a655
diff --git a/games-simulation/flightgear-data/flightgear-data-2016.4.4.ebuild
b/games-simulation/flightgear-data/flightgear-data-2016.4.4.ebuild
new file mode 100644
index ..1a1745f
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-2016.4.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~x86"
+IUSE=""
+
+# data files split to separate package since 2.10.0
+RDEPEND="
+ !
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: e43ca7caaee7093797b3b35b07dc5d63224d57cc
Author: Lars Wendler gentoo org>
AuthorDate: Sun Dec 25 14:19:33 2016 +
Commit: Lars Wendler gentoo org>
CommitDate: Sun Dec 25 14:22:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e43ca7ca
games-simulation/flightgear: Bump to version 2016.4.3 (bug #601008).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
games-simulation/flightgear/Manifest | 1 +
.../flightgear/flightgear-2016.4.3.ebuild | 133 +
2 files changed, 134 insertions(+)
diff --git a/games-simulation/flightgear/Manifest
b/games-simulation/flightgear/Manifest
index 28da3dd..b2a325c 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,2 +1,3 @@
DIST flightgear-2016.3.1.tar.bz2 7542098 SHA256
501d2f59b8f9d221332044346bbbfe195e42d0195945f8bb0fec8b474bc79c31 SHA512
57246144d954e36e330fe5da15ff5c86f810cbd0b09638c2df813a242677eca22e00a9432f6091da6731972699657fee525310f5bcc91cf8dc5e2250c8663e8a
WHIRLPOOL
f9c4809fe5d2981b366a3b2c3d47788843a8abd0bacee37eb8c15dafcfd2c3b855c760065c8f0274c10f96faa84632536a68641e6f80a047409ec944a4b4dd24
+DIST flightgear-2016.4.3.tar.bz2 7559919 SHA256
35a9c439265e4a9caf794458bb42917d93280b2e561cc7b9a02aaba1226d2822 SHA512
4a7bb2322b49a6585671c5f0c52a7206002ada82ec7255536be338e21167d7a28be54a52b5c6b3f5ee8037b18e5626513e6fbc805b4ada49c6ef227c88a81d46
WHIRLPOOL
3e0e9d478af5a978badaaa325837ccf269a05b00994f90a2c1d43c0466e85b3d69a7b8b7dd6a1a1d18070a76c1e0f74879ecaf51bc52530b30b1afa33b42b259
DIST flightgear-3.4.0.tar.bz2 7522457 SHA256
b5645d05b50728a89f091292bc557f440d8f8719dd9cebf7f5bf3fa8ea795780 SHA512
10626d00b34255753dc5a5c82076909c296219472faf51c38460cc357ac014b40bd127454f28b2d857f1a1a299716430fd8f04dc7881552b3c24dee6eb616b1e
WHIRLPOOL
636ca7e012175141bc4b081cb6137e5348d49b873d241c5d0f1ed0a2581b32d2f23f4fe0ed97d5a1b72440afd14687e5de4e6ebeeaf07b4e854b0ca47875b82f
diff --git a/games-simulation/flightgear/flightgear-2016.4.3.ebuild
b/games-simulation/flightgear/flightgear-2016.4.3.ebuild
new file mode 100644
index ..14ee221
--- /dev/null
+++ b/games-simulation/flightgear/flightgear-2016.4.3.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~x86"
+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
+ -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
+ -DSIMGEAR_SHARED=ON
+ -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
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear-data/
commit: 6d8b00a08672204e30dbd6d90c6b959fe0a0bbe4
Author: Lars Wendler gentoo org>
AuthorDate: Sun Dec 25 14:18:47 2016 +
Commit: Lars Wendler gentoo org>
CommitDate: Sun Dec 25 14:22:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d8b00a0
games-simulation/flightgear-data: Bump to version 2016.4.3 (bug #601008).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
games-simulation/flightgear-data/Manifest | 1 +
.../flightgear-data-2016.4.3.ebuild| 27 ++
2 files changed, 28 insertions(+)
diff --git a/games-simulation/flightgear-data/Manifest
b/games-simulation/flightgear-data/Manifest
index 37900e0..59c96bd 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1,2 +1,3 @@
DIST FlightGear-2016.3.1-data.tar.bz2 1430257110 SHA256
1eceb36f5b577bb8223ed1520e68179fb9292b95e63ffd9ad695dcc93b814d1c SHA512
ba4d51efc23cf125367815491cdb78153d5b553bae54bae41eb9f01f0749d53d1be9c0a63e998a31f05c0d514d5dcef2a1dfd55267e7698d34738e3dc5559018
WHIRLPOOL
e3f2ba81ad519ba94666cac046ad92563801aac9944f4180566d0e7d8b82849a0ac0c4c670ba64a04862bdd3f94239453cce8ec676c64fb809318632995dfc41
+DIST FlightGear-2016.4.3-data.tar.bz2 1648602662 SHA256
e4f6b26624af3fa6cf874077a8fe2f57fc298d124a7899731946a593cd73c4f3 SHA512
e38728894c676d4ef12a1317e68a4c15289da1c5a313c8ef72bfe53c9ec06c9aac5cceb5d679a362a19540d9fa617211633e7a66a6df96e43ddc876d391efeb1
WHIRLPOOL
82ef7b7c70b9cef12055133a73e0f9e277b824528aaa495e0b751343d9bec1be27558d04ef06dd0d3ee0fcb73deb3ed279ec76351a9fc29b32e52d25af9800aa
DIST FlightGear-data-3.4.0.tar.bz2 1145893777 SHA256
8cefa7c323d974d8e51fd23c97ae79dc731e65b81e1729cb1bc9bc1f99df128b SHA512
791ff1b1f7f759ccc73f738ba6cb6fd050d1341ae031a872745b4c1145cdb92de62193df7ea6e9fe05a1c95a60fa664da56015d643244d38c7b0b72a2c3146d9
WHIRLPOOL
0abaa4da7e9032469da80500fc23c84d6b696fc596529853a3a614bb3627ef6081c12ea78e6e8c987e6b11b303cca0d8da5c9628164d2a93bed452230302a655
diff --git a/games-simulation/flightgear-data/flightgear-data-2016.4.3.ebuild
b/games-simulation/flightgear-data/flightgear-data-2016.4.3.ebuild
new file mode 100644
index ..1a1745f
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-2016.4.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~x86"
+IUSE=""
+
+# data files split to separate package since 2.10.0
+RDEPEND="
+ !
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear-data/
commit: 35e13031ffd97be07efcf47f52870c6dab0ee18e
Author: Tobias Klausmann gentoo org>
AuthorDate: Tue Dec 20 19:15:33 2016 +
Commit: Tobias Klausmann gentoo org>
CommitDate: Tue Dec 20 19:15:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35e13031
games-simulation/flightgear-data-2016.3.1-r0: stable on amd64
Gentoo-Bug: 595748
games-simulation/flightgear-data/flightgear-data-2016.3.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-simulation/flightgear-data/flightgear-data-2016.3.1.ebuild
b/games-simulation/flightgear-data/flightgear-data-2016.3.1.ebuild
index 1a1745f..4b6ef95 100644
--- a/games-simulation/flightgear-data/flightgear-data-2016.3.1.ebuild
+++ b/games-simulation/flightgear-data/flightgear-data-2016.3.1.ebuild
@@ -10,7 +10,7 @@
SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
# data files split to separate package since 2.10.0
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
commit: 7973debcf73f2505053c432e3413be0c4e6f9fce
Author: Tobias Klausmann gentoo org>
AuthorDate: Tue Dec 20 19:15:31 2016 +
Commit: Tobias Klausmann gentoo org>
CommitDate: Tue Dec 20 19:15:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7973debc
games-simulation/flightgear-2016.3.1-r0: stable on amd64
Gentoo-Bug: 595748
games-simulation/flightgear/flightgear-2016.3.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-simulation/flightgear/flightgear-2016.3.1.ebuild
b/games-simulation/flightgear/flightgear-2016.3.1.ebuild
index 14ee221..db0371e 100644
--- a/games-simulation/flightgear/flightgear-2016.3.1.ebuild
+++ b/games-simulation/flightgear/flightgear-2016.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE="dbus debug examples qt5 test +udev +utils vim-syntax"
COMMON_DEPEND="
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear-data/, dev-games/simgear/, ...
commit: 72d18cbe69a357489ef7fe4f6f232b533141fbbd
Author: Maciej Mrozowski gentoo org>
AuthorDate: Fri Nov 4 01:45:44 2016 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Fri Nov 4 01:53:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72d18cbe
dev-games/flightgear: remove 2016.2.1
dev-games/simgear/Manifest | 1 -
.../files/simgear-2016.2.1-unbundle-udns.patch | 144 -
dev-games/simgear/simgear-2016.2.1.ebuild | 53
games-simulation/flightgear-data/Manifest | 1 -
.../flightgear-data-2016.2.1.ebuild| 27
games-simulation/flightgear/Manifest | 1 -
.../flightgear/flightgear-2016.2.1.ebuild | 131 ---
7 files changed, 358 deletions(-)
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 13bca2c..49ae6d3 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,3 +1,2 @@
-DIST simgear-2016.2.1.tar.bz2 1161873 SHA256
601d4ef75a7f9e7012f85d6f63219f3e2ef90f98249eaa5d16cc6b1a3c737a0a SHA512
22046873b67c2dd530d9734f799ea8a7238f6ffb58999b5a1d72053c4837212906048ec681cb2b704cd55d6b7aba03729d4f6a6a7e351f1e5aa2e497cc78d937
WHIRLPOOL
4f4fd697b301dfcd27a623d9475e63a46709d1e27b0324bdf097a8260d2759e7dedb16de6dbf1a82430dc3d80a32b58abf3bc82026894b83c2ec5c06391dcdcf
DIST simgear-2016.3.1.tar.bz2 1199016 SHA256
ae46e1273673be41028ee912d1826e87185ab594053c493707f9dbdeea5159dd SHA512
5c0e260da8b09e815cd6607f3e977b5827f450e9fbe10bfaef019d7489506905fde56a5ab6748165431088bbae7fa61d4bccc27e4d7828c8bc6a05247b450716
WHIRLPOOL
c349848d7e85166d7161272d722bebed7b387e6cd4c9db6cd405e3d042ee212b4448231eb92e0a86b8dc00c497af2c69455edd7d7d1cd4007d9ca09e91e575a7
DIST simgear-3.4.0.tar.bz2 1057455 SHA256
927d66fe72aacb9dacced4506430bd5fc7726bc8d3d07d6f1866bc4cb11a5894 SHA512
9ebf49ea2f024f0e52a4d18ba6f77361e7b9f51a0e7238661b4b2fd9db0176bdd948612d9b4aec3ae4d8210676e7533dfc0308b9c71bdeb22e99a68b90d81320
WHIRLPOOL
bb48b6640409a96816ade77c22a91f88c452d339165dd0241354c26ff27572a14538ecfd91265c239def4621657be8766c081cffc237711a691d7ef54461b548
diff --git a/dev-games/simgear/files/simgear-2016.2.1-unbundle-udns.patch
b/dev-games/simgear/files/simgear-2016.2.1-unbundle-udns.patch
deleted file mode 100644
index 40bad3c..
--- a/dev-games/simgear/files/simgear-2016.2.1-unbundle-udns.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From 2b15b6b8adce06107866fff0028503c1b92b0de4 Mon Sep 17 00:00:00 2001
-From: Maciej Mrozowski
-Date: Thu, 26 May 2016 02:24:19 +0200
-Subject: [PATCH] Add SYSTEM_UDNS CMake option. Remove spurious EXPAT_LIBRARIES
- linking when using bundled expat.
-
- 3rdparty/CMakeLists.txt | 2 +-
- CMakeLists.txt | 19 ++-
- CMakeModules/FindUdns.cmake | 42 ++
- simgear/CMakeLists.txt | 11 ++-
- 4 files changed, 67 insertions(+), 7 deletions(-)
- create mode 100644 CMakeModules/FindUdns.cmake
-
-diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
-index e9b5282..a03a82d 100644
a/3rdparty/CMakeLists.txt
-+++ b/3rdparty/CMakeLists.txt
-@@ -4,6 +4,6 @@ endif()
-
- add_subdirectory(utf8)
-
--if (ENABLE_DNS)
-+if (ENABLE_DNS AND NOT SYSTEM_UDNS)
- add_subdirectory(udns)
- endif()
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a67d65e..7de1a0a 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -114,12 +114,14 @@ endif()
-
- if (NOT MSVC)
- option(SIMGEAR_SHARED "Set to ON to build SimGear as a shared
library/framework" OFF)
--option(SYSTEM_EXPAT "Set to ON to build SimGear using the system
libExpat" OFF)
-+option(SYSTEM_EXPAT "Set to ON to build SimGear using the system expat
library" OFF)
-+option(SYSTEM_UDNS "Set to ON to build SimGear using the system udns
library" OFF)
- else()
- # Building SimGear DLLs is currently not supported for MSVC.
- set(SIMGEAR_SHARED OFF)
--# Using a system expat is currently not supported for MSVC - it would require
shared simgear (DLL).
-+# Using external 3rd party libraries is currently not supported for MSVC - it
would require shared simgear (DLL).
- set(SYSTEM_EXPAT OFF)
-+set(SYSTEM_UDNS OFF)
- endif()
-
- option(SIMGEAR_HEADLESS "Set to ON to build SimGear without GUI/graphics
support" OFF)
-@@ -426,9 +428,16 @@ endif()
- install (FILES ${PROJECT_BINARY_DIR}/simgear/simgear_config.h DESTINATION
include/simgear/)
-
- include_directories(3rdparty/utf8/source)
--if (ENABLE_DNS)
--message(STATUS "DNS resolver: ENABLED")
--include_directories(3rdparty/udns)
-+
-+if(ENABLE_DNS)
-+if(SYSTEM_UDNS)
-+message(STATUS "Requested to use system udns library, forcing
SIMGEAR_SHARED to true")
-+set(SIMGEAR_SHARED ON)
-+find_package(Udns REQUIRED)
-+else()
-+message(STATUS "DNS resolver: ENABLED")
-+include_directories(3rdparty/udns)
-+endif()
- else()
- messa
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/, dev-games/simgear/, ...
commit: 3c0e6789ac2c9476794c64c5c324eb393677712c
Author: Maciej Mrozowski gentoo org>
AuthorDate: Sat Oct 1 06:57:34 2016 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Sat Oct 1 07:01:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c0e6789
games-simulation/flightgear: Version bump 2016.3.1, bug 595304. Remove
2016.1.1. Sync live ebuild.
dev-games/simgear/Manifest | 2 +-
.../{simgear-2016.1.1.ebuild => simgear-2016.3.1.ebuild} | 10 +++---
dev-games/simgear/simgear-.ebuild | 6 ++
games-simulation/flightgear-data/Manifest | 2 +-
...ar-data-2016.1.1.ebuild => flightgear-data-2016.3.1.ebuild} | 0
games-simulation/flightgear/Manifest | 2 +-
.../{flightgear-2016.1.1.ebuild => flightgear-2016.3.1.ebuild} | 3 ++-
games-simulation/flightgear/flightgear-.ebuild | 2 ++
games-simulation/flightgear/metadata.xml | 2 +-
9 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 6fa9e7b..13bca2c 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,3 +1,3 @@
-DIST simgear-2016.1.1.tar.bz2 1065810 SHA256
dbbc40115bc41563d930102484a3682e9fa4dda6f120feaa1fe82e0eb9d96c0d SHA512
ccc3384beef2e2ff3819928f22289a774da28c1df11f42ddc58ad4913c2c329a2cc14ca0359a312b9684ae31e598dda8a7a49e27c9148d079858dc0bf8e6ae63
WHIRLPOOL
2cf05f28c3318ea678f728c87e447c73934348b8862c97602b264f63bbecca82fd7e6db17affe84c78e1a9c42e31ad64aca243e97723e3e54ffca8481609ba50
DIST simgear-2016.2.1.tar.bz2 1161873 SHA256
601d4ef75a7f9e7012f85d6f63219f3e2ef90f98249eaa5d16cc6b1a3c737a0a SHA512
22046873b67c2dd530d9734f799ea8a7238f6ffb58999b5a1d72053c4837212906048ec681cb2b704cd55d6b7aba03729d4f6a6a7e351f1e5aa2e497cc78d937
WHIRLPOOL
4f4fd697b301dfcd27a623d9475e63a46709d1e27b0324bdf097a8260d2759e7dedb16de6dbf1a82430dc3d80a32b58abf3bc82026894b83c2ec5c06391dcdcf
+DIST simgear-2016.3.1.tar.bz2 1199016 SHA256
ae46e1273673be41028ee912d1826e87185ab594053c493707f9dbdeea5159dd SHA512
5c0e260da8b09e815cd6607f3e977b5827f450e9fbe10bfaef019d7489506905fde56a5ab6748165431088bbae7fa61d4bccc27e4d7828c8bc6a05247b450716
WHIRLPOOL
c349848d7e85166d7161272d722bebed7b387e6cd4c9db6cd405e3d042ee212b4448231eb92e0a86b8dc00c497af2c69455edd7d7d1cd4007d9ca09e91e575a7
DIST simgear-3.4.0.tar.bz2 1057455 SHA256
927d66fe72aacb9dacced4506430bd5fc7726bc8d3d07d6f1866bc4cb11a5894 SHA512
9ebf49ea2f024f0e52a4d18ba6f77361e7b9f51a0e7238661b4b2fd9db0176bdd948612d9b4aec3ae4d8210676e7533dfc0308b9c71bdeb22e99a68b90d81320
WHIRLPOOL
bb48b6640409a96816ade77c22a91f88c452d339165dd0241354c26ff27572a14538ecfd91265c239def4621657be8766c081cffc237711a691d7ef54461b548
diff --git a/dev-games/simgear/simgear-2016.1.1.ebuild
b/dev-games/simgear/simgear-2016.3.1.ebuild
similarity index 81%
rename from dev-games/simgear/simgear-2016.1.1.ebuild
rename to dev-games/simgear/simgear-2016.3.1.ebuild
index de8291d..39f6c59 100644
--- a/dev-games/simgear/simgear-2016.1.1.ebuild
+++ b/dev-games/simgear/simgear-2016.3.1.ebuild
@@ -13,15 +13,16 @@ SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~ppc ~x86"
SLOT="0"
-IUSE="curl debug subversion test"
+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
- curl? ( net-misc/curl )
+ dns? ( net-libs/udns )
"
DEPEND="${COMMON_DEPEND}
>=dev-libs/boost-1.44
@@ -34,7 +35,7 @@ DOCS=(AUTHORS ChangeLog NEWS README Thanks)
src_configure() {
local mycmakeargs=(
- -DENABLE_CURL=$(usex curl)
+ -DENABLE_DNS=$(usex dns)
-DENABLE_PKGUTIL=ON
-DENABLE_RTI=OFF
-DENABLE_SOUND=ON
@@ -42,6 +43,9 @@ src_configure() {
-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/dev-games/simgear/simgear-.ebuild
b/dev-games/simgear/simgear-.ebuild
index 2c5c92d..2436583 100644
--- a/dev-games/simgear/simgear-.ebuild
+++ b/dev-games/simgear/simgear-.ebuild
@@ -33,10 +33,6 @@ RDEPEND="${COMMON_DEPEND}
subversion? ( dev-vcs/subversion )
"
-PATCHES=(
- "${FILESDIR}/simgear-2016.2.1-unbundle-udns.patch"
-)
-
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
src_configure() {
@@ -50,6 +46,8 @@ src_configure() {
-DSIMGEAR_SHARED=ON
-DSYSTEM_EXPAT=ON
-DSYSTEM_UDNS=ON
+ -DUSE_AEONWAVE=OFF
+ -DOSG_FSTREAM_EXPORT_FIXED=OFF #
[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear-data/, dev-games/simgear/, ...
commit: 91ea88de6527cde3be1dad19b5457861901d8648
Author: Maciej Mrozowski gentoo org>
AuthorDate: Wed Feb 24 18:24:10 2016 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Wed Feb 24 18:28:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91ea88de
games-simulation/flightgear: Version bump 2016.1.1
dev-games/simgear/Manifest | 1 +
dev-games/simgear/simgear-2016.1.1.ebuild | 48
games-simulation/flightgear-data/Manifest | 1 +
.../flightgear-data-2016.1.1.ebuild| 27 +
games-simulation/flightgear/Manifest | 1 +
.../flightgear/flightgear-2016.1.1.ebuild | 132 +
6 files changed, 210 insertions(+)
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index df7d42c..a9e5a71 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1 +1,2 @@
+DIST simgear-2016.1.1.tar.bz2 1065810 SHA256
dbbc40115bc41563d930102484a3682e9fa4dda6f120feaa1fe82e0eb9d96c0d SHA512
ccc3384beef2e2ff3819928f22289a774da28c1df11f42ddc58ad4913c2c329a2cc14ca0359a312b9684ae31e598dda8a7a49e27c9148d079858dc0bf8e6ae63
WHIRLPOOL
2cf05f28c3318ea678f728c87e447c73934348b8862c97602b264f63bbecca82fd7e6db17affe84c78e1a9c42e31ad64aca243e97723e3e54ffca8481609ba50
DIST simgear-3.4.0.tar.bz2 1057455 SHA256
927d66fe72aacb9dacced4506430bd5fc7726bc8d3d07d6f1866bc4cb11a5894 SHA512
9ebf49ea2f024f0e52a4d18ba6f77361e7b9f51a0e7238661b4b2fd9db0176bdd948612d9b4aec3ae4d8210676e7533dfc0308b9c71bdeb22e99a68b90d81320
WHIRLPOOL
bb48b6640409a96816ade77c22a91f88c452d339165dd0241354c26ff27572a14538ecfd91265c239def4621657be8766c081cffc237711a691d7ef54461b548
diff --git a/dev-games/simgear/simgear-2016.1.1.ebuild
b/dev-games/simgear/simgear-2016.1.1.ebuild
new file mode 100644
index 000..899b65f
--- /dev/null
+++ b/dev-games/simgear/simgear-2016.1.1.ebuild
@@ -0,0 +1,48 @@
+# 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
+
+DESCRIPTION="Development library for simulation games"
+HOMEPAGE="http://www.simgear.org/";
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+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/Manifest
b/games-simulation/flightgear-data/Manifest
index 48b1633..cc1eccf 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1 +1,2 @@
+DIST FlightGear-2016.1.1-data.tar.bz2 1266743984 SHA256
36016ac5ab83fc6ad44c5cebe0f4fa7a14cf55ff5b699016abdeacf5a04c4c18 SHA512
605d610d001f959e2434228b9c3741af0df5fd047af31e1d60ad5bdb1041cde3299cab622014735cff6534d2a8f0edbe44ab3528bae2072454aaf0b363e765b8
WHIRLPOOL
3c1c50d2a47a9c68839cea1c24439c1052fc8b4a8ff7ee4378913fe3aaa9c4f08feb3a2a8aca520087aa745a4bda0ef43d8ea4679072cd56ff1311acf27261e3
DIST FlightGear-data-3.4.0.tar.bz2 1145893777 SHA256
8cefa7c323d974d8e51fd23c97ae79dc731e65b81e1729cb1bc9bc1f99df128b SHA512
791ff1b1f7f759ccc73f738ba6cb6fd050d1341ae031a872745b4c1145cdb92de62193df7ea6e9fe05a1c95a60fa664da56015d643244d38c7b0b72a2c3146d9
WHIRLPOOL
0abaa4da7e9032469da80500fc23c84d6b696fc596529853a3a614bb3627ef6081c12ea78e6e8c987e6b11b303cca0d8da5c9628164d2a93bed452230302a655
diff --git a/games-simulation/flightgear-data/flightgear-data-2016.1.1.ebuild
b/games-simulation/flightgear-data/flightgear-data-2016.1.1.ebuild
new file mode 100644
index 000..1a1745f
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-2016.1.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~x86"
+IUSE=""
+
+# data files split to separate package since 2.10.0
+RDEPEND="
+ !http://www.flightgear.org/";
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE=
