From 211b81b4a7327a203d8374bbc3619c2607905fa7 Mon Sep 17 00:00:00 2001 From: Maciej Mrozowski Date: Sat, 10 Dec 2022 18:52:35 +0100 Subject: games-simulation/flightgear: version bump, remove old, remove unnecessary USE flag, compilation of libiaxclient (for fgcom) should be conditional, fixes bug 855542 Bug: https://bugs.gentoo.org/855542 Signed-off-by: Maciej Mrozowski --- games-simulation/flightgear-data/Manifest | 2 +- .../flightgear-data-2020.3.13.ebuild | 21 --- .../flightgear-data-2020.3.17.ebuild | 21 +++ games-simulation/flightgear/Manifest | 2 +- .../flightgear/flightgear-2020.3.13.ebuild | 171 --------------------- .../flightgear/flightgear-2020.3.17.ebuild | 170 ++++++++++++++++++++ games-simulation/flightgear/flightgear-9999.ebuild | 15 +- 7 files changed, 200 insertions(+), 202 deletions(-) delete mode 100644 games-simulation/flightgear-data/flightgear-data-2020.3.13.ebuild create mode 100644 games-simulation/flightgear-data/flightgear-data-2020.3.17.ebuild delete mode 100644 games-simulation/flightgear/flightgear-2020.3.13.ebuild create mode 100644 games-simulation/flightgear/flightgear-2020.3.17.ebuild (limited to 'games-simulation') diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest index eed50f9ba949..0dbe1ca1f82b 100644 --- a/games-simulation/flightgear-data/Manifest +++ b/games-simulation/flightgear-data/Manifest @@ -1 +1 @@ -DIST FlightGear-2020.3.13-data.txz 1789344308 BLAKE2B 869ee6fd1d8eb35d6ba4650ea4c1deeafd2e3cc79516711de607c97ade754fcd2a30649f547822778d0599975a71749afa1de5285377a2039c50bea05ef3bad6 SHA512 04a37a0936a8357356147621cff7be2998665356717df13057edb1c3b369c40a389a2fe1a0a35eb5a814b2205ac828bfba2d81a7b844ec1906046a944d65defd +DIST FlightGear-2020.3.17-data.txz 1789324280 BLAKE2B abb1384be2922a80a4abf1c5a540e160c94e74c63ec1ce337f2be253a49c54ee499b9cea752bead41ee4ff1a235b7f78c9143579b602b4a911f46bdb7766e15c SHA512 b15a8ae46709594d9aca5442c51b0cf5b2a804f5b39135bfa9c413ce4aca74db1955a399eb93abf38f1e265199e09ac0ecf05e518a23eeb35aeaa5cbc09277a0 diff --git a/games-simulation/flightgear-data/flightgear-data-2020.3.13.ebuild b/games-simulation/flightgear-data/flightgear-data-2020.3.13.ebuild deleted file mode 100644 index 5eb3beaef789..000000000000 --- a/games-simulation/flightgear-data/flightgear-data-2020.3.13.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.17.ebuild b/games-simulation/flightgear-data/flightgear-data-2020.3.17.ebuild new file mode 100644 index 000000000000..5eb3beaef789 --- /dev/null +++ b/games-simulation/flightgear-data/flightgear-data-2020.3.17.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="FlightGear data files" +HOMEPAGE="https://www.flightgear.org/" +SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.txz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +S=${WORKDIR}/fgdata + +src_install() { + insinto /usr/share/flightgear + rm -fr .git + doins -r * +} diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest index 14563fdf8a8c..229eec39eb6a 100644 --- a/games-simulation/flightgear/Manifest +++ b/games-simulation/flightgear/Manifest @@ -1 +1 @@ -DIST flightgear-2020.3.13.tar.bz2 8930824 BLAKE2B c859614b51d251ce4ac0b5a8a44e80602607902e0bcb00bb35d5b7c419fca9cdde70fccd3013fcced9ef42eafe21d64d91a33525afa0de41f2449d452a59ed82 SHA512 4623af52c0c1fd86ab2bf32bf95bc7be1bc4f867927b7f2ff1d453a4b6e5dbe4c4c094dd23050133e00b3d6b904f77fac396e0d093a99692d18c47823d637f7f +DIST flightgear-2020.3.17.tar.bz2 8934871 BLAKE2B e9cb4a18c119c813531af3d47f6378b0b8cb68a2b33453fedc0c5c1c68160b3d887eb497955118bb99b7297ed72714ee2ecc1c956599d1dbf0e8ca864eedefe0 SHA512 f083f91094b01ee78ad06c24a3ff784d119f27aebdf41d0a0f2ce41948acc3dc9b337ddce7aab3731eb3b2d7ae5fc6244505b019b6d49a8df61297453c291430 diff --git a/games-simulation/flightgear/flightgear-2020.3.13.ebuild b/games-simulation/flightgear/flightgear-2020.3.13.ebuild deleted file mode 100644 index 49a222d30548..000000000000 --- a/games-simulation/flightgear/flightgear-2020.3.13.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake bash-completion-r1 toolchain-funcs - -DESCRIPTION="Open Source Flight Simulator" -HOMEPAGE="https://www.flightgear.org/" -SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="cpu_flags_x86_sse2 dbus debug examples gdal openmp qt5 +udev +utils vim-syntax" - -# Needs --fg-root with path to flightgear-data passed to test runner passed, -# not really worth patching -RESTRICT="test" - -# zlib is some strange auto-dep from simgear -COMMON_DEPEND=" - dev-db/sqlite:3 - dev-games/openscenegraph[jpeg,png] - ~dev-games/simgear-${PV}[gdal=] - media-libs/openal - >=media-libs/plib-1.8.5 - >=media-libs/speex-1.2.0:0 - media-libs/speexdsp:0 - media-sound/gsm - sys-libs/zlib - virtual/glu - x11-libs/libX11 - dbus? ( >=sys-apps/dbus-1.6.18-r1 ) - gdal? ( >=sci-libs/gdal-2.0.0:0 ) - qt5? ( - >=dev-qt/qtcore-5.7.1:5 - >=dev-qt/qtdeclarative-5.7.1:5 - >=dev-qt/qtgui-5.7.1:5 - >=dev-qt/qtnetwork-5.7.1:5 - >=dev-qt/qtwidgets-5.7.1:5 - ) - udev? ( virtual/udev ) - utils? ( - media-libs/freeglut - media-libs/freetype:2 - media-libs/glew:0 - media-libs/libpng:0 - virtual/opengl - qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) - ) -" -# libXi and libXmu are build-only-deps according to FindGLUT.cmake -DEPEND="${COMMON_DEPEND} - dev-libs/boost - utils? ( - x11-libs/libXi - x11-libs/libXmu - ) -" -RDEPEND="${COMMON_DEPEND} - ~games-simulation/${PN}-data-${PV} -" -BDEPEND="qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )" - -PATCHES=( - "${FILESDIR}/${PN}-2020.3.8-cmake.patch" -) - -DOCS=(AUTHORS ChangeLog NEWS README Thanks) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_configure() { - local mycmakeargs=( - -DBUILD_SHARED_LIBS=OFF - -DENABLE_AUTOTESTING=OFF - -DENABLE_COMPOSITOR=OFF - -DENABLE_FGCOM=$(usex utils) - -DENABLE_FGELEV=$(usex utils) - -DENABLE_FGJS=$(usex utils) - -DENABLE_FGVIEWER=$(usex utils) - -DENABLE_GDAL=$(usex gdal) - -DENABLE_GPSSMOOTH=$(usex utils) - -DENABLE_HID_INPUT=$(usex udev) - -DENABLE_JS_DEMO=$(usex utils) - -DENABLE_JSBSIM=ON - -DENABLE_LARCSIM=ON - -DENABLE_METAR=$(usex utils) - -DENABLE_OPENMP=$(usex openmp) - -DENABLE_PLIB_JOYSTICK=ON # NOTE look for defaults changes in CMake - -DENABLE_PROFILE=OFF - -DENABLE_QT=$(usex qt5) - -DENABLE_RTI=OFF - -DENABLE_SIMD=$(usex cpu_flags_x86_sse2) - -DENABLE_STGMERGE=ON - -DENABLE_SWIFT=OFF # swift pilot client not packaged yet - -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 -} diff --git a/games-simulation/flightgear/flightgear-2020.3.17.ebuild b/games-simulation/flightgear/flightgear-2020.3.17.ebuild new file mode 100644 index 000000000000..52f9aeb065dc --- /dev/null +++ b/games-simulation/flightgear/flightgear-2020.3.17.ebuild @@ -0,0 +1,170 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake toolchain-funcs + +DESCRIPTION="Open Source Flight Simulator" +HOMEPAGE="https://www.flightgear.org/" +SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +SLOT="0" +IUSE="cpu_flags_x86_sse2 dbus debug examples gdal openmp qt5 +udev +utils" + +# Needs --fg-root with path to flightgear-data passed to test runner passed, +# not really worth patching +RESTRICT="test" + +# zlib is some strange auto-dep from simgear +COMMON_DEPEND=" + dev-db/sqlite:3 + dev-games/openscenegraph[jpeg,png] + ~dev-games/simgear-${PV}[gdal=] + media-libs/openal + >=media-libs/plib-1.8.5 + >=media-libs/speex-1.2.0:0 + media-libs/speexdsp:0 + media-sound/gsm + sys-libs/zlib + virtual/glu + x11-libs/libX11 + dbus? ( >=sys-apps/dbus-1.6.18-r1 ) + gdal? ( >=sci-libs/gdal-2.0.0:0 ) + qt5? ( + >=dev-qt/qtcore-5.7.1:5 + >=dev-qt/qtdeclarative-5.7.1:5 + >=dev-qt/qtgui-5.7.1:5 + >=dev-qt/qtnetwork-5.7.1:5 + >=dev-qt/qtwidgets-5.7.1:5 + ) + udev? ( virtual/udev ) + utils? ( + media-libs/freeglut + media-libs/freetype:2 + media-libs/glew:0 + media-libs/libpng:0 + virtual/opengl + qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) + ) +" +# libXi and libXmu are build-only-deps according to FindGLUT.cmake +DEPEND="${COMMON_DEPEND} + dev-libs/boost + utils? ( + x11-libs/libXi + x11-libs/libXmu + ) +" +RDEPEND="${COMMON_DEPEND} + ~games-simulation/${PN}-data-${PV} +" +BDEPEND="qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )" + +PATCHES=( + "${FILESDIR}/${PN}-2020.3.8-cmake.patch" +) + +DOCS=(AUTHORS ChangeLog NEWS README Thanks) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_configure() { + local mycmakeargs=( + -DBUILD_SHARED_LIBS=OFF + -DENABLE_AUTOTESTING=OFF + -DENABLE_COMPOSITOR=OFF + -DENABLE_FGCOM=$(usex utils) + -DENABLE_FGELEV=$(usex utils) + -DENABLE_FGJS=$(usex utils) + -DENABLE_FGVIEWER=$(usex utils) + -DENABLE_GDAL=$(usex gdal) + -DENABLE_GPSSMOOTH=$(usex utils) + -DENABLE_HID_INPUT=$(usex udev) + -DENABLE_IAX=$(usex utils) + -DENABLE_JS_DEMO=$(usex utils) + -DENABLE_JSBSIM=ON + -DENABLE_LARCSIM=ON + -DENABLE_METAR=$(usex utils) + -DENABLE_OPENMP=$(usex openmp) + -DENABLE_PLIB_JOYSTICK=ON # NOTE look for defaults changes in CMake + -DENABLE_PROFILE=OFF + -DENABLE_QT=$(usex qt5) + -DENABLE_RTI=OFF + -DENABLE_SIMD=$(usex cpu_flags_x86_sse2) + -DENABLE_STGMERGE=ON + -DENABLE_SWIFT=OFF # swift 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 + insinto /usr/share/vim/vimfiles/syntax + doins scripts/syntax/{ac3d,nasal}.vim + insinto /usr/share/vim/vimfiles/ftdetect/ + doins "${FILESDIR}"/{ac3d,nasal}.vim +} + +pkg_postinst() { + if use qt5; 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 19115fd74b49..6ca93526d600 100644 --- a/games-simulation/flightgear/flightgear-9999.ebuild +++ b/games-simulation/flightgear/flightgear-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake bash-completion-r1 toolchain-funcs git-r3 +inherit cmake toolchain-funcs git-r3 DESCRIPTION="Open Source Flight Simulator" HOMEPAGE="https://www.flightgear.org/" @@ -14,7 +14,7 @@ EGIT_BRANCH="next" LICENSE="GPL-2" KEYWORDS="" SLOT="0" -IUSE="cpu_flags_x86_sse2 dbus debug examples gdal openmp qt5 +udev +utils vim-syntax" +IUSE="cpu_flags_x86_sse2 dbus debug examples gdal openmp qt5 +udev +utils" # Needs --fg-root with path to flightgear-data passed to test runner passed, # not really worth patching @@ -91,6 +91,7 @@ src_configure() { -DENABLE_GDAL=$(usex gdal) -DENABLE_GPSSMOOTH=$(usex utils) -DENABLE_HID_INPUT=$(usex udev) + -DENABLE_IAX=$(usex utils) -DENABLE_JS_DEMO=$(usex utils) -DENABLE_JSBSIM=ON -DENABLE_LARCSIM=ON @@ -158,12 +159,10 @@ src_install() { 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 + insinto /usr/share/vim/vimfiles/syntax + doins scripts/syntax/{ac3d,nasal}.vim + insinto /usr/share/vim/vimfiles/ftdetect/ + doins "${FILESDIR}"/{ac3d,nasal}.vim } pkg_postinst() { -- cgit v1.2.3-65-gdbad