| 1 |
commit: e17ea23a40c1fcdb092d14d118ea10352078b34c |
| 2 |
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 6 01:09:45 2020 +0000 |
| 4 |
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 6 01:12:16 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e17ea23a |
| 7 |
|
| 8 |
games-simulation/flightgear: Do not add flags unrelated cpu_flags_x86_sse2, fix live ebuild |
| 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/flightgear-2019.1.1.ebuild | 4 +++- |
| 14 |
games-simulation/flightgear/flightgear-9999.ebuild | 11 ++++++----- |
| 15 |
2 files changed, 9 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/games-simulation/flightgear/flightgear-2019.1.1.ebuild b/games-simulation/flightgear/flightgear-2019.1.1.ebuild |
| 18 |
index 5eb17e2184a..a8847f1ad50 100644 |
| 19 |
--- a/games-simulation/flightgear/flightgear-2019.1.1.ebuild |
| 20 |
+++ b/games-simulation/flightgear/flightgear-2019.1.1.ebuild |
| 21 |
@@ -92,6 +92,8 @@ src_configure() { |
| 22 |
-DENABLE_PROFILE=OFF |
| 23 |
-DENABLE_QT=$(usex qt5) |
| 24 |
-DENABLE_RTI=OFF |
| 25 |
+ -DENABLE_SIMD=OFF # see CPU_FLAGS |
| 26 |
+ -DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2) |
| 27 |
-DENABLE_STGMERGE=ON |
| 28 |
-DENABLE_TERRASYNC=$(usex utils) |
| 29 |
-DENABLE_TRAFFIC=$(usex utils) |
| 30 |
@@ -114,7 +116,7 @@ src_configure() { |
| 31 |
-DWITH_FGPANEL=$(usex utils) |
| 32 |
) |
| 33 |
if use cpu_flags_x86_sse2; then |
| 34 |
- append-flags -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize |
| 35 |
+ append-flags -msse2 -mfpmath=sse |
| 36 |
fi |
| 37 |
if use gdal && use utils; then |
| 38 |
mycmakeargs+=(-DENABLE_DEMCONVERT=ON) |
| 39 |
|
| 40 |
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild |
| 41 |
index 6303c1ab598..ce6c889aeb7 100644 |
| 42 |
--- a/games-simulation/flightgear/flightgear-9999.ebuild |
| 43 |
+++ b/games-simulation/flightgear/flightgear-9999.ebuild |
| 44 |
@@ -14,7 +14,7 @@ EGIT_BRANCH="next" |
| 45 |
LICENSE="GPL-2" |
| 46 |
KEYWORDS="" |
| 47 |
SLOT="0" |
| 48 |
-IUSE="dbus debug examples gdal openmp qt5 +udev +utils vim-syntax" |
| 49 |
+IUSE="cpu_flags_x86_sse2 dbus debug examples gdal openmp qt5 +udev +utils vim-syntax" |
| 50 |
|
| 51 |
# Needs --fg-root with path to flightgear-data passed to test runner passed, |
| 52 |
# not really worth patching |
| 53 |
@@ -81,7 +81,6 @@ src_configure() { |
| 54 |
-DENABLE_FGELEV=$(usex utils) |
| 55 |
-DENABLE_FGJS=$(usex utils) |
| 56 |
-DENABLE_FGVIEWER=$(usex utils) |
| 57 |
- -DENABLE_FLITE=OFF |
| 58 |
-DENABLE_GDAL=$(usex gdal) |
| 59 |
-DENABLE_GPSSMOOTH=$(usex utils) |
| 60 |
-DENABLE_HID_INPUT=$(usex udev) |
| 61 |
@@ -94,6 +93,8 @@ src_configure() { |
| 62 |
-DENABLE_PROFILE=OFF |
| 63 |
-DENABLE_QT=$(usex qt5) |
| 64 |
-DENABLE_RTI=OFF |
| 65 |
+ -DENABLE_SIMD=OFF # see CPU_FLAGS |
| 66 |
+ -DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2) |
| 67 |
-DENABLE_STGMERGE=ON |
| 68 |
-DENABLE_TERRASYNC=$(usex utils) |
| 69 |
-DENABLE_TRAFFIC=$(usex utils) |
| 70 |
@@ -106,8 +107,8 @@ src_configure() { |
| 71 |
-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear |
| 72 |
-DSP_FDMS=ON |
| 73 |
-DSYSTEM_CPPUNIT=OFF # NOTE we do not build tests anyway |
| 74 |
- -DSYSTEM_FLITE=ON |
| 75 |
- -DSYSTEM_HTS_ENGINE=ON |
| 76 |
+ -DSYSTEM_FLITE=OFF |
| 77 |
+ -DSYSTEM_HTS_ENGINE=OFF |
| 78 |
-DSYSTEM_SPEEX=ON |
| 79 |
-DSYSTEM_GSM=ON |
| 80 |
-DSYSTEM_SQLITE=ON |
| 81 |
@@ -116,7 +117,7 @@ src_configure() { |
| 82 |
-DWITH_FGPANEL=$(usex utils) |
| 83 |
) |
| 84 |
if use cpu_flags_x86_sse2; then |
| 85 |
- append-flags -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize |
| 86 |
+ append-flags -msse2 -mfpmath=sse |
| 87 |
fi |
| 88 |
if use gdal && use utils; then |
| 89 |
mycmakeargs+=(-DENABLE_DEMCONVERT=ON) |
Archives