public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/, dev-games/simgear/, ...
@ 2016-10-01  7:02 Maciej Mrozowski
  0 siblings, 0 replies; 3+ messages in thread
From: Maciej Mrozowski @ 2016-10-01  7:02 UTC (permalink / raw
  To: gentoo-commits

commit:     3c0e6789ac2c9476794c64c5c324eb393677712c
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  1 06:57:34 2016 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Sat Oct  1 07:01:31 2016 +0000
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-9999.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-9999.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-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild
index 2c5c92d..2436583 100644
--- a/dev-games/simgear/simgear-9999.ebuild
+++ b/dev-games/simgear/simgear-9999.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 # TODO perhaps track it
 	)
 	cmake-utils_src_configure
 }

diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index 0600b5f..52129e7 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1,3 +1,3 @@
-DIST FlightGear-2016.1.1-data.tar.bz2 1266743984 SHA256 36016ac5ab83fc6ad44c5cebe0f4fa7a14cf55ff5b699016abdeacf5a04c4c18 SHA512 605d610d001f959e2434228b9c3741af0df5fd047af31e1d60ad5bdb1041cde3299cab622014735cff6534d2a8f0edbe44ab3528bae2072454aaf0b363e765b8 WHIRLPOOL 3c1c50d2a47a9c68839cea1c24439c1052fc8b4a8ff7ee4378913fe3aaa9c4f08feb3a2a8aca520087aa745a4bda0ef43d8ea4679072cd56ff1311acf27261e3
 DIST FlightGear-2016.2.1-data.tar.bz2 1562126790 SHA256 225b32f4d813635ece72f09541640e818fba95386ff8715015693978c37eaace SHA512 1c22d2afcb33ef8552fa9712a25fc116e31d585f4973339b134b6461421da1b47c3e5c795c5f1ee99d13a1c107f3a7a615c07843de2332a1e9f729bc64dd269d WHIRLPOOL b664f65c23342c0e13d58c431896019085780cf413da4c3350e3e22efb3aa1686fee6f3e1b97568711d5218eb2f1dab554d2d5559f06358c75eff1e711fcb7b8
+DIST FlightGear-2016.3.1-data.tar.bz2 1430257110 SHA256 1eceb36f5b577bb8223ed1520e68179fb9292b95e63ffd9ad695dcc93b814d1c SHA512 ba4d51efc23cf125367815491cdb78153d5b553bae54bae41eb9f01f0749d53d1be9c0a63e998a31f05c0d514d5dcef2a1dfd55267e7698d34738e3dc5559018 WHIRLPOOL e3f2ba81ad519ba94666cac046ad92563801aac9944f4180566d0e7d8b82849a0ac0c4c670ba64a04862bdd3f94239453cce8ec676c64fb809318632995dfc41
 DIST FlightGear-data-3.4.0.tar.bz2 1145893777 SHA256 8cefa7c323d974d8e51fd23c97ae79dc731e65b81e1729cb1bc9bc1f99df128b SHA512 791ff1b1f7f759ccc73f738ba6cb6fd050d1341ae031a872745b4c1145cdb92de62193df7ea6e9fe05a1c95a60fa664da56015d643244d38c7b0b72a2c3146d9 WHIRLPOOL 0abaa4da7e9032469da80500fc23c84d6b696fc596529853a3a614bb3627ef6081c12ea78e6e8c987e6b11b303cca0d8da5c9628164d2a93bed452230302a655

diff --git a/games-simulation/flightgear-data/flightgear-data-2016.1.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2016.3.1.ebuild
similarity index 100%
rename from games-simulation/flightgear-data/flightgear-data-2016.1.1.ebuild
rename to games-simulation/flightgear-data/flightgear-data-2016.3.1.ebuild

diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 1e2f003..f445143 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,3 +1,3 @@
-DIST flightgear-2016.1.1.tar.bz2 7541607 SHA256 acdffb8a6a000cd44b23816f5d1467dbcf375d3cbd6233b2998467bd55dd60ac SHA512 bcebbf100e383a808154dbdf2b0f28ffcf0e3c0415a2db90e0daabb0073e83be69b3989dfc9e299c35fa6e39ddb5b9d4dfefd7f4c23ca8cd981768d8ab89e9c0 WHIRLPOOL d431c59c160a383c4f91f34f1e7ad322502704a4693c6c189cf258958703b0fe97290ab9db60a7de93f99511c79993c1a02de5ae559be0f0fab83b1bea371791
 DIST flightgear-2016.2.1.tar.bz2 7556269 SHA256 b554170ca6b5943fd90496759b055fb60f362ea96f6c46dfff89e3d12c940a94 SHA512 679cb8e6aa4c2d601e7b984da6e4317fd454d14b1357d08cc64350eb973a6700a0dddd18b50cd50fcdce48fba2864ce0f7484b67a15e38cb5f5e8e7d4fc7b017 WHIRLPOOL 6d04982bb107d59094facb4d0430cb25de5ea994f25f1ea3a18351626335c1bc136228e376fd680baacb1e731718b49c317adb390737fd5641b51f8228303c48
