commit:     58936926ea438ec0f96f2800a91e149656575d99
Author:     Michal Privoznik <mprivozn <AT> redhat <DOT> com>
AuthorDate: Wed Mar 23 04:31:29 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 13 19:36:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58936926

games-simulation/flightgear: version bump 2020.3.13

Signed-off-by: Michal Privoznik <mprivozn <AT> redhat.com>
Closes: https://github.com/gentoo/gentoo/pull/24720
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-games/simgear/Manifest                         |   1 +
 dev-games/simgear/simgear-2020.3.13.ebuild         |  68 +++++++++
 games-simulation/flightgear-data/Manifest          |   1 +
 .../flightgear-data-2020.3.13.ebuild               |  21 +++
 games-simulation/flightgear/Manifest               |   1 +
 .../flightgear/flightgear-2020.3.13.ebuild         | 167 +++++++++++++++++++++
 6 files changed, 259 insertions(+)

diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index f1368969e3dd..922b810f5fd1 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1 +1,2 @@
 DIST simgear-2020.3.12.tar.bz2 1415062 BLAKE2B 
bed00dabb8d2ac937cb2fa7a8782c32568dc106d857dd2e9a7f3d2c99ad1372ffcd3c571b899920122e711ce1e561a9895762fb199f1cac947bb68769066b555
 SHA512 
2292c5c43b485fdf4b814b25eae8caa2ed16e043a159328aa5e35a27f9a4fd250219e8b506da1361916bd1d314bb857d3bd1343b1b6b34890bf06c63705c8dbc
+DIST simgear-2020.3.13.tar.bz2 1415729 BLAKE2B 
ed8a5daddba84811318ed92acd6a998785c4159b7e9bf39245e3fc0863e75ae8475283e123c7b185cae8d1113b1fc860758f347f3e19c2749322b280445a2a9f
 SHA512 
1128c6026cebc902f1d411a6013b3d406664ebae5b209248d15c55895823715066d18ca442af2642577d69c6f68d6d02daf64ebbc9bfe43142aae30b9ce1ae62

