Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/, sci-electronics/gazebo/files/
Date: Thu, 23 Aug 2018 11:41:54
Message-Id: 1535024504.a9278d349bd375e00bf565fbe2382eeb270c2216.aballier@gentoo
1 commit: a9278d349bd375e00bf565fbe2382eeb270c2216
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 23 11:41:33 2018 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 23 11:41:44 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9278d34
7
8 sci-electronics/gazebo: Remove old
9
10 Package-Manager: Portage-2.3.48, Repoman-2.3.10
11
12 sci-electronics/gazebo/Manifest | 3 --
13 sci-electronics/gazebo/files/ffmpeg4.patch | 30 -----------
14 sci-electronics/gazebo/gazebo-9.0.0-r1.ebuild | 77 --------------------------
15 sci-electronics/gazebo/gazebo-9.1.1-r1.ebuild | 78 ---------------------------
16 sci-electronics/gazebo/gazebo-9.2.0.ebuild | 78 ---------------------------
17 5 files changed, 266 deletions(-)
18
19 diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
20 index f414b5b75a8..5e7b82c4c6d 100644
21 --- a/sci-electronics/gazebo/Manifest
22 +++ b/sci-electronics/gazebo/Manifest
23 @@ -1,5 +1,2 @@
24 -DIST gazebo-9.0.0.tar.bz2 52779811 BLAKE2B a85c9fd0e4b805e28ea8fb71c068ad53f18db91a474631b5da73a2a565181c8c22270742c9fabf1656d322fd63ba1caac3286b992d7dc7b197a0582ed724d06e SHA512 52394445d34ce24b2036102be08b6b626fb7021dd0ebaab8e588b68e1e0790d2e26ed2af8ead8f37b0c2e2d37c3d7fc22f95b0b2a8bd95e8dcd77e7fb296dd50
25 -DIST gazebo-9.1.1.tar.bz2 52978923 BLAKE2B 46ddcc0928b3f591356379e20fa5478e385046f8ef2295730b5cb69e07636928226e423db654697a32bcab14846cd13dfe6248017fe1f410d4060f372154ae69 SHA512 1892a3f09d98b75cfdd30b020eb335b4e267db161850eba58153c5be4beb1c2053843f336d63fe638e3ba6466a9d746210a8e7cf3e2d577cc380ce4904576b3c
26 -DIST gazebo-9.2.0.tar.bz2 52929158 BLAKE2B 208b911551d4a16f5ab2e37b033e0f132bfbf4cdf01129fa4849d67ea9d2e092e00c3382e925a437d67916ddbaaf8ac499b21231ebdc5bd2302865476b9773df SHA512 4c91c66ce4b5d63cb97d948de5f9d5ae9dcb88de8f5e650a6f6dee085cd7539454a25871691a1bdb38a3c65fa52c5ea1b94fbd3a618a77cb234579f2f268a017
27 DIST gazebo-9.3.0.tar.bz2 52924750 BLAKE2B c908827fca7786b0dac10401549265d6d0ca0ce5c952816b5d3d5f2feec096f0465778b4165a4054abd285ec1fedc80e3d2ed3c81be234574d7419d2635f61f4 SHA512 5874582e015cfc2b690b26cd810e4c79cc5dba1ecea7eaa72d3c12e0a5f3dd6f42185666f0cf36a1d00564b642c2c63662b06657da82cfd2ce3ebd9219012cb4
28 DIST gazebo-9.3.1.tar.bz2 52961705 BLAKE2B d1860a13f1c23d3ffaeb8087c94a5b72682c99eec03927105a4e2fc9e951a41c2723f394fe613be4a2603aacd153817e5445b21518ecdb0f0d4d8e6eb4ee28eb SHA512 d3d41a32cab440358fb1dd2524d9a1601fbff8b272c86120d82ddc3337f2a8dcda46c3ba24f95dba99e061ef69c15ac919b5c8e4d16ea71a9da572bb9a5cee12
29
30 diff --git a/sci-electronics/gazebo/files/ffmpeg4.patch b/sci-electronics/gazebo/files/ffmpeg4.patch
31 deleted file mode 100644
32 index 7bd8777dea3..00000000000
33 --- a/sci-electronics/gazebo/files/ffmpeg4.patch
34 +++ /dev/null
35 @@ -1,30 +0,0 @@
36 -Index: gazebo-9.0.0/gazebo/common/AudioDecoder.cc
37 -===================================================================
38 ---- gazebo-9.0.0.orig/gazebo/common/AudioDecoder.cc
39 -+++ gazebo-9.0.0/gazebo/common/AudioDecoder.cc
40 -@@ -255,8 +255,8 @@ bool AudioDecoder::SetFile(const std::st
41 - return false;
42 - }
43 -
44 -- if (this->codec->capabilities & CODEC_CAP_TRUNCATED)
45 -- this->codecCtx->flags |= CODEC_FLAG_TRUNCATED;
46 -+ if (this->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
47 -+ this->codecCtx->flags |= AV_CODEC_FLAG_TRUNCATED;
48 -
49 - // Open codec
50 - if (avcodec_open2(this->codecCtx, this->codec, nullptr) < 0)
51 -Index: gazebo-9.0.0/gazebo/common/Video.cc
52 -===================================================================
53 ---- gazebo-9.0.0.orig/gazebo/common/Video.cc
54 -+++ gazebo-9.0.0/gazebo/common/Video.cc
55 -@@ -143,8 +143,8 @@ bool Video::Load(const std::string &_fil
56 -
57 - // Inform the codec that we can handle truncated bitstreams -- i.e.,
58 - // bitstreams where frame boundaries can fall in the middle of packets
59 -- if (codec->capabilities & CODEC_CAP_TRUNCATED)
60 -- this->codecCtx->flags |= CODEC_FLAG_TRUNCATED;
61 -+ if (codec->capabilities & AV_CODEC_CAP_TRUNCATED)
62 -+ this->codecCtx->flags |= AV_CODEC_FLAG_TRUNCATED;
63 -
64 - // Open codec
65 - if (avcodec_open2(this->codecCtx, codec, nullptr) < 0)
66
67 diff --git a/sci-electronics/gazebo/gazebo-9.0.0-r1.ebuild b/sci-electronics/gazebo/gazebo-9.0.0-r1.ebuild
68 deleted file mode 100644
69 index 082cdd6c8e6..00000000000
70 --- a/sci-electronics/gazebo/gazebo-9.0.0-r1.ebuild
71 +++ /dev/null
72 @@ -1,77 +0,0 @@
73 -# Copyright 1999-2018 Gentoo Foundation
74 -# Distributed under the terms of the GNU General Public License v2
75 -
76 -EAPI=5
77 -
78 -inherit cmake-utils versionator vcs-snapshot flag-o-matic
79 -
80 -DESCRIPTION="A 3D multiple robot simulator with dynamics"
81 -HOMEPAGE="http://gazebosim.org/"
82 -SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
83 -
84 -LICENSE="Apache-2.0"
85 -# Subslot = major version = soname of libs
86 -SLOT="0/9"
87 -KEYWORDS="~amd64"
88 -IUSE="cpu_flags_x86_sse2 libav test"
89 -
90 -RDEPEND="
91 - >=dev-libs/protobuf-2:=
92 - virtual/opengl
93 - media-libs/openal
94 - net-misc/curl
95 - dev-libs/tinyxml
96 - >=dev-libs/tinyxml2-6:=
97 - dev-libs/libtar
98 - dev-cpp/tbb
99 - >=dev-games/ogre-1.7.4[freeimage]
100 - >=media-libs/freeimage-3.15.4[png]
101 - sci-libs/libccd
102 - libav? ( >=media-video/libav-9:0= )
103 - !libav? ( >=media-video/ffmpeg-2.6:0= )
104 - sci-libs/gts
105 - >=sci-physics/bullet-2.82
106 - >=dev-libs/sdformat-6.0:=
107 - dev-qt/qtwidgets:5
108 - dev-qt/qtcore:5
109 - dev-qt/qtopengl:5
110 - dev-libs/boost:=[threads]
111 - sci-libs/gdal:=
112 - virtual/libusb:1
113 - dev-libs/libspnav
114 - media-libs/freeimage
115 - sci-libs/hdf5:=[cxx]
116 - sys-apps/util-linux
117 - media-gfx/graphviz
118 - net-libs/ignition-msgs:1=
119 - sci-libs/ignition-math:4=
120 - net-libs/ignition-transport:4=
121 - x11-libs/qwt:6=[qt5(+)]
122 -"
123 -DEPEND="${RDEPEND}
124 - dev-qt/qttest:5
125 - app-text/ronn
126 - app-arch/gzip
127 - virtual/pkgconfig
128 - x11-apps/mesa-progs
129 - test? ( dev-libs/libxslt )
130 -"
131 -CMAKE_BUILD_TYPE=RelWithDebInfo
132 -PATCHES=( "${FILESDIR}/qwt.patch" "${FILESDIR}/ffmpeg4.patch" )
133 -
134 -src_configure() {
135 - # doesnt build without it
136 - append-cxxflags "-std=c++11"
137 - # doesnt build with as-needed either
138 - append-ldflags "-Wl,--no-as-needed"
139 -
140 - local mycmakeargs=(
141 - "-DUSE_UPSTREAM_CFLAGS=OFF"
142 - "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
143 - "-DUSE_HOST_CFLAGS=FALSE"
144 - "-DBUILD_TESTING=$(usex test TRUE FALSE)"
145 - "-DENABLE_SCREEN_TESTS=FALSE"
146 - "-DUSE_EXTERNAL_TINYXML2=TRUE"
147 - )
148 - cmake-utils_src_configure
149 -}
150
151 diff --git a/sci-electronics/gazebo/gazebo-9.1.1-r1.ebuild b/sci-electronics/gazebo/gazebo-9.1.1-r1.ebuild
152 deleted file mode 100644
153 index a1bfd2b1d31..00000000000
154 --- a/sci-electronics/gazebo/gazebo-9.1.1-r1.ebuild
155 +++ /dev/null
156 @@ -1,78 +0,0 @@
157 -# Copyright 1999-2018 Gentoo Foundation
158 -# Distributed under the terms of the GNU General Public License v2
159 -
160 -EAPI=5
161 -
162 -inherit cmake-utils versionator vcs-snapshot flag-o-matic
163 -
164 -DESCRIPTION="A 3D multiple robot simulator with dynamics"
165 -HOMEPAGE="http://gazebosim.org/"
166 -SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
167 -
168 -LICENSE="Apache-2.0"
169 -# Subslot = major version = soname of libs
170 -SLOT="0/9"
171 -KEYWORDS="~amd64"
172 -IUSE="cpu_flags_x86_sse2 libav test"
173 -
174 -RDEPEND="
175 - >=dev-libs/protobuf-2:=
176 - virtual/opengl
177 - media-libs/openal
178 - net-misc/curl
179 - dev-libs/tinyxml
180 - >=dev-libs/tinyxml2-6:=
181 - dev-libs/libtar
182 - dev-cpp/tbb
183 - >=dev-games/ogre-1.7.4:=[freeimage]
184 - <dev-games/ogre-1.10
185 - >=media-libs/freeimage-3.15.4[png]
186 - sci-libs/libccd
187 - libav? ( >=media-video/libav-9:0= )
188 - !libav? ( >=media-video/ffmpeg-2.6:0= )
189 - sci-libs/gts
190 - >=sci-physics/bullet-2.82
191 - >=dev-libs/sdformat-6.0:=
192 - dev-qt/qtwidgets:5
193 - dev-qt/qtcore:5
194 - dev-qt/qtopengl:5
195 - dev-libs/boost:=[threads]
196 - sci-libs/gdal:=
197 - virtual/libusb:1
198 - dev-libs/libspnav
199 - media-libs/freeimage
200 - sci-libs/hdf5:=[cxx]
201 - sys-apps/util-linux
202 - media-gfx/graphviz
203 - net-libs/ignition-msgs:1=
204 - sci-libs/ignition-math:4=
205 - net-libs/ignition-transport:4=
206 - x11-libs/qwt:6=[qt5(+)]
207 -"
208 -DEPEND="${RDEPEND}
209 - dev-qt/qttest:5
210 - app-text/ronn
211 - app-arch/gzip
212 - virtual/pkgconfig
213 - x11-apps/mesa-progs
214 - test? ( dev-libs/libxslt )
215 -"
216 -CMAKE_BUILD_TYPE=RelWithDebInfo
217 -PATCHES=( "${FILESDIR}/qwt.patch" )
218 -
219 -src_configure() {
220 - # doesnt build without it
221 - append-cxxflags "-std=c++11"
222 - # doesnt build with as-needed either
223 - append-ldflags "-Wl,--no-as-needed"
224 -
225 - local mycmakeargs=(
226 - "-DUSE_UPSTREAM_CFLAGS=OFF"
227 - "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
228 - "-DUSE_HOST_CFLAGS=FALSE"
229 - "-DBUILD_TESTING=$(usex test TRUE FALSE)"
230 - "-DENABLE_SCREEN_TESTS=FALSE"
231 - "-DUSE_EXTERNAL_TINYXML2=TRUE"
232 - )
233 - cmake-utils_src_configure
234 -}
235
236 diff --git a/sci-electronics/gazebo/gazebo-9.2.0.ebuild b/sci-electronics/gazebo/gazebo-9.2.0.ebuild
237 deleted file mode 100644
238 index a1bfd2b1d31..00000000000
239 --- a/sci-electronics/gazebo/gazebo-9.2.0.ebuild
240 +++ /dev/null
241 @@ -1,78 +0,0 @@
242 -# Copyright 1999-2018 Gentoo Foundation
243 -# Distributed under the terms of the GNU General Public License v2
244 -
245 -EAPI=5
246 -
247 -inherit cmake-utils versionator vcs-snapshot flag-o-matic
248 -
249 -DESCRIPTION="A 3D multiple robot simulator with dynamics"
250 -HOMEPAGE="http://gazebosim.org/"
251 -SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
252 -
253 -LICENSE="Apache-2.0"
254 -# Subslot = major version = soname of libs
255 -SLOT="0/9"
256 -KEYWORDS="~amd64"
257 -IUSE="cpu_flags_x86_sse2 libav test"
258 -
259 -RDEPEND="
260 - >=dev-libs/protobuf-2:=
261 - virtual/opengl
262 - media-libs/openal
263 - net-misc/curl
264 - dev-libs/tinyxml
265 - >=dev-libs/tinyxml2-6:=
266 - dev-libs/libtar
267 - dev-cpp/tbb
268 - >=dev-games/ogre-1.7.4:=[freeimage]
269 - <dev-games/ogre-1.10
270 - >=media-libs/freeimage-3.15.4[png]
271 - sci-libs/libccd
272 - libav? ( >=media-video/libav-9:0= )
273 - !libav? ( >=media-video/ffmpeg-2.6:0= )
274 - sci-libs/gts
275 - >=sci-physics/bullet-2.82
276 - >=dev-libs/sdformat-6.0:=
277 - dev-qt/qtwidgets:5
278 - dev-qt/qtcore:5
279 - dev-qt/qtopengl:5
280 - dev-libs/boost:=[threads]
281 - sci-libs/gdal:=
282 - virtual/libusb:1
283 - dev-libs/libspnav
284 - media-libs/freeimage
285 - sci-libs/hdf5:=[cxx]
286 - sys-apps/util-linux
287 - media-gfx/graphviz
288 - net-libs/ignition-msgs:1=
289 - sci-libs/ignition-math:4=
290 - net-libs/ignition-transport:4=
291 - x11-libs/qwt:6=[qt5(+)]
292 -"
293 -DEPEND="${RDEPEND}
294 - dev-qt/qttest:5
295 - app-text/ronn
296 - app-arch/gzip
297 - virtual/pkgconfig
298 - x11-apps/mesa-progs
299 - test? ( dev-libs/libxslt )
300 -"
301 -CMAKE_BUILD_TYPE=RelWithDebInfo
302 -PATCHES=( "${FILESDIR}/qwt.patch" )
303 -
304 -src_configure() {
305 - # doesnt build without it
306 - append-cxxflags "-std=c++11"
307 - # doesnt build with as-needed either
308 - append-ldflags "-Wl,--no-as-needed"
309 -
310 - local mycmakeargs=(
311 - "-DUSE_UPSTREAM_CFLAGS=OFF"
312 - "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
313 - "-DUSE_HOST_CFLAGS=FALSE"
314 - "-DBUILD_TESTING=$(usex test TRUE FALSE)"
315 - "-DENABLE_SCREEN_TESTS=FALSE"
316 - "-DUSE_EXTERNAL_TINYXML2=TRUE"
317 - )
318 - cmake-utils_src_configure
319 -}