1 |
commit: d647eba30bef1720b55aeddf89f6670b9cdda475 |
2 |
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 5 23:20:17 2017 +0000 |
4 |
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 5 23:24:30 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d647eba3 |
7 |
|
8 |
games-simulation/flightgear: Version bump 2017.1.2, fix speexdps, bug 611674, enable SIMD intrinsics, sync live ebuild a bit. Drop PPC. |
9 |
|
10 |
dev-games/simgear/Manifest | 2 +- |
11 |
...gear-2017.1.1.ebuild => simgear-2017.1.2.ebuild} | 2 +- |
12 |
dev-games/simgear/simgear-9999.ebuild | 2 +- |
13 |
games-simulation/flightgear-data/Manifest | 2 +- |
14 |
...7.1.1.ebuild => flightgear-data-2017.1.2.ebuild} | 0 |
15 |
games-simulation/flightgear/Manifest | 2 +- |
16 |
.../flightgear/flightgear-2016.4.4.ebuild | 8 +++++++- |
17 |
...r-2017.1.1.ebuild => flightgear-2017.1.2.ebuild} | 16 ++++++++-------- |
18 |
games-simulation/flightgear/flightgear-9999.ebuild | 21 +++++++++++---------- |
19 |
games-simulation/flightgear/metadata.xml | 1 + |
20 |
10 files changed, 32 insertions(+), 24 deletions(-) |
21 |
|
22 |
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest |
23 |
index 82c27afd6bd..6bacd45efb2 100644 |
24 |
--- a/dev-games/simgear/Manifest |
25 |
+++ b/dev-games/simgear/Manifest |
26 |
@@ -1,2 +1,2 @@ |
27 |
DIST simgear-2016.4.4.tar.bz2 1200320 SHA256 5514fd0006bbfcdbdc0e2dab7da41eae491ea03a6246cc6a009590032b2fc1dc SHA512 f7b9124e40dba347cd73304fc1b20a5b6d09eb476bc41949d5be615be968a6a66f64141b87819bfa357bd1fd376b2e1fc18334eb1d4df2d4f1e3f95ef4a1928d WHIRLPOOL 3fb4d580d84633a6a852f6a8ab5e708afde9616b636bb5b49d30b56ed232d9938606f602d473e51855605d2544b364691ae362ec974f56b34e32507a37752221 |
28 |
-DIST simgear-2017.1.1.tar.bz2 1236106 SHA256 1815f6a2c3f43bb6121b2394e68f8e6e341c14a7a40e4163c0bcc105ee06ccbc SHA512 8920b41127eac40e3633444eae2cd7b61ac8a386164571a5f1205c92da7f555d54824fc39ab2e1af40860cb507eb358679282adede371c9a81c858bbcaadc9dd WHIRLPOOL 2b1fcce13c5919ac8fe248320a0289ac1dd317224f9a9b9ab9fd000e627ea726b1b2abf5e0fec6f924bc8561f408281dffd907081f82cd0b0e48ab5be8e97169 |
29 |
+DIST simgear-2017.1.2.tar.bz2 1235662 SHA256 69c8223051b039b00038aabbb8660cecce1866e3f854dadd9543db824d232f6b SHA512 5746262873f9ca9183bf5bcfbff1493637faa68c8d070a5683f991b414b69b0e432f181394db0c39c939b3d6e433288a143eb3489a407c38f3d26c9033027404 WHIRLPOOL a6b18db36078e1e26c8915ef72a5bb890bcef7433c6c641f314533c637cbcd3a626e4146ddbf7551fc179b9b07989baba04559a0f1684c4b00e94760ddace2cb |
30 |
|
31 |
diff --git a/dev-games/simgear/simgear-2017.1.1.ebuild b/dev-games/simgear/simgear-2017.1.2.ebuild |
32 |
similarity index 98% |
33 |
rename from dev-games/simgear/simgear-2017.1.1.ebuild |
34 |
rename to dev-games/simgear/simgear-2017.1.2.ebuild |
35 |
index ddd8ca08d24..d1fdac8b30b 100644 |
36 |
--- a/dev-games/simgear/simgear-2017.1.1.ebuild |
37 |
+++ b/dev-games/simgear/simgear-2017.1.2.ebuild |
38 |
@@ -37,7 +37,7 @@ src_configure() { |
39 |
-DENABLE_DNS=$(usex dns) |
40 |
-DENABLE_PKGUTIL=ON |
41 |
-DENABLE_RTI=OFF |
42 |
- -DENABLE_SIMD=OFF |
43 |
+ -DENABLE_SIMD=ON |
44 |
-DENABLE_SOUND=ON |
45 |
-DENABLE_TESTS=$(usex test) |
46 |
-DSIMGEAR_HEADLESS=OFF |
47 |
|
48 |
diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild |
49 |
index e1e26cab473..b18a51cc4e3 100644 |
50 |
--- a/dev-games/simgear/simgear-9999.ebuild |
51 |
+++ b/dev-games/simgear/simgear-9999.ebuild |
52 |
@@ -39,7 +39,7 @@ src_configure() { |
53 |
-DENABLE_DNS=$(usex dns) |
54 |
-DENABLE_PKGUTIL=ON |
55 |
-DENABLE_RTI=OFF |
56 |
- -DENABLE_SIMD=OFF |
57 |
+ -DENABLE_SIMD=ON |
58 |
-DENABLE_SOUND=ON |
59 |
-DENABLE_TESTS=$(usex test) |
60 |
-DSIMGEAR_HEADLESS=OFF |
61 |
|
62 |
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest |
63 |
index 999baea96a3..f644b68fc2a 100644 |
64 |
--- a/games-simulation/flightgear-data/Manifest |
65 |
+++ b/games-simulation/flightgear-data/Manifest |
66 |
@@ -1,2 +1,2 @@ |
67 |
DIST FlightGear-2016.4.4-data.tar.bz2 1654119067 SHA256 3dfd4b82c99a8bf4b81dd31846efce52ed417be180eaa71020ccc914f9a49668 SHA512 e9a8dfb17c03fb2961e4d031ef63d56c580f029a7ceee816e67c3944a3a79f476ee1c6ad40ce8af530c8551497d9e1329b00805499ad85c4610c07bfaf22d3aa WHIRLPOOL 249ba21e7ad58c885a92094ec403d99bc8879e9c6638b8ebc2e48053c5524c62383c95ddb9bac3039ddbcd50a90b4a690676df642125e4219fc3c7e94f793717 |
68 |
-DIST FlightGear-2017.1.1-data.tar.bz2 1460031625 SHA256 873c0906934b3d795db9fd78889a5c6badc2fe15229bef549974b1492042fd80 SHA512 7f6f0bbe5807d45a2613a164d3111383c7bab330b05367f064974719f0a7bfceb13146852bf061ced284e57c86aa7eec74a1cb6869616f45d0a48e51abfc1607 WHIRLPOOL 2186387798b22bb7c30bcb503ae219477eaae380a76537a6ea1bc3e16a790626f32d64dc7837941d58799d063773228f0c37239b6217e35bcb54c43f60a95d32 |
69 |
+DIST FlightGear-2017.1.2-data.tar.bz2 1460657435 SHA256 99d38d0478a8c8031f59376112bd54a6f996e1d363807b3bb45786384cfb2753 SHA512 0498b662a26c03dd08a1861d63e982adeded1a01db34ccf09d2acd9420a0b0343242216c58fa2a2ce215806690eb4d1796114f15f3adbd391fa18421629d4f97 WHIRLPOOL 45a1898ed0ca108d501f3bd35153a2107c4e4f682e3b49a7e8f49015fa5a6b6468d5177cc79458e23f5ae9b3ee2744540ab82a48561d9ba994cb147adc898650 |
70 |
|
71 |
diff --git a/games-simulation/flightgear-data/flightgear-data-2017.1.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2017.1.2.ebuild |
72 |
similarity index 100% |
73 |
rename from games-simulation/flightgear-data/flightgear-data-2017.1.1.ebuild |
74 |
rename to games-simulation/flightgear-data/flightgear-data-2017.1.2.ebuild |
75 |
|
76 |
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest |
77 |
index 85833400310..c3aa9fb9e43 100644 |
78 |
--- a/games-simulation/flightgear/Manifest |
79 |
+++ b/games-simulation/flightgear/Manifest |
80 |
@@ -1,2 +1,2 @@ |
81 |
DIST flightgear-2016.4.4.tar.bz2 7560911 SHA256 d51992cbe40f1812f9821ab27b838d52e04c10551772d57fc2e815f4444dfafc SHA512 3f3d5a72adea9cb9a22b7b355a18492c1c58634e6203d6ae364d7a89f1af0fcc3df446c72c3c83ac9a1f51e05a6cd83c7d7af5f7bc3a5e8e75e3b80f709394a0 WHIRLPOOL 0a3fc48c5ec440cdcc7f2a99b860c51310fd9f256e5577458ccd9fa5202c26751b982918752326c68b5c6d9554eb902c4789df4a6221752870d3eaf263756226 |
82 |
-DIST flightgear-2017.1.1.tar.bz2 8057285 SHA256 8f98bbdc027164564cddf660856e0b2f4924c5c9b6a32735b14cd57b4338a028 SHA512 97421940c10e0afa3ecabeb3b3f676a262ed715ac47174cecceaef6962bc3f4a20c3bbc8505f4d600c6099940294d912148e9adb908ce6dc4546a5d2f2508a01 WHIRLPOOL 18b34c1dad47cd519fed095a000f5f532751f8c3902f2c7170b927c2dbe1c1227c74f270eb8fbc27e6d258373b8f288a96db4f864d1d512a42ebc0ae285832fc |
83 |
+DIST flightgear-2017.1.2.tar.bz2 8056697 SHA256 41fe2a4ab0c14ed10436026c2edbb83148bf603691487976aaf2a5314f524659 SHA512 26466d6bd567c06cec7744dccba5c4a70d01c5169153c3c660175e9b400b9d1b5cc0d067e4d53d102ba5c20ceffb2217afcc54a0e86bf8aa7b3e7ee5a60aaf07 WHIRLPOOL f7b8a7884d4738a6e803a27b0dd3a5ad7bfc65d25b6c19baca0b0244222b967963ff3663298a8659ff01fd6aa52c4d7ed91f29792c8b77dded36ec6ba687200c |
84 |
|
85 |
diff --git a/games-simulation/flightgear/flightgear-2016.4.4.ebuild b/games-simulation/flightgear/flightgear-2016.4.4.ebuild |
86 |
index 63155169636..e1245c6f657 100644 |
87 |
--- a/games-simulation/flightgear/flightgear-2016.4.4.ebuild |
88 |
+++ b/games-simulation/flightgear/flightgear-2016.4.4.ebuild |
89 |
@@ -20,7 +20,13 @@ COMMON_DEPEND=" |
90 |
>=dev-games/openscenegraph-3.2.0[png] |
91 |
~dev-games/simgear-${PV} |
92 |
media-libs/openal |
93 |
- media-libs/speex |
94 |
+ || ( |
95 |
+ ( |
96 |
+ >=media-libs/speex-1.2.0:0 |
97 |
+ media-libs/speexdsp:0 |
98 |
+ ) |
99 |
+ <media-libs/speex-1.2.0:0 |
100 |
+ ) |
101 |
media-sound/gsm |
102 |
sys-libs/zlib |
103 |
virtual/glu |
104 |
|
105 |
diff --git a/games-simulation/flightgear/flightgear-2017.1.1.ebuild b/games-simulation/flightgear/flightgear-2017.1.2.ebuild |
106 |
similarity index 93% |
107 |
rename from games-simulation/flightgear/flightgear-2017.1.1.ebuild |
108 |
rename to games-simulation/flightgear/flightgear-2017.1.2.ebuild |
109 |
index 74fd2237a07..caf3f423149 100644 |
110 |
--- a/games-simulation/flightgear/flightgear-2017.1.1.ebuild |
111 |
+++ b/games-simulation/flightgear/flightgear-2017.1.2.ebuild |
112 |
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2" |
113 |
|
114 |
LICENSE="GPL-2" |
115 |
SLOT="0" |
116 |
-KEYWORDS="~amd64 ~ppc ~x86" |
117 |
+KEYWORDS="~amd64 ~x86" |
118 |
IUSE="dbus debug examples qt5 test +udev +utils vim-syntax" |
119 |
|
120 |
# zlib is some strange auto-dep from simgear |
121 |
@@ -20,13 +20,8 @@ COMMON_DEPEND=" |
122 |
>=dev-games/openscenegraph-3.2.0[png] |
123 |
~dev-games/simgear-${PV} |
124 |
media-libs/openal |
125 |
- || ( |
126 |
- ( |
127 |
- >=media-libs/speex-1.2.0 |
128 |
- media-libs/speexdsp |
129 |
- ) |
130 |
- <media-libs/speex-1.2.0 |
131 |
- ) |
132 |
+ >=media-libs/speex-1.2.0:0 |
133 |
+ media-libs/speexdsp:0 |
134 |
media-sound/gsm |
135 |
sys-libs/zlib |
136 |
virtual/glu |
137 |
@@ -40,8 +35,11 @@ COMMON_DEPEND=" |
138 |
udev? ( virtual/udev ) |
139 |
utils? ( |
140 |
media-libs/freeglut |
141 |
+ media-libs/freetype:2 |
142 |
+ media-libs/glew:0 |
143 |
media-libs/libpng:0 |
144 |
virtual/opengl |
145 |
+ qt5? ( >=dev-qt/qtwebsockets-5.4.1:5 ) |
146 |
) |
147 |
" |
148 |
# libXi and libXmu are build-only-deps according to FindGLUT.cmake |
149 |
@@ -64,6 +62,7 @@ src_configure() { |
150 |
-DENABLE_FGCOM=$(usex utils) |
151 |
-DENABLE_FGELEV=$(usex utils) |
152 |
-DENABLE_FGJS=$(usex utils) |
153 |
+ -DENABLE_FGQCANVAS=$(usex qt5 && usex utils) |
154 |
-DENABLE_FGVIEWER=$(usex utils) |
155 |
-DENABLE_FLITE=OFF |
156 |
-DENABLE_GPSSMOOTH=$(usex utils) |
157 |
@@ -77,6 +76,7 @@ src_configure() { |
158 |
-DENABLE_RTI=OFF |
159 |
-DENABLE_TERRASYNC=$(usex utils) |
160 |
-DENABLE_TESTS=$(usex test) |
161 |
+ -DENABLE_TRAFFIC=$(usex utils) |
162 |
-DENABLE_UIUC_MODEL=ON |
163 |
-DENABLE_YASIM=ON |
164 |
-DEVENT_INPUT=$(usex udev) |
165 |
|
166 |
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild |
167 |
index 746af698999..30b2cbd0177 100644 |
168 |
--- a/games-simulation/flightgear/flightgear-9999.ebuild |
169 |
+++ b/games-simulation/flightgear/flightgear-9999.ebuild |
170 |
@@ -14,26 +14,23 @@ EGIT_BRANCH="next" |
171 |
LICENSE="GPL-2" |
172 |
SLOT="0" |
173 |
KEYWORDS="" |
174 |
-IUSE="dbus debug examples qt5 test +udev +utils vim-syntax" |
175 |
+IUSE="dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax" |
176 |
|
177 |
# zlib is some strange auto-dep from simgear |
178 |
+# TODO openmp |
179 |
COMMON_DEPEND=" |
180 |
dev-db/sqlite:3 |
181 |
>=dev-games/openscenegraph-3.2.0[png] |
182 |
~dev-games/simgear-${PV} |
183 |
media-libs/openal |
184 |
- || ( |
185 |
- ( |
186 |
- >=media-libs/speex-1.2.0 |
187 |
- media-libs/speexdsp |
188 |
- ) |
189 |
- <media-libs/speex-1.2.0 |
190 |
- ) |
191 |
+ >=media-libs/speex-1.2.0:0 |
192 |
+ media-libs/speexdsp:0 |
193 |
media-sound/gsm |
194 |
sys-libs/zlib |
195 |
virtual/glu |
196 |
x11-libs/libX11 |
197 |
dbus? ( >=sys-apps/dbus-1.6.18-r1 ) |
198 |
+ gdal? ( >=sci-libs/gdal-2.0.0:0 ) |
199 |
qt5? ( |
200 |
>=dev-qt/qtcore-5.4.1:5 |
201 |
>=dev-qt/qtgui-5.4.1:5 |
202 |
@@ -46,6 +43,7 @@ COMMON_DEPEND=" |
203 |
media-libs/glew:0 |
204 |
media-libs/libpng:0 |
205 |
virtual/opengl |
206 |
+ qt5? ( >=dev-qt/qtwebsockets-5.4.1:5 ) |
207 |
) |
208 |
" |
209 |
# libXi and libXmu are build-only-deps according to FindGLUT.cmake |
210 |
@@ -65,28 +63,31 @@ DOCS=(AUTHORS ChangeLog NEWS README Thanks) |
211 |
|
212 |
src_configure() { |
213 |
local mycmakeargs=( |
214 |
- -DENABLE_FGCANVAS=$(usex qt5 && usex utils) |
215 |
+ -DENABLE_DEMCONVERT=$(usex gdal && usex utils) |
216 |
-DENABLE_FGCOM=$(usex utils) |
217 |
-DENABLE_FGELEV=$(usex utils) |
218 |
-DENABLE_FGJS=$(usex utils) |
219 |
+ -DENABLE_FGQCANVAS=$(usex qt5 && usex utils) |
220 |
-DENABLE_FGVIEWER=$(usex utils) |
221 |
-DENABLE_FLITE=OFF |
222 |
+ -DENABLE_GDAL=$(usex gdal) |
223 |
-DENABLE_GPSSMOOTH=$(usex utils) |
224 |
-DENABLE_JS_DEMO=$(usex utils) |
225 |
-DENABLE_JSBSIM=ON |
226 |
-DENABLE_LARCSIM=ON |
227 |
-DENABLE_LOGGING=$(usex test) |
228 |
-DENABLE_METAR=$(usex utils) |
229 |
+ -DENABLE_OPENMP=$(usex openmp) |
230 |
-DENABLE_PROFILE=OFF |
231 |
-DENABLE_QT=$(usex qt5) |
232 |
-DENABLE_RTI=OFF |
233 |
- -DENABLE_SIMD=OFF # NOTE dead codepath in Gentoo anyway |
234 |
-DENABLE_TERRASYNC=$(usex utils) |
235 |
-DENABLE_TESTS=$(usex test) |
236 |
-DENABLE_TRAFFIC=$(usex utils) |
237 |
-DENABLE_UIUC_MODEL=ON |
238 |
-DENABLE_YASIM=ON |
239 |
-DEVENT_INPUT=$(usex udev) |
240 |
+ -DFG_BUILD_TYPE=Dev |
241 |
-DFG_DATA_DIR=/usr/share/${PN} |
242 |
-DJSBSIM_TERRAIN=ON |
243 |
-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear |
244 |
|
245 |
diff --git a/games-simulation/flightgear/metadata.xml b/games-simulation/flightgear/metadata.xml |
246 |
index 50f99784e5f..519cdc02d1e 100644 |
247 |
--- a/games-simulation/flightgear/metadata.xml |
248 |
+++ b/games-simulation/flightgear/metadata.xml |
249 |
@@ -11,6 +11,7 @@ |
250 |
</maintainer> |
251 |
<use> |
252 |
<flag name="dbus">Enable screensaver DBus interaction</flag> |
253 |
+ <flag name="gdal">Builds alternative terrain engine based on pagedLOD using <pkg>sci-libs/gdal</pkg></flag> |
254 |
<flag name="qt5">Builds Qt5 launcher application</flag> |
255 |
<flag name="udev">Enables event-based Input devices through <pkg>virtual/udev</pkg></flag> |
256 |
<flag name="utils">Builds various utilities (fgpanel, fgviewer among others)</flag> |