diff --git a/dev-games/simgear/simgear-2020.3.13.ebuild 
b/dev-games/simgear/simgear-2020.3.13.ebuild
new file mode 100644
index 000000000000..03d49387c0ed
--- /dev/null
+++ b/dev-games/simgear/simgear-2020.3.13.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="Development library for simulation games"
+HOMEPAGE="https://www.flightgear.org/";
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="cpu_flags_x86_sse2 +dns debug gdal openmp subversion test"
+RESTRICT="!test? ( test )"
+
+# TODO aeonwave
+COMMON_DEPEND="
+       app-arch/xz-utils
+       dev-libs/expat
+       dev-games/openscenegraph
+       media-libs/openal
+       net-misc/curl
+       sys-libs/zlib
+       virtual/opengl
+       dns? ( net-libs/udns )
+       gdal? ( sci-libs/gdal )
+"
+DEPEND="${COMMON_DEPEND}
+       >=dev-libs/boost-1.44
+"
+RDEPEND="${COMMON_DEPEND}
+       subversion? ( dev-vcs/subversion )
+"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-2019.1.1-gdal3.patch"
+       "${FILESDIR}/${PN}-2020.1.2-do-not-assume-libc++-clang.patch"
+)
+
+pkg_pretend() {
+       [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+       [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+       local mycmakeargs=(
+               -DENABLE_DNS=$(usex dns)
+               -DENABLE_GDAL=$(usex gdal)
+               -DENABLE_OPENMP=$(usex openmp)
+               -DENABLE_PKGUTIL=ON
+               -DENABLE_RTI=OFF
+               -DENABLE_SIMD=$(usex cpu_flags_x86_sse2)
+               -DENABLE_SOUND=ON
+               -DENABLE_TESTS=$(usex test)
+               -DSIMGEAR_HEADLESS=OFF
+               -DSIMGEAR_SHARED=ON
+               -DSYSTEM_EXPAT=ON
+               -DSYSTEM_UDNS=ON
+               -DUSE_AEONWAVE=OFF
+               -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
+       )
+       cmake_src_configure
+}

diff --git a/games-simulation/flightgear-data/Manifest 
b/games-simulation/flightgear-data/Manifest
index dc86542310ac..55a83e4a3ae1 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1 +1,2 @@
 DIST FlightGear-2020.3.12-data.txz 1787955196 BLAKE2B 
648994bb8a70416d9fbf9fbb71c91d6652db4f915ce39938ad870f6de4a745c7f6df36025726fe29d67a598f1ce64718d12b7be5b81ebb83318246cd991fac1a
 SHA512 
7bb97c0b2ee59b300a95f331bfd12e39aaaa7d3320e33cc4e72ea3c5fae196af52e97d9ed7f6af274162ecdd00642e729d96165df5dcbcb95e2853cf7c1df463
+DIST FlightGear-2020.3.13-data.txz 1789344308 BLAKE2B 
869ee6fd1d8eb35d6ba4650ea4c1deeafd2e3cc79516711de607c97ade754fcd2a30649f547822778d0599975a71749afa1de5285377a2039c50bea05ef3bad6
 SHA512 
04a37a0936a8357356147621cff7be2998665356717df13057edb1c3b369c40a389a2fe1a0a35eb5a814b2205ac828bfba2d81a7b844ec1906046a944d65defd

diff --git a/games-simulation/flightgear-data/flightgear-data-2020.3.13.ebuild 
b/games-simulation/flightgear-data/flightgear-data-2020.3.13.ebuild
new file mode 100644
index 000000000000..f6a2970e8ba8
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-2020.3.13.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="FlightGear data files"
+HOMEPAGE="https://www.flightgear.org/";
+SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.txz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/fgdata
+
+src_install() {
+       insinto /usr/share/flightgear
+       rm -fr .git
+       doins -r *
+}

diff --git a/games-simulation/flightgear/Manifest 
b/games-simulation/flightgear/Manifest
index 50074be20454..63e6ad1110d2 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1 +1,2 @@
 DIST flightgear-2020.3.12.tar.bz2 8929319 BLAKE2B 
e84b0519d69f46d5951372deed59f9b1219739710b3374d0bc0041127f8e4b7869c43b20169a9ac3a89d4e121f9da27d01c6db98e683bc3f80da6b1930e1a7c0
 SHA512 
91e04ae6dc5d12e799bab10b3c4321e77f8d995469453453fdff26a9858f40056dbe8c095423397fcbef307994042c377eb37532af2732674f39e5624c950e9c
+DIST flightgear-2020.3.13.tar.bz2 8930824 BLAKE2B 
c859614b51d251ce4ac0b5a8a44e80602607902e0bcb00bb35d5b7c419fca9cdde70fccd3013fcced9ef42eafe21d64d91a33525afa0de41f2449d452a59ed82
 SHA512 
4623af52c0c1fd86ab2bf32bf95bc7be1bc4f867927b7f2ff1d453a4b6e5dbe4c4c094dd23050133e00b3d6b904f77fac396e0d093a99692d18c47823d637f7f

diff --git a/games-simulation/flightgear/flightgear-2020.3.13.ebuild 
b/games-simulation/flightgear/flightgear-2020.3.13.ebuild
new file mode 100644
index 000000000000..c052d32d8134
--- /dev/null
+++ b/games-simulation/flightgear/flightgear-2020.3.13.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="Open Source Flight Simulator"
+HOMEPAGE="https://www.flightgear.org/";
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="cpu_flags_x86_sse2 dbus debug examples gdal openmp qt5 +udev +utils 
vim-syntax"
+
+# Needs --fg-root with path to flightgear-data passed to test runner passed,
+# not really worth patching
+RESTRICT="test"
+
+# zlib is some strange auto-dep from simgear
+COMMON_DEPEND="
+       dev-db/sqlite:3
+       dev-games/openscenegraph[jpeg,png]
+       ~dev-games/simgear-${PV}[gdal=]
+       media-libs/openal
+       >=media-libs/plib-1.8.5
+       >=media-libs/speex-1.2.0:0
+       media-libs/speexdsp:0
+       media-sound/gsm
+       sys-libs/zlib
+       virtual/glu
+       x11-libs/libX11
+       dbus? ( >=sys-apps/dbus-1.6.18-r1 )
+       gdal? ( >=sci-libs/gdal-2.0.0:0 )
+       qt5? (
+               >=dev-qt/qtcore-5.7.1:5
+               >=dev-qt/qtdeclarative-5.7.1:5
+               >=dev-qt/qtgui-5.7.1:5
+               >=dev-qt/qtnetwork-5.7.1:5
+               >=dev-qt/qtwidgets-5.7.1:5
+       )
+       udev? ( virtual/udev )
+       utils? (
+               media-libs/freeglut
+               media-libs/freetype:2
+               media-libs/glew:0
+               media-libs/libpng:0
+               virtual/opengl
+               qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 )
+       )
+"
+# libXi and libXmu are build-only-deps according to FindGLUT.cmake
+DEPEND="${COMMON_DEPEND}
+       >=dev-libs/boost-1.44
+       qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )
+       utils? (
+               x11-libs/libXi
+               x11-libs/libXmu
+       )
+"
+RDEPEND="${COMMON_DEPEND}
+       ~games-simulation/${PN}-data-${PV}
+"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-2020.3.8-cmake.patch"
+)
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+pkg_pretend() {
+       use openmp && tc-check-openmp
+}
+
+src_configure() {
+       local mycmakeargs=(
+               -DBUILD_SHARED_LIBS=OFF
+               -DENABLE_AUTOTESTING=OFF
+               -DENABLE_COMPOSITOR=OFF
+               -DENABLE_FGCOM=$(usex utils)
+               -DENABLE_FGELEV=$(usex utils)
+               -DENABLE_FGJS=$(usex utils)
+               -DENABLE_FGVIEWER=$(usex utils)
+               -DENABLE_GDAL=$(usex gdal)
+               -DENABLE_GPSSMOOTH=$(usex utils)
+               -DENABLE_HID_INPUT=$(usex udev)
+               -DENABLE_JS_DEMO=$(usex utils)
+               -DENABLE_JSBSIM=ON
+               -DENABLE_LARCSIM=ON
+               -DENABLE_METAR=$(usex utils)
+               -DENABLE_OPENMP=$(usex openmp)
+               -DENABLE_PLIB_JOYSTICK=ON # NOTE look for defaults changes in 
CMake
+               -DENABLE_PROFILE=OFF
+               -DENABLE_QT=$(usex qt5)
+               -DENABLE_RTI=OFF
+               -DENABLE_SIMD=$(usex cpu_flags_x86_sse2)
+               -DENABLE_STGMERGE=ON
+               -DENABLE_SWIFT=OFF # swift pilot client not packaged yet
+               -DENABLE_TERRASYNC=$(usex utils)
+               -DENABLE_TRAFFIC=$(usex utils)
+               -DENABLE_UIUC_MODEL=ON
+               -DENABLE_YASIM=ON
+               -DEVENT_INPUT=$(usex udev)
+               -DFG_BUILD_TYPE=Release
+               -DFG_DATA_DIR=/usr/share/${PN}
+               -DJSBSIM_TERRAIN=ON
+               -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
+               -DSP_FDMS=ON
+               -DSYSTEM_CPPUNIT=OFF # NOTE we do not build tests anyway
+               -DSYSTEM_FLITE=OFF
+               -DSYSTEM_HTS_ENGINE=OFF
+               -DSYSTEM_SPEEX=ON
+               -DSYSTEM_GSM=ON
+               -DSYSTEM_SQLITE=ON
+               -DUSE_AEONWAVE=OFF
+               -DUSE_DBUS=$(usex dbus)
+               -DWITH_FGPANEL=$(usex utils)
+       )
+       if use gdal && use utils; then
+               mycmakeargs+=(-DENABLE_DEMCONVERT=ON)
+       else
+               mycmakeargs+=(-DENABLE_DEMCONVERT=OFF)
+       fi
+       if use qt5 && use utils; then
+               mycmakeargs+=(-DENABLE_FGQCANVAS=ON)
+       else
+               mycmakeargs+=(-DENABLE_FGQCANVAS=OFF)
+       fi
+
+       cmake_src_configure
+}
+
+src_install() {
+       cmake_src_install
+
+       # Install bash completion (TODO zsh)
+       # Uncomment below when scripts stops writing files...
+#      sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
+#              -i scripts/completion/fg-completion.bash || die 'unable to 
replace FG_ROOT'
+#      newbashcomp scripts/completion/fg-completion.bash ${PN}
+
+       # Install examples and other misc files
+       if use examples; then
+               docompress -x /usr/share/doc/"${PF}"/{examples,tools}
+               docinto examples
+               dodoc -r scripts/java scripts/perl scripts/python
+               docinto examples/c++
+               dodoc -r scripts/example/*
+               docinto tools
+               dodoc -r scripts/atis scripts/tools/*
+       fi
+
+       # Install nasal script syntax
+       if use vim-syntax; then
+               insinto /usr/share/vim/vimfiles/syntax
+               doins scripts/syntax/{ac3d,nasal}.vim
+               insinto /usr/share/vim/vimfiles/ftdetect/
+               doins "${FILESDIR}"/{ac3d,nasal}.vim
+       fi
+}
+
+pkg_postinst() {
+       if use qt5; then
+               einfo "To use launcher, run fgfs with '--launcher' parameter"
+       fi
+}

Reply via email to