| 1 |
commit: 85d10adb3b7e1ce2c3191b718a0b60de53af70da |
| 2 |
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 1 00:55:50 2020 +0000 |
| 4 |
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 1 00:58:15 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85d10adb |
| 7 |
|
| 8 |
games-simulation/flightgear: Version bump, remove old |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 11 |
Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org> |
| 12 |
|
| 13 |
games-simulation/flightgear/Manifest | 3 +- |
| 14 |
.../flightgear/flightgear-2018.3.1.ebuild | 159 --------------------- |
| 15 |
...-2018.3.2.ebuild => flightgear-2019.1.1.ebuild} | 3 +- |
| 16 |
games-simulation/flightgear/flightgear-9999.ebuild | 6 +- |
| 17 |
4 files changed, 8 insertions(+), 163 deletions(-) |
| 18 |
|
| 19 |
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest |
| 20 |
index 006bb29ae93..ea3c7817887 100644 |
| 21 |
--- a/games-simulation/flightgear/Manifest |
| 22 |
+++ b/games-simulation/flightgear/Manifest |
| 23 |
@@ -1,2 +1 @@ |
| 24 |
-DIST flightgear-2018.3.1.tar.bz2 8404294 BLAKE2B b90d64bc7381baef3adf3f2b77acb6822562d76319e85bebeda977754c281cd48b4ce137d910cc9f96947cfe1b7612c6ff45f2ed49775348b651944bb8796ba4 SHA512 ad07cdf90b1890519a22a1f79374b2d11e70191d85bc76d50913708a250801c3e091228999011367e374572a46c60f572f8b138d6a7c9fd2155f63107667d93c |
| 25 |
-DIST flightgear-2018.3.2.tar.bz2 8405351 BLAKE2B 8abc3cc37281f1cc30c51518570e7278722f1d804f6568d7619150e7ddf13eef784314873571ea99d039ca4a94968e8e96779e26d8618eee4b1ed248e88dc52a SHA512 76a127949351fe48d847a1471002ecbc3daa769952fef7a7a141e83031771e87f4e23c329e9d03ddd2e99b4b96fb6af2ebe5ab90ca50c0111217c62492cd516d |
| 26 |
+DIST flightgear-2019.1.1.tar.bz2 8440986 BLAKE2B da387456aaa6e8b86a8a865989f40c6bbcef4bf378175628c26fb172161cc3b278e4b16a3a270b7ed7fcf70329a88754c9a875a14f919fa90f284a485c909cce SHA512 edcc464af0bde4766e61137211276d77a6bb297567b0168dfaf3b97fdb9a595e5e8a0b84232680fcc975cf195261b9751edb79ae73123333feb31ab3d7215d8c |
| 27 |
|
| 28 |
diff --git a/games-simulation/flightgear/flightgear-2018.3.1.ebuild b/games-simulation/flightgear/flightgear-2018.3.1.ebuild |
| 29 |
deleted file mode 100644 |
| 30 |
index 6e3aa9ddb61..00000000000 |
| 31 |
--- a/games-simulation/flightgear/flightgear-2018.3.1.ebuild |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,159 +0,0 @@ |
| 34 |
-# Copyright 1999-2020 Gentoo Authors |
| 35 |
-# Distributed under the terms of the GNU General Public License v2 |
| 36 |
- |
| 37 |
-EAPI=6 |
| 38 |
- |
| 39 |
-inherit cmake-utils bash-completion-r1 toolchain-funcs |
| 40 |
- |
| 41 |
-DESCRIPTION="Open Source Flight Simulator" |
| 42 |
-HOMEPAGE="https://www.flightgear.org/" |
| 43 |
-SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2" |
| 44 |
- |
| 45 |
-LICENSE="GPL-2" |
| 46 |
-KEYWORDS="~amd64 ~x86" |
| 47 |
-SLOT="0" |
| 48 |
-IUSE="dbus debug examples gdal openmp qt5 +udev +utils vim-syntax" |
| 49 |
- |
| 50 |
-# Needs --fg-root with path to flightgear-data passed to test runner passed, |
| 51 |
-# not really worth patching |
| 52 |
-RESTRICT="test" |
| 53 |
- |
| 54 |
-# zlib is some strange auto-dep from simgear |
| 55 |
-COMMON_DEPEND=" |
| 56 |
- dev-db/sqlite:3 |
| 57 |
- <dev-games/openscenegraph-3.5.6:=[jpeg,png] |
| 58 |
- ~dev-games/simgear-${PV}[gdal=] |
| 59 |
- media-libs/openal |
| 60 |
- >=media-libs/speex-1.2.0:0 |
| 61 |
- media-libs/speexdsp:0 |
| 62 |
- media-sound/gsm |
| 63 |
- sys-libs/zlib |
| 64 |
- virtual/glu |
| 65 |
- x11-libs/libX11 |
| 66 |
- dbus? ( >=sys-apps/dbus-1.6.18-r1 ) |
| 67 |
- gdal? ( >=sci-libs/gdal-2.0.0:0 ) |
| 68 |
- qt5? ( |
| 69 |
- >=dev-qt/qtcore-5.7.1:5 |
| 70 |
- >=dev-qt/qtdeclarative-5.7.1:5 |
| 71 |
- >=dev-qt/qtgui-5.7.1:5 |
| 72 |
- >=dev-qt/qtnetwork-5.7.1:5 |
| 73 |
- >=dev-qt/qtwidgets-5.7.1:5 |
| 74 |
- ) |
| 75 |
- udev? ( virtual/udev ) |
| 76 |
- utils? ( |
| 77 |
- media-libs/freeglut |
| 78 |
- media-libs/freetype:2 |
| 79 |
- media-libs/glew:0 |
| 80 |
- media-libs/libpng:0 |
| 81 |
- virtual/opengl |
| 82 |
- qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) |
| 83 |
- ) |
| 84 |
-" |
| 85 |
-# libXi and libXmu are build-only-deps according to FindGLUT.cmake |
| 86 |
-DEPEND="${COMMON_DEPEND} |
| 87 |
- >=dev-libs/boost-1.44 |
| 88 |
- >=media-libs/plib-1.8.5 |
| 89 |
- utils? ( |
| 90 |
- x11-libs/libXi |
| 91 |
- x11-libs/libXmu |
| 92 |
- ) |
| 93 |
-" |
| 94 |
-RDEPEND="${COMMON_DEPEND} |
| 95 |
- ~games-simulation/${PN}-data-${PV} |
| 96 |
-" |
| 97 |
- |
| 98 |
-DOCS=(AUTHORS ChangeLog NEWS README Thanks) |
| 99 |
- |
| 100 |
-pkg_pretend() { |
| 101 |
- use openmp && tc-check-openmp |
| 102 |
-} |
| 103 |
- |
| 104 |
-src_configure() { |
| 105 |
- local mycmakeargs=( |
| 106 |
- -DENABLE_AUTOTESTING=OFF |
| 107 |
- -DENABLE_FGCOM=$(usex utils) |
| 108 |
- -DENABLE_FGELEV=$(usex utils) |
| 109 |
- -DENABLE_FGJS=$(usex utils) |
| 110 |
- -DENABLE_FGVIEWER=$(usex utils) |
| 111 |
- -DENABLE_FLITE=OFF |
| 112 |
- -DENABLE_GDAL=$(usex gdal) |
| 113 |
- -DENABLE_GPSSMOOTH=$(usex utils) |
| 114 |
- -DENABLE_HID_INPUT=$(usex udev) |
| 115 |
- -DENABLE_JS_DEMO=$(usex utils) |
| 116 |
- -DENABLE_JSBSIM=ON |
| 117 |
- -DENABLE_LARCSIM=ON |
| 118 |
- -DENABLE_METAR=$(usex utils) |
| 119 |
- -DENABLE_OPENMP=$(usex openmp) |
| 120 |
- -DENABLE_PLIB_JOYSTICK=ON # NOTE look for defaults changes in CMake |
| 121 |
- -DENABLE_PROFILE=OFF |
| 122 |
- -DENABLE_QT=$(usex qt5) |
| 123 |
- -DENABLE_RTI=OFF |
| 124 |
- -DENABLE_STGMERGE=ON |
| 125 |
- -DENABLE_TERRASYNC=$(usex utils) |
| 126 |
- -DENABLE_TRAFFIC=$(usex utils) |
| 127 |
- -DENABLE_UIUC_MODEL=ON |
| 128 |
- -DENABLE_YASIM=ON |
| 129 |
- -DEVENT_INPUT=$(usex udev) |
| 130 |
- -DFG_BUILD_TYPE=Release |
| 131 |
- -DFG_DATA_DIR=/usr/share/${PN} |
| 132 |
- -DJSBSIM_TERRAIN=ON |
| 133 |
- -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear |
| 134 |
- -DSP_FDMS=ON |
| 135 |
- -DSYSTEM_CPPUNIT=OFF # NOTE we do not build tests anyway |
| 136 |
- -DSYSTEM_FLITE=ON |
| 137 |
- -DSYSTEM_HTS_ENGINE=ON |
| 138 |
- -DSYSTEM_SPEEX=ON |
| 139 |
- -DSYSTEM_GSM=ON |
| 140 |
- -DSYSTEM_SQLITE=ON |
| 141 |
- -DUSE_AEONWAVE=OFF |
| 142 |
- -DUSE_DBUS=$(usex dbus) |
| 143 |
- -DWITH_FGPANEL=$(usex utils) |
| 144 |
- ) |
| 145 |
- if use gdal && use utils; then |
| 146 |
- mycmakeargs+=(-DENABLE_DEMCONVERT=ON) |
| 147 |
- else |
| 148 |
- mycmakeargs+=(-DENABLE_DEMCONVERT=OFF) |
| 149 |
- fi |
| 150 |
- if use qt5 && use utils; then |
| 151 |
- mycmakeargs+=(-DENABLE_FGQCANVAS=ON) |
| 152 |
- else |
| 153 |
- mycmakeargs+=(-DENABLE_FGQCANVAS=OFF) |
| 154 |
- fi |
| 155 |
- |
| 156 |
- cmake-utils_src_configure |
| 157 |
-} |
| 158 |
- |
| 159 |
-src_install() { |
| 160 |
- cmake-utils_src_install |
| 161 |
- |
| 162 |
- # Install bash completion (TODO zsh) |
| 163 |
- # Uncomment below when scripts stops writing files... |
| 164 |
-# sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \ |
| 165 |
-# -i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT' |
| 166 |
-# newbashcomp scripts/completion/fg-completion.bash ${PN} |
| 167 |
- |
| 168 |
- # Install examples and other misc files |
| 169 |
- if use examples; then |
| 170 |
- insinto /usr/share/doc/"${PF}"/examples |
| 171 |
- doins -r scripts/java scripts/perl scripts/python |
| 172 |
- insinto /usr/share/doc/"${PF}"/examples/c++ |
| 173 |
- doins -r scripts/example/* |
| 174 |
- insinto /usr/share/doc/"${PF}"/tools |
| 175 |
- doins -r scripts/atis scripts/tools/* |
| 176 |
- fi |
| 177 |
- |
| 178 |
- # Install nasal script syntax |
| 179 |
- if use vim-syntax; then |
| 180 |
- insinto /usr/share/vim/vimfiles/syntax |
| 181 |
- doins scripts/syntax/{ac3d,nasal}.vim |
| 182 |
- insinto /usr/share/vim/vimfiles/ftdetect/ |
| 183 |
- doins "${FILESDIR}"/{ac3d,nasal}.vim |
| 184 |
- fi |
| 185 |
-} |
| 186 |
- |
| 187 |
-pkg_postinst() { |
| 188 |
- einfo "Please note that data files location changed to /usr/share/flightgear" |
| 189 |
- if use qt5; then |
| 190 |
- einfo "To use launcher, run fgfs with '--launcher' parameter" |
| 191 |
- fi |
| 192 |
-} |
| 193 |
|
| 194 |
diff --git a/games-simulation/flightgear/flightgear-2018.3.2.ebuild b/games-simulation/flightgear/flightgear-2019.1.1.ebuild |
| 195 |
similarity index 98% |
| 196 |
rename from games-simulation/flightgear/flightgear-2018.3.2.ebuild |
| 197 |
rename to games-simulation/flightgear/flightgear-2019.1.1.ebuild |
| 198 |
index 7b68e8112ef..5eb17e2184a 100644 |
| 199 |
--- a/games-simulation/flightgear/flightgear-2018.3.2.ebuild |
| 200 |
+++ b/games-simulation/flightgear/flightgear-2019.1.1.ebuild |
| 201 |
@@ -21,7 +21,7 @@ RESTRICT="test" |
| 202 |
# zlib is some strange auto-dep from simgear |
| 203 |
COMMON_DEPEND=" |
| 204 |
dev-db/sqlite:3 |
| 205 |
- <dev-games/openscenegraph-3.5.6:=[jpeg,png] |
| 206 |
+ dev-games/openscenegraph[jpeg,png] |
| 207 |
~dev-games/simgear-${PV}[gdal=] |
| 208 |
media-libs/openal |
| 209 |
>=media-libs/speex-1.2.0:0 |
| 210 |
@@ -74,6 +74,7 @@ pkg_pretend() { |
| 211 |
src_configure() { |
| 212 |
local mycmakeargs=( |
| 213 |
-DENABLE_AUTOTESTING=OFF |
| 214 |
+ -DENABLE_COMPOSITOR=OFF |
| 215 |
-DENABLE_FGCOM=$(usex utils) |
| 216 |
-DENABLE_FGELEV=$(usex utils) |
| 217 |
-DENABLE_FGJS=$(usex utils) |
| 218 |
|
| 219 |
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild |
| 220 |
index 1dcf521d629..6303c1ab598 100644 |
| 221 |
--- a/games-simulation/flightgear/flightgear-9999.ebuild |
| 222 |
+++ b/games-simulation/flightgear/flightgear-9999.ebuild |
| 223 |
@@ -23,7 +23,7 @@ RESTRICT="test" |
| 224 |
# zlib is some strange auto-dep from simgear |
| 225 |
COMMON_DEPEND=" |
| 226 |
dev-db/sqlite:3 |
| 227 |
- <dev-games/openscenegraph-3.5.6:=[jpeg,png] |
| 228 |
+ dev-games/openscenegraph[jpeg,png] |
| 229 |
~dev-games/simgear-${PV}[gdal=] |
| 230 |
media-libs/openal |
| 231 |
>=media-libs/speex-1.2.0:0 |
| 232 |
@@ -76,6 +76,7 @@ pkg_pretend() { |
| 233 |
src_configure() { |
| 234 |
local mycmakeargs=( |
| 235 |
-DENABLE_AUTOTESTING=OFF |
| 236 |
+ -DENABLE_COMPOSITOR=OFF |
| 237 |
-DENABLE_FGCOM=$(usex utils) |
| 238 |
-DENABLE_FGELEV=$(usex utils) |
| 239 |
-DENABLE_FGJS=$(usex utils) |
| 240 |
@@ -114,6 +115,9 @@ src_configure() { |
| 241 |
-DUSE_DBUS=$(usex dbus) |
| 242 |
-DWITH_FGPANEL=$(usex utils) |
| 243 |
) |
| 244 |
+ if use cpu_flags_x86_sse2; then |
| 245 |
+ append-flags -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize |
| 246 |
+ fi |
| 247 |
if use gdal && use utils; then |
| 248 |
mycmakeargs+=(-DENABLE_DEMCONVERT=ON) |
| 249 |
else |
Archives