+DIST flightgear-2016.3.1.tar.bz2 7542098 SHA256 501d2f59b8f9d221332044346bbbfe195e42d0195945f8bb0fec8b474bc79c31 SHA512 57246144d954e36e330fe5da15ff5c86f810cbd0b09638c2df813a242677eca22e00a9432f6091da6731972699657fee525310f5bcc91cf8dc5e2250c8663e8a WHIRLPOOL f9c4809fe5d2981b366a3b2c3d47788843a8abd0bacee37eb8c15dafcfd2c3b855c760065c8f0274c10f96faa84632536a68641e6f80a047409ec944a4b4dd24
 DIST flightgear-3.4.0.tar.bz2 7522457 SHA256 b5645d05b50728a89f091292bc557f440d8f8719dd9cebf7f5bf3fa8ea795780 SHA512 10626d00b34255753dc5a5c82076909c296219472faf51c38460cc357ac014b40bd127454f28b2d857f1a1a299716430fd8f04dc7881552b3c24dee6eb616b1e WHIRLPOOL 636ca7e012175141bc4b081cb6137e5348d49b873d241c5d0f1ed0a2581b32d2f23f4fe0ed97d5a1b72440afd14687e5de4e6ebeeaf07b4e854b0ca47875b82f

diff --git a/games-simulation/flightgear/flightgear-2016.1.1.ebuild b/games-simulation/flightgear/flightgear-2016.3.1.ebuild
similarity index 97%
rename from games-simulation/flightgear/flightgear-2016.1.1.ebuild
rename to games-simulation/flightgear/flightgear-2016.3.1.ebuild
index bbd90f6..14ee221 100644
--- a/games-simulation/flightgear/flightgear-2016.1.1.ebuild
+++ b/games-simulation/flightgear/flightgear-2016.3.1.ebuild
@@ -4,7 +4,6 @@
 
 EAPI=6
 
-CMAKE_WARN_UNUSED_CLI=1
 inherit cmake-utils bash-completion-r1
 
 DESCRIPTION="Open Source Flight Simulator"
