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

Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/, sci-electronics/gazebo/files/
Date: Wed, 01 Feb 2023 19:27:20
Message-Id: 1675279596.8905bcd7f8606448a288c413513c56011471b72b.asturm@gentoo
1 commit: 8905bcd7f8606448a288c413513c56011471b72b
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 27 20:59:06 2023 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 1 19:26:36 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8905bcd7
7
8 sci-electronics/gazebo: drop 11.10.2, 11.11.0
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 sci-electronics/gazebo/Manifest | 2 -
13 sci-electronics/gazebo/files/ffmpeg4.patch | 16 ----
14 sci-electronics/gazebo/files/ffmpeg5.patch | 137 ---------------------------
15 sci-electronics/gazebo/gazebo-11.10.2.ebuild | 85 -----------------
16 sci-electronics/gazebo/gazebo-11.11.0.ebuild | 83 ----------------
17 5 files changed, 323 deletions(-)
18
19 diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
20 index 51f9bccaff8e..b778335ec365 100644
21 --- a/sci-electronics/gazebo/Manifest
22 +++ b/sci-electronics/gazebo/Manifest
23 @@ -1,3 +1 @@
24 -DIST gazebo-11.10.2.tar.bz2 56496495 BLAKE2B 09bf370531214e9567d961445797cb50c9e5a81a405720c580d13e6b33029a63dd2cd9930dcbd239c1bf9091a9d5b092bfdef77b0b3524d281a10549e22e7c9a SHA512 8900c483f63cedb8543cfe718b336e3ec372fc0dc3d47ac9cd5378987fae634f16911d3c91fdf70add93b4a090e92f3558beec6c1277e1ba109652dcaf049ac2
25 -DIST gazebo-11.11.0.tar.bz2 56505651 BLAKE2B c3f63a1ee128fd86be914ba9ad7567d0adf337d82772184bbc362373083ad2b79f1172998182a70faf4127fe6f5996d6946e79927c40a384ac5e0eef3b7799c9 SHA512 f9062a54ee4e252219a246124ad0a22570e12f34f7bced8910a14b96541b16337efbba0f824b0ba70adf91d41acfc407eb0cdb19bbd7272151ef9723acc48882
26 DIST gazebo-11.12.0.tar.bz2 56542859 BLAKE2B f2da8371fa4655cc831401fcf6ceec8c82d507a93515762c078ac20a78cb4b739c9f373ef53bebc71b5d7e1c1cf4b98928b3e855fca6943a09da554ee19df1cb SHA512 8f60d432ab07084951bbe31c632f04f2fa11500441fb81fe27078a5cb5b67ba681889e1079844d44a5a30df562797d51683fd674942db9fd8c4d853e3e2c5d3e
27
28 diff --git a/sci-electronics/gazebo/files/ffmpeg4.patch b/sci-electronics/gazebo/files/ffmpeg4.patch
29 deleted file mode 100644
30 index 7b7c8d7270fd..000000000000
31 --- a/sci-electronics/gazebo/files/ffmpeg4.patch
32 +++ /dev/null
33 @@ -1,16 +0,0 @@
34 -Index: gazebo-11.10.1/gazebo/common/VideoEncoder.cc
35 -===================================================================
36 ---- gazebo-11.10.1.orig/gazebo/common/VideoEncoder.cc
37 -+++ gazebo-11.10.1/gazebo/common/VideoEncoder.cc
38 -@@ -224,7 +224,10 @@ bool VideoEncoder::Start(const std::stri
39 -
40 - // The remainder of this function handles FFMPEG initialization of a video
41 - // stream
42 -- const AVOutputFormat *outputFormat = nullptr;
43 -+#if LIBAVFORMAT_VERSION_MAJOR >= 59
44 -+ const
45 -+#endif
46 -+ AVOutputFormat *outputFormat = nullptr;
47 -
48 - // This 'if' and 'free' are just for safety. We chech the value of formatCtx
49 - // below.
50
51 diff --git a/sci-electronics/gazebo/files/ffmpeg5.patch b/sci-electronics/gazebo/files/ffmpeg5.patch
52 deleted file mode 100644
53 index e55bab3c311f..000000000000
54 --- a/sci-electronics/gazebo/files/ffmpeg5.patch
55 +++ /dev/null
56 @@ -1,137 +0,0 @@
57 -Index: gazebo-11.10.1/gazebo/common/AudioDecoder.cc
58 -===================================================================
59 ---- gazebo-11.10.1.orig/gazebo/common/AudioDecoder.cc
60 -+++ gazebo-11.10.1/gazebo/common/AudioDecoder.cc
61 -@@ -113,8 +113,13 @@ bool AudioDecoder::Decode(uint8_t **_out
62 - # pragma GCC diagnostic push
63 - # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
64 - #endif
65 -- bytesDecoded = avcodec_decode_audio4(this->codecCtx, decodedFrame,
66 -- &gotFrame, &packet1);
67 -+ bytesDecoded = avcodec_send_packet(this->codecCtx, &packet1);
68 -+ if (bytesDecoded >= 0 || bytesDecoded == AVERROR_EOF) {
69 -+ bytesDecoded = avcodec_receive_frame(this->codecCtx, decodedFrame);
70 -+ gotFrame = bytesDecoded >= 0;
71 -+ if (bytesDecoded == AVERROR(EAGAIN) || bytesDecoded == AVERROR_EOF) bytesDecoded = 0;
72 -+ }
73 -+
74 - #ifndef _WIN32
75 - # pragma GCC diagnostic pop
76 - #endif
77 -@@ -214,7 +219,7 @@ bool AudioDecoder::SetFile(const std::st
78 - # pragma GCC diagnostic push
79 - # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
80 - #endif
81 -- if (this->formatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
82 -+ if (this->formatCtx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
83 - #ifndef _WIN32
84 - # pragma GCC diagnostic pop
85 - #endif
86 -@@ -238,7 +243,9 @@ bool AudioDecoder::SetFile(const std::st
87 - # pragma GCC diagnostic push
88 - # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
89 - #endif
90 -- this->codecCtx = this->formatCtx->streams[audioStream]->codec;
91 -+ this->codecCtx = avcodec_alloc_context3(nullptr);
92 -+ avcodec_parameters_to_context(this->codecCtx, this->formatCtx->streams[audioStream]->codecpar);
93 -+
94 - #ifndef _WIN32
95 - # pragma GCC diagnostic pop
96 - #endif
97 -Index: gazebo-11.10.1/gazebo/common/AudioDecoder.hh
98 -===================================================================
99 ---- gazebo-11.10.1.orig/gazebo/common/AudioDecoder.hh
100 -+++ gazebo-11.10.1/gazebo/common/AudioDecoder.hh
101 -@@ -75,7 +75,7 @@ namespace gazebo
102 - private: AVCodecContext *codecCtx;
103 -
104 - /// \brief libavcodec audio codec.
105 -- private: AVCodec *codec;
106 -+ private: const AVCodec *codec;
107 -
108 - /// \brief Index of the audio stream.
109 - private: int audioStream;
110 -Index: gazebo-11.10.1/gazebo/common/Video.cc
111 -===================================================================
112 ---- gazebo-11.10.1.orig/gazebo/common/Video.cc
113 -+++ gazebo-11.10.1/gazebo/common/Video.cc
114 -@@ -77,7 +77,7 @@ void Video::Cleanup()
115 - #ifdef HAVE_FFMPEG
116 - bool Video::Load(const std::string &_filename)
117 - {
118 -- AVCodec *codec = nullptr;
119 -+ const AVCodec *codec = nullptr;
120 - this->videoStream = -1;
121 -
122 - if (this->formatCtx || this->avFrame || this->codecCtx)
123 -@@ -107,7 +107,7 @@ bool Video::Load(const std::string &_fil
124 - # pragma GCC diagnostic push
125 - # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
126 - #endif
127 -- if (this->formatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO)
128 -+ if (this->formatCtx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)
129 - #ifndef _WIN32
130 - # pragma GCC diagnostic pop
131 - #endif
132 -@@ -128,13 +128,14 @@ bool Video::Load(const std::string &_fil
133 - # pragma GCC diagnostic push
134 - # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
135 - #endif
136 -- this->codecCtx = this->formatCtx->streams[this->videoStream]->codec;
137 -+ this->codecCtx = avcodec_alloc_context3(nullptr);
138 -+ avcodec_parameters_to_context(this->codecCtx, this->formatCtx->streams[this->videoStream]->codecpar);
139 - #ifndef _WIN32
140 - # pragma GCC diagnostic pop
141 - #endif
142 -
143 - // Find the decoder for the video stream
144 -- codec = avcodec_find_decoder(this->codecCtx->codec_id);
145 -+ codec = avcodec_find_decoder(this->formatCtx->streams[this->videoStream]->codecpar->codec_id);
146 - if (codec == nullptr)
147 - {
148 - gzerr << "Codec not found\n";
149 -@@ -231,15 +232,19 @@ bool Video::GetNextFrame(unsigned char *
150 - # pragma GCC diagnostic push
151 - # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
152 - #endif
153 -- int processedLength = avcodec_decode_video2(this->codecCtx, this->avFrame,
154 -- &frameAvailable, &tmpPacket);
155 -+ int processedLength = avcodec_send_packet(this->codecCtx, !tmpPacket.data && !tmpPacket.size ? nullptr : &tmpPacket);
156 - #ifndef _WIN32
157 - # pragma GCC diagnostic pop
158 - #endif
159 -+ if (processedLength >= 0 || processedLength == AVERROR_EOF) {
160 -+ processedLength = avcodec_receive_frame(this->codecCtx, this->avFrame);
161 -+ frameAvailable = processedLength >= 0;
162 -+ if (processedLength == AVERROR(EAGAIN) || processedLength == AVERROR_EOF) processedLength = 0;
163 -+ }
164 - if (processedLength < 0)
165 - {
166 - gzerr << "Error while processing the data\n";
167 -- break;
168 -+ break;
169 - }
170 -
171 - tmpPacket.data = tmpPacket.data + processedLength;
172 -Index: gazebo-11.10.1/gazebo/common/VideoEncoder.cc
173 -===================================================================
174 ---- gazebo-11.10.1.orig/gazebo/common/VideoEncoder.cc
175 -+++ gazebo-11.10.1/gazebo/common/VideoEncoder.cc
176 -@@ -224,7 +224,7 @@ bool VideoEncoder::Start(const std::stri
177 -
178 - // The remainder of this function handles FFMPEG initialization of a video
179 - // stream
180 -- AVOutputFormat *outputFormat = nullptr;
181 -+ const AVOutputFormat *outputFormat = nullptr;
182 -
183 - // This 'if' and 'free' are just for safety. We chech the value of formatCtx
184 - // below.
185 -@@ -294,7 +294,7 @@ bool VideoEncoder::Start(const std::stri
186 - }
187 -
188 - // find the video encoder
189 -- AVCodec *encoder = avcodec_find_encoder(
190 -+ const AVCodec *encoder = avcodec_find_encoder(
191 - this->dataPtr->formatCtx->oformat->video_codec);
192 - if (!encoder)
193 - {
194
195 diff --git a/sci-electronics/gazebo/gazebo-11.10.2.ebuild b/sci-electronics/gazebo/gazebo-11.10.2.ebuild
196 deleted file mode 100644
197 index d813f60aea22..000000000000
198 --- a/sci-electronics/gazebo/gazebo-11.10.2.ebuild
199 +++ /dev/null
200 @@ -1,85 +0,0 @@
201 -# Copyright 1999-2022 Gentoo Authors
202 -# Distributed under the terms of the GNU General Public License v2
203 -
204 -EAPI=7
205 -
206 -inherit cmake flag-o-matic
207 -
208 -DESCRIPTION="A 3D multiple robot simulator with dynamics"
209 -HOMEPAGE="http://gazebosim.org/"
210 -SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
211 -
212 -LICENSE="Apache-2.0"
213 -# Subslot = major version = soname of libs
214 -SLOT="0/11"
215 -KEYWORDS="~amd64"
216 -IUSE="cpu_flags_x86_sse2 test"
217 -RESTRICT="!test? ( test )"
218 -
219 -RDEPEND="
220 - >=dev-libs/protobuf-2:=
221 - virtual/opengl
222 - media-libs/openal
223 - net-misc/curl
224 - dev-libs/tinyxml
225 - >=dev-libs/tinyxml2-6:=
226 - dev-libs/libtar
227 - dev-cpp/tbb:=
228 - >=dev-games/ogre-1.7.4:=[freeimage]
229 - <dev-games/ogre-1.10
230 - >=media-libs/freeimage-3.15.4[png]
231 - sci-libs/libccd
232 - >=media-video/ffmpeg-2.6:0=
233 - sci-libs/gts
234 - >=sci-physics/bullet-2.82:=
235 - >=dev-libs/sdformat-9.1:=
236 - dev-qt/qtwidgets:5
237 - dev-qt/qtcore:5
238 - dev-qt/qtopengl:5
239 - dev-libs/boost:=
240 - sci-libs/gdal:=
241 - virtual/libusb:1
242 - dev-libs/libspnav
243 - media-libs/freeimage
244 - sci-libs/hdf5:=[cxx]
245 - sys-apps/util-linux
246 - media-gfx/graphviz
247 - net-libs/ignition-msgs:5=
248 - sci-libs/ignition-math:6=
249 - net-libs/ignition-transport:8=
250 - sci-libs/ignition-common:3=
251 - sci-libs/ignition-fuel-tools:4=
252 - x11-libs/qwt:6=[qt5(+)]
253 -"
254 -DEPEND="${RDEPEND}
255 - dev-qt/qttest:5
256 - x11-apps/mesa-progs
257 - test? ( dev-libs/libxslt )
258 -"
259 -BDEPEND="
260 - || ( app-text/ronn-ng app-text/ronn )
261 - app-arch/gzip
262 - virtual/pkgconfig
263 -"
264 -CMAKE_BUILD_TYPE=RelWithDebInfo
265 -PATCHES=(
266 - "${FILESDIR}/qwt2.patch"
267 - "${FILESDIR}/cmake.patch"
268 - "${FILESDIR}/ffmpeg5.patch"
269 - "${FILESDIR}/ffmpeg4.patch"
270 -)
271 -
272 -src_configure() {
273 - # find OGRE properly
274 - sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die
275 -
276 - local mycmakeargs=(
277 - "-DUSE_UPSTREAM_CFLAGS=OFF"
278 - "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
279 - "-DUSE_HOST_CFLAGS=FALSE"
280 - "-DBUILD_TESTING=$(usex test TRUE FALSE)"
281 - "-DENABLE_SCREEN_TESTS=FALSE"
282 - "-DUSE_EXTERNAL_TINYXML2=TRUE"
283 - )
284 - cmake_src_configure
285 -}
286
287 diff --git a/sci-electronics/gazebo/gazebo-11.11.0.ebuild b/sci-electronics/gazebo/gazebo-11.11.0.ebuild
288 deleted file mode 100644
289 index 4eac05330fc9..000000000000
290 --- a/sci-electronics/gazebo/gazebo-11.11.0.ebuild
291 +++ /dev/null
292 @@ -1,83 +0,0 @@
293 -# Copyright 1999-2022 Gentoo Authors
294 -# Distributed under the terms of the GNU General Public License v2
295 -
296 -EAPI=7
297 -
298 -inherit cmake flag-o-matic
299 -
300 -DESCRIPTION="A 3D multiple robot simulator with dynamics"
301 -HOMEPAGE="http://gazebosim.org/"
302 -SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
303 -
304 -LICENSE="Apache-2.0"
305 -# Subslot = major version = soname of libs
306 -SLOT="0/11"
307 -KEYWORDS="~amd64"
308 -IUSE="cpu_flags_x86_sse2 test"
309 -RESTRICT="!test? ( test )"
310 -
311 -RDEPEND="
312 - >=dev-libs/protobuf-2:=
313 - virtual/opengl
314 - media-libs/openal
315 - net-misc/curl
316 - dev-libs/tinyxml
317 - >=dev-libs/tinyxml2-6:=
318 - dev-libs/libtar
319 - dev-cpp/tbb:=
320 - >=dev-games/ogre-1.7.4:=[freeimage]
321 - <dev-games/ogre-1.10
322 - >=media-libs/freeimage-3.15.4[png]
323 - sci-libs/libccd
324 - >=media-video/ffmpeg-2.6:0=
325 - sci-libs/gts
326 - >=sci-physics/bullet-2.82:=
327 - >=dev-libs/sdformat-9.8:=
328 - dev-qt/qtwidgets:5
329 - dev-qt/qtcore:5
330 - dev-qt/qtopengl:5
331 - dev-libs/boost:=
332 - sci-libs/gdal:=
333 - virtual/libusb:1
334 - dev-libs/libspnav
335 - media-libs/freeimage
336 - sci-libs/hdf5:=[cxx]
337 - sys-apps/util-linux
338 - >=media-gfx/graphviz-4
339 - net-libs/ignition-msgs:5=
340 - sci-libs/ignition-math:6=
341 - net-libs/ignition-transport:8=
342 - sci-libs/ignition-common:3=
343 - sci-libs/ignition-fuel-tools:4=
344 - x11-libs/qwt:6=[qt5(+)]
345 -"
346 -DEPEND="${RDEPEND}
347 - dev-qt/qttest:5
348 - x11-apps/mesa-progs
349 - test? ( dev-libs/libxslt )
350 -"
351 -BDEPEND="
352 - || ( app-text/ronn-ng app-text/ronn )
353 - app-arch/gzip
354 - virtual/pkgconfig
355 -"
356 -CMAKE_BUILD_TYPE=RelWithDebInfo
357 -PATCHES=(
358 - "${FILESDIR}/qwt2.patch"
359 - "${FILESDIR}/cmake.patch"
360 -)
361 -
362 -src_configure() {
363 - # find OGRE properly
364 - sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die
365 -
366 - local mycmakeargs=(
367 - "-DUSE_UPSTREAM_CFLAGS=OFF"
368 - "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
369 - "-DUSE_HOST_CFLAGS=FALSE"
370 - "-DBUILD_TESTING=$(usex test TRUE FALSE)"
371 - "-DENABLE_SCREEN_TESTS=FALSE"
372 - "-DUSE_EXTERNAL_TINYXML2=TRUE"
373 - )
374 - cmake_src_configure
375 -}
Report Message
Find on MARC Find on Google Groups