Date: Thu, 26 Aug 2021 10:09:34 GMT From: Ganael LAPLANCHE <martymac@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 680b7489432d - main - games/flightgear: Update to 2020.3.11 Message-ID: <202108261009.17QA9YWA019481@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=680b7489432deea2c70648e4a75e39dad34e0bb3 commit 680b7489432deea2c70648e4a75e39dad34e0bb3 Author: Ganael LAPLANCHE <martymac@FreeBSD.org> AuthorDate: 2021-08-26 10:07:26 +0000 Commit: Ganael LAPLANCHE <martymac@FreeBSD.org> CommitDate: 2021-08-26 10:08:39 +0000 games/flightgear: Update to 2020.3.11 games/flightgear-data: switch from deprecated @exec to @preexec --- devel/simgear/Makefile | 3 +-- devel/simgear/distinfo | 6 +++--- devel/simgear/pkg-plist | 1 + games/flightgear-data/Makefile | 4 ++-- games/flightgear-data/distinfo | 6 +++--- games/flightgear/Makefile | 3 +-- games/flightgear/distinfo | 6 +++--- .../flightgear/files/patch-src-Navaids-PositionedOctree.cxx | 13 +++++++++++++ 8 files changed, 27 insertions(+), 15 deletions(-) diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile index f875f60c038e..4ce6b2bad4c2 100644 --- a/devel/simgear/Makefile +++ b/devel/simgear/Makefile @@ -1,6 +1,5 @@ PORTNAME= simgear -PORTVERSION= 2020.3.9 -PORTREVISION= 1 +PORTVERSION= 2020.3.11 CATEGORIES= devel games MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} diff --git a/devel/simgear/distinfo b/devel/simgear/distinfo index 3ed1472d9c9e..2bf8fdeaae2e 100644 --- a/devel/simgear/distinfo +++ b/devel/simgear/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1623703945 -SHA256 (simgear-2020.3.9.tar.bz2) = 5da4688e049389793bed7b2655399f1bc0109c7bb06389de6684719639424e6c -SIZE (simgear-2020.3.9.tar.bz2) = 1409436 +TIMESTAMP = 1629663788 +SHA256 (simgear-2020.3.11.tar.bz2) = bb8dfcbc2a3b0143d1ffcf01d1a961e566ef21dd33d9cc768d6d9aa5871d4f3c +SIZE (simgear-2020.3.11.tar.bz2) = 1415047 diff --git a/devel/simgear/pkg-plist b/devel/simgear/pkg-plist index 495593b7a3f8..3d4aebdaf627 100644 --- a/devel/simgear/pkg-plist +++ b/devel/simgear/pkg-plist @@ -286,6 +286,7 @@ include/simgear/scene/util/SGEnlargeBoundingBox.hxx include/simgear/scene/util/SGImageUtils.hxx include/simgear/scene/util/SGNodeMasks.hxx include/simgear/scene/util/SGPickCallback.hxx +include/simgear/scene/util/SGProgram.hxx include/simgear/scene/util/SGReaderWriterOptions.hxx include/simgear/scene/util/SGSceneFeatures.hxx include/simgear/scene/util/SGSceneUserData.hxx diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile index 2d06f723fce1..7513482954a7 100644 --- a/games/flightgear-data/Makefile +++ b/games/flightgear-data/Makefile @@ -1,7 +1,7 @@ # Created by: Brian Buchanan <brian@CSUA.Berkeley.EDU> PORTNAME= flightgear-data -PORTVERSION= 2020.3.9 +PORTVERSION= 2020.3.11 CATEGORIES= games MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} DISTNAME= FlightGear-${PORTVERSION}-data @@ -30,7 +30,7 @@ pre-install: @${RM} ${PLIST} @cd ${WRKSRC} && \ ${FIND} * -type d -empty | ${SORT} \ - | ${SED} -e 's|^|@exec ${MKDIR} %D/share/flightgear/|' >> ${PLIST} && \ + | ${SED} -e 's|^|@preexec ${MKDIR} %D/share/flightgear/|' >> ${PLIST} && \ ${FIND} * -type f | ${SORT} \ | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \ ${FIND} * -type d -empty | ${SORT} -r \ diff --git a/games/flightgear-data/distinfo b/games/flightgear-data/distinfo index 1dd2460a6cd4..1bb3df09c218 100644 --- a/games/flightgear-data/distinfo +++ b/games/flightgear-data/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1623704460 -SHA256 (FlightGear-2020.3.9-data.txz) = ffff439931bd4c7e8ad12d1cbbeffc83c6d1a4e64b0857df43d420f9efbdb76c -SIZE (FlightGear-2020.3.9-data.txz) = 1736333428 +TIMESTAMP = 1629665125 +SHA256 (FlightGear-2020.3.11-data.txz) = 123f151b2c0f4220f0dd55e875ca57a4ec38a94f71f8c04c58caeac077e2b558 +SIZE (FlightGear-2020.3.11-data.txz) = 1736954520 diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile index d9293ab9730a..5724f895921d 100644 --- a/games/flightgear/Makefile +++ b/games/flightgear/Makefile @@ -1,8 +1,7 @@ # Created by: Brian Buchanan <brian@CSUA.Berkeley.EDU> PORTNAME= flightgear -PORTVERSION= 2020.3.9 -PORTREVISION= 1 +PORTVERSION= 2020.3.11 CATEGORIES= games MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} diff --git a/games/flightgear/distinfo b/games/flightgear/distinfo index 97d201207a90..a398469e56c8 100644 --- a/games/flightgear/distinfo +++ b/games/flightgear/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1623703961 -SHA256 (flightgear-2020.3.9.tar.bz2) = d71f6c6804dae4d9c3e0c8e25dcf76973d19d747c0b051a0174703a238ac138e -SIZE (flightgear-2020.3.9.tar.bz2) = 8923743 +TIMESTAMP = 1629665894 +SHA256 (flightgear-2020.3.11.tar.bz2) = fe2706c7707ea73abc5114773de45f29861ab0f8f535656af0428ed049ca4a97 +SIZE (flightgear-2020.3.11.tar.bz2) = 8926212 diff --git a/games/flightgear/files/patch-src-Navaids-PositionedOctree.cxx b/games/flightgear/files/patch-src-Navaids-PositionedOctree.cxx new file mode 100644 index 000000000000..dff348dfc8a3 --- /dev/null +++ b/games/flightgear/files/patch-src-Navaids-PositionedOctree.cxx @@ -0,0 +1,13 @@ +Backport fix from c8d5296f7bef162311a303ff904577b4010c5e80 + +--- src/Navaids/PositionedOctree.cxx.orig 2021-08-23 13:26:31 UTC ++++ src/Navaids/PositionedOctree.cxx +@@ -148,7 +148,7 @@ void Leaf::visit(const SGVec3d& aPos, double aCutoff, + + void Leaf::insertChild(FGPositioned::Type ty, PositionedID id) + { +- assert(childrenLoaded); ++ assert(_childrenLoaded); + children.insert(children.end(), TypedPositioned(ty, id)); + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108261009.17QA9YWA019481>