diff options
| -rw-r--r-- | dev-games/simgear/Manifest | 1 | ||||
| -rw-r--r-- | dev-games/simgear/simgear-2018.3.2.ebuild | 66 | ||||
| -rw-r--r-- | dev-games/simgear/simgear-9999.ebuild | 14 | ||||
| -rw-r--r-- | games-simulation/flightgear-data/Manifest | 3 | ||||
| -rw-r--r-- | games-simulation/flightgear-data/flightgear-data-2018.2.1.ebuild | 26 | ||||
| -rw-r--r-- | games-simulation/flightgear-data/flightgear-data-2018.3.2.ebuild (renamed from games-simulation/flightgear-data/flightgear-data-2018.1.1.ebuild) | 2 | ||||
| -rw-r--r-- | games-simulation/flightgear/Manifest | 1 | ||||
| -rw-r--r-- | games-simulation/flightgear/flightgear-2018.3.2.ebuild | 162 | ||||
| -rw-r--r-- | games-simulation/flightgear/flightgear-9999.ebuild | 2 |
9 files changed, 243 insertions, 34 deletions
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest index c17226fec253..ae0736f5723e 100644 --- a/dev-games/simgear/Manifest +++ b/dev-games/simgear/Manifest @@ -1 +1,2 @@ DIST simgear-2018.3.1.tar.bz2 1330322 BLAKE2B 5b350ddce726d8ea15c4a1a64a28b9e4307647378c52989231daa7b4a0e53730dc754c239660d0f5ec33189ece6629448b37f61ca7578c21c3aa4147d4565a26 SHA512 673ee76e9f4f9c9adb25a2523bad5b70a079d821391cb8fc9f9e651ad6c195356ac9a8ba18a65df365dc66990406de287099fb249ca23eefc111ebba884f7289 +DIST simgear-2018.3.2.tar.bz2 1329982 BLAKE2B cc4ee90e0a76db5212ca3bb8f422376d9fd91c261c4aaee1aa0c2dc7438ed589866bdde009fd44c727ae87d7365d4aea67da0cfd32ff26d47e81eb9c027ddf0b SHA512 3f60df34f22ea84bdb3e0aa0e2c0b73b2fddf15d17ea985aee254bf4c269b7447976629a7e4b022c460c7c406940d0b2669b723c6b899499d064cfe91546f0ba diff --git a/dev-games/simgear/simgear-2018.3.2.ebuild b/dev-games/simgear/simgear-2018.3.2.ebuild new file mode 100644 index 000000000000..a65b51665aac --- /dev/null +++ b/dev-games/simgear/simgear-2018.3.2.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2019 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" + +COMMON_DEPEND=" + dev-libs/expat + <dev-games/openscenegraph-3.5.6:= + 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 ) +" + +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=OFF + -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 -ftree-vectorize -ftree-slp-vectorize + fi + + cmake-utils_src_configure +} diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild index 10462f88d9fc..4ef9fc550b61 100644 --- a/dev-games/simgear/simgear-9999.ebuild +++ b/dev-games/simgear/simgear-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils cmake-utils toolchain-funcs git-r3 +inherit eutils cmake-utils toolchain-funcs flag-o-matic git-r3 DESCRIPTION="Development library for simulation games" HOMEPAGE="http://www.simgear.org/" @@ -14,7 +14,7 @@ EGIT_BRANCH="next" LICENSE="GPL-2" KEYWORDS="" SLOT="0" -IUSE="+dns debug gdal openmp subversion test" +IUSE="cpu_flags_x86_sse2 +dns debug gdal openmp subversion test" COMMON_DEPEND=" dev-libs/expat @@ -48,7 +48,8 @@ src_configure() { -DENABLE_OPENMP=$(usex openmp) -DENABLE_PKGUTIL=ON -DENABLE_RTI=OFF - -DENABLE_SIMD=ON + -DENABLE_SIMD=OFF # see CPU_FLAGS + -DENABLE_SIMD_CODE=OFF -DENABLE_SOUND=ON -DENABLE_TESTS=$(usex test) -DSIMGEAR_HEADLESS=OFF @@ -58,5 +59,10 @@ src_configure() { -DUSE_AEONWAVE=OFF -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it ) + + if use cpu_flags_x86_sse2; then + append-flags -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize + fi + cmake-utils_src_configure } diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest index a638f22b8ead..9e4437fefde1 100644 --- a/games-simulation/flightgear-data/Manifest +++ b/games-simulation/flightgear-data/Manifest @@ -1,3 +1,2 @@ -DIST FlightGear-2018.1.1-data.tar.bz2 1576049981 BLAKE2B cfcf028ca04ed785ba7c65979e6566ab773d8af869a9b62050969295eafecf7d1f5b6162f498af96786fa23a46e886390f240b56c83e7107473f59552a1155a5 SHA512 022f102f95c9cd8b153d991dad55ecd182e71aa0f3ecfe1502a35d6dcda0746a1fd183f808e59aba8c7f3a0cc9ae1f2f91ff49565bff4c7bc5a1c4889fcc127f -DIST FlightGear-2018.2.1-data.tar.bz2 1624676603 BLAKE2B baecea2002fc3c256205e70c6692102f9bccd04c839902353b0e6d803a97221479e8b54095530dc7af366d842c487d04447f0fd775527e6f5ea0ac32ed602dd6 SHA512 93690703965dd83b610ea0ba67938c0d3fb2d5f6d8c842851a979f352387431eacafb4d181a56dad6def474b2ab84f412cf5531570ce18c1ec80076fe92e4d05 DIST FlightGear-2018.3.1-data.tar.bz2 1735407015 BLAKE2B e076e0096656c607cd32c7f86999685bc65bc1d8a28a260e0e7d760a5d4ea645f3a84f8410f9091e9767fcc143d0910f3e2ac2546e9408a49032b864bdd3c742 SHA512 495ef2dc87244c10cbca6deed7731e84f07c4a495e6d70ea7a88581e655b366c17900603f2388d2d21c4fe5cc4279820ae2a112376deeba4d37a53cd3495c102 +DIST FlightGear-2018.3.2-data.tar.bz2 1744998558 BLAKE2B 8ce8b34973687df907695c11eb385fc87526e6c6b54a2e1180819a6d0b503f27d0bbce7f400041a4f724e5dc940a84db90faf267e4ab012457ac753f243eb1d1 SHA512 64baa8a42d6a6e930cc2a14e62f6f3488f08cb3121973aece8818275b8f4934a94539e24b95646d7c5bb8bd5eef65ff91d63013c07dabf79f452908b749640bb diff --git a/games-simulation/flightgear-data/flightgear-data-2018.2.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2018.2.1.ebuild deleted file mode 100644 index f364395e8473..000000000000 --- a/games-simulation/flightgear-data/flightgear-data-2018.2.1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2018 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-data/flightgear-data-2018.1.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2018.3.2.ebuild index f835ef53253b..5e2859ac4b45 100644 --- a/games-simulation/flightgear-data/flightgear-data-2018.1.1.ebuild +++ b/games-simulation/flightgear-data/flightgear-data-2018.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest index 0d282499cf94..006bb29ae931 100644 --- a/games-simulation/flightgear/Manifest +++ b/games-simulation/flightgear/Manifest @@ -1 +1,2 @@ DIST flightgear-2018.3.1.tar.bz2 8404294 BLAKE2B b90d64bc7381baef3adf3f2b77acb6822562d76319e85bebeda977754c281cd48b4ce137d910cc9f96947cfe1b7612c6ff45f2ed49775348b651944bb8796ba4 SHA512 ad07cdf90b1890519a22a1f79374b2d11e70191d85bc76d50913708a250801c3e091228999011367e374572a46c60f572f8b138d6a7c9fd2155f63107667d93c +DIST flightgear-2018.3.2.tar.bz2 8405351 BLAKE2B 8abc3cc37281f1cc30c51518570e7278722f1d804f6568d7619150e7ddf13eef784314873571ea99d039ca4a94968e8e96779e26d8618eee4b1ed248e88dc52a SHA512 76a127949351fe48d847a1471002ecbc3daa769952fef7a7a141e83031771e87f4e23c329e9d03ddd2e99b4b96fb6af2ebe5ab90ca50c0111217c62492cd516d diff --git a/games-simulation/flightgear/flightgear-2018.3.2.ebuild b/games-simulation/flightgear/flightgear-2018.3.2.ebuild new file mode 100644 index 000000000000..31cb9fe151d2 --- /dev/null +++ b/games-simulation/flightgear/flightgear-2018.3.2.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2019 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="http://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-3.5.6:=[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 + utils? ( + x11-libs/libXi + x11-libs/libXmu + ) +" +RDEPEND="${COMMON_DEPEND} + ~games-simulation/${PN}-data-${PV} +" + +DOCS=(AUTHORS ChangeLog NEWS README Thanks) + +pkg_pretend() { + use openmp && tc-check-openmp +} + +src_configure() { + local mycmakeargs=( + -DENABLE_AUTOTESTING=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_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 -ftree-vectorize -ftree-slp-vectorize + 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-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild index 7dd168e9627a..e485d9af2d35 100644 --- a/games-simulation/flightgear/flightgear-9999.ebuild +++ b/games-simulation/flightgear/flightgear-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 |