[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/, dev-games/simgear/, ...

2019-03-17 Thread Maciej Mrozowski 
commit: 76fbe622c5c4c49cfebfa2d85e42c016ee0366b6
Author: Maciej Mrozowski  gentoo  org>
AuthorDate: Sun Mar 17 23:35:32 2019 +
Commit: Maciej Mrozowski  gentoo  org>
CommitDate: Sun Mar 17 23:40:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76fbe622

games-simulation/flightgear: Version bump 2018.3.2

Signed-off-by: Maciej Mrozowski  gentoo.org>

 dev-games/simgear/Manifest |  1 +
 ...simgear-.ebuild => simgear-2018.3.2.ebuild} | 20 ++---
 dev-games/simgear/simgear-.ebuild  | 14 
 games-simulation/flightgear-data/Manifest  |  3 +--
 .../flightgear-data-2018.1.1.ebuild| 26 --
 2.1.ebuild => flightgear-data-2018.3.2.ebuild} |  2 +-
 games-simulation/flightgear/Manifest   |  1 +
 ...gear-.ebuild => flightgear-2018.3.2.ebuild} | 17 +++---
 games-simulation/flightgear/flightgear-.ebuild |  2 +-
 9 files changed, 36 insertions(+), 50 deletions(-)

diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index c17226fec25..ae0736f5723 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-.ebuild 
b/dev-games/simgear/simgear-2018.3.2.ebuild
similarity index 72%
copy from dev-games/simgear/simgear-.ebuild
copy to dev-games/simgear/simgear-2018.3.2.ebuild
index 10462f88d9f..a65b51665aa 100644
--- a/dev-games/simgear/simgear-.ebuild
+++ b/dev-games/simgear/simgear-2018.3.2.ebuild
@@ -1,20 +1,18 @@
-# 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 cmake-utils toolchain-funcs flag-o-matic
 
 DESCRIPTION="Development library for simulation games"
 HOMEPAGE="http://www.simgear.org/;
-EGIT_REPO_URI="git://git.code.sf.net/p/flightgear/${PN}
-   git://mapserver.flightgear.org/${PN}"
-EGIT_BRANCH="next"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 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 +46,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 +57,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/dev-games/simgear/simgear-.ebuild 
b/dev-games/simgear/simgear-.ebuild
index 10462f88d9f..4ef9fc550b6 100644
--- a/dev-games/simgear/simgear-.ebuild
+++ b/dev-games/simgear/simgear-.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

[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/, dev-games/simgear/, ...

2018-06-03 Thread Maciej Mrozowski 
commit: c4e6a000a88ee161f778d51640e3013f0be45a8e
Author: Maciej Mrozowski  gentoo  org>
AuthorDate: Mon Jun  4 01:39:02 2018 +
Commit: Maciej Mrozowski  gentoo  org>
CommitDate: Mon Jun  4 01:41:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4e6a000

games-simulation/flightgear: version bump 2018.2.1

 dev-games/simgear/Manifest |   1 +
 dev-games/simgear/simgear-2018.2.1.ebuild  |  60 +
 games-simulation/flightgear-data/Manifest  |   1 +
 .../flightgear-data-2018.2.1.ebuild|  26 
 games-simulation/flightgear/Manifest   |   1 +
 .../flightgear/flightgear-2018.2.1.ebuild  | 148 +
 6 files changed, 237 insertions(+)

diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 79038a8ba4a..e61b6afba8f 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1 +1,2 @@
 DIST simgear-2018.1.1.tar.bz2 1303653 BLAKE2B 
44b98c2ba8ae292c3736d04813869df528d7ca14bbdc1773e1f4bd4b7b4899b5fd8605a7ada5dcc2d5e863e82ee2f1e1d2b980d3bd775c92325ad3ca834306c3
 SHA512 
3de7a15dc7b60e9e7466950c1b466d0daefea84b4730a9b8cf5e26c41cece5fd03ccf57b0f3cb977093482beb734560812e347003e19e0bb4b40d81820a11563
+DIST simgear-2018.2.1.tar.bz2 1314943 BLAKE2B 
60e44896d466085014020874a1be6ab3f6f87e472f985237404dffb5dfbd5c25f0d330701276e0b8d075830695872eb7521bb4eb5b0107edac5977c3aab85bf7
 SHA512 
6756994e0688a1f3699c33548ea90b19e99a439ea2f2002cf524629370cd1161a1556ee966fc3a781141fc7a08e7574adc0ecbe6dec67e72d631c6c4d744e4dd

diff --git a/dev-games/simgear/simgear-2018.2.1.ebuild 
b/dev-games/simgear/simgear-2018.2.1.ebuild
new file mode 100644
index 000..c8c3453c301
--- /dev/null
+++ b/dev-games/simgear/simgear-2018.2.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils toolchain-funcs
+
+DESCRIPTION="Development library for simulation games"
+HOMEPAGE="http://www.simgear.org/;
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dns debug gdal openmp subversion test"
+
+COMMON_DEPEND="
+   dev-libs/expat
+   >=dev-games/openscenegraph-3.2.0
+   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=ON
+   -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
+   )
+   cmake-utils_src_configure
+}