@@ -71,6 +70,7 @@ src_configure() {
 		-DEVENT_INPUT=$(usex udev)
 		-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
@@ -78,6 +78,7 @@ src_configure() {
 		-DSYSTEM_SPEEX=ON
 		-DSYSTEM_GSM=ON
 		-DSYSTEM_SQLITE=ON
+		-DUSE_AEONWAVE=OFF
 		-DUSE_DBUS=$(usex dbus)
 		-DWITH_FGPANEL=$(usex utils)
 	)

diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index d512c59..8d7628f 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -72,6 +72,7 @@ src_configure() {
 		-DEVENT_INPUT=$(usex udev)
 		-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
@@ -79,6 +80,7 @@ src_configure() {
 		-DSYSTEM_SPEEX=ON
 		-DSYSTEM_GSM=ON
 		-DSYSTEM_SQLITE=ON
+		-DUSE_AEONWAVE=OFF
 		-DUSE_DBUS=$(usex dbus)
 		-DWITH_FGPANEL=$(usex utils)
 	)

diff --git a/games-simulation/flightgear/metadata.xml b/games-simulation/flightgear/metadata.xml
index 83e7f59..82acb57 100644
--- a/games-simulation/flightgear/metadata.xml
+++ b/games-simulation/flightgear/metadata.xml
@@ -15,7 +15,7 @@
 	<flag name="oldfdm">Enables deprecated Flight Dynamics Models (LaRCsim, UIUC)</flag>
 	<flag name="qt5">Builds Qt5 launcher application</flag>
 	<flag name="udev">Enables event-based Input devices through <pkg>virtual/udev</pkg></flag>
-	<flag name="utils">Builds various utilities (fgpanel, terrasync, fgviewer among others)</flag>
+	<flag name="utils">Builds various utilities (fgpanel, fgviewer among others)</flag>
 	<flag name="yasim">Enables YASim Flight Dynamics Model</flag>
 </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/, dev-games/simgear/, ...
@ 2018-06-04  1:41 Maciej Mrozowski
  0 siblings, 0 replies; 3+ messages in thread
From: Maciej Mrozowski @ 2018-06-04  1:41 UTC (permalink / raw
  To: gentoo-commits

commit:     c4e6a000a88ee161f778d51640e3013f0be45a8e
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  4 01:39:02 2018 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Mon Jun  4 01:41:09 2018 +0000
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 00000000000..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 00000000000..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 files split to separate package since 2.10.0
+RDEPEND="
+	!<games-simulation/flightgear-2.10.0
+"
+
+S=${WORKDIR}/fgdata
+
+src_install() {
+	insinto /usr/share/flightgear
+	rm -fr .git
+	doins -r *
+}

diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 0f960baf586..8501b33c552 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1 +1,2 @@
 DIST flightgear-2018.1.1.tar.bz2 8158999 BLAKE2B 5d7ca65c0b2627c7b34681e0af8e060f67cbed80d7e313c056fb92f026bc2355af66bbb6b377573db32f5101c63f1fa04521ba7fdffd584a56ae1049d1bcce83 SHA512 962be602a8c294081109ee1893383ac22dd83a0511fdb600d24d5dc9eca24d19687eaeed545695259502431e6d8c8bcdafe26846636ad40be28f5c2e4b0cfe93
+DIST flightgear-2018.2.1.tar.bz2 8344999 BLAKE2B fc5fbd43bcc2e40ed3245aa5059b0e5a40918a707cbddc8383de191e29f6cdfaa6960f6cfffb201b20ad10f5da0f343a693768d38be2788fd2582f7b5dc2419c SHA512 d308eebf6d6017794c086d534f6543c03a54e55bd7f48caf8359d5a84776406eac8cd8f32252efb2cd8bbb82c9c15fe4d7e3229ff2483e7a9772bd532331be03

diff --git a/games-simulation/flightgear/flightgear-2018.2.1.ebuild b/games-simulation/flightgear/flightgear-2018.2.1.ebuild
new file mode 100644
index 00000000000..69d28c39ce7
--- /dev/null
+++ b/games-simulation/flightgear/flightgear-2018.2.1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="Open Source Flight Simulator"
+HOMEPAGE="http://www.flightgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="dbus debug examples gdal openmp 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[jpeg,png]
+	~dev-games/simgear-${PV}[gdal=]
+	media-libs/openal
+	>=media-libs/speex-1.2.0:0
+	media-libs/speexdsp:0
+	media-sound/gsm
+	sys-libs/zlib
+	virtual/glu
+	x11-libs/libX11
+	dbus? ( >=sys-apps/dbus-1.6.18-r1 )
+	gdal? ( >=sci-libs/gdal-2.0.0:0 )
+	qt5? (
+		>=dev-qt/qtcore-5.7.1:5
+		>=dev-qt/qtdeclarative-5.7.1:5
+		>=dev-qt/qtgui-5.7.1:5
+		>=dev-qt/qtnetwork-5.7.1:5
+		>=dev-qt/qtwidgets-5.7.1:5
+	)
+	udev? ( virtual/udev )
+	utils? (
+		media-libs/freeglut
+		media-libs/freetype:2
+		media-libs/glew:0
+		media-libs/libpng:0
+		virtual/opengl
+		qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 )
+	)
+"
+# 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
+	)
+	test? ( dev-util/cppunit )
+"
+RDEPEND="${COMMON_DEPEND}
+	~games-simulation/${PN}-data-${PV}
+"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+pkg_pretend() {
+	use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_AUTOTESTING=OFF
+		-DENABLE_DEMCONVERT=$(usex gdal && usex utils)
+		-DENABLE_FGCOM=$(usex utils)
+		-DENABLE_FGELEV=$(usex utils)
+		-DENABLE_FGJS=$(usex utils)
+		-DENABLE_FGQCANVAS=$(usex qt5 && usex utils)
+		-DENABLE_FGVIEWER=$(usex utils)
+		-DENABLE_FLITE=OFF
+		-DENABLE_GDAL=$(usex gdal)
+		-DENABLE_GPSSMOOTH=$(usex utils)
+		-DENABLE_HID_INPUT=$(usex udev)
+		-DENABLE_JS_DEMO=$(usex utils)
+		-DENABLE_JSBSIM=ON
+		-DENABLE_LARCSIM=ON
+		-DENABLE_METAR=$(usex utils)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PLIB_JOYSTICK=ON # NOTE look for defaults changes in CMake
+		-DENABLE_PROFILE=OFF
+		-DENABLE_QT=$(usex qt5)
+		-DENABLE_RTI=OFF
+		-DENABLE_TERRASYNC=$(usex utils)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TRAFFIC=$(usex utils)
+		-DENABLE_UIUC_MODEL=ON
+		-DENABLE_YASIM=ON
+		-DEVENT_INPUT=$(usex udev)
+		-DFG_BUILD_TYPE=Release
+		-DFG_DATA_DIR=/usr/share/${PN}
+		-DJSBSIM_TERRAIN=ON
+		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
+		-DSP_FDMS=ON
+		-DSYSTEM_CPPUNIT=ON
+		-DSYSTEM_FLITE=ON
+		-DSYSTEM_HTS_ENGINE=ON
+		-DSYSTEM_SPEEX=ON
+		-DSYSTEM_GSM=ON
+		-DSYSTEM_SQLITE=ON
+		-DUSE_AEONWAVE=OFF
+		-DUSE_DBUS=$(usex dbus)
+		-DWITH_FGPANEL=$(usex utils)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Install bash completion (TODO zsh)
+	# Uncomment below when scripts stops writing files...
+#	sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
+#		-i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT'
+#	newbashcomp scripts/completion/fg-completion.bash ${PN}
+
+	# Install examples and other misc files
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins -r scripts/java scripts/perl scripts/python
+		insinto /usr/share/doc/"${PF}"/examples/c++
+		doins -r scripts/example/*
+		insinto /usr/share/doc/"${PF}"/tools
+		doins -r scripts/atis scripts/tools/*
+	fi
+
+	# Install nasal script syntax
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/syntax/{ac3d,nasal}.vim
+		insinto /usr/share/vim/vimfiles/ftdetect/
+		doins "${FILESDIR}"/{ac3d,nasal}.vim
+	fi
+}
+
+pkg_postinst() {
+	einfo "Please note that data files location changed to /usr/share/flightgear"
+	if use qt5; then
+		einfo "To use launcher, run fgfs with '--launcher' parameter"
+	fi
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/, dev-games/simgear/, ...
@ 2019-03-17 23:40 Maciej Mrozowski
  0 siblings, 0 replies; 3+ messages in thread
From: Maciej Mrozowski @ 2019-03-17 23:40 UTC (permalink / raw
  To: gentoo-commits

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

games-simulation/flightgear: Version bump 2018.3.2

Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>

 dev-games/simgear/Manifest                         |  1 +
 ...simgear-9999.ebuild => simgear-2018.3.2.ebuild} | 20 ++++++++++-------
 dev-games/simgear/simgear-9999.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-9999.ebuild => flightgear-2018.3.2.ebuild} | 17 +++++++-------
 games-simulation/flightgear/flightgear-9999.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-9999.ebuild b/dev-games/simgear/simgear-2018.3.2.ebuild
similarity index 72%
copy from dev-games/simgear/simgear-9999.ebuild
copy to dev-games/simgear/simgear-2018.3.2.ebuild
index 10462f88d9f..a65b51665aa 100644
--- a/dev-games/simgear/simgear-9999.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-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild
index 10462f88d9f..4ef9fc550b6 100644
--- a/dev-games/simgear/simgear-9999.ebuild
+++ b/dev-games/simgear/simgear-9999.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
 		-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/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index a638f22b8ea..9e4437fefde 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1,3 +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
 DIST FlightGear-2018.3.1-data.tar.bz2 1735407015 BLAKE2B e076e0096656c607cd32c7f86999685bc65bc1d8a28a260e0e7d760a5d4ea645f3a84f8410f9091e9767fcc143d0910f3e2ac2546e9408a49032b864bdd3c742 SHA512 495ef2dc87244c10cbca6deed7731e84f07c4a495e6d70ea7a88581e655b366c17900603f2388d2d21c4fe5cc4279820ae2a112376deeba4d37a53cd3495c102
+DIST FlightGear-2018.3.2-data.tar.bz2 1744998558 BLAKE2B 8ce8b34973687df907695c11eb385fc87526e6c6b54a2e1180819a6d0b503f27d0bbce7f400041a4f724e5dc940a84db90faf267e4ab012457ac753f243eb1d1 SHA512 64baa8a42d6a6e930cc2a14e62f6f3488f08cb3121973aece8818275b8f4934a94539e24b95646d7c5bb8bd5eef65ff91d63013c07dabf79f452908b749640bb

diff --git a/games-simulation/flightgear-data/flightgear-data-2018.1.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2018.1.1.ebuild
deleted file mode 100644
index f835ef53253..00000000000
--- a/games-simulation/flightgear-data/flightgear-data-2018.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 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 files split to separate package since 2.10.0
-RDEPEND="
-	!<games-simulation/flightgear-2.10.0
-"
-
-S=${WORKDIR}/fgdata
-
-src_install() {
-	insinto /usr/share/flightgear
-	rm -fr .git
-	doins -r *
-}

diff --git a/games-simulation/flightgear-data/flightgear-data-2018.2.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2018.3.2.ebuild
similarity index 92%
rename from games-simulation/flightgear-data/flightgear-data-2018.2.1.ebuild
rename to games-simulation/flightgear-data/flightgear-data-2018.3.2.ebuild
index f364395e847..5e2859ac4b4 100644
--- a/games-simulation/flightgear-data/flightgear-data-2018.2.1.ebuild
+++ b/games-simulation/flightgear-data/flightgear-data-2018.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6

diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 0d282499cf9..006bb29ae93 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1 +1,2 @@
 DIST flightgear-2018.3.1.tar.bz2 8404294 BLAKE2B b90d64bc7381baef3adf3f2b77acb6822562d76319e85bebeda977754c281cd48b4ce137d910cc9f96947cfe1b7612c6ff45f2ed49775348b651944bb8796ba4 SHA512 ad07cdf90b1890519a22a1f79374b2d11e70191d85bc76d50913708a250801c3e091228999011367e374572a46c60f572f8b138d6a7c9fd2155f63107667d93c
+DIST flightgear-2018.3.2.tar.bz2 8405351 BLAKE2B 8abc3cc37281f1cc30c51518570e7278722f1d804f6568d7619150e7ddf13eef784314873571ea99d039ca4a94968e8e96779e26d8618eee4b1ed248e88dc52a SHA512 76a127949351fe48d847a1471002ecbc3daa769952fef7a7a141e83031771e87f4e23c329e9d03ddd2e99b4b96fb6af2ebe5ab90ca50c0111217c62492cd516d

diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-2018.3.2.ebuild
similarity index 90%
copy from games-simulation/flightgear/flightgear-9999.ebuild
copy to games-simulation/flightgear/flightgear-2018.3.2.ebuild
index 7dd168e9627..31cb9fe151d 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-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 cmake-utils bash-completion-r1 toolchain-funcs git-r3
+inherit cmake-utils bash-completion-r1 toolchain-funcs
 
 DESCRIPTION="Open Source Flight Simulator"
 HOMEPAGE="http://www.flightgear.org/"
-EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/${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="dbus debug examples gdal openmp qt5 +udev +utils vim-syntax"
+IUSE="cpu_flags_x86_sse2 dbus debug examples gdal openmp qt5 +udev +utils vim-syntax"
 
 # Needs --fg-root with path to flightgear-data passed to test runner passed,
 # not really worth patching
@@ -96,7 +94,7 @@ src_configure() {
 		-DENABLE_UIUC_MODEL=ON
 		-DENABLE_YASIM=ON
 		-DEVENT_INPUT=$(usex udev)
-		-DFG_BUILD_TYPE=Nightly
+		-DFG_BUILD_TYPE=Release
 		-DFG_DATA_DIR=/usr/share/${PN}
 		-DJSBSIM_TERRAIN=ON
 		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
@@ -111,6 +109,9 @@ src_configure() {
 		-DUSE_DBUS=$(usex dbus)
 		-DWITH_FGPANEL=$(usex utils)
 	)
+	if use cpu_flags_x86_sse2; then
+		append-flags -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize
+	fi
 	if use gdal && use utils; then
 		mycmakeargs+=(-DENABLE_DEMCONVERT=ON)
 	else

diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index 7dd168e9627..e485d9af2d3 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-03-17 23:40 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-04  1:41 [gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/, dev-games/simgear/, Maciej Mrozowski
  -- strict thread matches above, loose matches on Subject: below --
2019-03-17 23:40 Maciej Mrozowski
2016-10-01  7:02 Maciej Mrozowski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox