Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Maciej Mrozowski <reavertm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear-data/, games-simulation/flightgear/files/, ...
Date: Sun, 02 Aug 2020 22:30:49
Message-Id: 1596407410.ecfd4818dec077ddfc863298bc209ffdd08a7766.reavertm@gentoo
1 commit: ecfd4818dec077ddfc863298bc209ffdd08a7766
2 Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 2 21:02:34 2020 +0000
4 Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 2 22:30:10 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecfd4818
7
8 games-simulation/flightgear: Version bump, remove old, fixes
9
10 Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>
11 Closes: https://bugs.gentoo.org/724694
12 Bug: https://bugs.gentoo.org/728996
13
14 dev-games/simgear/Manifest | 2 +-
15 ...ear-2019.1.1.ebuild => simgear-2020.1.2.ebuild} | 6 +--
16 dev-games/simgear/simgear-9999.ebuild | 6 +--
17 games-simulation/flightgear-data/Manifest | 2 +-
18 ....1.1.ebuild => flightgear-data-2020.1.2.ebuild} | 2 +-
19 .../flightgear-data/flightgear-data-9999.ebuild | 2 +-
20 games-simulation/flightgear/Manifest | 2 +-
21 .../files/flightgear-2018.3.2-cmake.patch | 24 ------------
22 .../files/flightgear-2020.1.2-cmake.patch | 45 ++++++++++++++++++++++
23 ...-2019.1.1.ebuild => flightgear-2020.1.2.ebuild} | 19 +++++----
24 games-simulation/flightgear/flightgear-9999.ebuild | 14 ++++---
25 11 files changed, 76 insertions(+), 48 deletions(-)
26
27 diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
28 index 7e80f426ea0..5662c13e156 100644
29 --- a/dev-games/simgear/Manifest
30 +++ b/dev-games/simgear/Manifest
31 @@ -1 +1 @@
32 -DIST simgear-2019.1.1.tar.bz2 1370523 BLAKE2B 2f61b2b4b7716b7f15852ff68bee6b749b7daa04caa27927a53eb6d6e4346c46c835938c95436250da767efd2e8043aacc0cb444b37dacde78acada98ffdb4e8 SHA512 83fe4330cf27b9298719f53f2fccde2af77bacdc6f430cc22c8bdfb475fe9b6e01578c1225af21e4e1433c7d2f2b00427454064f942359ba4c1e9896e7fe05d2
33 +DIST simgear-2020.1.2.tar.bz2 1393059 BLAKE2B 62fa15d88368177e23cf52edf51e8c56252399d8f2661e518911c1093a0d7f9f11069da8d65b479f2d4b45792dcd011194e57fa99ac3991f749e8196aaff9552 SHA512 c2e835de471f374a6c33cfd1769b7079d178ee66075bfe87cc9eb1f06dc2648db93c31f62f0ac7a664703406817cb1e909a531812cb76c99cd8751eb7e6782e7
34
35 diff --git a/dev-games/simgear/simgear-2019.1.1.ebuild b/dev-games/simgear/simgear-2020.1.2.ebuild
36 similarity index 94%
37 rename from dev-games/simgear/simgear-2019.1.1.ebuild
38 rename to dev-games/simgear/simgear-2020.1.2.ebuild
39 index be0ff641626..318b7167413 100644
40 --- a/dev-games/simgear/simgear-2019.1.1.ebuild
41 +++ b/dev-games/simgear/simgear-2020.1.2.ebuild
42 @@ -1,9 +1,9 @@
43 # Copyright 1999-2020 Gentoo Authors
44 # Distributed under the terms of the GNU General Public License v2
45
46 -EAPI=6
47 +EAPI=7
48
49 -inherit cmake-utils toolchain-funcs flag-o-matic
50 +inherit cmake toolchain-funcs flag-o-matic
51
52 DESCRIPTION="Development library for simulation games"
53 HOMEPAGE="http://www.simgear.org/"
54 @@ -68,5 +68,5 @@ src_configure() {
55 append-flags -msse2 -mfpmath=sse
56 fi
57
58 - cmake-utils_src_configure
59 + cmake_src_configure
60 }
61
62 diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild
63 index d5d56055482..b0146cf1b28 100644
64 --- a/dev-games/simgear/simgear-9999.ebuild
65 +++ b/dev-games/simgear/simgear-9999.ebuild
66 @@ -1,9 +1,9 @@
67 # Copyright 1999-2020 Gentoo Authors
68 # Distributed under the terms of the GNU General Public License v2
69
70 -EAPI=6
71 +EAPI=7
72
73 -inherit eutils cmake-utils toolchain-funcs flag-o-matic git-r3
74 +inherit eutils cmake toolchain-funcs flag-o-matic git-r3
75
76 DESCRIPTION="Development library for simulation games"
77 HOMEPAGE="http://www.simgear.org/"
78 @@ -70,5 +70,5 @@ src_configure() {
79 append-flags -msse2 -mfpmath=sse
80 fi
81
82 - cmake-utils_src_configure
83 + cmake_src_configure
84 }
85
86 diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
87 index 001e1fa1533..35816de847b 100644
88 --- a/games-simulation/flightgear-data/Manifest
89 +++ b/games-simulation/flightgear-data/Manifest
90 @@ -1 +1 @@
91 -DIST FlightGear-2019.1.1-data.tar.bz2 1748213475 BLAKE2B 6be5021a666d8363fd97e777e0674d61875e1309a391647f6ecebcc4443d494821a737709c135dc45521ae30401479f6f74c28d7db8da992fa279ae461e16a2c SHA512 e5697f587c272036d3f5cfd7dcc7464e3eae7251e41425a91c80eabccbf711a6416a4746b5bf39a2806dc3d4f6839359483a0165899eb4ec812308b2b5da060a
92 +DIST FlightGear-2020.1.2-data.tar.bz2 1954932485 BLAKE2B e3f06ed6a36d2cfc6518f4a1cac4aaf28df2b7e1fb4720488dd38f3df7dfccb1cc9b48e0f216fa79db5fc3b380dcdd1161325ba0195cc14aadbc2d79fab39031 SHA512 16329d230f8cfd35dbd60aad0afc66225134e5c2f98abb89ca271837f04917f6aa876fc35868783a3a3d56c4ba1d25f429436de516a8086f4b7e296a0d352e03
93
94 diff --git a/games-simulation/flightgear-data/flightgear-data-2019.1.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2020.1.2.ebuild
95 similarity index 98%
96 rename from games-simulation/flightgear-data/flightgear-data-2019.1.1.ebuild
97 rename to games-simulation/flightgear-data/flightgear-data-2020.1.2.ebuild
98 index 30bc1d192aa..d5d9b497664 100644
99 --- a/games-simulation/flightgear-data/flightgear-data-2019.1.1.ebuild
100 +++ b/games-simulation/flightgear-data/flightgear-data-2020.1.2.ebuild
101 @@ -1,7 +1,7 @@
102 # Copyright 1999-2020 Gentoo Authors
103 # Distributed under the terms of the GNU General Public License v2
104
105 -EAPI=6
106 +EAPI=7
107
108 DESCRIPTION="FlightGear data files"
109 HOMEPAGE="https://www.flightgear.org/"
110
111 diff --git a/games-simulation/flightgear-data/flightgear-data-9999.ebuild b/games-simulation/flightgear-data/flightgear-data-9999.ebuild
112 index 387835083e9..27d27dcf76b 100644
113 --- a/games-simulation/flightgear-data/flightgear-data-9999.ebuild
114 +++ b/games-simulation/flightgear-data/flightgear-data-9999.ebuild
115 @@ -1,7 +1,7 @@
116 # Copyright 1999-2020 Gentoo Authors
117 # Distributed under the terms of the GNU General Public License v2
118
119 -EAPI=6
120 +EAPI=7
121
122 inherit git-r3
123
124
125 diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
126 index ea3c7817887..2977ffa6f2d 100644
127 --- a/games-simulation/flightgear/Manifest
128 +++ b/games-simulation/flightgear/Manifest
129 @@ -1 +1 @@
130 -DIST flightgear-2019.1.1.tar.bz2 8440986 BLAKE2B da387456aaa6e8b86a8a865989f40c6bbcef4bf378175628c26fb172161cc3b278e4b16a3a270b7ed7fcf70329a88754c9a875a14f919fa90f284a485c909cce SHA512 edcc464af0bde4766e61137211276d77a6bb297567b0168dfaf3b97fdb9a595e5e8a0b84232680fcc975cf195261b9751edb79ae73123333feb31ab3d7215d8c
131 +DIST flightgear-2020.1.2.tar.bz2 8504580 BLAKE2B 699db9490e27b3de82bcf2903321c7ee24784e6a96285784bb449eb05fb23f3a0417d015ea10a55992c3783c0e42a2cda7e591d998532145213d1941811b1725 SHA512 a27897a1e23fe78c64717df1a86ef37dba047a1942af1dd2e4e3f3da05975bb5c524ee03444c8067551966d6a1bbfe36866f2617fa6fe1f6b957d5769c31058c
132
133 diff --git a/games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch b/games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch
134 deleted file mode 100644
135 index 97747e8b748..00000000000
136 --- a/games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch
137 +++ /dev/null
138 @@ -1,24 +0,0 @@
139 -diff -ruN flightgear-2018.3.2/CMakeLists.txt my/CMakeLists.txt
140 ---- flightgear-2018.3.2/CMakeLists.txt 2019-01-29 14:17:49.000000000 +0100
141 -+++ my/CMakeLists.txt 2019-08-18 05:29:04.762138013 +0200
142 -@@ -323,7 +323,7 @@
143 - ## Qt5 setup setup
144 - if (ENABLE_QT)
145 - message(STATUS "Qt launcher enabled, checking for Qt >= 5.4 / qmake")
146 -- find_package(Qt5 5.4 COMPONENTS Widgets Network Qml Quick Svg)
147 -+ find_package(Qt5 5.4 COMPONENTS Widgets Network Qml Quick)
148 - if (Qt5Widgets_FOUND)
149 - message(STATUS "Will enable Qt launcher GUI")
150 - message(STATUS " Qt5Widgets version: ${Qt5Widgets_VERSION_STRING}")
151 -diff -ruN flightgear-2018.3.2/src/GUI/CMakeLists.txt my/src/GUI/CMakeLists.txt
152 ---- flightgear-2018.3.2/src/GUI/CMakeLists.txt 2019-01-29 14:17:50.000000000 +0100
153 -+++ my/src/GUI/CMakeLists.txt 2019-08-18 05:38:19.607822998 +0200
154 -@@ -127,7 +127,7 @@
155 - ${qml_sources})
156 -
157 - set_property(TARGET fglauncher PROPERTY AUTOMOC ON)
158 -- target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Quick Qt5::Svg SimGearCore)
159 -+ target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Quick SimGearCore)
160 - target_include_directories(fglauncher PRIVATE ${PROJECT_BINARY_DIR}/src/GUI)
161 -
162 - add_library(fgqmlui QQuickDrawable.cxx
163
164 diff --git a/games-simulation/flightgear/files/flightgear-2020.1.2-cmake.patch b/games-simulation/flightgear/files/flightgear-2020.1.2-cmake.patch
165 new file mode 100644
166 index 00000000000..f463c458b5a
167 --- /dev/null
168 +++ b/games-simulation/flightgear/files/flightgear-2020.1.2-cmake.patch
169 @@ -0,0 +1,45 @@
170 +diff -ruN flightgear-2020.1.2/CMakeLists.txt fgfs-my/CMakeLists.txt
171 +--- flightgear-2020.1.2/CMakeLists.txt 2020-05-24 17:14:48.000000000 +0200
172 ++++ fgfs-my/CMakeLists.txt 2020-05-31 13:56:41.745941586 +0200
173 +@@ -367,7 +367,7 @@
174 + ## Qt5 setup setup
175 + if (ENABLE_QT)
176 + message(STATUS "Qt launcher enabled, checking for Qt >= 5.4 / qmake")
177 +- find_package(Qt5 5.4 COMPONENTS Widgets Network Qml Quick Svg)
178 ++ find_package(Qt5 5.4 COMPONENTS Widgets Network Qml Quick)
179 + if (Qt5Widgets_FOUND)
180 + message(STATUS "Will enable Qt launcher GUI")
181 + set(HAVE_QT 1)
182 +diff -ruN flightgear-2020.1.2/CMakeModules/SetupFGFSLibraries.cmake fgfs-my/CMakeModules/SetupFGFSLibraries.cmake
183 +--- flightgear-2020.1.2/CMakeModules/SetupFGFSLibraries.cmake 2020-05-24 17:14:48.000000000 +0200
184 ++++ fgfs-my/CMakeModules/SetupFGFSLibraries.cmake 2020-05-31 13:55:33.484421108 +0200
185 +@@ -33,15 +33,8 @@
186 +
187 + # PkgConfig::DBUS target
188 +
189 +- if(CMAKE_VERSION VERSION_LESS 3.6)
190 +- if(DBUS_FOUND)
191 +- target_link_libraries(${target} ${DBUS_LDFLAGS})
192 +- endif()
193 +- else()
194 +- # PkgConfig::DBUS target
195 +- if(TARGET PkgConfig::DBUS)
196 +- target_link_libraries(${target} PkgConfig::DBUS)
197 +- endif()
198 ++ if(DBUS_FOUND)
199 ++ target_link_libraries(${target} ${DBUS_LDFLAGS})
200 + endif()
201 +
202 + if(FG_HAVE_GPERFTOOLS)
203 +diff -ruN flightgear-2020.1.2/src/GUI/CMakeLists.txt fgfs-my/src/GUI/CMakeLists.txt
204 +--- flightgear-2020.1.2/src/GUI/CMakeLists.txt 2020-05-24 17:14:48.000000000 +0200
205 ++++ fgfs-my/src/GUI/CMakeLists.txt 2020-05-31 13:56:41.745941586 +0200
206 +@@ -137,7 +137,7 @@
207 + ${qml_sources})
208 +
209 + set_property(TARGET fglauncher PROPERTY AUTOMOC ON)
210 +- target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Quick Qt5::Svg SimGearCore)
211 ++ target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Quick SimGearCore)
212 + target_include_directories(fglauncher PRIVATE ${PROJECT_BINARY_DIR}/src/GUI)
213 +
214 + add_library(fgqmlui QQuickDrawable.cxx
215
216 diff --git a/games-simulation/flightgear/flightgear-2019.1.1.ebuild b/games-simulation/flightgear/flightgear-2020.1.2.ebuild
217 similarity index 93%
218 rename from games-simulation/flightgear/flightgear-2019.1.1.ebuild
219 rename to games-simulation/flightgear/flightgear-2020.1.2.ebuild
220 index a8847f1ad50..d3f932dbf99 100644
221 --- a/games-simulation/flightgear/flightgear-2019.1.1.ebuild
222 +++ b/games-simulation/flightgear/flightgear-2020.1.2.ebuild
223 @@ -1,9 +1,9 @@
224 # Copyright 1999-2020 Gentoo Authors
225 # Distributed under the terms of the GNU General Public License v2
226
227 -EAPI=6
228 +EAPI=7
229
230 -inherit cmake-utils bash-completion-r1 toolchain-funcs
231 +inherit cmake bash-completion-r1 toolchain-funcs
232
233 DESCRIPTION="Open Source Flight Simulator"
234 HOMEPAGE="https://www.flightgear.org/"
235 @@ -63,7 +63,9 @@ RDEPEND="${COMMON_DEPEND}
236 ~games-simulation/${PN}-data-${PV}
237 "
238
239 -PATCHES=("${FILESDIR}/${PN}-2018.3.2-cmake.patch")
240 +PATCHES=(
241 + "${FILESDIR}/${PN}-2020.1.2-cmake.patch"
242 +)
243
244 DOCS=(AUTHORS ChangeLog NEWS README Thanks)
245
246 @@ -73,13 +75,13 @@ pkg_pretend() {
247
248 src_configure() {
249 local mycmakeargs=(
250 + -DBUILD_SHARED_LIBS=OFF
251 -DENABLE_AUTOTESTING=OFF
252 -DENABLE_COMPOSITOR=OFF
253 -DENABLE_FGCOM=$(usex utils)
254 -DENABLE_FGELEV=$(usex utils)
255 -DENABLE_FGJS=$(usex utils)
256 -DENABLE_FGVIEWER=$(usex utils)
257 - -DENABLE_FLITE=OFF
258 -DENABLE_GDAL=$(usex gdal)
259 -DENABLE_GPSSMOOTH=$(usex utils)
260 -DENABLE_HID_INPUT=$(usex udev)
261 @@ -95,6 +97,7 @@ src_configure() {
262 -DENABLE_SIMD=OFF # see CPU_FLAGS
263 -DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2)
264 -DENABLE_STGMERGE=ON
265 + -DENABLE_SWIFT=OFF # swift pilot client not packaged yet
266 -DENABLE_TERRASYNC=$(usex utils)
267 -DENABLE_TRAFFIC=$(usex utils)
268 -DENABLE_UIUC_MODEL=ON
269 @@ -106,8 +109,8 @@ src_configure() {
270 -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
271 -DSP_FDMS=ON
272 -DSYSTEM_CPPUNIT=OFF # NOTE we do not build tests anyway
273 - -DSYSTEM_FLITE=ON
274 - -DSYSTEM_HTS_ENGINE=ON
275 + -DSYSTEM_FLITE=OFF
276 + -DSYSTEM_HTS_ENGINE=OFF
277 -DSYSTEM_SPEEX=ON
278 -DSYSTEM_GSM=ON
279 -DSYSTEM_SQLITE=ON
280 @@ -129,11 +132,11 @@ src_configure() {
281 mycmakeargs+=(-DENABLE_FGQCANVAS=OFF)
282 fi
283
284 - cmake-utils_src_configure
285 + cmake_src_configure
286 }
287
288 src_install() {
289 - cmake-utils_src_install
290 + cmake_src_install
291
292 # Install bash completion (TODO zsh)
293 # Uncomment below when scripts stops writing files...
294
295 diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
296 index ce6c889aeb7..fcfdb4a0c9e 100644
297 --- a/games-simulation/flightgear/flightgear-9999.ebuild
298 +++ b/games-simulation/flightgear/flightgear-9999.ebuild
299 @@ -1,9 +1,9 @@
300 # Copyright 1999-2020 Gentoo Authors
301 # Distributed under the terms of the GNU General Public License v2
302
303 -EAPI=6
304 +EAPI=7
305
306 -inherit cmake-utils bash-completion-r1 toolchain-funcs git-r3
307 +inherit cmake bash-completion-r1 toolchain-funcs git-r3
308
309 DESCRIPTION="Open Source Flight Simulator"
310 HOMEPAGE="https://www.flightgear.org/"
311 @@ -65,7 +65,9 @@ RDEPEND="${COMMON_DEPEND}
312 ~games-simulation/${PN}-data-${PV}
313 "
314
315 -PATCHES=("${FILESDIR}/${PN}-2018.3.2-cmake.patch")
316 +PATCHES=(
317 + "${FILESDIR}/${PN}-2020.1.2-cmake.patch"
318 +)
319
320 DOCS=(AUTHORS ChangeLog NEWS README Thanks)
321
322 @@ -75,6 +77,7 @@ pkg_pretend() {
323
324 src_configure() {
325 local mycmakeargs=(
326 + -DBUILD_SHARED_LIBS=OFF
327 -DENABLE_AUTOTESTING=OFF
328 -DENABLE_COMPOSITOR=OFF
329 -DENABLE_FGCOM=$(usex utils)
330 @@ -96,6 +99,7 @@ src_configure() {
331 -DENABLE_SIMD=OFF # see CPU_FLAGS
332 -DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2)
333 -DENABLE_STGMERGE=ON
334 + -DENABLE_SWIFT=OFF # swift pilot client not packaged yet
335 -DENABLE_TERRASYNC=$(usex utils)
336 -DENABLE_TRAFFIC=$(usex utils)
337 -DENABLE_UIUC_MODEL=ON
338 @@ -130,11 +134,11 @@ src_configure() {
339 mycmakeargs+=(-DENABLE_FGQCANVAS=OFF)
340 fi
341
342 - cmake-utils_src_configure
343 + cmake_src_configure
344 }
345
346 src_install() {
347 - cmake-utils_src_install
348 + cmake_src_install
349
350 # Install bash completion (TODO zsh)
351 # Uncomment below when scripts stops writing files...
Report Message
Find on MARC Find on Google Groups