diff --git a/games-simulation/flightgear-data/Manifest 
b/games-simulation/flightgear-data/Manifest
index 4a6111a05fa..4b2df599cd3 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1 +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

diff --git a/games-simulation/flightgear-data/flightgear-data-2018.2.1.ebuild 
b/games-simulation/flightgear-data/flightgear-data-2018.2.1.ebuild
new file mode 100644
index 000..f364395e847
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-2018.2.1.ebuild
@@ -0,0 +1,26 @@
+# 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

[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/, dev-games/simgear/, dev-games/simgear/files/, ...

2017-06-14 Thread Maciej Mrozowski 
commit: c4ad6b25be4e46fe9f36968d2b32cbf707d42fd9
Author: Maciej Mrozowski  gentoo  org>
AuthorDate: Thu Jun 15 03:36:55 2017 +
Commit: Maciej Mrozowski  gentoo  org>
CommitDate: Thu Jun 15 03:45:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4ad6b25

games-simulation/flightgear: Version bump 2017.2.1

 dev-games/simgear/Manifest |  1 +
 .../files/simgear-2017.2.1-gdal-underlinking.patch | 28 ++
 dev-games/simgear/metadata.xml |  5 ++--
 ...simgear-.ebuild => simgear-2017.2.1.ebuild} | 21 ++--
 dev-games/simgear/simgear-.ebuild  | 13 --
 games-simulation/flightgear-data/Manifest  |  1 +
 .../flightgear-data-2017.2.1.ebuild| 26 
 games-simulation/flightgear/Manifest   |  1 +
 ...gear-.ebuild => flightgear-2017.2.1.ebuild} | 21 +---
 games-simulation/flightgear/flightgear-.ebuild | 17 -
 games-simulation/flightgear/metadata.xml   |  8 +++
 profiles/base/package.use.mask |  5 
 12 files changed, 117 insertions(+), 30 deletions(-)

diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 353ae86b693..f5e09310de6 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,3 +1,4 @@
 DIST simgear-2016.4.4.tar.bz2 1200320 SHA256 
5514fd0006bbfcdbdc0e2dab7da41eae491ea03a6246cc6a009590032b2fc1dc SHA512 
f7b9124e40dba347cd73304fc1b20a5b6d09eb476bc41949d5be615be968a6a66f64141b87819bfa357bd1fd376b2e1fc18334eb1d4df2d4f1e3f95ef4a1928d
 WHIRLPOOL 
3fb4d580d84633a6a852f6a8ab5e708afde9616b636bb5b49d30b56ed232d9938606f602d473e51855605d2544b364691ae362ec974f56b34e32507a37752221
 DIST simgear-2017.1.2.tar.bz2 1235662 SHA256 
69c8223051b039b00038aabbb8660cecce1866e3f854dadd9543db824d232f6b SHA512 
5746262873f9ca9183bf5bcfbff1493637faa68c8d070a5683f991b414b69b0e432f181394db0c39c939b3d6e433288a143eb3489a407c38f3d26c9033027404
 WHIRLPOOL 
