From ecfd4818dec077ddfc863298bc209ffdd08a7766 Mon Sep 17 00:00:00 2001 From: Maciej Mrozowski Date: Sun, 2 Aug 2020 23:02:34 +0200 Subject: games-simulation/flightgear: Version bump, remove old, fixes Signed-off-by: Maciej Mrozowski Closes: https://bugs.gentoo.org/724694 Bug: https://bugs.gentoo.org/728996 --- dev-games/simgear/Manifest | 2 +- dev-games/simgear/simgear-2019.1.1.ebuild | 72 --------- dev-games/simgear/simgear-2020.1.2.ebuild | 72 +++++++++ dev-games/simgear/simgear-9999.ebuild | 6 +- games-simulation/flightgear-data/Manifest | 2 +- .../flightgear-data-2019.1.1.ebuild | 21 --- .../flightgear-data-2020.1.2.ebuild | 21 +++ .../flightgear-data/flightgear-data-9999.ebuild | 2 +- games-simulation/flightgear/Manifest | 2 +- .../files/flightgear-2018.3.2-cmake.patch | 24 --- .../files/flightgear-2020.1.2-cmake.patch | 45 ++++++ .../flightgear/flightgear-2019.1.1.ebuild | 168 -------------------- .../flightgear/flightgear-2020.1.2.ebuild | 171 +++++++++++++++++++++ games-simulation/flightgear/flightgear-9999.ebuild | 14 +- 14 files changed, 325 insertions(+), 297 deletions(-) delete mode 100644 dev-games/simgear/simgear-2019.1.1.ebuild create mode 100644 dev-games/simgear/simgear-2020.1.2.ebuild delete mode 100644 games-simulation/flightgear-data/flightgear-data-2019.1.1.ebuild create mode 100644 games-simulation/flightgear-data/flightgear-data-2020.1.2.ebuild delete mode 100644 games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch create mode 100644 games-simulation/flightgear/files/flightgear-2020.1.2-cmake.patch delete mode 100644 games-simulation/flightgear/flightgear-2019.1.1.ebuild create mode 100644 games-simulation/flightgear/flightgear-2020.1.2.ebuild diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest index 7e80f426ea00..5662c13e1568 100644 --- a/dev-games/simgear/Manifest +++ b/dev-games/simgear/Manifest @@ -1 +1 @@ -DIST simgear-2019.1.1.tar.bz2 1370523 BLAKE2B 2f61b2b4b7716b7f15852ff68bee6b749b7daa04caa27927a53eb6d6e4346c46c835938c95436250da767efd2e8043aacc0cb444b37dacde78acada98ffdb4e8 SHA512 83fe4330cf27b9298719f53f2fccde2af77bacdc6f430cc22c8bdfb475fe9b6e01578c1225af21e4e1433c7d2f2b00427454064f942359ba4c1e9896e7fe05d2 +DIST simgear-2020.1.2.tar.bz2 1393059 BLAKE2B 62fa15d88368177e23cf52edf51e8c56252399d8f2661e518911c1093a0d7f9f11069da8d65b479f2d4b45792dcd011194e57fa99ac3991f749e8196aaff9552 SHA512 c2e835de471f374a6c33cfd1769b7079d178ee66075bfe87cc9eb1f06dc2648db93c31f62f0ac7a664703406817cb1e909a531812cb76c99cd8751eb7e6782e7 diff --git a/dev-games/simgear/simgear-2019.1.1.ebuild b/dev-games/simgear/simgear-2019.1.1.ebuild deleted file mode 100644 index be0ff6416267..000000000000 --- a/dev-games/simgear/simgear-2019.1.1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils toolchain-funcs flag-o-matic - -DESCRIPTION="Development library for simulation games" -HOMEPAGE="http://www.simgear.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=" - 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" -) - -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=OFF # see CPU_FLAGS - -DENABLE_SIMD_CODE=$(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 - ) - - if use cpu_flags_x86_sse2; then - append-flags -msse2 -mfpmath=sse - fi - - cmake-utils_src_configure -} diff --git a/dev-games/simgear/simgear-2020.1.2.ebuild b/dev-games/simgear/simgear-2020.1.2.ebuild new file mode 100644 index 000000000000..318b71674130 --- /dev/null +++ b/dev-games/simgear/simgear-2020.1.2.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake toolchain-funcs flag-o-matic + +DESCRIPTION="Development library for simulation games" +HOMEPAGE="http://www.simgear.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=" + 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" +) + +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=OFF # see CPU_FLAGS + -DENABLE_SIMD_CODE=$(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 + ) + + if use cpu_flags_x86_sse2; then + append-flags -msse2 -mfpmath=sse + fi + + cmake_src_configure +} diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild index d5d560554829..b0146cf1b283 100644 --- a/dev-games/simgear/simgear-9999.ebuild +++ b/dev-games/simgear/simgear-9999.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils cmake-utils toolchain-funcs flag-o-matic git-r3 +inherit eutils cmake toolchain-funcs flag-o-matic git-r3 DESCRIPTION="Development library for simulation games" HOMEPAGE="http://www.simgear.org/" @@ -70,5 +70,5 @@ src_configure() { append-flags -msse2 -mfpmath=sse fi - cmake-utils_src_configure + cmake_src_configure } diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest index 001e1fa15334..35816de847bb 100644 --- a/games-simulation/flightgear-data/Manifest +++ b/games-simulation/flightgear-data/Manifest @@ -1 +1 @@ -DIST FlightGear-2019.1.1-data.tar.bz2 1748213475 BLAKE2B 6be5021a666d8363fd97e777e0674d61875e1309a391647f6ecebcc4443d494821a737709c135dc45521ae30401479f6f74c28d7db8da992fa279ae461e16a2c SHA512 e5697f587c272036d3f5cfd7dcc7464e3eae7251e41425a91c80eabccbf711a6416a4746b5bf39a2806dc3d4f6839359483a0165899eb4ec812308b2b5da060a +DIST FlightGear-2020.1.2-data.tar.bz2 1954932485 BLAKE2B e3f06ed6a36d2cfc6518f4a1cac4aaf28df2b7e1fb4720488dd38f3df7dfccb1cc9b48e0f216fa79db5fc3b380dcdd1161325ba0195cc14aadbc2d79fab39031 SHA512 16329d230f8cfd35dbd60aad0afc66225134e5c2f98abb89ca271837f04917f6aa876fc35868783a3a3d56c4ba1d25f429436de516a8086f4b7e296a0d352e03 diff --git a/games-simulation/flightgear-data/flightgear-data-2019.1.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2019.1.1.ebuild deleted file mode 100644 index 30bc1d192aa2..000000000000 --- a/games-simulation/flightgear-data/flightgear-data-2019.1.1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="FlightGear data files" -HOMEPAGE="https://www.flightgear.org/" -SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -S=${WORKDIR}/fgdata - -src_install() { - insinto /usr/share/flightgear - rm -fr .git - doins -r * -} diff --git a/games-simulation/flightgear-data/flightgear-data-2020.1.2.ebuild b/games-simulation/flightgear-data/flightgear-data-2020.1.2.ebuild new file mode 100644 index 000000000000..d5d9b4976641 --- /dev/null +++ b/games-simulation/flightgear-data/flightgear-data-2020.1.2.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2020 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.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +S=${WORKDIR}/fgdata + +src_install() { + insinto /usr/share/flightgear + rm -fr .git + doins -r * +} diff --git a/games-simulation/flightgear-data/flightgear-data-9999.ebuild b/games-simulation/flightgear-data/flightgear-data-9999.ebuild index 387835083e95..27d27dcf76bf 100644 --- a/games-simulation/flightgear-data/flightgear-data-9999.ebuild +++ b/games-simulation/flightgear-data/flightgear-data-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit git-r3 diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest index ea3c7817887b..2977ffa6f2d4 100644 --- a/games-simulation/flightgear/Manifest +++ b/games-simulation/flightgear/Manifest @@ -1 +1 @@ -DIST flightgear-2019.1.1.tar.bz2 8440986 BLAKE2B da387456aaa6e8b86a8a865989f40c6bbcef4bf378175628c26fb172161cc3b278e4b16a3a270b7ed7fcf70329a88754c9a875a14f919fa90f284a485c909cce SHA512 edcc464af0bde4766e61137211276d77a6bb297567b0168dfaf3b97fdb9a595e5e8a0b84232680fcc975cf195261b9751edb79ae73123333feb31ab3d7215d8c +DIST flightgear-2020.1.2.tar.bz2 8504580 BLAKE2B 699db9490e27b3de82bcf2903321c7ee24784e6a96285784bb449eb05fb23f3a0417d015ea10a55992c3783c0e42a2cda7e591d998532145213d1941811b1725 SHA512 a27897a1e23fe78c64717df1a86ef37dba047a1942af1dd2e4e3f3da05975bb5c524ee03444c8067551966d6a1bbfe36866f2617fa6fe1f6b957d5769c31058c diff --git a/games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch b/games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch deleted file mode 100644 index 97747e8b7487..000000000000 --- a/games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ruN flightgear-2018.3.2/CMakeLists.txt my/CMakeLists.txt ---- flightgear-2018.3.2/CMakeLists.txt 2019-01-29 14:17:49.000000000 +0100 -+++ my/CMakeLists.txt 2019-08-18 05:29:04.762138013 +0200 -@@ -323,7 +323,7 @@ - ## Qt5 setup setup - if (ENABLE_QT) - message(STATUS "Qt launcher enabled, checking for Qt >= 5.4 / qmake") -- find_package(Qt5 5.4 COMPONENTS Widgets Network Qml Quick Svg) -+ find_package(Qt5 5.4 COMPONENTS Widgets Network Qml Quick) - if (Qt5Widgets_FOUND) - message(STATUS "Will enable Qt launcher GUI") - message(STATUS " Qt5Widgets version: ${Qt5Widgets_VERSION_STRING}") -diff -ruN flightgear-2018.3.2/src/GUI/CMakeLists.txt my/src/GUI/CMakeLists.txt ---- flightgear-2018.3.2/src/GUI/CMakeLists.txt 2019-01-29 14:17:50.000000000 +0100 -+++ my/src/GUI/CMakeLists.txt 2019-08-18 05:38:19.607822998 +0200 -@@ -127,7 +127,7 @@ - ${qml_sources}) - - set_property(TARGET fglauncher PROPERTY AUTOMOC ON) -- target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Quick Qt5::Svg SimGearCore) -+ target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Quick SimGearCore) - target_include_directories(fglauncher PRIVATE ${PROJECT_BINARY_DIR}/src/GUI) - - add_library(fgqmlui QQuickDrawable.cxx diff --git a/games-simulation/flightgear/files/flightgear-2020.1.2-cmake.patch b/games-simulation/flightgear/files/flightgear-2020.1.2-cmake.patch new file mode 100644 index 000000000000..f463c458b5a0 --- /dev/null +++ b/games-simulation/flightgear/files/flightgear-2020.1.2-cmake.patch @@ -0,0 +1,45 @@ +diff -ruN flightgear-2020.1.2/CMakeLists.txt fgfs-my/CMakeLists.txt +--- flightgear-2020.1.2/CMakeLists.txt 2020-05-24 17:14:48.000000000 +0200 ++++ fgfs-my/CMakeLists.txt 2020-05-31 13:56:41.745941586 +0200 +@@ -367,7 +367,7 @@ + ## Qt5 setup setup + if (ENABLE_QT) + message(STATUS "Qt launcher enabled, checking for Qt >= 5.4 / qmake") +- find_package(Qt5 5.4 COMPONENTS Widgets Network Qml Quick Svg) ++ find_package(Qt5 5.4 COMPONENTS Widgets Network Qml Quick) + if (Qt5Widgets_FOUND) + message(STATUS "Will enable Qt launcher GUI") + set(HAVE_QT 1) +diff -ruN flightgear-2020.1.2/CMakeModules/SetupFGFSLibraries.cmake fgfs-my/CMakeModules/SetupFGFSLibraries.cmake +--- flightgear-2020.1.2/CMakeModules/SetupFGFSLibraries.cmake 2020-05-24 17:14:48.000000000 +0200 ++++ fgfs-my/CMakeModules/SetupFGFSLibraries.cmake 2020-05-31 13:55:33.484421108 +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.1.2/src/GUI/CMakeLists.txt fgfs-my/src/GUI/CMakeLists.txt +--- flightgear-2020.1.2/src/GUI/CMakeLists.txt 2020-05-24 17:14:48.000000000 +0200 ++++ fgfs-my/src/GUI/CMakeLists.txt 2020-05-31 13:56:41.745941586 +0200 +@@ -137,7 +137,7 @@ + ${qml_sources}) + + set_property(TARGET fglauncher PROPERTY AUTOMOC ON) +- target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Quick Qt5::Svg SimGearCore) ++ target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Quick SimGearCore) + target_include_directories(fglauncher PRIVATE ${PROJECT_BINARY_DIR}/src/GUI) + + add_library(fgqmlui QQuickDrawable.cxx diff --git a/games-simulation/flightgear/flightgear-2019.1.1.ebuild b/games-simulation/flightgear/flightgear-2019.1.1.ebuild deleted file mode 100644 index a8847f1ad50a..000000000000 --- a/games-simulation/flightgear/flightgear-2019.1.1.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils bash-completion-r1 toolchain-funcs - -DESCRIPTION="Open Source Flight Simulator" -HOMEPAGE="https://www.flightgear.org/" -SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="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/speex-1.2.0:0 - media-libs/speexdsp:0 - media-sound/gsm - sys-libs/zlib - virtual/glu - x11-libs/libX11 - dbus? ( >=sys-apps/dbus-1.6.18-r1 ) - gdal? ( >=sci-libs/gdal-2.0.0:0 ) - qt5? ( - >=dev-qt/qtcore-5.7.1:5 - >=dev-qt/qtdeclarative-5.7.1:5 - >=dev-qt/qtgui-5.7.1:5 - >=dev-qt/qtnetwork-5.7.1:5 - >=dev-qt/qtwidgets-5.7.1:5 - ) - udev? ( virtual/udev ) - utils? ( - media-libs/freeglut - media-libs/freetype:2 - media-libs/glew:0 - media-libs/libpng:0 - virtual/opengl - qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) - ) -" -# libXi and libXmu are build-only-deps according to FindGLUT.cmake -DEPEND="${COMMON_DEPEND} - >=dev-libs/boost-1.44 - >=media-libs/plib-1.8.5 - 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}-2018.3.2-cmake.patch") - -DOCS=(AUTHORS ChangeLog NEWS README Thanks) - -pkg_pretend() { - use openmp && tc-check-openmp -} - -src_configure() { - local mycmakeargs=( - -DENABLE_AUTOTESTING=OFF - -DENABLE_COMPOSITOR=OFF - -DENABLE_FGCOM=$(usex utils) - -DENABLE_FGELEV=$(usex utils) - -DENABLE_FGJS=$(usex utils) - -DENABLE_FGVIEWER=$(usex utils) - -DENABLE_FLITE=OFF - -DENABLE_GDAL=$(usex gdal) - -DENABLE_GPSSMOOTH=$(usex utils) - -DENABLE_HID_INPUT=$(usex udev) - -DENABLE_JS_DEMO=$(usex utils) - -DENABLE_JSBSIM=ON - -DENABLE_LARCSIM=ON - -DENABLE_METAR=$(usex utils) - -DENABLE_OPENMP=$(usex openmp) - -DENABLE_PLIB_JOYSTICK=ON # NOTE look for defaults changes in CMake - -DENABLE_PROFILE=OFF - -DENABLE_QT=$(usex qt5) - -DENABLE_RTI=OFF - -DENABLE_SIMD=OFF # see CPU_FLAGS - -DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2) - -DENABLE_STGMERGE=ON - -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=ON - -DSYSTEM_HTS_ENGINE=ON - -DSYSTEM_SPEEX=ON - -DSYSTEM_GSM=ON - -DSYSTEM_SQLITE=ON - -DUSE_AEONWAVE=OFF - -DUSE_DBUS=$(usex dbus) - -DWITH_FGPANEL=$(usex utils) - ) - if use cpu_flags_x86_sse2; then - append-flags -msse2 -mfpmath=sse - fi - 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-utils_src_configure -} - -src_install() { - cmake-utils_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 - insinto /usr/share/doc/"${PF}"/examples - doins -r scripts/java scripts/perl scripts/python - insinto /usr/share/doc/"${PF}"/examples/c++ - doins -r scripts/example/* - insinto /usr/share/doc/"${PF}"/tools - doins -r scripts/atis scripts/tools/* - 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() { - einfo "Please note that data files location changed to /usr/share/flightgear" - if use qt5; then - einfo "To use launcher, run fgfs with '--launcher' parameter" - fi -} diff --git a/games-simulation/flightgear/flightgear-2020.1.2.ebuild b/games-simulation/flightgear/flightgear-2020.1.2.ebuild new file mode 100644 index 000000000000..d3f932dbf99c --- /dev/null +++ b/games-simulation/flightgear/flightgear-2020.1.2.ebuild @@ -0,0 +1,171 @@ +# Copyright 1999-2020 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/speex-1.2.0:0 + media-libs/speexdsp:0 + media-sound/gsm + sys-libs/zlib + virtual/glu + x11-libs/libX11 + dbus? ( >=sys-apps/dbus-1.6.18-r1 ) + gdal? ( >=sci-libs/gdal-2.0.0:0 ) + qt5? ( + >=dev-qt/qtcore-5.7.1:5 + >=dev-qt/qtdeclarative-5.7.1:5 + >=dev-qt/qtgui-5.7.1:5 + >=dev-qt/qtnetwork-5.7.1:5 + >=dev-qt/qtwidgets-5.7.1:5 + ) + udev? ( virtual/udev ) + utils? ( + media-libs/freeglut + media-libs/freetype:2 + media-libs/glew:0 + media-libs/libpng:0 + virtual/opengl + qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) + ) +" +# libXi and libXmu are build-only-deps according to FindGLUT.cmake +DEPEND="${COMMON_DEPEND} + >=dev-libs/boost-1.44 + >=media-libs/plib-1.8.5 + 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.1.2-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=OFF # see CPU_FLAGS + -DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2) + -DENABLE_STGMERGE=ON + -DENABLE_SWIFT=OFF # swift pilot client not packaged yet + -DENABLE_TERRASYNC=$(usex utils) + -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 cpu_flags_x86_sse2; then + append-flags -msse2 -mfpmath=sse + fi + 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 + insinto /usr/share/doc/"${PF}"/examples + doins -r scripts/java scripts/perl scripts/python + insinto /usr/share/doc/"${PF}"/examples/c++ + doins -r scripts/example/* + insinto /usr/share/doc/"${PF}"/tools + doins -r scripts/atis scripts/tools/* + 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() { + einfo "Please note that data files location changed to /usr/share/flightgear" + 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 ce6c889aeb77..fcfdb4a0c9e2 100644 --- a/games-simulation/flightgear/flightgear-9999.ebuild +++ b/games-simulation/flightgear/flightgear-9999.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils bash-completion-r1 toolchain-funcs git-r3 +inherit cmake bash-completion-r1 toolchain-funcs git-r3 DESCRIPTION="Open Source Flight Simulator" HOMEPAGE="https://www.flightgear.org/" @@ -65,7 +65,9 @@ RDEPEND="${COMMON_DEPEND} ~games-simulation/${PN}-data-${PV} " -PATCHES=("${FILESDIR}/${PN}-2018.3.2-cmake.patch") +PATCHES=( + "${FILESDIR}/${PN}-2020.1.2-cmake.patch" +) DOCS=(AUTHORS ChangeLog NEWS README Thanks) @@ -75,6 +77,7 @@ pkg_pretend() { src_configure() { local mycmakeargs=( + -DBUILD_SHARED_LIBS=OFF -DENABLE_AUTOTESTING=OFF -DENABLE_COMPOSITOR=OFF -DENABLE_FGCOM=$(usex utils) @@ -96,6 +99,7 @@ src_configure() { -DENABLE_SIMD=OFF # see CPU_FLAGS -DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2) -DENABLE_STGMERGE=ON + -DENABLE_SWIFT=OFF # swift pilot client not packaged yet -DENABLE_TERRASYNC=$(usex utils) -DENABLE_TRAFFIC=$(usex utils) -DENABLE_UIUC_MODEL=ON @@ -130,11 +134,11 @@ src_configure() { mycmakeargs+=(-DENABLE_FGQCANVAS=OFF) fi - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install # Install bash completion (TODO zsh) # Uncomment below when scripts stops writing files... -- cgit v1.2.3-65-gdbad