| 1 |
commit: 3c0e6789ac2c9476794c64c5c324eb393677712c |
| 2 |
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 1 06:57:34 2016 +0000 |
| 4 |
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 1 07:01:31 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c0e6789 |
| 7 |
|
| 8 |
games-simulation/flightgear: Version bump 2016.3.1, bug 595304. Remove 2016.1.1. Sync live ebuild. |
| 9 |
|
| 10 |
dev-games/simgear/Manifest | 2 +- |
| 11 |
.../{simgear-2016.1.1.ebuild => simgear-2016.3.1.ebuild} | 10 +++++++--- |
| 12 |
dev-games/simgear/simgear-9999.ebuild | 6 ++---- |
| 13 |
games-simulation/flightgear-data/Manifest | 2 +- |
| 14 |
...ar-data-2016.1.1.ebuild => flightgear-data-2016.3.1.ebuild} | 0 |
| 15 |
games-simulation/flightgear/Manifest | 2 +- |
| 16 |
.../{flightgear-2016.1.1.ebuild => flightgear-2016.3.1.ebuild} | 3 ++- |
| 17 |
games-simulation/flightgear/flightgear-9999.ebuild | 2 ++ |
| 18 |
games-simulation/flightgear/metadata.xml | 2 +- |
| 19 |
9 files changed, 17 insertions(+), 12 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest |
| 22 |
index 6fa9e7b..13bca2c 100644 |
| 23 |
--- a/dev-games/simgear/Manifest |
| 24 |
+++ b/dev-games/simgear/Manifest |
| 25 |
@@ -1,3 +1,3 @@ |
| 26 |
-DIST simgear-2016.1.1.tar.bz2 1065810 SHA256 dbbc40115bc41563d930102484a3682e9fa4dda6f120feaa1fe82e0eb9d96c0d SHA512 ccc3384beef2e2ff3819928f22289a774da28c1df11f42ddc58ad4913c2c329a2cc14ca0359a312b9684ae31e598dda8a7a49e27c9148d079858dc0bf8e6ae63 WHIRLPOOL 2cf05f28c3318ea678f728c87e447c73934348b8862c97602b264f63bbecca82fd7e6db17affe84c78e1a9c42e31ad64aca243e97723e3e54ffca8481609ba50 |
| 27 |
DIST simgear-2016.2.1.tar.bz2 1161873 SHA256 601d4ef75a7f9e7012f85d6f63219f3e2ef90f98249eaa5d16cc6b1a3c737a0a SHA512 22046873b67c2dd530d9734f799ea8a7238f6ffb58999b5a1d72053c4837212906048ec681cb2b704cd55d6b7aba03729d4f6a6a7e351f1e5aa2e497cc78d937 WHIRLPOOL 4f4fd697b301dfcd27a623d9475e63a46709d1e27b0324bdf097a8260d2759e7dedb16de6dbf1a82430dc3d80a32b58abf3bc82026894b83c2ec5c06391dcdcf |
| 28 |
+DIST simgear-2016.3.1.tar.bz2 1199016 SHA256 ae46e1273673be41028ee912d1826e87185ab594053c493707f9dbdeea5159dd SHA512 5c0e260da8b09e815cd6607f3e977b5827f450e9fbe10bfaef019d7489506905fde56a5ab6748165431088bbae7fa61d4bccc27e4d7828c8bc6a05247b450716 WHIRLPOOL c349848d7e85166d7161272d722bebed7b387e6cd4c9db6cd405e3d042ee212b4448231eb92e0a86b8dc00c497af2c69455edd7d7d1cd4007d9ca09e91e575a7 |
| 29 |
DIST simgear-3.4.0.tar.bz2 1057455 SHA256 927d66fe72aacb9dacced4506430bd5fc7726bc8d3d07d6f1866bc4cb11a5894 SHA512 9ebf49ea2f024f0e52a4d18ba6f77361e7b9f51a0e7238661b4b2fd9db0176bdd948612d9b4aec3ae4d8210676e7533dfc0308b9c71bdeb22e99a68b90d81320 WHIRLPOOL bb48b6640409a96816ade77c22a91f88c452d339165dd0241354c26ff27572a14538ecfd91265c239def4621657be8766c081cffc237711a691d7ef54461b548 |
| 30 |
|
| 31 |
diff --git a/dev-games/simgear/simgear-2016.1.1.ebuild b/dev-games/simgear/simgear-2016.3.1.ebuild |
| 32 |
similarity index 81% |
| 33 |
rename from dev-games/simgear/simgear-2016.1.1.ebuild |
| 34 |
rename to dev-games/simgear/simgear-2016.3.1.ebuild |
| 35 |
index de8291d..39f6c59 100644 |
| 36 |
--- a/dev-games/simgear/simgear-2016.1.1.ebuild |
| 37 |
+++ b/dev-games/simgear/simgear-2016.3.1.ebuild |
| 38 |
@@ -13,15 +13,16 @@ SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2" |
| 39 |
LICENSE="GPL-2" |
| 40 |
KEYWORDS="~amd64 ~ppc ~x86" |
| 41 |
SLOT="0" |
| 42 |
-IUSE="curl debug subversion test" |
| 43 |
+IUSE="+dns debug subversion test" |
| 44 |
|
| 45 |
COMMON_DEPEND=" |
| 46 |
dev-libs/expat |
| 47 |
>=dev-games/openscenegraph-3.2.0 |
| 48 |
media-libs/openal |
| 49 |
+ net-misc/curl |
| 50 |
sys-libs/zlib |
| 51 |
virtual/opengl |
| 52 |
- curl? ( net-misc/curl ) |
| 53 |
+ dns? ( net-libs/udns ) |
| 54 |
" |
| 55 |
DEPEND="${COMMON_DEPEND} |
| 56 |
>=dev-libs/boost-1.44 |
| 57 |
@@ -34,7 +35,7 @@ DOCS=(AUTHORS ChangeLog NEWS README Thanks) |
| 58 |
|
| 59 |
src_configure() { |
| 60 |
local mycmakeargs=( |
| 61 |
- -DENABLE_CURL=$(usex curl) |
| 62 |
+ -DENABLE_DNS=$(usex dns) |
| 63 |
-DENABLE_PKGUTIL=ON |
| 64 |
-DENABLE_RTI=OFF |
| 65 |
-DENABLE_SOUND=ON |
| 66 |
@@ -42,6 +43,9 @@ src_configure() { |
| 67 |
-DSIMGEAR_HEADLESS=OFF |
| 68 |
-DSIMGEAR_SHARED=ON |
| 69 |
-DSYSTEM_EXPAT=ON |
| 70 |
+ -DSYSTEM_UDNS=ON |
| 71 |
+ -DUSE_AEONWAVE=OFF |
| 72 |
+ -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it |
| 73 |
) |
| 74 |
cmake-utils_src_configure |
| 75 |
} |
| 76 |
|
| 77 |
diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild |
| 78 |
index 2c5c92d..2436583 100644 |
| 79 |
--- a/dev-games/simgear/simgear-9999.ebuild |
| 80 |
+++ b/dev-games/simgear/simgear-9999.ebuild |
| 81 |
@@ -33,10 +33,6 @@ RDEPEND="${COMMON_DEPEND} |
| 82 |
subversion? ( dev-vcs/subversion ) |
| 83 |
" |
| 84 |
|
| 85 |
-PATCHES=( |
| 86 |
- "${FILESDIR}/simgear-2016.2.1-unbundle-udns.patch" |
| 87 |
-) |
| 88 |
- |
| 89 |
DOCS=(AUTHORS ChangeLog NEWS README Thanks) |
| 90 |
|
| 91 |
src_configure() { |
| 92 |
@@ -50,6 +46,8 @@ src_configure() { |
| 93 |
-DSIMGEAR_SHARED=ON |
| 94 |
-DSYSTEM_EXPAT=ON |
| 95 |
-DSYSTEM_UDNS=ON |
| 96 |
+ -DUSE_AEONWAVE=OFF |
| 97 |
+ -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it |
| 98 |
) |
| 99 |
cmake-utils_src_configure |
| 100 |
} |
| 101 |
|
| 102 |
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest |
| 103 |
index 0600b5f..52129e7 100644 |
| 104 |
--- a/games-simulation/flightgear-data/Manifest |
| 105 |
+++ b/games-simulation/flightgear-data/Manifest |
| 106 |
@@ -1,3 +1,3 @@ |
| 107 |
-DIST FlightGear-2016.1.1-data.tar.bz2 1266743984 SHA256 36016ac5ab83fc6ad44c5cebe0f4fa7a14cf55ff5b699016abdeacf5a04c4c18 SHA512 605d610d001f959e2434228b9c3741af0df5fd047af31e1d60ad5bdb1041cde3299cab622014735cff6534d2a8f0edbe44ab3528bae2072454aaf0b363e765b8 WHIRLPOOL 3c1c50d2a47a9c68839cea1c24439c1052fc8b4a8ff7ee4378913fe3aaa9c4f08feb3a2a8aca520087aa745a4bda0ef43d8ea4679072cd56ff1311acf27261e3 |
| 108 |
DIST FlightGear-2016.2.1-data.tar.bz2 1562126790 SHA256 225b32f4d813635ece72f09541640e818fba95386ff8715015693978c37eaace SHA512 1c22d2afcb33ef8552fa9712a25fc116e31d585f4973339b134b6461421da1b47c3e5c795c5f1ee99d13a1c107f3a7a615c07843de2332a1e9f729bc64dd269d WHIRLPOOL b664f65c23342c0e13d58c431896019085780cf413da4c3350e3e22efb3aa1686fee6f3e1b97568711d5218eb2f1dab554d2d5559f06358c75eff1e711fcb7b8 |
| 109 |
+DIST FlightGear-2016.3.1-data.tar.bz2 1430257110 SHA256 1eceb36f5b577bb8223ed1520e68179fb9292b95e63ffd9ad695dcc93b814d1c SHA512 ba4d51efc23cf125367815491cdb78153d5b553bae54bae41eb9f01f0749d53d1be9c0a63e998a31f05c0d514d5dcef2a1dfd55267e7698d34738e3dc5559018 WHIRLPOOL e3f2ba81ad519ba94666cac046ad92563801aac9944f4180566d0e7d8b82849a0ac0c4c670ba64a04862bdd3f94239453cce8ec676c64fb809318632995dfc41 |
| 110 |
DIST FlightGear-data-3.4.0.tar.bz2 1145893777 SHA256 8cefa7c323d974d8e51fd23c97ae79dc731e65b81e1729cb1bc9bc1f99df128b SHA512 791ff1b1f7f759ccc73f738ba6cb6fd050d1341ae031a872745b4c1145cdb92de62193df7ea6e9fe05a1c95a60fa664da56015d643244d38c7b0b72a2c3146d9 WHIRLPOOL 0abaa4da7e9032469da80500fc23c84d6b696fc596529853a3a614bb3627ef6081c12ea78e6e8c987e6b11b303cca0d8da5c9628164d2a93bed452230302a655 |
| 111 |
|
| 112 |
diff --git a/games-simulation/flightgear-data/flightgear-data-2016.1.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2016.3.1.ebuild |
| 113 |
similarity index 100% |
| 114 |
rename from games-simulation/flightgear-data/flightgear-data-2016.1.1.ebuild |
| 115 |
rename to games-simulation/flightgear-data/flightgear-data-2016.3.1.ebuild |
| 116 |
|
| 117 |
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest |
| 118 |
index 1e2f003..f445143 100644 |
| 119 |
--- a/games-simulation/flightgear/Manifest |
| 120 |
+++ b/games-simulation/flightgear/Manifest |
| 121 |
@@ -1,3 +1,3 @@ |
| 122 |
-DIST flightgear-2016.1.1.tar.bz2 7541607 SHA256 acdffb8a6a000cd44b23816f5d1467dbcf375d3cbd6233b2998467bd55dd60ac SHA512 bcebbf100e383a808154dbdf2b0f28ffcf0e3c0415a2db90e0daabb0073e83be69b3989dfc9e299c35fa6e39ddb5b9d4dfefd7f4c23ca8cd981768d8ab89e9c0 WHIRLPOOL d431c59c160a383c4f91f34f1e7ad322502704a4693c6c189cf258958703b0fe97290ab9db60a7de93f99511c79993c1a02de5ae559be0f0fab83b1bea371791 |
| 123 |
DIST flightgear-2016.2.1.tar.bz2 7556269 SHA256 b554170ca6b5943fd90496759b055fb60f362ea96f6c46dfff89e3d12c940a94 SHA512 679cb8e6aa4c2d601e7b984da6e4317fd454d14b1357d08cc64350eb973a6700a0dddd18b50cd50fcdce48fba2864ce0f7484b67a15e38cb5f5e8e7d4fc7b017 WHIRLPOOL 6d04982bb107d59094facb4d0430cb25de5ea994f25f1ea3a18351626335c1bc136228e376fd680baacb1e731718b49c317adb390737fd5641b51f8228303c48 |
| 124 |
+DIST flightgear-2016.3.1.tar.bz2 7542098 SHA256 501d2f59b8f9d221332044346bbbfe195e42d0195945f8bb0fec8b474bc79c31 SHA512 57246144d954e36e330fe5da15ff5c86f810cbd0b09638c2df813a242677eca22e00a9432f6091da6731972699657fee525310f5bcc91cf8dc5e2250c8663e8a WHIRLPOOL f9c4809fe5d2981b366a3b2c3d47788843a8abd0bacee37eb8c15dafcfd2c3b855c760065c8f0274c10f96faa84632536a68641e6f80a047409ec944a4b4dd24 |
| 125 |
DIST flightgear-3.4.0.tar.bz2 7522457 SHA256 b5645d05b50728a89f091292bc557f440d8f8719dd9cebf7f5bf3fa8ea795780 SHA512 10626d00b34255753dc5a5c82076909c296219472faf51c38460cc357ac014b40bd127454f28b2d857f1a1a299716430fd8f04dc7881552b3c24dee6eb616b1e WHIRLPOOL 636ca7e012175141bc4b081cb6137e5348d49b873d241c5d0f1ed0a2581b32d2f23f4fe0ed97d5a1b72440afd14687e5de4e6ebeeaf07b4e854b0ca47875b82f |
| 126 |
|
| 127 |
diff --git a/games-simulation/flightgear/flightgear-2016.1.1.ebuild b/games-simulation/flightgear/flightgear-2016.3.1.ebuild |
| 128 |
similarity index 97% |
| 129 |
rename from games-simulation/flightgear/flightgear-2016.1.1.ebuild |
| 130 |
rename to games-simulation/flightgear/flightgear-2016.3.1.ebuild |
| 131 |
index bbd90f6..14ee221 100644 |
| 132 |
--- a/games-simulation/flightgear/flightgear-2016.1.1.ebuild |
| 133 |
+++ b/games-simulation/flightgear/flightgear-2016.3.1.ebuild |
| 134 |
@@ -4,7 +4,6 @@ |
| 135 |
|
| 136 |
EAPI=6 |
| 137 |
|
| 138 |
-CMAKE_WARN_UNUSED_CLI=1 |
| 139 |
inherit cmake-utils bash-completion-r1 |
| 140 |
|
| 141 |
DESCRIPTION="Open Source Flight Simulator" |
| 142 |
@@ -71,6 +70,7 @@ src_configure() { |
| 143 |
-DEVENT_INPUT=$(usex udev) |
| 144 |
-DFG_DATA_DIR=/usr/share/${PN} |
| 145 |
-DJSBSIM_TERRAIN=ON |
| 146 |
+ -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear |
| 147 |
-DSIMGEAR_SHARED=ON |
| 148 |
-DSP_FDMS=ON |
| 149 |
-DSYSTEM_FLITE=ON |
| 150 |
@@ -78,6 +78,7 @@ src_configure() { |
| 151 |
-DSYSTEM_SPEEX=ON |
| 152 |
-DSYSTEM_GSM=ON |
| 153 |
-DSYSTEM_SQLITE=ON |
| 154 |
+ -DUSE_AEONWAVE=OFF |
| 155 |
-DUSE_DBUS=$(usex dbus) |
| 156 |
-DWITH_FGPANEL=$(usex utils) |
| 157 |
) |
| 158 |
|
| 159 |
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild |
| 160 |
index d512c59..8d7628f 100644 |
| 161 |
--- a/games-simulation/flightgear/flightgear-9999.ebuild |
| 162 |
+++ b/games-simulation/flightgear/flightgear-9999.ebuild |
| 163 |
@@ -72,6 +72,7 @@ src_configure() { |
| 164 |
-DEVENT_INPUT=$(usex udev) |
| 165 |
-DFG_DATA_DIR=/usr/share/${PN} |
| 166 |
-DJSBSIM_TERRAIN=ON |
| 167 |
+ -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear |
| 168 |
-DSIMGEAR_SHARED=ON |
| 169 |
-DSP_FDMS=ON |
| 170 |
-DSYSTEM_FLITE=ON |
| 171 |
@@ -79,6 +80,7 @@ src_configure() { |
| 172 |
-DSYSTEM_SPEEX=ON |
| 173 |
-DSYSTEM_GSM=ON |
| 174 |
-DSYSTEM_SQLITE=ON |
| 175 |
+ -DUSE_AEONWAVE=OFF |
| 176 |
-DUSE_DBUS=$(usex dbus) |
| 177 |
-DWITH_FGPANEL=$(usex utils) |
| 178 |
) |
| 179 |
|
| 180 |
diff --git a/games-simulation/flightgear/metadata.xml b/games-simulation/flightgear/metadata.xml |
| 181 |
index 83e7f59..82acb57 100644 |
| 182 |
--- a/games-simulation/flightgear/metadata.xml |
| 183 |
+++ b/games-simulation/flightgear/metadata.xml |
| 184 |
@@ -15,7 +15,7 @@ |
| 185 |
<flag name="oldfdm">Enables deprecated Flight Dynamics Models (LaRCsim, UIUC)</flag> |
| 186 |
<flag name="qt5">Builds Qt5 launcher application</flag> |
| 187 |
<flag name="udev">Enables event-based Input devices through <pkg>virtual/udev</pkg></flag> |
| 188 |
- <flag name="utils">Builds various utilities (fgpanel, terrasync, fgviewer among others)</flag> |
| 189 |
+ <flag name="utils">Builds various utilities (fgpanel, fgviewer among others)</flag> |
| 190 |
<flag name="yasim">Enables YASim Flight Dynamics Model</flag> |
| 191 |
</use> |
| 192 |
</pkgmetadata> |
Archives