a6b18db36078e1e26c8915ef72a5bb890bcef7433c6c641f314533c637cbcd3a626e4146ddbf7551fc179b9b07989baba04559a0f1684c4b00e94760ddace2cb
 DIST simgear-2017.1.3.tar.bz2 1235062 SHA256 
85304d985b4fc0dc00d9f7603b02d096e3c24ca4c98adc18dc9af1e2d0e3c310 SHA512 
600f883ad92d37bf76d5e6beb066da340c7af927b0f2d51ce290cccaf23d1f3289b1aa31d3aa6cc17a4b9bc57c7180f03e234e08601e4169f26624678bf551aa
 WHIRLPOOL 
377caa9327be22f10e0c45a64db7747d66dc7498b425ae5cf330544e727248b84f907b9eebb7c6b8e6a3272d1929a2b2ae1eaf8a4a542469d1e3615e9a2b7966
+DIST simgear-2017.2.1.tar.bz2 1290780 SHA256 
9924592c01cb41ad66a0ff1dc43b7678ceec69fb573d3f4e4637e26c247c7a9e SHA512 
168f5e3eab7cdd44643a62e1970c6329ac1121ca98e36c4134d963237e70304a20b7c8df3b438e24c204d51569d6863ef8b16098462d850f72a5f11a10ccbfd5
 WHIRLPOOL 
dc57cb2b87ec0111b0c555b6b87bcba7ec80c34c2277978c3aac7e71a3df260b4ac32f79698b2ea6d84a3bd6a942dc163aabd80c5f5004c409a189456f812d4a

diff --git a/dev-games/simgear/files/simgear-2017.2.1-gdal-underlinking.patch 
b/dev-games/simgear/files/simgear-2017.2.1-gdal-underlinking.patch
new file mode 100644
index 000..63eb79ed35c
--- /dev/null
+++ b/dev-games/simgear/files/simgear-2017.2.1-gdal-underlinking.patch
@@ -0,0 +1,28 @@
+From 9971d517fdf351e40467c88915d3e30e56f999d4 Mon Sep 17 00:00:00 2001
+From: Maciej Mrozowski 
+Date: Thu, 15 Jun 2017 04:58:03 +0200
+Subject: [PATCH] Link shared SimGearScene with libgdal when enabled
+
+---
+ simgear/CMakeLists.txt | 5 +
+ 1 file changed, 5 insertions(+)
+
+diff --git a/simgear/CMakeLists.txt b/simgear/CMakeLists.txt
+index 18c2e04c..6c7cb495 100644
+--- a/simgear/CMakeLists.txt
 b/simgear/CMakeLists.txt
+@@ -173,6 +173,11 @@ if(NOT SIMGEAR_HEADLESS)
+ ${OPENGL_LIBRARY}
+ ${JPEG_LIBRARY})
+ 
++if(ENABLE_GDAL)
++target_link_libraries(SimGearScene
++${GDAL_LIBRARIES})
++endif()
++
+ # only actually needed by canvas/KeyboardEvent.cxx
+ target_include_directories(SimGearScene PRIVATE 
${PROJECT_SOURCE_DIR}/3rdparty/utf8/source)
+ endif()
+-- 
+2.13.0
+

diff --git a/dev-games/simgear/metadata.xml b/dev-games/simgear/metadata.xml
index c852718c8de..8a1ed54ebf7 100644
--- a/dev-games/simgear/metadata.xml
+++ b/dev-games/simgear/metadata.xml
@@ -14,8 +14,9 @@ SimGear is a set of open-source libraries designed to be used 
as building blocks
 quickly assembling 3d simulations, games, and visualization applications.


-   Enables DNS resolver via 
net-libs/udns
-   Enables terrasync scenery 
downloader
+   Enable DNS resolver via 
net-libs/udns
+Enable alternative terrain engine based on pagedLOD 
via sci-libs/gdal
+   Enable terrasync scenery 
downloader


flightgear

diff --git a/dev-games/simgear/simgear-.ebuild 
b/dev-games/simgear/simgear-2017.2.1.ebuild
similarity index 68%
copy from

[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/, dev-games/simgear/

2017-02-06 Thread Maciej Mrozowski 
commit: 9c51f2971df92b9732494b7ec13e19173d13e585
Author: Maciej Mrozowski  gentoo  org>
AuthorDate: Sat Feb  4 16:17:34 2017 +
Commit: Maciej Mrozowski  gentoo  org>
CommitDate: Mon Feb  6 23:01:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c51f297

games-simulation/flightgear: sync ebuilds with CMake (wrt options, also for 
simgear)

 dev-games/simgear/simgear-2016.4.4.ebuild  |  1 +
 dev-games/simgear/simgear-.ebuild  |  1 +
 games-simulation/flightgear/flightgear-2016.4.4.ebuild |  8 ++--
 games-simulation/flightgear/flightgear-.ebuild | 13 -
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/dev-games/simgear/simgear-2016.4.4.ebuild 
b/dev-games/simgear/simgear-2016.4.4.ebuild
index 18dac11..82da537 100644
--- a/dev-games/simgear/simgear-2016.4.4.ebuild
+++ b/dev-games/simgear/simgear-2016.4.4.ebuild
@@ -38,6 +38,7 @@ src_configure() {
-DENABLE_DNS=$(usex dns)
-DENABLE_PKGUTIL=ON
-DENABLE_RTI=OFF
+   -DENABLE_SIMD=OFF
-DENABLE_SOUND=ON
-DENABLE_TESTS=$(usex test)
-DSIMGEAR_HEADLESS=OFF

diff --git a/dev-games/simgear/simgear-.ebuild 
b/dev-games/simgear/simgear-.ebuild
index 2436583..11f3809 100644
--- a/dev-games/simgear/simgear-.ebuild
+++ b/dev-games/simgear/simgear-.ebuild
@@ -40,6 +40,7 @@ src_configure() {
-DENABLE_DNS=$(usex dns)
-DENABLE_PKGUTIL=ON
-DENABLE_RTI=OFF
+   -DENABLE_SIMD=OFF
-DENABLE_SOUND=ON
-DENABLE_TESTS=$(usex test)
-DSIMGEAR_HEADLESS=OFF

diff --git a/games-simulation/flightgear/flightgear-2016.4.4.ebuild 
b/games-simulation/flightgear/flightgear-2016.4.4.ebuild
index c0949ff..5104182 100644
--- a/games-simulation/flightgear/flightgear-2016.4.4.ebuild
+++ b/games-simulation/flightgear/flightgear-2016.4.4.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="dbus debug examples qt5 test +udev +utils vim-syntax"
 
+# zlib is some strange auto-dep from simgear
 COMMON_DEPEND="
dev-db/sqlite:3
>=dev-games/openscenegraph-3.2.0[png]
@@ -38,10 +39,14 @@ COMMON_DEPEND="
virtual/opengl
)
 "
+# 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/libXmu )
+   utils? (
+   x11-libs/libXi
+   x11-libs/libXmu
+   )
 "
 RDEPEND="${COMMON_DEPEND}
~games-simulation/${PN}-data-${PV}
@@ -73,7 +78,6 @@ src_configure() {
-DFG_DATA_DIR=/usr/share/${PN}
-DJSBSIM_TERRAIN=ON
-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
-   -DSIMGEAR_SHARED=ON
-DSP_FDMS=ON
-DSYSTEM_FLITE=ON
-DSYSTEM_HTS_ENGINE=ON

diff --git a/games-simulation/flightgear/flightgear-.ebuild 
b/games-simulation/flightgear/flightgear-.ebuild
index 8d7628f..5d50a56 100644
--- a/games-simulation/flightgear/flightgear-.ebuild
+++ b/games-simulation/flightgear/flightgear-.ebuild
@@ -17,6 +17,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="dbus debug examples qt5 test +udev +utils vim-syntax"
 
+# zlib is some strange auto-dep from simgear
 COMMON_DEPEND="
dev-db/sqlite:3
>=dev-games/openscenegraph-3.2.0[png]
@@ -25,6 +26,7 @@ COMMON_DEPEND="
media-libs/speex
media-sound/gsm
sys-libs/zlib
+   virtual/glu
x11-libs/libX11
dbus? ( >=sys-apps/dbus-1.6.18-r1 )
qt5? (
@@ -35,13 +37,20 @@ COMMON_DEPEND="
udev? ( virtual/udev )
utils? (
media-libs/freeglut
+   media-libs/freetype:2
+   media-libs/glew:0
media-libs/libpng:0
virtual/opengl
)
 "
+# 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}
@@ -51,6 +60,7 @@ DOCS=(AUTHORS ChangeLog NEWS README Thanks)
 
 src_configure() {
local mycmakeargs=(
+   -DENABLE_FGCANVAS=$(usex qt5 && usex utils)
-DENABLE_FGCOM=$(usex utils)
-DENABLE_FGELEV=$(usex utils)
-DENABLE_FGJS=$(usex utils)
@@ -65,15 +75,16 @@ src_configure() {
-DENABLE_PROFILE=OFF
-DENABLE_QT=$(usex qt5)
-DENABLE_RTI=OFF
+   -DENABLE_SIMD=OFF # NOTE dead codepath in Gentoo anyway
-DENABLE_TERRASYNC=$(usex utils)
-DENABLE_TESTS=$(usex test)
+   -DENABLE_TRAFFIC=$(usex utils)

[gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/, dev-games/simgear/, ...

2016-10-01 Thread Maciej Mrozowski 
commit: 3c0e6789ac2c9476794c64c5c324eb393677712c
Author: Maciej Mrozowski  gentoo  org>
AuthorDate: Sat Oct  1 06:57:34 2016 +
Commit: Maciej Mrozowski  gentoo  org>
CommitDate: Sat Oct  1 07:01:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c0e6789

games-simulation/flightgear: Version bump 2016.3.1, bug 595304. Remove 
2016.1.1. Sync live ebuild.

 dev-games/simgear/Manifest |  2 +-
 .../{simgear-2016.1.1.ebuild => simgear-2016.3.1.ebuild}   | 10 +++---
 dev-games/simgear/simgear-.ebuild  |  6 ++
 games-simulation/flightgear-data/Manifest  |  2 +-
 ...ar-data-2016.1.1.ebuild => flightgear-data-2016.3.1.ebuild} |  0
 games-simulation/flightgear/Manifest   |  2 +-
 .../{flightgear-2016.1.1.ebuild => flightgear-2016.3.1.ebuild} |  3 ++-
 games-simulation/flightgear/flightgear-.ebuild |  2 ++
 games-simulation/flightgear/metadata.xml   |  2 +-
 9 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 6fa9e7b..13bca2c 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,3 +1,3 @@
-DIST simgear-2016.1.1.tar.bz2 1065810 SHA256 
dbbc40115bc41563d930102484a3682e9fa4dda6f120feaa1fe82e0eb9d96c0d SHA512 
ccc3384beef2e2ff3819928f22289a774da28c1df11f42ddc58ad4913c2c329a2cc14ca0359a312b9684ae31e598dda8a7a49e27c9148d079858dc0bf8e6ae63
 WHIRLPOOL 
2cf05f28c3318ea678f728c87e447c73934348b8862c97602b264f63bbecca82fd7e6db17affe84c78e1a9c42e31ad64aca243e97723e3e54ffca8481609ba50
 DIST simgear-2016.2.1.tar.bz2 1161873 SHA256 
601d4ef75a7f9e7012f85d6f63219f3e2ef90f98249eaa5d16cc6b1a3c737a0a SHA512 
22046873b67c2dd530d9734f799ea8a7238f6ffb58999b5a1d72053c4837212906048ec681cb2b704cd55d6b7aba03729d4f6a6a7e351f1e5aa2e497cc78d937
 WHIRLPOOL 
4f4fd697b301dfcd27a623d9475e63a46709d1e27b0324bdf097a8260d2759e7dedb16de6dbf1a82430dc3d80a32b58abf3bc82026894b83c2ec5c06391dcdcf
+DIST simgear-2016.3.1.tar.bz2 1199016 SHA256 
ae46e1273673be41028ee912d1826e87185ab594053c493707f9dbdeea5159dd SHA512 
5c0e260da8b09e815cd6607f3e977b5827f450e9fbe10bfaef019d7489506905fde56a5ab6748165431088bbae7fa61d4bccc27e4d7828c8bc6a05247b450716
 WHIRLPOOL 
c349848d7e85166d7161272d722bebed7b387e6cd4c9db6cd405e3d042ee212b4448231eb92e0a86b8dc00c497af2c69455edd7d7d1cd4007d9ca09e91e575a7
 DIST simgear-3.4.0.tar.bz2 1057455 SHA256 
927d66fe72aacb9dacced4506430bd5fc7726bc8d3d07d6f1866bc4cb11a5894 SHA512 
9ebf49ea2f024f0e52a4d18ba6f77361e7b9f51a0e7238661b4b2fd9db0176bdd948612d9b4aec3ae4d8210676e7533dfc0308b9c71bdeb22e99a68b90d81320
 WHIRLPOOL 
bb48b6640409a96816ade77c22a91f88c452d339165dd0241354c26ff27572a14538ecfd91265c239def4621657be8766c081cffc237711a691d7ef54461b548

diff --git a/dev-games/simgear/simgear-2016.1.1.ebuild 
b/dev-games/simgear/simgear-2016.3.1.ebuild
similarity index 81%
rename from dev-games/simgear/simgear-2016.1.1.ebuild
rename to dev-games/simgear/simgear-2016.3.1.ebuild
index de8291d..39f6c59 100644
--- a/dev-games/simgear/simgear-2016.1.1.ebuild
+++ b/dev-games/simgear/simgear-2016.3.1.ebuild
@@ -13,15 +13,16 @@ SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
-IUSE="curl debug subversion test"
+IUSE="+dns debug subversion test"
 
 COMMON_DEPEND="
dev-libs/expat
>=dev-games/openscenegraph-3.2.0
media-libs/openal
+   net-misc/curl
sys-libs/zlib
virtual/opengl
-   curl? ( net-misc/curl )
+   dns? ( net-libs/udns )
 "
 DEPEND="${COMMON_DEPEND}
>=dev-libs/boost-1.44
@@ -34,7 +35,7 @@ DOCS=(AUTHORS ChangeLog NEWS README Thanks)
 
 src_configure() {
local mycmakeargs=(
-   -DENABLE_CURL=$(usex curl)
+   -DENABLE_DNS=$(usex dns)
-DENABLE_PKGUTIL=ON
-DENABLE_RTI=OFF
-DENABLE_SOUND=ON
@@ -42,6 +43,9 @@ src_configure() {
-DSIMGEAR_HEADLESS=OFF
-DSIMGEAR_SHARED=ON
-DSYSTEM_EXPAT=ON
+   -DSYSTEM_UDNS=ON
+   -DUSE_AEONWAVE=OFF
+   -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
)
cmake-utils_src_configure
 }

diff --git a/dev-games/simgear/simgear-.ebuild 
b/dev-games/simgear/simgear-.ebuild
index 2c5c92d..2436583 100644
--- a/dev-games/simgear/simgear-.ebuild
+++ b/dev-games/simgear/simgear-.ebuild
@@ -33,10 +33,6 @@ RDEPEND="${COMMON_DEPEND}
subversion? ( dev-vcs/subversion )
 "
 
-PATCHES=(
-   "${FILESDIR}/simgear-2016.2.1-unbundle-udns.patch"
-)
-
 DOCS=(AUTHORS ChangeLog NEWS README Thanks)
 
 src_configure() {
@@ -50,6 +46,8 @@ src_configure() {
-DSIMGEAR_SHARED=ON
-DSYSTEM_EXPAT=ON
-DSYSTEM_UDNS=ON
+   -DUSE_AEONWAVE=OFF
+   -DOSG_FSTREAM_EXPORT_FIXED=OFF