* [gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/, games-simulation/flightgear-data/, ...
@ 2017-10-19 22:46 Maciej Mrozowski
0 siblings, 0 replies; 3+ messages in thread
From: Maciej Mrozowski @ 2017-10-19 22:46 UTC (permalink / raw
To: gentoo-commits
commit: caafd4191dff3213ec89e71ba5eab17d884c61a7
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 19 22:39:01 2017 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 19 22:45:35 2017 +0000
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-9999.ebuild => simgear-2017.3.1.ebuild} | 20 ++++++++---------
dev-games/simgear/simgear-9999.ebuild | 10 ++++-----
games-simulation/flightgear-data/Manifest | 1 +
.../flightgear-data-2017.3.1.ebuild | 26 ++++++++++++++++++++++
games-simulation/flightgear/Manifest | 1 +
...gear-9999.ebuild => flightgear-2017.3.1.ebuild} | 21 ++++-------------
games-simulation/flightgear/flightgear-9999.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-9999.ebuild b/dev-games/simgear/simgear-2017.3.1.ebuild
similarity index 73%
copy from dev-games/simgear/simgear-9999.ebuild
copy to dev-games/simgear/simgear-2017.3.1.ebuild
index 00072326c7c..cca44548c83 100644
--- a/dev-games/simgear/simgear-9999.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-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild
index 00072326c7c..6ee236bee6f 100644
--- a/dev-games/simgear/simgear-9999.ebuild
+++ b/dev-games/simgear/simgear-9999.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/flightgear-data/Manifest
index e897d0b0c71..f9610b4c644 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -2,3 +2,4 @@ DIST FlightGear-2016.4.4-data.tar.bz2 1654119067 SHA256 3dfd4b82c99a8bf4b81dd318
DIST FlightGear-2017.1.2-data.tar.bz2 1460657435 SHA256 99d38d0478a8c8031f59376112bd54a6f996e1d363807b3bb45786384cfb2753 SHA512 0498b662a26c03dd08a1861d63e982adeded1a01db34ccf09d2acd9420a0b0343242216c58fa2a2ce215806690eb4d1796114f15f3adbd391fa18421629d4f97 WHIRLPOOL 45a1898ed0ca108d501f3bd35153a2107c4e4f682e3b49a7e8f49015fa5a6b6468d5177cc79458e23f5ae9b3ee2744540ab82a48561d9ba994cb147adc898650
DIST FlightGear-2017.1.3-data.tar.bz2 1460527272 SHA256 bf35d9a15be9e7bd1c286eee879251e0907a3fb5cca4e7d1fdfbe67690345365 SHA512 eb6140612920b190cec7f2879e4789cfb1ab41ab3c2d463948c592347bfd8f042bb62b499abf94d51e550bc472afe334c77ad750930d954067dc1f6bab66efac WHIRLPOOL c2de9906a0d4f88bafd85edb9b217b1ee766f128c0b6e95f82a6c6a98313c63e26113e5798b5be7e8714831db94bb5c95afc0cbdd570b0c2313dcf856e944523
DIST FlightGear-2017.2.1-data.tar.bz2 1590727949 SHA256 c9350e4500a1d97ebc515e7bb9e74081a8726a8fa244966543c9c67bcdacd1a4 SHA512 a6f6ff55d5ff866626b98fdfd77610fcde567aa53f74ccffb22c0580d1b6cc7c50fbc65b9c8b1f75ccfb07434b830b230c73a165c095f9367b67cd37b60018fc WHIRLPOOL dec850a9c1db5d6dec1682671f12b7d8015b29590100ce43f20724eb3d907da37b114f76f51cca4f1cde9e2c0e365cd913d9a42a2f51f91d8a32eef5e98146bc
+DIST FlightGear-2017.3.1-data.tar.bz2 1560855079 SHA256 df08b06e88a29a9f80f29186afd54d278636a663281a1b68e8f484bbb403d898 SHA512 9a3a68103bbb0f74d7f019b45cca00e686122618c1b5142231ba0c8b83f1283956782d3ea4372b1d96d653ea45f7087c32f39f26fe97695faddad0be12f8d9ff WHIRLPOOL dfa888d2735c25cb44f77812860febb9a983d0f03ff438398352bfca9300550b3b3367c36441323cbb440e75c304a7c69e9893bb9ffd4d4a1d70fa89ba86fab8
diff --git a/games-simulation/flightgear-data/flightgear-data-2017.3.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2017.3.1.ebuild
new file mode 100644
index 00000000000..f835ef53253
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-2017.3.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="FlightGear data files"
+HOMEPAGE="http://www.flightgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# data files split to separate package since 2.10.0
+RDEPEND="
+ !<games-simulation/flightgear-2.10.0
+"
+
+S=${WORKDIR}/fgdata
+
+src_install() {
+ insinto /usr/share/flightgear
+ rm -fr .git
+ doins -r *
+}
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 470ee1a646d..3cbfc245fe8 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -2,3 +2,4 @@ DIST flightgear-2016.4.4.tar.bz2 7560911 SHA256 d51992cbe40f1812f9821ab27b838d52
DIST flightgear-2017.1.2.tar.bz2 8056697 SHA256 41fe2a4ab0c14ed10436026c2edbb83148bf603691487976aaf2a5314f524659 SHA512 26466d6bd567c06cec7744dccba5c4a70d01c5169153c3c660175e9b400b9d1b5cc0d067e4d53d102ba5c20ceffb2217afcc54a0e86bf8aa7b3e7ee5a60aaf07 WHIRLPOOL f7b8a7884d4738a6e803a27b0dd3a5ad7bfc65d25b6c19baca0b0244222b967963ff3663298a8659ff01fd6aa52c4d7ed91f29792c8b77dded36ec6ba687200c
DIST flightgear-2017.1.3.tar.bz2 8056402 SHA256 3d7cb2b4b1d60b80b0613222b1fc7b6db665eddaf68d7080c07cdedcb544b0ad SHA512 93aa27a976bcdd79c76eb9751ba90a79a6146d8f3961c3bdf1db136a99cb9a0ab644c7409a26267181be0476fa455bf739b78cb7028e3e12d5509f96a1d3f303 WHIRLPOOL 55592116f730eaefb57f1d1eb684629c3cfa4e4167ed4f3a17203b1ce7eacb9885f389cb934a4e3f9d10230ce45410ec09dd2b81220a5077f4c4c545dd8a116c
DIST flightgear-2017.2.1.tar.bz2 8054033 SHA256 c7d9a63736cafd02236707d0f8e1bb36884a1a989cf49575bad13b4cbb311f5b SHA512 d4063d93d70046532c061cc6e09e0c6514cd8138c3baac1652b098a9196e5b435eee4e5ed19082a9e1994f95738114d13fe043290e7efb1539c70b107bbd33ea WHIRLPOOL 63e0c461551a361a2204f66fb0460d1884b3b078afc86681983ad843fb0a1fb944f26d23926563785211f2cd87b237adc5776c9d1eea4cb30fb0bd6d9907ed27
+DIST flightgear-2017.3.1.tar.bz2 8098283 SHA256 6f2e1d992e2f202b8f9c918c9fb19124ef06824ea0e767e2f4dff6ba43728ccd SHA512 e91268b4fc6a5b04761cf64e003e9962e5a66a91c0f089a1de220ef7cc438250dbd93ed99773c09f19255604c4cc5a0b65b80fe19e663fa0eae8107374527b4b WHIRLPOOL 708653d6c80c7041087bd66091de4f838a57ba3f2305d632a0d48867af7774477f492004750e5d89f4aec7a8cf3136d27bbb214635c7a8264f1ccc1eeb24a2fd
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-2017.3.1.ebuild
similarity index 86%
copy from games-simulation/flightgear/flightgear-9999.ebuild
copy to games-simulation/flightgear/flightgear-2017.3.1.ebuild
index a4ad24d989c..23182087a6f 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-2017.3.1.ebuild
@@ -3,16 +3,14 @@
EAPI=6
-inherit cmake-utils bash-completion-r1 toolchain-funcs git-r3
+inherit cmake-utils bash-completion-r1 toolchain-funcs
DESCRIPTION="Open Source Flight Simulator"
HOMEPAGE="http://www.flightgear.org/"
-EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/${PN}
- git://mapserver.flightgear.org/${PN}"
-EGIT_BRANCH="next"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
SLOT="0"
IUSE="dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax"
@@ -92,7 +90,7 @@ src_configure() {
-DENABLE_UIUC_MODEL=ON
-DENABLE_YASIM=ON
-DEVENT_INPUT=$(usex udev)
- -DFG_BUILD_TYPE=Nightly
+ -DFG_BUILD_TYPE=Release
-DFG_DATA_DIR=/usr/share/${PN}
-DJSBSIM_TERRAIN=ON
-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
@@ -113,17 +111,6 @@ src_configure() {
src_install() {
cmake-utils_src_install
- # Install icons and menu entry
- local s
- for s in 16 22 24 32 48 64 128; do
- doicon -s ${s} icons/${s}x${s}/apps/${PN}.png
- use utils && doicon -s ${s} icons/${s}x${s}/apps/fgcom.png
- done
- doicon -s scalable icons/scalable/${PN}.svg
- use utils && doicon -s scalable icons/scalable/fgcom.svg
-
- domenu package/org.flightgear.FlightGear.desktop
-
# Install bash completion (TODO zsh)
# Uncomment below when scripts stops writing files...
# sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index a4ad24d989c..2a386a47842 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -113,17 +113,6 @@ src_configure() {
src_install() {
cmake-utils_src_install
- # Install icons and menu entry
- local s
- for s in 16 22 24 32 48 64 128; do
- doicon -s ${s} icons/${s}x${s}/apps/${PN}.png
- use utils && doicon -s ${s} icons/${s}x${s}/apps/fgcom.png
- done
- doicon -s scalable icons/scalable/${PN}.svg
- use utils && doicon -s scalable icons/scalable/fgcom.svg
-
- domenu package/org.flightgear.FlightGear.desktop
-
# Install bash completion (TODO zsh)
# Uncomment below when scripts stops writing files...
# sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/, games-simulation/flightgear-data/, ...
@ 2023-12-09 0:53 Maciej Mrozowski
0 siblings, 0 replies; 3+ messages in thread
From: Maciej Mrozowski @ 2023-12-09 0:53 UTC (permalink / raw
To: gentoo-commits
commit: f5a2fbce5f39e4b57689a277046ccb81d043cef0
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 9 00:48:52 2023 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 9 00:52:26 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5a2fbce
games-simulation/flightgear: version bump, remove old
Signed-off-by: Maciej Mrozowski <reavertm <AT> 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..000000000000
--- 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 189e3fa637ae30662cd60cd473c9540e1e7f2b49cf29afe720794a278f09c7d788a458a6ddac843121958aa25f78f2528f1c5c8303c2a1e5cfc5478b1591df89
+DIST flightgear-2020.3.19.tar.bz2 8935152 BLAKE2B cc4ae515278ced52186683ae44b0ebf0aba9569fac12c5a5646b2a420663154651edcbf7eba18a040127f2d90dbffa1f48000529e8adc944d22fb314ce53c091 SHA512 ad5a4dd455a92bd9032c0f01084c0c114e4a91e60d53f200a754e54e1f8e08fd8e9008ea9f97f69410ee842fdc6c2210091d4ac5e5c6da6ba19f47e22438d207
diff --git a/games-simulation/flightgear/flightgear-2020.3.18.ebuild b/games-simulation/flightgear/flightgear-2020.3.19.ebuild
similarity index 100%
rename from games-simulation/flightgear/flightgear-2020.3.18.ebuild
rename to games-simulation/flightgear/flightgear-2020.3.19.ebuild
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/, games-simulation/flightgear-data/, ...
@ 2025-05-22 6:56 Maciej Mrozowski
0 siblings, 0 replies; 3+ messages in thread
From: Maciej Mrozowski @ 2025-05-22 6:56 UTC (permalink / raw
To: gentoo-commits
commit: ebff69b36d297f5e535c679af450210c71e29526
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Thu May 22 06:52:31 2025 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Thu May 22 06:55:13 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebff69b3
games-simulation/flightgear: version bump 2024.1.1, remove old, #951572
Closes: https://bugs.gentoo.org/951572
Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>
dev-games/simgear/Manifest | 2 +-
...-sure-that-n-is-not-being-set-as-format-t.patch | 34 +
.../files/0002-fix-support-for-aarch64.patch | 25 +
.../simgear/files/simgear-2019.1.1-gdal3.patch | 12 -
...mgear-2020.1.2-do-not-assume-libc++-clang.patch | 12 -
.../files/simgear-2020.3.17-boost-1.81.patch | 11 -
...imgear-2020.3.19-flightgear-CVE-2025-0781.patch | 84 ---
dev-games/simgear/metadata.xml | 4 +-
...2020.3.19-r1.ebuild => simgear-2024.1.1.ebuild} | 36 +-
dev-games/simgear/simgear-9999.ebuild | 37 +-
games-simulation/flightgear-data/Manifest | 2 +-
...3.19.ebuild => flightgear-data-2024.1.1.ebuild} | 11 +-
.../flightgear-data/flightgear-data-9999.ebuild | 8 +-
games-simulation/flightgear-data/metadata.xml | 2 +-
games-simulation/flightgear/Manifest | 2 +-
...-sure-that-n-is-not-being-set-as-format-t.patch | 33 +
.../0003-make-fglauncher-a-static-library.patch | 25 +
.../files/0005-make-fgqmlui-a-static-library.patch | 25 +
.../files/0006-fgviewer-fix-crash-on-exit.patch | 29 +
.../files/flightgear-2020.3.19-CVE-2025-0781.patch | 61 --
.../files/flightgear-2020.3.8-cmake.patch | 45 --
.../files/flightgear-2024.1.1-cmake.patch | 43 ++
.../files/flightgear-2024.1.1-fix-fgpanel.patch | 709 +++++++++++++++++++++
...0.3.19-r1.ebuild => flightgear-2024.1.1.ebuild} | 59 +-
games-simulation/flightgear/flightgear-9999.ebuild | 57 +-
games-simulation/flightgear/metadata.xml | 4 +-
profiles/base/package.use.force | 4 -
profiles/base/package.use.mask | 5 +
28 files changed, 1026 insertions(+), 355 deletions(-)
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 4b9a4b11d829..ca1871b82758 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1 +1 @@
-DIST simgear-2020.3.19.tar.bz2 1427799 BLAKE2B a3c90756053d01fdbb7f7518cbf58018b21a1e7acfbee523ffda0ba27682113c67c531b2f0c0678d7e962f365411811b7044e0df9b995e0d3eabef2ede431757 SHA512 b5c2acb9b843c48e573764c1474bc8723167376546d2fe01246ea936d348abf7e26c8778037680dc76fad5e514209ccce03f8c49cdd90ff0fb44f86759f9ec64
+DIST simgear-2024.1.1.tar.bz2 1814060 BLAKE2B 296122debafe91fec4bad682071bd77d7ac84aac009fdca5db4143351da1a8fb6221c5137abb6bee66d49d0ff6417d7c8455ba738c66f4608dcead2f162fe274 SHA512 dfdf5515c3b8083bb9a314ce4cea619b049e33ca332cecaa14928be95de7ddadef1724c1aec126c49bfade030774b7952f79bb55facd1d3e2f26041f706eb231
diff --git a/dev-games/simgear/files/0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch b/dev-games/simgear/files/0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
new file mode 100644
index 000000000000..fb31de6d7f5d
--- /dev/null
+++ b/dev-games/simgear/files/0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
@@ -0,0 +1,34 @@
+From 9465f10110e02686b3f8a860520a7e8f3c6a7936 Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice@bellet.info>
+Date: Sun, 22 Sep 2013 11:56:12 +0200
+Subject: [PATCH 0/1] check to be sure that %n is not being set as format type
+ (CVE-2012-2090)
+
+---
+ simgear/scene/model/SGText.cxx | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/simgear/scene/model/SGText.cxx b/simgear/scene/model/SGText.cxx
+index 08e84439..bc673511 100644
+--- a/simgear/scene/model/SGText.cxx
++++ b/simgear/scene/model/SGText.cxx
+@@ -73,6 +73,16 @@ void SGText::UpdateCallback::operator()(osg::Node * node, osg::NodeVisitor *nv )
+ // FIXME:
+ // hopefully the users never specifies bad formats here
+ // this should better be something more robust
++ // It is never safe for format.c_str to be %n.
++ string unsafe ("%n");
++ size_t found;
++
++ found=format.find(unsafe);
++ if (found!=string::npos) {
++ SG_LOG(SG_GENERAL, SG_ALERT, "format type contained %n, but this is unsafe, reverting to %s");
++ format = "%s";
++ }
++
+ char buf[256];
+ if( numeric ) {
+ double d = property->getDoubleValue() * scale + offset;
+--
+2.48.1
+
diff --git a/dev-games/simgear/files/0002-fix-support-for-aarch64.patch b/dev-games/simgear/files/0002-fix-support-for-aarch64.patch
new file mode 100644
index 000000000000..e83856a46560
--- /dev/null
+++ b/dev-games/simgear/files/0002-fix-support-for-aarch64.patch
@@ -0,0 +1,25 @@
+From 560be7700e03b20e5f252fed371ac14a0e7a7c17 Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice@bellet.info>
+Date: Fri, 19 Feb 2016 15:57:19 +0100
+Subject: [PATCH 1/1] fix support for aarch64
+
+---
+ simgear/nasal/naref.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/simgear/nasal/naref.h b/simgear/nasal/naref.h
+index 21f766f5..7e269a1f 100644
+--- a/simgear/nasal/naref.h
++++ b/simgear/nasal/naref.h
+@@ -18,7 +18,7 @@
+ # endif
+ #elif defined(_M_IX86) || defined(__i386) || defined(__x86_64) || \
+ defined(__ia64__) || defined(_M_IA64) || defined(__ARMEL__) || \
+- defined(_M_X64) || defined(_M_ARM) || \
++ defined(_M_X64) || defined(_M_ARM) || defined(__aarch64__) || \
+ defined(__e2k__)
+ # define NASAL_LE
+ #elif defined(__sparc) || defined(__ARMEB__) || \
+--
+2.48.1
+
diff --git a/dev-games/simgear/files/simgear-2019.1.1-gdal3.patch b/dev-games/simgear/files/simgear-2019.1.1-gdal3.patch
deleted file mode 100644
index 6d48994224c8..000000000000
--- a/dev-games/simgear/files/simgear-2019.1.1-gdal3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8a2f59f..5916c4c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -308,6 +308,7 @@ endif(ENABLE_RTI)
- if(ENABLE_GDAL)
- find_package(GDAL 2.0.0 REQUIRED)
- if (GDAL_FOUND)
-+ add_compile_definitions(USE_DEPRECATED_SRS_WKT_WGS84)
- include_directories(${GDAL_INCLUDE_DIR})
- endif(GDAL_FOUND)
- endif(ENABLE_GDAL)
diff --git a/dev-games/simgear/files/simgear-2020.1.2-do-not-assume-libc++-clang.patch b/dev-games/simgear/files/simgear-2020.1.2-do-not-assume-libc++-clang.patch
deleted file mode 100644
index 3ff70aeebdc5..000000000000
--- a/dev-games/simgear/files/simgear-2020.1.2-do-not-assume-libc++-clang.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN simgear-2020.1.2/CMakeLists.txt simgear-my/CMakeLists.txt
---- simgear-2020.1.2/CMakeLists.txt 2020-05-24 17:13:35.000000000 +0200
-+++ simgear-my/CMakeLists.txt 2020-10-17 15:48:58.375116913 +0200
-@@ -442,8 +442,6 @@
- set(WARNING_FLAGS_CXX "-Wall -fPIC -Wno-overloaded-virtual -Wno-redeclared-class-member")
- set(WARNING_FLAGS_C "-Wall -fPIC")
- set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
-- # fix Boost compilation :(
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
-
- # override CMake default RelWithDebInfo flags.
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG")
diff --git a/dev-games/simgear/files/simgear-2020.3.17-boost-1.81.patch b/dev-games/simgear/files/simgear-2020.3.17-boost-1.81.patch
deleted file mode 100644
index 6edcafcea031..000000000000
--- a/dev-games/simgear/files/simgear-2020.3.17-boost-1.81.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/887431
---- a/simgear/scene/viewer/Compositor.hxx
-+++ b/simgear/scene/viewer/Compositor.hxx
-@@ -17,6 +17,7 @@
- #ifndef SG_COMPOSITOR_HXX
- #define SG_COMPOSITOR_HXX
-
-+#include <array>
- #include <unordered_map>
- #include <vector>
-
diff --git a/dev-games/simgear/files/simgear-2020.3.19-flightgear-CVE-2025-0781.patch b/dev-games/simgear/files/simgear-2020.3.19-flightgear-CVE-2025-0781.patch
deleted file mode 100644
index 3de416a1a2e9..000000000000
--- a/dev-games/simgear/files/simgear-2020.3.19-flightgear-CVE-2025-0781.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 5bb023647114267141a7610e8f1ca7d6f4f5a5a8 Mon Sep 17 00:00:00 2001
-From: Florent Rougon <f.rougon@frougon.net>
-Date: Tue, 21 Jan 2025 00:16:43 +0100
-Subject: [PATCH] cppbind: check I/O rules when auto-constructing an SGPath
- from a Nasal scalar
-
-- Add static member function SGPath::NasalIORulesChecker as a
- PermissionChecker (this is essentially checkIORules() moved from the
- flightgear repository).
-
-- Use it in the from_nasal_helper() that creates an SGPath instance from
- a Nasal scalar.
----
- simgear/misc/sg_path.cxx | 20 +++++++++++++++++++
- simgear/misc/sg_path.hxx | 7 +++++++
- .../cppbind/detail/from_nasal_helper.cxx | 3 ++-
- 3 files changed, 29 insertions(+), 1 deletion(-)
-
-diff --git a/simgear/misc/sg_path.cxx b/simgear/misc/sg_path.cxx
-index f6c5b089e..c66bc72c4 100644
---- a/simgear/misc/sg_path.cxx
-+++ b/simgear/misc/sg_path.cxx
-@@ -275,6 +275,26 @@ void SGPath::set_cached(bool cached)
- // * Access permissions for Nasal code *
- // ***************************************************************************
-
-+// Static member function
-+SGPath::Permissions SGPath::NasalIORulesChecker(const SGPath& path)
-+{
-+ Permissions perm;
-+
-+ if (!path.isAbsolute()) {
-+ // SGPath caches permissions, which breaks for relative paths if the
-+ // current directory changes.
-+ SG_LOG(SG_NASAL, SG_ALERT,
-+ "SGPath::NasalIORulesChecker(): file operation on '" <<
-+ path.utf8Str() << "': access denied (relative paths not "
-+ "accepted; use realpath() to obtain an absolute path)");
-+ }
-+
-+ perm.read = path.isAbsolute() && !path.validate(false).isNull();
-+ perm.write = path.isAbsolute() && !path.validate(true).isNull();
-+
-+ return perm;
-+}
-+
- // Static member function
- void SGPath::clearListOfAllowedPaths(bool write)
- {
-diff --git a/simgear/misc/sg_path.hxx b/simgear/misc/sg_path.hxx
-index 32e9d662b..75da94c95 100644
---- a/simgear/misc/sg_path.hxx
-+++ b/simgear/misc/sg_path.hxx
-@@ -162,6 +162,13 @@ public:
- */
- SGPath validate(bool write) const;
-
-+ /**
-+ * Normal PermissionChecker for SGPath instances created from Nasal.
-+ * @param path an SGPath instance
-+ * @return read and write permissions conforming to validate()
-+ */
-+ static Permissions NasalIORulesChecker(const SGPath& path);
-+
- /**
- * Append another piece to the existing path. Inserts a path
- * separator between the existing component and the new component.
-diff --git a/simgear/nasal/cppbind/detail/from_nasal_helper.cxx b/simgear/nasal/cppbind/detail/from_nasal_helper.cxx
-index bdf10fe5e..ad027c0b0 100644
---- a/simgear/nasal/cppbind/detail/from_nasal_helper.cxx
-+++ b/simgear/nasal/cppbind/detail/from_nasal_helper.cxx
-@@ -47,7 +47,8 @@ namespace nasal
- SGPath from_nasal_helper(naContext c, naRef ref, const SGPath*)
- {
- naRef na_str = naStringValue(c, ref);
-- return SGPath(std::string(naStr_data(na_str), naStr_len(na_str)));
-+ return SGPath(std::string(naStr_data(na_str), naStr_len(na_str)),
-+ &SGPath::NasalIORulesChecker);
- }
-
- //----------------------------------------------------------------------------
---
-GitLab
-
diff --git a/dev-games/simgear/metadata.xml b/dev-games/simgear/metadata.xml
index 241bec9110a6..b81abeee21c9 100644
--- a/dev-games/simgear/metadata.xml
+++ b/dev-games/simgear/metadata.xml
@@ -14,11 +14,11 @@ SimGear is a set of open-source libraries designed to be used as building blocks
quickly assembling 3d simulations, games, and visualization applications.
</longdescription>
<use>
- <flag name="dns">Enable DNS resolver via <pkg>net-libs/udns</pkg></flag>
+ <flag name="ffmpeg">Enable video recording via <pkg>media-video/ffmpeg</pkg></flag>
<flag name="gdal">Enable alternative terrain engine based on pagedLOD via <pkg>sci-libs/gdal</pkg></flag>
<flag name="subversion">Enable terrasync scenery downloader</flag>
</use>
<upstream>
- <remote-id type="sourceforge">flightgear</remote-id>
+ <remote-id type="gitlab">flightgear/simgear</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-games/simgear/simgear-2020.3.19-r1.ebuild b/dev-games/simgear/simgear-2024.1.1.ebuild
similarity index 59%
rename from dev-games/simgear/simgear-2020.3.19-r1.ebuild
rename to dev-games/simgear/simgear-2024.1.1.ebuild
index fac3a4948f31..900c52e996b8 100644
--- a/dev-games/simgear/simgear-2020.3.19-r1.ebuild
+++ b/dev-games/simgear/simgear-2024.1.1.ebuild
@@ -1,30 +1,31 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit cmake toolchain-funcs
+inherit cmake
DESCRIPTION="Development library for simulation games"
HOMEPAGE="https://www.flightgear.org/"
-SRC_URI="https://downloads.sourceforge.net/flightgear/${P}.tar.bz2"
+SRC_URI="https://gitlab.com/flightgear/fgmeta/-/jobs/9264813015/artifacts/raw/sgbuild/${P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
SLOT="0"
-IUSE="cpu_flags_x86_sse2 +dns debug gdal openmp subversion test"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_sse2 debug ffmpeg gdal subversion test"
RESTRICT="!test? ( test )"
-# TODO aeonwave
+# TODO AeonWave, CycloneDDS
COMMON_DEPEND="
app-arch/xz-utils
dev-libs/expat
dev-games/openscenegraph
media-libs/openal
+ net-libs/udns
net-misc/curl
sys-libs/zlib
virtual/opengl
- dns? ( net-libs/udns )
+ ffmpeg? ( media-video/ffmpeg:0 )
gdal? ( sci-libs/gdal:= )
"
DEPEND="${COMMON_DEPEND}
@@ -35,35 +36,28 @@ RDEPEND="${COMMON_DEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-2019.1.1-gdal3.patch"
- "${FILESDIR}/${PN}-2020.1.2-do-not-assume-libc++-clang.patch"
- "${FILESDIR}/${PN}-2020.3.17-boost-1.81.patch"
- "${FILESDIR}/${PN}-2020.3.19-flightgear-CVE-2025-0781.patch"
+ "${FILESDIR}/0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch"
+ "${FILESDIR}/0002-fix-support-for-aarch64.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_ASAN=OFF
+ -DENABLE_CYCLONE=OFF
-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)
+ -DENABLE_TSAN=OFF
+ -DENABLE_VIDEO_RECORD=$(usex ffmpeg)
-DSIMGEAR_HEADLESS=OFF
-DSIMGEAR_SHARED=ON
-DSYSTEM_EXPAT=ON
-DSYSTEM_UDNS=ON
-DUSE_AEONWAVE=OFF
+ -DUSE_OPENALSOFT=ON
-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
)
cmake_src_configure
diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild
index a00bfb2e0bd7..0bd95f07ace0 100644
--- a/dev-games/simgear/simgear-9999.ebuild
+++ b/dev-games/simgear/simgear-9999.ebuild
@@ -1,30 +1,31 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit cmake toolchain-funcs git-r3
+inherit cmake git-r3
DESCRIPTION="Development library for simulation games"
HOMEPAGE="https://www.flightgear.org/"
-EGIT_REPO_URI="https://git.code.sf.net/p/flightgear/${PN}"
+EGIT_REPO_URI="https://gitlab.com/flightgear/${PN}.git"
EGIT_BRANCH="next"
LICENSE="GPL-2"
-KEYWORDS=""
SLOT="0"
-IUSE="cpu_flags_x86_sse2 +dns debug gdal openmp subversion test"
+KEYWORDS=""
+IUSE="cpu_flags_x86_sse2 debug ffmpeg gdal subversion test"
RESTRICT="!test? ( test )"
-# TODO aeonwave
+# TODO AeonWave, CycloneDDS
COMMON_DEPEND="
dev-libs/expat
dev-games/openscenegraph
media-libs/openal
+ net-libs/udns
net-misc/curl
sys-libs/zlib
virtual/opengl
- dns? ( net-libs/udns )
+ ffmpeg? ( media-video/ffmpeg:0 )
gdal? ( sci-libs/gdal:= )
"
DEPEND="${COMMON_DEPEND}
@@ -34,34 +35,24 @@ 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_ASAN=OFF
+ -DENABLE_CYCLONE=OFF
-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)
+ -DENABLE_TSAN=OFF
+ -DENABLE_VIDEO_RECORD=$(usex ffmpeg)
-DSIMGEAR_HEADLESS=OFF
-DSIMGEAR_SHARED=ON
-DSYSTEM_EXPAT=ON
-DSYSTEM_UDNS=ON
-DUSE_AEONWAVE=OFF
+ -DUSE_OPENALSOFT=ON
-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 3526353df994..dfd4bbb60dc1 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1 +1 @@
-DIST FlightGear-2020.3.19-data.txz 1789370768 BLAKE2B 2fa77d7821dc866e871ad92587204e82cb8bd2a961055b32a880285163505cd17b0044425a3b9d58cf181f32d94fdddbf4abc6e9e81d1264cf3d0173b9d65554 SHA512 054efd8a77f55b16e955d6489f34c671d927b3c4c6ea1d15e244189b1852215cee36de927a1a82d04e81d9afc3e8af8575724935c2113dfba919426be5f0eb95
+DIST FlightGear-2024.1.1-data.txz 1873735848 BLAKE2B b43cfd5aa90f749fb6f0c40c25c94e494a296c92eca452d7e171dd4654d9aae3b80c432cb0bd69af44981ec0704776d91cf85f67d6d93fe3b58db19859094e33 SHA512 ab478e806248783b4b8bb4ab5250d83e41f523c466beb3655fdb58e3ca508b2fb58247adb55041101e82729c9063901298b8220a608ddba5e9d3c80fc7575061
diff --git a/games-simulation/flightgear-data/flightgear-data-2020.3.19.ebuild b/games-simulation/flightgear-data/flightgear-data-2024.1.1.ebuild
similarity index 60%
rename from games-simulation/flightgear-data/flightgear-data-2020.3.19.ebuild
rename to games-simulation/flightgear-data/flightgear-data-2024.1.1.ebuild
index 24cfae895a84..470dc9147526 100644
--- a/games-simulation/flightgear-data/flightgear-data-2020.3.19.ebuild
+++ b/games-simulation/flightgear-data/flightgear-data-2024.1.1.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DESCRIPTION="FlightGear data files"
HOMEPAGE="https://www.flightgear.org/"
-SRC_URI="https://downloads.sourceforge.net/flightgear/FlightGear-${PV}-data.txz"
+SRC_URI="https://download.flightgear.org/release-2024.1/FlightGear-${PV}-data.txz"
+
+S=${WORKDIR}/fgdata_$(ver_cut 1)_$(ver_cut 2)
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/fgdata
src_install() {
insinto /usr/share/flightgear
diff --git a/games-simulation/flightgear-data/flightgear-data-9999.ebuild b/games-simulation/flightgear-data/flightgear-data-9999.ebuild
index 27d27dcf76bf..4689c0dd649c 100644
--- a/games-simulation/flightgear-data/flightgear-data-9999.ebuild
+++ b/games-simulation/flightgear-data/flightgear-data-9999.ebuild
@@ -1,20 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit git-r3
DESCRIPTION="FlightGear data files"
HOMEPAGE="https://www.flightgear.org/"
-EGIT_REPO_URI="git://git.code.sf.net/p/flightgear/fgdata
- git://mapserver.flightgear.org/fgdata"
+EGIT_REPO_URI="https://gitlab.com/flightgear/fgdata.git"
EGIT_BRANCH="next"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE=""
src_install() {
insinto /usr/share/flightgear
diff --git a/games-simulation/flightgear-data/metadata.xml b/games-simulation/flightgear-data/metadata.xml
index 5f385ce0fbfd..6b3e58480c7f 100644
--- a/games-simulation/flightgear-data/metadata.xml
+++ b/games-simulation/flightgear-data/metadata.xml
@@ -10,6 +10,6 @@
<name>Gentoo Games Project</name>
</maintainer>
<upstream>
- <remote-id type="sourceforge">flightgear</remote-id>
+ <remote-id type="gitlab">flightgear/fgdata</remote-id>
</upstream>
</pkgmetadata>
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 4c646ab93dec..cc775842173b 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1 +1 @@
-DIST flightgear-2020.3.19.tar.bz2 8935152 BLAKE2B cc4ae515278ced52186683ae44b0ebf0aba9569fac12c5a5646b2a420663154651edcbf7eba18a040127f2d90dbffa1f48000529e8adc944d22fb314ce53c091 SHA512 ad5a4dd455a92bd9032c0f01084c0c114e4a91e60d53f200a754e54e1f8e08fd8e9008ea9f97f69410ee842fdc6c2210091d4ac5e5c6da6ba19f47e22438d207
+DIST flightgear-2024.1.1.tar.bz2 9421622 BLAKE2B 1ac040e66d651da16dd25d92a07b70670ccba55269997afb7789374b64f3cde73d0f5d8230f2048656b4f06e78534f013e608e8d908ad902104a98b72b0304ca SHA512 7d5cd04a6da75e0a5099ee545ef55f795c9493c15dbfecb6b534f8aa9374c972ba3cb60c31299a2132835a235ab7fc017a20c7b386522663238e4c1876865bb2
diff --git a/games-simulation/flightgear/files/0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch b/games-simulation/flightgear/files/0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
new file mode 100644
index 000000000000..1cf5e6b4fa54
--- /dev/null
+++ b/games-simulation/flightgear/files/0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
@@ -0,0 +1,33 @@
+From 609b73ec6941321b157afb236f86c943f959a845 Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice@bellet.info>
+Date: Sun, 22 Sep 2013 12:19:18 +0200
+Subject: [PATCH] check to be sure that %n is not being set as format type
+ (CVE-2012-2090)
+
+---
+ src/Environment/fgclouds.cxx | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/Environment/fgclouds.cxx b/src/Environment/fgclouds.cxx
+index 043cbb007..a57c529d8 100644
+--- a/src/Environment/fgclouds.cxx
++++ b/src/Environment/fgclouds.cxx
+@@ -218,6 +218,15 @@ void FGClouds::buildLayer(int iLayer, const string& name, double coverage) {
+ double count = acloud->getDoubleValue("count", 1.0);
+ tCloudVariety[CloudVarietyCount].count = count;
+ int variety = 0;
++ // It is never safe for cloud_name.c_str to be %n.
++ string unsafe ("%n");
++ size_t found;
++
++ found=cloud_name.find(unsafe);
++ if (found!=string::npos) {
++ SG_LOG(SG_GENERAL, SG_ALERT, "format type contained %n, but this is unsafe , ignore it");
++ continue;
++ }
+ char variety_name[50];
+ do {
+ variety++;
+--
+2.48.1
+
diff --git a/games-simulation/flightgear/files/0003-make-fglauncher-a-static-library.patch b/games-simulation/flightgear/files/0003-make-fglauncher-a-static-library.patch
new file mode 100644
index 000000000000..a205953c8a4e
--- /dev/null
+++ b/games-simulation/flightgear/files/0003-make-fglauncher-a-static-library.patch
@@ -0,0 +1,25 @@
+From 00de7fd687bdc7ab7c679678f3a523d2038b7d8f Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice@bellet.info>
+Date: Tue, 17 Feb 2015 23:00:29 +0100
+Subject: [PATCH] make fglauncher a static library
+
+---
+ src/GUI/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt
+index f4fc01a6e..0a0bd3398 100644
+--- a/src/GUI/CMakeLists.txt
++++ b/src/GUI/CMakeLists.txt
+@@ -104,7 +104,7 @@ if (HAVE_QT)
+
+
+
+- add_library(fglauncher QtLauncher.cxx
++ add_library(fglauncher STATIC QtLauncher.cxx
+ QtLauncher.hxx
+ SettingsWrapper.hxx
+ LauncherMainWindow.hxx
+--
+2.48.1
+
diff --git a/games-simulation/flightgear/files/0005-make-fgqmlui-a-static-library.patch b/games-simulation/flightgear/files/0005-make-fgqmlui-a-static-library.patch
new file mode 100644
index 000000000000..450a701a5a26
--- /dev/null
+++ b/games-simulation/flightgear/files/0005-make-fgqmlui-a-static-library.patch
@@ -0,0 +1,25 @@
+From 5cd88182e3b8f3e011be53a307cbf981dbb97836 Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice@bellet.info>
+Date: Sun, 8 Apr 2018 18:03:30 +0200
+Subject: [PATCH] make fgqmlui a static library
+
+---
+ src/GUI/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt
+index 0a0bd3398..34a1e1f2d 100644
+--- a/src/GUI/CMakeLists.txt
++++ b/src/GUI/CMakeLists.txt
+@@ -185,7 +185,7 @@ if (HAVE_QT)
+ Qt${QT_VERSION_MAJOR}::Svg
+ SimGearCore)
+
+- add_library(fgqmlui
++ add_library(fgqmlui STATIC
+ PropertyItemModel.cxx
+ PropertyItemModel.hxx
+ FGQmlInstance.cxx
+--
+2.48.1
+
diff --git a/games-simulation/flightgear/files/0006-fgviewer-fix-crash-on-exit.patch b/games-simulation/flightgear/files/0006-fgviewer-fix-crash-on-exit.patch
new file mode 100644
index 000000000000..a93c6e009356
--- /dev/null
+++ b/games-simulation/flightgear/files/0006-fgviewer-fix-crash-on-exit.patch
@@ -0,0 +1,29 @@
+From 95101b6fedaa332c70caca15a8fc762355d499b3 Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice@bellet.info>
+Date: Wed, 7 Jun 2017 09:19:06 +0200
+Subject: [PATCH] fgviewer: fix crash on exit
+
+---
+ utils/fgviewer/fgviewer.cxx | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/utils/fgviewer/fgviewer.cxx b/utils/fgviewer/fgviewer.cxx
+index 1af450e96..c5628cef8 100644
+--- a/utils/fgviewer/fgviewer.cxx
++++ b/utils/fgviewer/fgviewer.cxx
+@@ -271,5 +271,11 @@ main(int argc, char** argv)
+ // Note that this does not affect the hla camera manipulator
+ viewer.home();
+
+- return viewer.run();
++ int result = viewer.run();
++
++ // clear cache now, since it contains SimGear objects. Otherwise SG_LOG
++ // calls during shutdown will cause crashes.
++ osgDB::Registry::instance()->clearObjectCache();
++
++ return result;
+ }
+--
+2.48.1
+
diff --git a/games-simulation/flightgear/files/flightgear-2020.3.19-CVE-2025-0781.patch b/games-simulation/flightgear/files/flightgear-2020.3.19-CVE-2025-0781.patch
deleted file mode 100644
index eb8e092c5d7a..000000000000
--- a/games-simulation/flightgear/files/flightgear-2020.3.19-CVE-2025-0781.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From ad37afce28083fad7f79467b3ffdead753584358 Mon Sep 17 00:00:00 2001
-From: Florent Rougon <f.rougon@frougon.net>
-Date: Tue, 21 Jan 2025 00:31:22 +0100
-Subject: [PATCH] NasalSGPath: move checkIORules() to
- SGPath::NasalIORulesChecker()
-
-This allows the from_nasal_helper() in SimGear that constructs SGPath
-instances from Nasal scalars to use SGPath::NasalIORulesChecker() as a
-PermissionChecker.
----
- src/Scripting/NasalSGPath.cxx | 23 ++++-------------------
- 1 file changed, 4 insertions(+), 19 deletions(-)
-
-diff --git a/src/Scripting/NasalSGPath.cxx b/src/Scripting/NasalSGPath.cxx
-index 92abbbe873..d5f49d8922 100644
---- a/src/Scripting/NasalSGPath.cxx
-+++ b/src/Scripting/NasalSGPath.cxx
-@@ -30,28 +30,12 @@
- typedef std::shared_ptr<SGPath> SGPathRef;
- typedef nasal::Ghost<SGPathRef> NasalSGPath;
-
--SGPath::Permissions checkIORules(const SGPath& path)
--{
-- SGPath::Permissions perm;
-- if (!path.isAbsolute()) {
-- // SGPath caches permissions, which breaks for relative paths
-- // if the current directory changes
-- SG_LOG(SG_NASAL, SG_ALERT, "os.path: file operation on '" <<
-- path<< "' access denied (relative paths not accepted; use "
-- "realpath() to make a path absolute)");
-- }
--
-- perm.read = path.isAbsolute() && !SGPath(path).validate(false).isNull();
-- perm.write = path.isAbsolute() && !SGPath(path).validate(true).isNull();
--
-- return perm;
--}
--
- // TODO make exposing such function easier...
- static naRef validatedPathToNasal( const nasal::CallContext& ctx,
- const SGPath& p )
- {
-- return ctx.to_nasal( SGPathRef(new SGPath(p.utf8Str(), &checkIORules)) );
-+ return ctx.to_nasal(SGPathRef(new SGPath(p.utf8Str(),
-+ &SGPath::NasalIORulesChecker)));
- }
-
- /**
-@@ -78,7 +62,8 @@ static void f_path_set(SGPath& p, const nasal::CallContext& ctx)
- */
- static naRef f_desktop(const nasal::CallContext& ctx)
- {
-- return validatedPathToNasal(ctx, SGPath::desktop(SGPath(&checkIORules)));
-+ return validatedPathToNasal(
-+ ctx, SGPath::desktop(SGPath(&SGPath::NasalIORulesChecker)));
- }
-
- /**
---
-GitLab
-
diff --git a/games-simulation/flightgear/files/flightgear-2020.3.8-cmake.patch b/games-simulation/flightgear/files/flightgear-2020.3.8-cmake.patch
deleted file mode 100644
index d89a0df947d8..000000000000
--- a/games-simulation/flightgear/files/flightgear-2020.3.8-cmake.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ruN flightgear-2020.3.8/CMakeLists.txt fgfs-my/CMakeLists.txt
---- flightgear-2020.3.8/CMakeLists.txt 2021-03-24 15:35:40.000000000 +0100
-+++ fgfs-my/CMakeLists.txt 2021-05-15 00:47:36.801503634 +0200
-@@ -373,7 +373,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 Gui Network Qml Quick Svg)
-+ find_package(Qt5 5.4 COMPONENTS Widgets Gui Network Qml Quick)
- if (Qt5Widgets_FOUND AND Qt5Quick_FOUND)
- message(STATUS "Will enable Qt launcher GUI")
- set(HAVE_QT 1)
-diff -ruN flightgear-2020.3.8/CMakeModules/SetupFGFSLibraries.cmake fgfs-my/CMakeModules/SetupFGFSLibraries.cmake
---- flightgear-2020.3.8/CMakeModules/SetupFGFSLibraries.cmake 2021-03-24 15:35:40.000000000 +0100
-+++ fgfs-my/CMakeModules/SetupFGFSLibraries.cmake 2021-05-15 00:47:36.801503634 +0200
-@@ -33,15 +33,8 @@
-
- # PkgConfig::DBUS target
-
-- if(CMAKE_VERSION VERSION_LESS 3.6)
-- if(DBUS_FOUND)
-- target_link_libraries(${target} ${DBUS_LDFLAGS})
-- endif()
-- else()
-- # PkgConfig::DBUS target
-- if(TARGET PkgConfig::DBUS)
-- target_link_libraries(${target} PkgConfig::DBUS)
-- endif()
-+ if(DBUS_FOUND)
-+ target_link_libraries(${target} ${DBUS_LDFLAGS})
- endif()
-
- if(FG_HAVE_GPERFTOOLS)
-diff -ruN flightgear-2020.3.8/src/GUI/CMakeLists.txt fgfs-my/src/GUI/CMakeLists.txt
---- flightgear-2020.3.8/src/GUI/CMakeLists.txt 2021-03-24 15:35:40.000000000 +0100
-+++ fgfs-my/src/GUI/CMakeLists.txt 2021-05-15 00:47:36.801503634 +0200
-@@ -142,7 +142,7 @@
-
- set_property(TARGET fglauncher PROPERTY AUTOMOC ON)
- target_include_directories(fglauncher PRIVATE ${PROJECT_BINARY_DIR}/src/GUI)
-- 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)
-
- if (ENABLE_QQ_UI)
- set(QQUI_SOURCES
diff --git a/games-simulation/flightgear/files/flightgear-2024.1.1-cmake.patch b/games-simulation/flightgear/files/flightgear-2024.1.1-cmake.patch
new file mode 100644
index 000000000000..0aa0f665e1dd
--- /dev/null
+++ b/games-simulation/flightgear/files/flightgear-2024.1.1-cmake.patch
@@ -0,0 +1,43 @@
+diff '--color=auto' -ruN flightgear-2024.1.1/CMakeLists.txt my/CMakeLists.txt
+--- flightgear-2024.1.1/CMakeLists.txt 2025-02-27 15:49:31.000000000 +0100
++++ my/CMakeLists.txt 2025-05-22 04:59:08.937714480 +0200
+@@ -368,7 +368,7 @@
+ set(minQtVersion 5.12.1)
+ endif()
+
+- find_package(Qt${QT_VERSION_MAJOR} ${minQtVersion} REQUIRED COMPONENTS Widgets Gui Network Qml Quick Svg)
++ find_package(Qt${QT_VERSION_MAJOR} ${minQtVersion} REQUIRED COMPONENTS Widgets Gui Network Qml Quick)
+ if (NOT Qt${QT_VERSION_MAJOR}Widgets_FOUND)
+ message(FATAL_ERROR "Qt support enabled, Qt was found but some required packages are missing, stopping.")
+ endif()
+diff '--color=auto' -ruN flightgear-2024.1.1/CMakeModules/Installation.cmake my/CMakeModules/Installation.cmake
+--- flightgear-2024.1.1/CMakeModules/Installation.cmake 2025-02-27 15:49:31.000000000 +0100
++++ my/CMakeModules/Installation.cmake 2025-05-22 05:25:32.200462286 +0200
+@@ -149,7 +149,7 @@
+ ########################################################################################
+ # AppDir creation for Linux AppImage
+
+-if (LINUX)
++if (LINUX AND APPIMAGE)
+
+ install(DIRECTORY ${OSG_PLUGINS_DIR}
+ DESTINATION appdir/usr/lib
+diff '--color=auto' -ruN flightgear-2024.1.1/src/GUI/CMakeLists.txt my/src/GUI/CMakeLists.txt
+--- flightgear-2024.1.1/src/GUI/CMakeLists.txt 2025-02-27 15:49:31.000000000 +0100
++++ my/src/GUI/CMakeLists.txt 2025-05-22 05:52:05.224936638 +0200
+@@ -182,7 +182,6 @@
+ Qt${QT_VERSION_MAJOR}::Network
+ Qt${QT_VERSION_MAJOR}::Qml
+ Qt${QT_VERSION_MAJOR}::Quick
+- Qt${QT_VERSION_MAJOR}::Svg
+ SimGearCore)
+
+ add_library(fgqmlui
+@@ -250,7 +249,6 @@
+ Qt${QT_VERSION_MAJOR}::Network
+ Qt${QT_VERSION_MAJOR}::Qml
+ Qt${QT_VERSION_MAJOR}::Quick
+- Qt${QT_VERSION_MAJOR}::Svg
+ SimGearCore)
+
+ target_include_directories(fgqmlui PRIVATE ${PROJECT_BINARY_DIR}/src/GUI ${OPENSCENEGRAPH_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/games-simulation/flightgear/files/flightgear-2024.1.1-fix-fgpanel.patch b/games-simulation/flightgear/files/flightgear-2024.1.1-fix-fgpanel.patch
new file mode 100644
index 000000000000..ff21afce83ce
--- /dev/null
+++ b/games-simulation/flightgear/files/flightgear-2024.1.1-fix-fgpanel.patch
@@ -0,0 +1,709 @@
+diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/ApplicationProperties.cxx my/utils/fgpanel/ApplicationProperties.cxx
+--- flightgear-2024.1.1/utils/fgpanel/ApplicationProperties.cxx 2025-02-27 15:49:32.000000000 +0100
++++ my/utils/fgpanel/ApplicationProperties.cxx 2025-05-22 06:30:47.453461696 +0200
+@@ -71,5 +71,5 @@
+ return path;
+ }
+
+-string ApplicationProperties::root = ".";
++std::string ApplicationProperties::root = ".";
+ SGPropertyNode_ptr ApplicationProperties::Properties = new SGPropertyNode;
+diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGCroppedTexture.cxx my/utils/fgpanel/FGCroppedTexture.cxx
+--- flightgear-2024.1.1/utils/fgpanel/FGCroppedTexture.cxx 2025-02-27 15:49:32.000000000 +0100
++++ my/utils/fgpanel/FGCroppedTexture.cxx 2025-05-22 06:46:12.372528774 +0200
+@@ -23,11 +23,11 @@
+ #include "FGCroppedTexture.hxx"
+
+ GLuint FGCroppedTexture::s_current_bound_texture = 0;
+-map <string, GLuint> FGCroppedTexture::s_cache;
+-map <string, FGTextureLoaderInterface*> FGCroppedTexture::s_TextureLoader;
++std::map <std::string, GLuint> FGCroppedTexture::s_cache;
++std::map <std::string, FGTextureLoaderInterface*> FGCroppedTexture::s_TextureLoader;
+ FGDummyTextureLoader FGCroppedTexture::s_DummyTextureLoader;
+
+-FGCroppedTexture::FGCroppedTexture (const string &path,
++FGCroppedTexture::FGCroppedTexture (const std::string &path,
+ const float minX, const float minY,
+ const float maxX, const float maxY) :
+ m_path (path),
+@@ -40,11 +40,11 @@
+ }
+
+ void
+-FGCroppedTexture::setPath (const string &path) {
++FGCroppedTexture::setPath (const std::string &path) {
+ m_path = path;
+ }
+
+-const string &
++const std::string &
+ FGCroppedTexture::getPath () const {
+ return m_path;
+ }
+@@ -55,7 +55,7 @@
+ }
+
+ void
+-FGCroppedTexture::registerTextureLoader (const string &extension,
++FGCroppedTexture::registerTextureLoader (const std::string &extension,
+ FGTextureLoaderInterface * const loader) {
+ if (s_TextureLoader.count (extension) == 0) {
+ s_TextureLoader[extension] = loader;
+@@ -100,7 +100,7 @@
+ "Using texture " << m_path << " from cache (#" << m_texture << ")");
+ } else {
+ const SGPath path (ApplicationProperties::GetRootPath (m_path.c_str ()));
+- const string extension (path.extension ());
++ const std::string extension (path.extension ());
+ FGTextureLoaderInterface *loader (&s_DummyTextureLoader);
+ if (s_TextureLoader.count (extension) == 0) {
+ SG_LOG (SG_COCKPIT,
+diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGCroppedTexture.hxx my/utils/fgpanel/FGCroppedTexture.hxx
+--- flightgear-2024.1.1/utils/fgpanel/FGCroppedTexture.hxx 2025-02-27 15:49:32.000000000 +0100
++++ my/utils/fgpanel/FGCroppedTexture.hxx 2025-05-22 06:55:00.337444768 +0200
+@@ -30,19 +30,19 @@
+ */
+ class FGCroppedTexture : public SGReferenced {
+ public:
+- FGCroppedTexture (const string &path,
++ FGCroppedTexture (const std::string &path,
+ const float minX = 0.0, const float minY = 0.0,
+ const float maxX = 1.0, const float maxY = 1.0);
+
+ virtual ~FGCroppedTexture ();
+
+- virtual void setPath (const string &path);
++ virtual void setPath (const std::string &path);
+
+- virtual const string &getPath () const;
++ virtual const std::string &getPath () const;
+
+ virtual void setCrop (const float minX, const float minY, const float maxX, const float maxY);
+
+- static void registerTextureLoader (const string &extension,
++ static void registerTextureLoader (const std::string &extension,
+ FGTextureLoaderInterface * const loader);
+
+ virtual float getMinX () const;
+@@ -54,13 +54,13 @@
+ virtual void bind (const GLint Textured_Layer_Sampler_Loc);
+
+ private:
+- string m_path;
++ std::string m_path;
+ float m_minX, m_minY, m_maxX, m_maxY;
+
+ GLuint m_texture;
+ static GLuint s_current_bound_texture;
+- static map <string, GLuint> s_cache;
+- static map <string, FGTextureLoaderInterface*> s_TextureLoader;
++ static std::map <std::string, GLuint> s_cache;
++ static std::map <std::string, FGTextureLoaderInterface*> s_TextureLoader;
+ static FGDummyTextureLoader s_DummyTextureLoader;
+ };
+
+diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGDummyTextureLoader.cxx my/utils/fgpanel/FGDummyTextureLoader.cxx
+--- flightgear-2024.1.1/utils/fgpanel/FGDummyTextureLoader.cxx 2025-02-27 15:49:32.000000000 +0100
++++ my/utils/fgpanel/FGDummyTextureLoader.cxx 2025-05-22 06:31:21.970651761 +0200
+@@ -19,7 +19,7 @@
+ #include "FGDummyTextureLoader.hxx"
+
+ GLuint
+-FGDummyTextureLoader::loadTexture (const string& filename) {
++FGDummyTextureLoader::loadTexture (const std::string& filename) {
+ GLuint texture;
+ glGenTextures (1, &texture);
+ glBindTexture (GL_TEXTURE_2D, texture);
+diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGDummyTextureLoader.hxx my/utils/fgpanel/FGDummyTextureLoader.hxx
+--- flightgear-2024.1.1/utils/fgpanel/FGDummyTextureLoader.hxx 2025-02-27 15:49:32.000000000 +0100
++++ my/utils/fgpanel/FGDummyTextureLoader.hxx 2025-05-22 06:32:30.237016268 +0200
+@@ -18,8 +18,6 @@
+
+ #pragma once
+
+-#include <string.h>
+-
+ #include "FGTextureLoaderInterface.hxx"
+
+
+diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGFontCache.cxx my/utils/fgpanel/FGFontCache.cxx
+--- flightgear-2024.1.1/utils/fgpanel/FGFontCache.cxx 2025-02-27 15:49:32.000000000 +0100
++++ my/utils/fgpanel/FGFontCache.cxx 2025-05-22 06:59:46.822658662 +0200
+@@ -57,7 +57,7 @@
+ }
+
+ bool
+-FGFontCache::Set_Font (const string& Font_Name,
++FGFontCache::Set_Font (const std::string& Font_Name,
+ const float Size,
+ GLuint &Glyph_Texture) {
+ if (m_Face_Map.find (Font_Name) != m_Face_Map.end ()) {
+@@ -68,7 +68,7 @@
+ SG_LOG (SG_COCKPIT, SG_ALERT, "Could not open font : " + Font_Name);
+ return false;
+ }
+- m_Face_Map.insert (pair <string, FT_Face *> (Font_Name, Face_Ptr));
++ m_Face_Map.insert (std::pair <std::string, FT_Face *> (Font_Name, Face_Ptr));
+ m_Current_Face_Ptr = Face_Ptr;
+ }
+ if (m_Current_Face_Ptr != NULL) {
+@@ -76,7 +76,7 @@
+ } else {
+ return false;
+ }
+- const string Key_Str (Font_Name + "_" + Get_Size (Size));
++ const std::string Key_Str (Font_Name + "_" + Get_Size (Size));
+ if (m_Pos_Map.find (Key_Str) != m_Pos_Map.end ()) {
+ m_Current_Pos = m_Pos_Map[Key_Str];
+ } else {
+@@ -117,7 +117,7 @@
+ GL_ALPHA,
+ GL_UNSIGNED_BYTE,
+ m_Texture);
+- m_Pos_Map.insert (pair <string, unsigned int> (Key_Str, m_Current_Pos));
++ m_Pos_Map.insert (std::pair <std::string, unsigned int> (Key_Str, m_Current_Pos));
+ }
+ Glyph_Texture = m_Glyph_Texture;
+ return true;
+@@ -175,12 +175,12 @@
+ Y = double (Line) / double (Texture_Size);
+ }
+
+-string
++std::string
+ FGFontCache::Get_Size (const float Size) {
+ const int Half_Size (int (round (2.0 * Size)));
+ const int Int_Part (Half_Size / 2);
+ const int Dec_Part ((Half_Size % 2) ? 5 : 0);
+- stringstream Result_SS;
++ std::stringstream Result_SS;
+ Result_SS << Int_Part << "." << Dec_Part;
+ return Result_SS.str ();
+ }
+diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGGroupLayer.hxx my/utils/fgpanel/FGGroupLayer.hxx
+--- flightgear-2024.1.1/utils/fgpanel/FGGroupLayer.hxx 2025-02-27 15:49:32.000000000 +0100
++++ my/utils/fgpanel/FGGroupLayer.hxx 2025-05-22 06:58:50.708076810 +0200
+@@ -37,7 +37,7 @@
+ // transfer pointer ownership
+ virtual void addLayer (FGInstrumentLayer * const layer);
+ protected:
+- vector <FGInstrumentLayer *> m_layers;
++ std::vector <FGInstrumentLayer *> m_layers;
+ };
+
+ #endif
+diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGPanel.cxx my/utils/fgpanel/FGPanel.cxx
+--- flightgear-2024.1.1/utils/fgpanel/FGPanel.cxx 2025-02-27 15:49:32.000000000 +0100
++++ my/utils/fgpanel/FGPanel.cxx 2025-05-22 07:14:43.910871435 +0200
+@@ -127,7 +127,7 @@
+ Textured_Layer_Program_Object = GL_utils::instance ().load_program (V_Textured_Layer_Shader_Str,
+ F_Textured_Layer_Shader_Str);
+ if (Textured_Layer_Program_Object == 0) {
+- terminate ();
++ std::terminate ();
+ }
+
+ // Get the attribute locations
+@@ -148,7 +148,7 @@
+
+ // Text Layer Shaders
+ if (!FGTextLayer::Init ()) {
+- terminate ();
++ std::terminate ();
+ }
+
+ glClearColor (0.0f, 0.0f, 0.0f, 1.0f);
+diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGPanelProtocol.cxx my/utils/fgpanel/FGPanelProtocol.cxx
+--- flightgear-2024.1.1/utils/fgpanel/FGPanelProtocol.cxx 2025-02-27 15:49:32.000000000 +0100
++++ my/utils/fgpanel/FGPanelProtocol.cxx 2025-05-22 07:14:15.894624768 +0200
+@@ -88,8 +88,8 @@
+ io (NULL) {
+ const SGPropertyNode_ptr outputNode (root->getNode ("protocol/generic/output"));
+ if (outputNode) {
+- const vector<SGPropertyNode_ptr> chunks (outputNode->getChildren ("chunk"));
+- for (vector<SGPropertyNode_ptr>::size_type i = 0; i < chunks.size (); i++) {
++ const std::vector<SGPropertyNode_ptr> chunks (outputNode->getChildren ("chunk"));
++ for (size_t i = 0; i < chunks.size (); i++) {
+ const SGPropertyNode_ptr chunk (chunks[i]);
+
+ const SGPropertyNode_ptr nodeNode (chunk->getNode ("node", false));
+@@ -98,7 +98,7 @@
+ }
+ const SGPropertyNode_ptr node (ApplicationProperties::Properties->getNode (nodeNode->getStringValue (), true));
+
+- string type;
++ std::string type;
+ const SGPropertyNode_ptr typeNode (chunk->getNode ("type", false));
+ if (typeNode != NULL) {
+ type = typeNode->getStringValue ();
+@@ -144,8 +144,8 @@
+ // process most recent line of data
+ Page ^= 1;
+ buf[Page][sizeof (buf[Page]) - 1] = 0;
+- const vector<string> tokens (simgear::strutils::split (buf[Page], ","));
+- for (vector<string>::size_type i = 0; i < tokens.size (); i++) {
++ const std::vector<std::string> tokens (simgear::strutils::split (buf[Page], ","));
++ for (size_t i = 0; i < tokens.size (); i++) {
+ if (i < propertySetterVector.size ()) {
+ propertySetterVector[i]->setValue (tokens[i].c_str ());
+ }
+@@ -159,9 +159,9 @@
+ if (listenNode == NULL) {
+ return;
+ }
+- const string hostname (listenNode->getNode ("host", true)->getStringValue ());
+- const string port (listenNode->getNode ("port", true)->getStringValue ());
+- const string style (listenNode->getNode ("style", true)->getStringValue ());
++ const std::string hostname (listenNode->getNode ("host", true)->getStringValue ());
++ const std::string port (listenNode->getNode ("port", true)->getStringValue ());
++ const std::string style (listenNode->getNode ("style", true)->getStringValue ());
+
+ if (io != NULL) {
+ delete io;
+@@ -169,7 +169,7 @@
+ io = new SGSocket (hostname, port, style);
+
+ if (!io->open (SG_IO_IN)) {
+- cerr << "can't open socket " << style << ":" << hostname << ":" << port << endl;
++ std::cerr << "can't open socket " << style << ":" << hostname << ":" << port << std::endl;
+ }
+ }
+
+diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGPNGTextureLoader.cxx my/utils/fgpanel/FGPNGTextureLoader.cxx
+--- flightgear-2024.1.1/utils/fgpanel/FGPNGTextureLoader.cxx 2025-02-27 15:49:32.000000000 +0100
++++ my/utils/fgpanel/FGPNGTextureLoader.cxx 2025-05-22 07:10:38.485216103 +0200
+@@ -42,7 +42,7 @@
+ using namespace std;
+
+ GLuint
+-FGPNGTextureLoader::loadTexture (const string &filename) {
++FGPNGTextureLoader::loadTexture (const std::string &filename) {
+ //header for testing if it is a png
+ png_byte header[8];
+
+diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGPNGTextureLoader.hxx my/utils/fgpanel/FGPNGTextureLoader.hxx
+--- flightgear-2024.1.1/utils/fgpanel/FGPNGTextureLoader.hxx 2025-02-27 15:49:32.000000000 +0100
++++ my/utils/fgpanel/FGPNGTextureLoader.hxx 2025-05-22 07:10:11.651891427 +0200
+@@ -20,7 +20,7 @@
+
+ class FGPNGTextureLoader : public FGTextureLoaderInterface {
+ public:
+- virtual GLuint loadTexture (const string &filename);
++ virtual GLuint loadTexture (const std::string &filename);
+
+ const static GLuint NOTEXTURE = 0;
+ };
+diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGRGBTextureLoader.cxx my/utils/fgpanel/FGRGBTextureLoader.cxx
+--- flightgear-2024.1.1/utils/fgpanel/FGRGBTextureLoader.cxx 2025-02-27 15:49:32.000000000 +0100
++++ my/utils/fgpanel/FGRGBTextureLoader.cxx 2025-05-22 07:13:33.966248033 +0200
+@@ -52,7 +52,7 @@
+ unsigned long wasteBytes;
+ char name[80];
+ unsigned long colorMap;
+- istream *file;
++ std::istream *file;
+ unsigned char *tmp, *tmpR, *tmpG, *tmpB, *tmpA;
+ unsigned long rleEnd;
+ GLuint *rowStart;
+@@ -156,7 +156,7 @@
+ }
+
+ static rawImageRec *
+-RawImageOpen (istream& fin) {
++RawImageOpen (std::istream& fin) {
+ union {
+ int testWord;
+ char testByte[4];
+@@ -242,7 +242,7 @@
+ }
+ int x (ybyz * sizeof (GLuint));
+ raw->rleEnd = 512 + (2 * x);
+- fin.seekg (512, ios::beg);
++ fin.seekg (512, std::ios::beg);
+ fin.read ((char*) raw->rowStart, x);
+ fin.read ((char*) raw->rowSize, x);
+ if (raw->swapFlag) {
+@@ -260,7 +260,7 @@
+ unsigned short *tempShort;
+
+ if ((raw->type & 0xFF00) == 0x0100) {
+- raw->file->seekg (long (raw->rowStart[y + z * raw->sizeY]), ios::beg);
++ raw->file->seekg (long (raw->rowStart[y + z * raw->sizeY]), std::ios::beg);
+ raw->file->read ((char*) raw->tmp, (unsigned int) (raw->rowSize[y + z * raw->sizeY]));
+
+ unsigned char *iPtr = raw->tmp;
+@@ -333,7 +333,7 @@
+ }
+ }
+ } else {
+- raw->file->seekg (512 + (y * raw->sizeX * raw->bpc) + (z * raw->sizeX * raw->sizeY * raw->bpc), ios::beg);
++ raw->file->seekg (512 + (y * raw->sizeX * raw->bpc) + (z * raw->sizeX * raw->sizeY * raw->bpc), std::ios::beg);
+ raw->file->read ((char*) buf, raw->sizeX * raw->bpc);
+ if (raw->swapFlag && raw->bpc != 1) {
+ ConvertShort (reinterpret_cast<unsigned short*> (buf), raw->sizeX);
+@@ -427,7 +427,7 @@
+ // supportsExtension("bw","bw image format");
+
+ GLuint
+-readRGBStream (istream &fin) {
++readRGBStream (std::istream &fin) {
+ rawImageRec * const raw (RawImageOpen (fin));
+
+ if (raw == NULL) {
+@@ -468,9 +468,9 @@
+ }
+
+ GLuint
+-FGRGBTextureLoader::loadTexture (const string &filename) {
++FGRGBTextureLoader::loadTexture (const std::string &filename) {
+ GLuint texture = NOTEXTURE;
+- ifstream istream (filename.c_str (), ios::in | ios::binary);
++ std::ifstream istream (filename.c_str (), std::ios::in | std::ios::binary);
+ texture = readRGBStream (istream);
+ istream.close ();
+ return texture;
+diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGRGBTextureLoader.hxx my/utils/fgpanel/FGRGBTextureLoader.hxx
+--- flightgear-2024.1.1/utils/fgpanel/FGRGBTextureLoader.hxx 2025-02-27 15:49:32.000000000 +0100
++++ my/utils/fgpanel/FGRGBTextureLoader.hxx 2025-05-22 07:05:22.209920047 +0200
+@@ -20,7 +20,7 @@
+
+ class FGRGBTextureLoader : public FGTextureLoaderInterface {
+ public:
+- virtual GLuint loadTexture (const string &filename);
++ virtual GLuint loadTexture (const std::string &filename);
+
+ const static GLuint NOTEXTURE = 0;
+ };
+diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGTextLayer.cxx my/utils/fgpanel/FGTextLayer.cxx
+--- flightgear-2024.1.1/utils/fgpanel/FGTextLayer.cxx 2025-02-27 15:49:32.000000000 +0100
++++ my/utils/fgpanel/FGTextLayer.cxx 2025-05-22 07:19:55.218845401 +0200
+@@ -156,7 +156,7 @@
+ int Left, Bottom, W, H;
+ double X1, Y1, X2, Y2;
+
+- for (string::iterator It = m_value.begin (); It != m_value.end (); ++It) {
++ for (std::string::iterator It = m_value.begin (); It != m_value.end (); ++It) {
+ if (The_Font_Cache.Get_Char (*It,
+ X, Y,
+ Left, Bottom,
+@@ -221,7 +221,7 @@
+ }
+
+ void
+-FGTextLayer::setFontName (const string &name) {
++FGTextLayer::setFontName (const std::string &name) {
+ if (The_Font_Path.isNull ()) {
+ char *Env_Path = ::getenv ("FG_FONTS");
+ if (Env_Path != NULL) {
+@@ -247,8 +247,8 @@
+ // Implementation of FGTextLayer::Chunk.
+ ////////////////////////////////////////////////////////////////////////
+
+-FGTextLayer::Chunk::Chunk (const string &text,
+- const string &fmt) :
++FGTextLayer::Chunk::Chunk (const std::string &text,
++ const std::string &fmt) :
+ m_type (FGTextLayer::TEXT),
+ m_text (text),
+ m_fmt (fmt),
+@@ -262,7 +262,7 @@
+
+ FGTextLayer::Chunk::Chunk (const ChunkType type,
+ const SGPropertyNode *node,
+- const string &fmt,
++ const std::string &fmt,
+ const float mult,
+ const float offs,
+ const bool truncation) :
+diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/GL_utils.cxx my/utils/fgpanel/GL_utils.cxx
+--- flightgear-2024.1.1/utils/fgpanel/GL_utils.cxx 2025-02-27 15:49:32.000000000 +0100
++++ my/utils/fgpanel/GL_utils.cxx 2025-05-22 07:18:54.467677071 +0200
+@@ -57,7 +57,7 @@
+ GLuint shader (glCreateShader (type));
+
+ if (shader == 0) {
+- cerr << "Error creating shader" << endl;
++ std::cerr << "Error creating shader" << std::endl;
+ return 0;
+ }
+
+@@ -79,7 +79,7 @@
+ char* info_log ((char *) malloc (sizeof (char) * info_len));
+
+ glGetShaderInfoLog (shader, info_len, NULL, info_log);
+- cerr << "Error compiling shader:" << endl << info_log << endl;
++ std::cerr << "Error compiling shader:" << std::endl << info_log << std::endl;
+
+ free (info_log);
+ }
+@@ -106,13 +106,13 @@
+ // Load the vertex/fragment shaders
+ GLuint vertex_shader (load_shader (GL_VERTEX_SHADER, vert_shader_src));
+ if (vertex_shader == 0) {
+- cerr << "Error loading vertex shader" << endl;
++ std::cerr << "Error loading vertex shader" << std::endl;
+ return 0;
+ }
+
+ GLuint fragment_shader (load_shader (GL_FRAGMENT_SHADER, frag_shader_src));
+ if (fragment_shader == 0) {
+- cerr << "Error loading fragment shader" << endl;
++ std::cerr << "Error loading fragment shader" << std::endl;
+ glDeleteShader (vertex_shader);
+ return 0;
+ }
+@@ -121,7 +121,7 @@
+ GLuint program_object (glCreateProgram ());
+
+ if (program_object == 0) {
+- cerr << "Error creating program" << endl;
++ std::cerr << "Error creating program" << std::endl;
+ return 0;
+ }
+
+@@ -143,7 +143,7 @@
+ char* info_log ((char *) malloc (sizeof (char) * info_len));
+
+ glGetProgramInfoLog (program_object, info_len, NULL, info_log);
+- cerr << "Error linking program:" << endl << info_log << endl;
++ std::cerr << "Error linking program:" << std::endl << info_log << std::endl;
+
+ free (info_log);
+ }
+@@ -364,11 +364,11 @@
+ GL_utils::Debug (const GL_utils::GLenum_Mode mode) const {
+ if (mode < GL_UTILS_LAST) {
+ for (int l = 0; l < 4; ++l) {
+- cout << " ";
++ std::cout << " ";
+ for (int c = 0; c < 4; ++c) {
+- cout << m_Matrix[mode].top ().m[c][l] << " ";
++ std::cout << m_Matrix[mode].top ().m[c][l] << " ";
+ }
+- cout << endl;
++ std::cout << std::endl;
+ }
+ }
+ }
+diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/main.cxx my/utils/fgpanel/main.cxx
+--- flightgear-2024.1.1/utils/fgpanel/main.cxx 2025-02-27 15:49:32.000000000 +0100
++++ my/utils/fgpanel/main.cxx 2025-05-22 06:55:23.033614787 +0200
+@@ -25,6 +25,6 @@
+ return 0;
+ }
+ catch (...) {
+- cerr << "Sorry, your program terminated." << endl;
++ std::cerr << "Sorry, your program terminated." << std::endl;
+ }
+ }
+diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/panel_io.cxx my/utils/fgpanel/panel_io.cxx
+--- flightgear-2024.1.1/utils/fgpanel/panel_io.cxx 2025-02-27 15:49:32.000000000 +0100
++++ my/utils/fgpanel/panel_io.cxx 2025-05-22 07:43:05.623983755 +0200
+@@ -26,8 +26,6 @@
+ #include <windows.h>
+ #endif
+
+-#include <string.h> // for strcmp()
+-
+ #include <simgear/compiler.h>
+ #include <simgear/structure/exception.hxx>
+ #include <simgear/debug/logstream.hxx>
+@@ -101,7 +99,7 @@
+ */
+ static FGCroppedTexture_ptr
+ readTexture (const SGPropertyNode *node) {
+- SG_LOG(SG_COCKPIT, SG_DEBUG, "Read texture " << node->getName ());
++ SG_LOG(SG_COCKPIT, SG_DEBUG, "Read texture " << node->getNameString ());
+
+ return new FGCroppedTexture (node->getStringValue ("path"),
+ node->getFloatValue ("x1"),
+@@ -158,9 +156,9 @@
+ readTransformation (const SGPropertyNode *node, const float w_scale, const float h_scale) {
+ FGPanelTransformation *t (new FGPanelTransformation);
+
+- const string name (node->getName ());
+- string type (node->getStringValue ("type"));
+- const string propName (node->getStringValue ("property", ""));
++ const std::string name (node->getNameString ());
++ std::string type (node->getStringValue ("type"));
++ const std::string propName (node->getStringValue ("property", ""));
+ const SGPropertyNode *target (0);
+
+ if (type.empty ()) {
+@@ -191,14 +189,14 @@
+ t->table = new SGInterpTable();
+ for (int i = 0; i < trans_table->nChildren(); i++) {
+ const SGPropertyNode * node = trans_table->getChild(i);
+- if (!strcmp(node->getName(), "entry")) {
++ if (node->getNameString () == "entry") {
+ double ind = node->getDoubleValue("ind", 0.0);
+ double dep = node->getDoubleValue("dep", 0.0);
+ SG_LOG(SG_COCKPIT, SG_INFO, "Adding interpolation entry "
+ << ind << "==>" << dep);
+ t->table->addEntry(ind, dep);
+ } else {
+- SG_LOG(SG_COCKPIT, SG_INFO, "Skipping " << node->getName()
++ SG_LOG(SG_COCKPIT, SG_INFO, "Skipping " << node->getNameString ()
+ << " in interpolation");
+ }
+ }
+@@ -262,9 +260,9 @@
+ FGTextLayer::Chunk *
+ readTextChunk (const SGPropertyNode *node) {
+ FGTextLayer::Chunk *chunk;
+- const string name (node->getStringValue ("name"));
+- string type (node->getStringValue ("type"));
+- const string format (node->getStringValue ("format"));
++ const std::string name (node->getStringValue ("name"));
++ std::string type (node->getStringValue ("type"));
++ const std::string format (node->getStringValue ("format"));
+
+ // Default to literal text.
+ if (type.empty ()) {
+@@ -275,7 +273,7 @@
+
+ // A literal text string.
+ if (type == "literal") {
+- const string text (node->getStringValue ("text"));
++ const std::string text (node->getStringValue ("text"));
+ chunk = new FGTextLayer::Chunk (text, format);
+ } else if (type == "text-value") {
+ // The value of a string property.
+@@ -284,7 +282,7 @@
+ chunk = new FGTextLayer::Chunk (FGTextLayer::TEXT_VALUE, target, format);
+ } else if (type == "number-value") {
+ // The value of a float property.
+- const string propName (node->getStringValue ("property"));
++ const std::string propName (node->getStringValue ("property"));
+ const float scale (node->getFloatValue ("scale", 1.0));
+ const float offset (node->getFloatValue ("offset", 0.0));
+ const bool truncation (node->getBoolValue ("truncate", false));
+@@ -326,8 +324,8 @@
+ static FGInstrumentLayer *
+ readLayer (const SGPropertyNode *node, const float w_scale, const float h_scale) {
+ FGInstrumentLayer *layer (NULL);
+- const string name (node->getStringValue ("name"));
+- string type (node->getStringValue ("type"));
++ const std::string name (node->getStringValue ("name"));
++ std::string type (node->getStringValue ("type"));
+ int w (node->getIntValue ("w", -1));
+ int h (node->getIntValue ("h", -1));
+ const bool emissive (node->getBoolValue ("emissive", false));
+@@ -357,7 +355,7 @@
+ layer = new FGGroupLayer ();
+ for (int i = 0; i < node->nChildren(); i++) {
+ const SGPropertyNode *child = node->getChild (i);
+- if (!strcmp (child->getName (), "layer")) {
++ if (child->getNameString () == "layer") {
+ ((FGGroupLayer *) layer)->addLayer (readLayer (child, w_scale, h_scale));
+ }
+ }
+@@ -376,7 +374,7 @@
+ tlayer->setPointSize (pointSize);
+
+ // Set the font.
+- const string fontName (node->getStringValue ("font", "7-Segment"));
++ const std::string fontName (node->getStringValue ("font", "7-Segment"));
+ tlayer->setFontName (fontName);
+
+ const SGPropertyNode *chunk_group (node->getNode ("chunks"));
+@@ -384,13 +382,13 @@
+ const int nChunks (chunk_group->nChildren ());
+ for (int i = 0; i < nChunks; i++) {
+ const SGPropertyNode *node (chunk_group->getChild (i));
+- if (!strcmp(node->getName (), "chunk")) {
++ if (node->getNameString () == "chunk") {
+ FGTextLayer::Chunk * const chunk (readTextChunk (node));
+ if (chunk != 0) {
+ tlayer->addChunk (chunk);
+ }
+ } else {
+- SG_LOG(SG_COCKPIT, SG_INFO, "Skipping " << node->getName()
++ SG_LOG(SG_COCKPIT, SG_INFO, "Skipping " << node->getNameString ()
+ << " in chunks");
+ }
+ }
+@@ -401,7 +399,7 @@
+ layer = new FGSwitchLayer ();
+ for (int i = 0; i < node->nChildren (); i++) {
+ const SGPropertyNode *child (node->getChild (i));
+- if (!strcmp (child->getName (), "layer")) {
++ if (child->getNameString () == "layer") {
+ ((FGGroupLayer *) layer)->addLayer (readLayer (child, w_scale, h_scale));
+ }
+ }
+@@ -420,13 +418,13 @@
+ const int nTransformations (trans_group->nChildren ());
+ for (int i = 0; i < nTransformations; i++) {
+ const SGPropertyNode *node (trans_group->getChild (i));
+- if (!strcmp(node->getName (), "transformation")) {
++ if (node->getNameString () == "transformation") {
+ FGPanelTransformation * const t (readTransformation (node, w_scale, h_scale));
+ if (t != 0) {
+ layer->addTransformation (t);
+ }
+ } else {
+- SG_LOG(SG_COCKPIT, SG_INFO, "Skipping " << node->getName()
++ SG_LOG(SG_COCKPIT, SG_INFO, "Skipping " << node->getNameString ()
+ << " in transformations");
+ }
+ }
+@@ -450,7 +448,7 @@
+ */
+ static FGPanelInstrument *
+ readInstrument (const SGPropertyNode *node) {
+- const string name (node->getStringValue ("name"));
++ const std::string name (node->getStringValue ("name"));
+ const int x (node->getIntValue ("x", -1));
+ const int y (node->getIntValue ("y", -1));
+ const int real_w (node->getIntValue ("w", -1));
+@@ -488,13 +486,13 @@
+ const int nLayers (layer_group->nChildren ());
+ for (int i = 0; i < nLayers; i++) {
+ const SGPropertyNode *node (layer_group->getChild (i));
+- if (!strcmp (node->getName (), "layer")) {
++ if (node->getNameString () == "layer") {
+ FGInstrumentLayer * const layer (readLayer (node, w_scale, h_scale));
+ if (layer != 0) {
+ instrument->addLayer (layer);
+ }
+ } else {
+- SG_LOG(SG_COCKPIT, SG_INFO, "Skipping " << node->getName ()
++ SG_LOG(SG_COCKPIT, SG_INFO, "Skipping " << node->getNameString ()
+ << " in layers");
+ }
+ }
+@@ -521,7 +519,7 @@
+
+ // Assign the background texture, if any, or a bogus chequerboard.
+ //
+- const string bgTexture (root->getStringValue ("background"));
++ const std::string bgTexture (root->getStringValue ("background"));
+ if (!bgTexture.empty ()) {
+ panel->setBackground (new FGCroppedTexture (bgTexture));
+ }
+@@ -534,7 +532,7 @@
+ //
+ for (int i = 0; i < 8; i++) {
+ SGPropertyNode * const mbgNode (root->getChild ("multibackground", i));
+- string mbgTexture;
++ std::string mbgTexture;
+ if (mbgNode != NULL) {
+ mbgTexture = mbgNode->getStringValue ();
+ }
+@@ -557,13 +555,13 @@
+ const int nInstruments (instrument_group->nChildren ());
+ for (int i = 0; i < nInstruments; i++) {
+ const SGPropertyNode *node = instrument_group->getChild (i);
+- if (!strcmp (node->getName (), "instrument")) {
++ if (node->getNameString () == "instrument") {
+ FGPanelInstrument * const instrument (readInstrument (node));
+ if (instrument != 0) {
+ panel->addInstrument (instrument);
+ }
+ } else {
+- SG_LOG(SG_COCKPIT, SG_INFO, "Skipping " << node->getName()
++ SG_LOG(SG_COCKPIT, SG_INFO, "Skipping " << node->getNameString ()
+ << " in instruments section");
+ }
+ }
diff --git a/games-simulation/flightgear/flightgear-2020.3.19-r1.ebuild b/games-simulation/flightgear/flightgear-2024.1.1.ebuild
similarity index 78%
rename from games-simulation/flightgear/flightgear-2020.3.19-r1.ebuild
rename to games-simulation/flightgear/flightgear-2024.1.1.ebuild
index a9721bf5e6c4..c6b686ffb695 100644
--- a/games-simulation/flightgear/flightgear-2020.3.19-r1.ebuild
+++ b/games-simulation/flightgear/flightgear-2024.1.1.ebuild
@@ -1,27 +1,28 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit cmake flag-o-matic toolchain-funcs
+inherit cmake flag-o-matic
DESCRIPTION="Open Source Flight Simulator"
HOMEPAGE="https://www.flightgear.org/"
-SRC_URI="https://downloads.sourceforge.net/flightgear/${P}.tar.bz2"
+SRC_URI="https://gitlab.com/flightgear/fgmeta/-/jobs/9264813015/artifacts/raw/fgbuild/${P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
SLOT="0"
-IUSE="cpu_flags_x86_sse2 dbus debug examples gdal openmp qt5 +udev +utils"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_sse2 dbus debug examples gdal qt6 +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
+# TODO add osgXR
COMMON_DEPEND="
dev-db/sqlite:3
- dev-games/openscenegraph[jpeg,png]
+ >=dev-games/openscenegraph-3.6.0[jpeg,png]
~dev-games/simgear-${PV}[gdal=]
media-libs/openal
>=media-libs/plib-1.8.5
@@ -33,12 +34,9 @@ COMMON_DEPEND="
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
+ qt6? (
+ dev-qt/qtbase:6[gui,network,widgets]
+ dev-qt/qtdeclarative:6
)
udev? ( virtual/udev )
utils? (
@@ -47,7 +45,7 @@ COMMON_DEPEND="
media-libs/glew:0
media-libs/libpng:0
virtual/opengl
- qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 )
+ qt6? ( dev-qt/qtwebsockets:6 )
)
"
# libXi and libXmu are build-only-deps according to FindGLUT.cmake
@@ -62,23 +60,19 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
~games-simulation/${PN}-data-${PV}
"
-BDEPEND="qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )"
+BDEPEND="qt6? ( dev-qt/qttools:6 )"
PATCHES=(
- "${FILESDIR}/${PN}-2020.3.8-cmake.patch"
- "${FILESDIR}/${PN}-2020.3.19-CVE-2025-0781.patch"
+ "${FILESDIR}/${PN}-2024.1.1-cmake.patch"
+ "${FILESDIR}/${PN}-2024.1.1-fix-fgpanel.patch"
+ "${FILESDIR}/0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch"
+ "${FILESDIR}/0003-make-fglauncher-a-static-library.patch"
+ "${FILESDIR}/0005-make-fgqmlui-a-static-library.patch"
+ "${FILESDIR}/0006-fgviewer-fix-crash-on-exit.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() {
# -Werror=lto-type-mismatch, -Werror=odr
# https://bugs.gentoo.org/859217
@@ -87,8 +81,9 @@ src_configure() {
local mycmakeargs=(
-DBUILD_SHARED_LIBS=OFF
+ -DCHECK_FOR_QT5=OFF
+ -DCHECK_FOR_QT6=ON
-DENABLE_AUTOTESTING=OFF
- -DENABLE_COMPOSITOR=OFF
-DENABLE_FGCOM=$(usex utils)
-DENABLE_FGELEV=$(usex utils)
-DENABLE_FGJS=$(usex utils)
@@ -101,17 +96,18 @@ src_configure() {
-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_QT=$(usex qt6)
-DENABLE_RTI=OFF
+ -DENABLE_SENTRY=OFF # sentry-native masked
+ -DENABLE_HUD=ON
+ -DENABLE_PUI=ON
-DENABLE_SIMD=$(usex cpu_flags_x86_sse2)
-DENABLE_STGMERGE=ON
-DENABLE_SWIFT=OFF # swift pilot client not packaged yet
- -DENABLE_TERRASYNC=$(usex utils)
-DENABLE_TRAFFIC=$(usex utils)
-DENABLE_UIUC_MODEL=ON
+ -DENABLE_VR=OFF
-DENABLE_YASIM=ON
-DEVENT_INPUT=$(usex udev)
-DFG_BUILD_TYPE=Release
@@ -125,6 +121,7 @@ src_configure() {
-DSYSTEM_SPEEX=ON
-DSYSTEM_GSM=ON
-DSYSTEM_SQLITE=ON
+ -DSYSTEM_OSGXR=ON
-DUSE_AEONWAVE=OFF
-DUSE_DBUS=$(usex dbus)
-DWITH_FGPANEL=$(usex utils)
@@ -134,7 +131,7 @@ src_configure() {
else
mycmakeargs+=(-DENABLE_DEMCONVERT=OFF)
fi
- if use qt5 && use utils; then
+ if use qt6 && use utils; then
mycmakeargs+=(-DENABLE_FGQCANVAS=ON)
else
mycmakeargs+=(-DENABLE_FGQCANVAS=OFF)
@@ -171,7 +168,7 @@ src_install() {
}
pkg_postinst() {
- if use qt5; then
+ if use qt6; then
einfo "To use launcher, run fgfs with '--launcher' parameter"
fi
}
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index 720c1042bbd6..784fced7bb9f 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -1,28 +1,29 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit cmake flag-o-matic toolchain-funcs git-r3
+inherit cmake flag-o-matic git-r3
DESCRIPTION="Open Source Flight Simulator"
HOMEPAGE="https://www.flightgear.org/"
-EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/${PN}"
+EGIT_REPO_URI="https://gitlab.com/flightgear/${PN}.git"
EGIT_BRANCH="next"
LICENSE="GPL-2"
-KEYWORDS=""
SLOT="0"
-IUSE="cpu_flags_x86_sse2 dbus debug examples gdal openmp qt5 +udev +utils"
+KEYWORDS=""
+IUSE="cpu_flags_x86_sse2 dbus debug examples gdal qt6 +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
+# TODO add osgXR
COMMON_DEPEND="
dev-db/sqlite:3
- dev-games/openscenegraph[jpeg,png]
+ >=dev-games/openscenegraph-3.6.0[jpeg,png]
~dev-games/simgear-${PV}[gdal=]
media-libs/openal
>=media-libs/plib-1.8.5
@@ -34,12 +35,9 @@ COMMON_DEPEND="
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
+ qt6? (
+ dev-qt/qtbase:6[gui,network,widgets]
+ dev-qt/qtdeclarative:6
)
udev? ( virtual/udev )
utils? (
@@ -48,7 +46,7 @@ COMMON_DEPEND="
media-libs/glew:0
media-libs/libpng:0
virtual/opengl
- qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 )
+ qt6? ( dev-qt/qtwebsockets:6 )
)
"
# libXi and libXmu are build-only-deps according to FindGLUT.cmake
@@ -63,22 +61,15 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
~games-simulation/${PN}-data-${PV}
"
-BDEPEND="qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )"
+BDEPEND="qt6? ( dev-qt/qttools:6 )"
PATCHES=(
- "${FILESDIR}/${PN}-2020.3.5-cmake.patch"
+ "${FILESDIR}/${PN}-2024.1.1-cmake.patch"
+ "${FILESDIR}/${PN}-2024.1.1-fix-fgpanel.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() {
# -Werror=lto-type-mismatch, -Werror=odr
# https://bugs.gentoo.org/859217
@@ -87,8 +78,9 @@ src_configure() {
local mycmakeargs=(
-DBUILD_SHARED_LIBS=OFF
+ -DCHECK_FOR_QT5=OFF
+ -DCHECK_FOR_QT6=ON
-DENABLE_AUTOTESTING=OFF
- -DENABLE_COMPOSITOR=OFF
-DENABLE_FGCOM=$(usex utils)
-DENABLE_FGELEV=$(usex utils)
-DENABLE_FGJS=$(usex utils)
@@ -101,17 +93,18 @@ src_configure() {
-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_QT=$(usex qt6)
-DENABLE_RTI=OFF
+ -DENABLE_SENTRY=OFF # sentry-native masked
+ -DENABLE_HUD=ON
+ -DENABLE_PUI=ON
-DENABLE_SIMD=$(usex cpu_flags_x86_sse2)
-DENABLE_STGMERGE=ON
-DENABLE_SWIFT=OFF # swift pilot client not packaged yet
- -DENABLE_TERRASYNC=$(usex utils)
-DENABLE_TRAFFIC=$(usex utils)
-DENABLE_UIUC_MODEL=ON
+ -DENABLE_VR=OFF
-DENABLE_YASIM=ON
-DEVENT_INPUT=$(usex udev)
-DFG_BUILD_TYPE=Nightly
@@ -125,6 +118,7 @@ src_configure() {
-DSYSTEM_SPEEX=ON
-DSYSTEM_GSM=ON
-DSYSTEM_SQLITE=ON
+ -DSYSTEM_OSGXR=ON
-DUSE_AEONWAVE=OFF
-DUSE_DBUS=$(usex dbus)
-DWITH_FGPANEL=$(usex utils)
@@ -134,7 +128,7 @@ src_configure() {
else
mycmakeargs+=(-DENABLE_DEMCONVERT=OFF)
fi
- if use qt5 && use utils; then
+ if use qt6 && use utils; then
mycmakeargs+=(-DENABLE_FGQCANVAS=ON)
else
mycmakeargs+=(-DENABLE_FGQCANVAS=OFF)
@@ -171,8 +165,7 @@ src_install() {
}
pkg_postinst() {
- einfo "Please note that data files location changed to /usr/share/flightgear"
- if use qt5; then
+ if use qt6; then
einfo "To use launcher, run fgfs with '--launcher' parameter"
fi
}
diff --git a/games-simulation/flightgear/metadata.xml b/games-simulation/flightgear/metadata.xml
index 7990d6211708..6cf62990e859 100644
--- a/games-simulation/flightgear/metadata.xml
+++ b/games-simulation/flightgear/metadata.xml
@@ -12,11 +12,11 @@
<use>
<flag name="dbus">Enable screensaver DBus interaction</flag>
<flag name="gdal">Enable alternative terrain engine based on pagedLOD using <pkg>sci-libs/gdal</pkg></flag>
- <flag name="qt5">Build Qt5 launcher application</flag>
+ <flag name="qt6">Build Qt6 launcher application</flag>
<flag name="udev">Enable event-based Input devices through <pkg>virtual/udev</pkg></flag>
<flag name="utils">Build various utilities (fgpanel, fgviewer among others)</flag>
</use>
<upstream>
- <remote-id type="sourceforge">flightgear</remote-id>
+ <remote-id type="gitlab">flightgear/flightgear</remote-id>
</upstream>
</pkgmetadata>
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index c01151866046..12a79b604723 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -321,10 +321,6 @@ net-fs/autofs libtirpc
net-misc/netkit-bootparamd libtirpc
sys-cluster/glusterfs libtirpc
-# Maciej Mrozowski <reavertm@gentoo.org> (2016-09-01)
-# Workaround until resolved upstream (bug #586840)
->=dev-games/simgear-2016.2.1 dns
-
# Justin Lecher <jlec@gentoo.org> (2014-08-10)
# Doesn't work without acl support
# No patch yet, #516626
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 0ace8980d552..a354d961dbd9 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,11 @@
# New entries go on top.
+# Maciej Mrozowski <reavertm@gentoo.org> (2025-05-22)
+# Does not compile as of 2024.1.1, requires buildsystem fixes.
+dev-games/simgear gdal
+games-simulation/flightgear gdal
+
# Andreas Sturmlechner <asturm@gentoo.org> (2025-05-14)
# dev-qt/qtwebchannel:5 is masked, last revdep was dev-python/pyqtwebengine
dev-python/pyqt5 webchannel
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-05-22 6:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-22 6:56 [gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/, games-simulation/flightgear-data/, Maciej Mrozowski
-- strict thread matches above, loose matches on Subject: below --
2023-12-09 0:53 Maciej Mrozowski
2017-10-19 22:46 Maciej Mrozowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox