From 60f657b5e6155f26601c7def7baa11cee72246d0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 1 Feb 2023 21:05:47 +0000 Subject: gentoo auto-resync : 01:02:2023 - 21:05:47 --- sci-electronics/gazebo/Manifest | 8 +- sci-electronics/gazebo/files/ffmpeg4.patch | 16 ---- sci-electronics/gazebo/files/ffmpeg5.patch | 137 --------------------------- sci-electronics/gazebo/gazebo-11.10.2.ebuild | 85 ----------------- sci-electronics/gazebo/gazebo-11.11.0.ebuild | 83 ---------------- sci-electronics/gazebo/gazebo-11.12.0.ebuild | 6 +- 6 files changed, 4 insertions(+), 331 deletions(-) delete mode 100644 sci-electronics/gazebo/files/ffmpeg4.patch delete mode 100644 sci-electronics/gazebo/files/ffmpeg5.patch delete mode 100644 sci-electronics/gazebo/gazebo-11.10.2.ebuild delete mode 100644 sci-electronics/gazebo/gazebo-11.11.0.ebuild (limited to 'sci-electronics/gazebo') diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest index 22c357368f27..ed08d33fb67f 100644 --- a/sci-electronics/gazebo/Manifest +++ b/sci-electronics/gazebo/Manifest @@ -1,11 +1,5 @@ AUX cmake.patch 699 BLAKE2B 64edc9a3e51952ca5e15488a4fa148028d77bbb3a294937d9df263e8f0d78c59e6d2a40574534aa12911d79b8871901ff5fd16af236f32f0e580b7e86a3f8198 SHA512 95693482c14ddbc759af20c7ef30d1660e8630b21cf52d15ca14e8ef08d3631483c736e67423e2cabf1a8c8b834e8e25ece8a7bd15f71b38853b71d2fdcbce8f -AUX ffmpeg4.patch 619 BLAKE2B 365911baabf0c5a0788e1a964aea75d04749bc6874a696104ed47f7d9c017cb31d0c11294481768ceb3f0c8c139256b0876d5266594cf780954533395ead7034 SHA512 3055895af8a651dc7cac24c4a7258adbd29586a1411178ca7eb7420b8a0897cb6fc9d89dd42a41221b12a79e34757d82071c2841d77ecfeeeb42d60b9a4e8210 -AUX ffmpeg5.patch 5512 BLAKE2B 8bdd4e447fb825cd0a5cd1b2d56503803fc6cda2c8cab568caa604d6f9acaaae3b998b61cacfb275ff8ddb9c484b4ac3d40409b0f56f878437a1332477b6be75 SHA512 bf927c2eec9a6cbc373355c5535bce63618fa29def46c1357172fd45e8229eb122e680e3f7ca01012cc4b9eb49d9c254e302ea42350d3c79a4d44b4ac802235c AUX qwt2.patch 592 BLAKE2B 77c1f9ffa4e1754d8f6bcbd7eff2dfa470abb2c265fb44a4d8a652d0be85b0f337fea7c8786b1f52ecf285a1b78d61238ce61a0d28ca2895d21b700ed3890585 SHA512 16e0c25c13985badc1f4870e02d35d9d72c3006abcc8ae736327b88b15323c2c52892a3d76c5a745b46f512b5f2b2bebd70e390bec2515d954a47e4a08c94792 -DIST gazebo-11.10.2.tar.bz2 56496495 BLAKE2B 09bf370531214e9567d961445797cb50c9e5a81a405720c580d13e6b33029a63dd2cd9930dcbd239c1bf9091a9d5b092bfdef77b0b3524d281a10549e22e7c9a SHA512 8900c483f63cedb8543cfe718b336e3ec372fc0dc3d47ac9cd5378987fae634f16911d3c91fdf70add93b4a090e92f3558beec6c1277e1ba109652dcaf049ac2 -DIST gazebo-11.11.0.tar.bz2 56505651 BLAKE2B c3f63a1ee128fd86be914ba9ad7567d0adf337d82772184bbc362373083ad2b79f1172998182a70faf4127fe6f5996d6946e79927c40a384ac5e0eef3b7799c9 SHA512 f9062a54ee4e252219a246124ad0a22570e12f34f7bced8910a14b96541b16337efbba0f824b0ba70adf91d41acfc407eb0cdb19bbd7272151ef9723acc48882 DIST gazebo-11.12.0.tar.bz2 56542859 BLAKE2B f2da8371fa4655cc831401fcf6ceec8c82d507a93515762c078ac20a78cb4b739c9f373ef53bebc71b5d7e1c1cf4b98928b3e855fca6943a09da554ee19df1cb SHA512 8f60d432ab07084951bbe31c632f04f2fa11500441fb81fe27078a5cb5b67ba681889e1079844d44a5a30df562797d51683fd674942db9fd8c4d853e3e2c5d3e -EBUILD gazebo-11.10.2.ebuild 1946 BLAKE2B 7f210c80718368ee995b32c3525d0580dc428593805212897bd9e9fcbfcd05ed4ca571c78a7031e2df64e3e7abcd8aed4be4df9576e237a697faaca0da673c64 SHA512 028c4afdfea771dec647d2383fda9977f004629dce02f54d45467ed3bf0ce153e5520f6fc08c3228efc345c25b5af5ede09b1715d566719d9ba21a3f1b6ba9f6 -EBUILD gazebo-11.11.0.ebuild 1892 BLAKE2B 68b1531e734d14dafda0ca4b69df64dc12f5bb49878b6bc3644b4e98260d3ae55169845837d71426e687dc610ad911b818565a9c5b167b4c7e8f43704f5f8fd1 SHA512 5e22e87d60a884f8af412aa75c98068c52d6618148204b393973eab239af7a18ffd97c64b3ddc8d6198bd77aa18620da37c350310521e83181e541f8d03389d8 -EBUILD gazebo-11.12.0.ebuild 1892 BLAKE2B 68b1531e734d14dafda0ca4b69df64dc12f5bb49878b6bc3644b4e98260d3ae55169845837d71426e687dc610ad911b818565a9c5b167b4c7e8f43704f5f8fd1 SHA512 5e22e87d60a884f8af412aa75c98068c52d6618148204b393973eab239af7a18ffd97c64b3ddc8d6198bd77aa18620da37c350310521e83181e541f8d03389d8 +EBUILD gazebo-11.12.0.ebuild 1884 BLAKE2B f036548dd1e5e0180a804c5aefb70ce4990081f8ff9f2ba7208e5c3488b9f829a846b7b77322b160dc0728853afa109bb1f334cfb258f3725a16451fb72266a7 SHA512 08954da9a7a9338d6889d945dd4e43e069d7ebee0d74f2869fe7220885a1b0bc31fac083a80b973c2e3014151da886495999682fea5e1fa323c0be8d3038eda2 MISC metadata.xml 244 BLAKE2B 5a5426f4a80c61e49915e23ab7298bd1e53d89bd5361ad61fdaa3a50c88e7f27ea69205fd8c407addfdfde991e10cbe70aa554bfd737daf9d3d639c4eddd5934 SHA512 052b13f84da2d92069cdab006492e4b72274519bae5081f01ee4605215c7dca16bade6fa3856a7fec9435d1b564e607c9c52e0f9fdf199363af330778bf6c0af diff --git a/sci-electronics/gazebo/files/ffmpeg4.patch b/sci-electronics/gazebo/files/ffmpeg4.patch deleted file mode 100644 index 7b7c8d7270fd..000000000000 --- a/sci-electronics/gazebo/files/ffmpeg4.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: gazebo-11.10.1/gazebo/common/VideoEncoder.cc -=================================================================== ---- gazebo-11.10.1.orig/gazebo/common/VideoEncoder.cc -+++ gazebo-11.10.1/gazebo/common/VideoEncoder.cc -@@ -224,7 +224,10 @@ bool VideoEncoder::Start(const std::stri - - // The remainder of this function handles FFMPEG initialization of a video - // stream -- const AVOutputFormat *outputFormat = nullptr; -+#if LIBAVFORMAT_VERSION_MAJOR >= 59 -+ const -+#endif -+ AVOutputFormat *outputFormat = nullptr; - - // This 'if' and 'free' are just for safety. We chech the value of formatCtx - // below. diff --git a/sci-electronics/gazebo/files/ffmpeg5.patch b/sci-electronics/gazebo/files/ffmpeg5.patch deleted file mode 100644 index e55bab3c311f..000000000000 --- a/sci-electronics/gazebo/files/ffmpeg5.patch +++ /dev/null @@ -1,137 +0,0 @@ -Index: gazebo-11.10.1/gazebo/common/AudioDecoder.cc -=================================================================== ---- gazebo-11.10.1.orig/gazebo/common/AudioDecoder.cc -+++ gazebo-11.10.1/gazebo/common/AudioDecoder.cc -@@ -113,8 +113,13 @@ bool AudioDecoder::Decode(uint8_t **_out - # pragma GCC diagnostic push - # pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #endif -- bytesDecoded = avcodec_decode_audio4(this->codecCtx, decodedFrame, -- &gotFrame, &packet1); -+ bytesDecoded = avcodec_send_packet(this->codecCtx, &packet1); -+ if (bytesDecoded >= 0 || bytesDecoded == AVERROR_EOF) { -+ bytesDecoded = avcodec_receive_frame(this->codecCtx, decodedFrame); -+ gotFrame = bytesDecoded >= 0; -+ if (bytesDecoded == AVERROR(EAGAIN) || bytesDecoded == AVERROR_EOF) bytesDecoded = 0; -+ } -+ - #ifndef _WIN32 - # pragma GCC diagnostic pop - #endif -@@ -214,7 +219,7 @@ bool AudioDecoder::SetFile(const std::st - # pragma GCC diagnostic push - # pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #endif -- if (this->formatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) -+ if (this->formatCtx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) - #ifndef _WIN32 - # pragma GCC diagnostic pop - #endif -@@ -238,7 +243,9 @@ bool AudioDecoder::SetFile(const std::st - # pragma GCC diagnostic push - # pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #endif -- this->codecCtx = this->formatCtx->streams[audioStream]->codec; -+ this->codecCtx = avcodec_alloc_context3(nullptr); -+ avcodec_parameters_to_context(this->codecCtx, this->formatCtx->streams[audioStream]->codecpar); -+ - #ifndef _WIN32 - # pragma GCC diagnostic pop - #endif -Index: gazebo-11.10.1/gazebo/common/AudioDecoder.hh -=================================================================== ---- gazebo-11.10.1.orig/gazebo/common/AudioDecoder.hh -+++ gazebo-11.10.1/gazebo/common/AudioDecoder.hh -@@ -75,7 +75,7 @@ namespace gazebo - private: AVCodecContext *codecCtx; - - /// \brief libavcodec audio codec. -- private: AVCodec *codec; -+ private: const AVCodec *codec; - - /// \brief Index of the audio stream. - private: int audioStream; -Index: gazebo-11.10.1/gazebo/common/Video.cc -=================================================================== ---- gazebo-11.10.1.orig/gazebo/common/Video.cc -+++ gazebo-11.10.1/gazebo/common/Video.cc -@@ -77,7 +77,7 @@ void Video::Cleanup() - #ifdef HAVE_FFMPEG - bool Video::Load(const std::string &_filename) - { -- AVCodec *codec = nullptr; -+ const AVCodec *codec = nullptr; - this->videoStream = -1; - - if (this->formatCtx || this->avFrame || this->codecCtx) -@@ -107,7 +107,7 @@ bool Video::Load(const std::string &_fil - # pragma GCC diagnostic push - # pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #endif -- if (this->formatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) -+ if (this->formatCtx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) - #ifndef _WIN32 - # pragma GCC diagnostic pop - #endif -@@ -128,13 +128,14 @@ bool Video::Load(const std::string &_fil - # pragma GCC diagnostic push - # pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #endif -- this->codecCtx = this->formatCtx->streams[this->videoStream]->codec; -+ this->codecCtx = avcodec_alloc_context3(nullptr); -+ avcodec_parameters_to_context(this->codecCtx, this->formatCtx->streams[this->videoStream]->codecpar); - #ifndef _WIN32 - # pragma GCC diagnostic pop - #endif - - // Find the decoder for the video stream -- codec = avcodec_find_decoder(this->codecCtx->codec_id); -+ codec = avcodec_find_decoder(this->formatCtx->streams[this->videoStream]->codecpar->codec_id); - if (codec == nullptr) - { - gzerr << "Codec not found\n"; -@@ -231,15 +232,19 @@ bool Video::GetNextFrame(unsigned char * - # pragma GCC diagnostic push - # pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #endif -- int processedLength = avcodec_decode_video2(this->codecCtx, this->avFrame, -- &frameAvailable, &tmpPacket); -+ int processedLength = avcodec_send_packet(this->codecCtx, !tmpPacket.data && !tmpPacket.size ? nullptr : &tmpPacket); - #ifndef _WIN32 - # pragma GCC diagnostic pop - #endif -+ if (processedLength >= 0 || processedLength == AVERROR_EOF) { -+ processedLength = avcodec_receive_frame(this->codecCtx, this->avFrame); -+ frameAvailable = processedLength >= 0; -+ if (processedLength == AVERROR(EAGAIN) || processedLength == AVERROR_EOF) processedLength = 0; -+ } - if (processedLength < 0) - { - gzerr << "Error while processing the data\n"; -- break; -+ break; - } - - tmpPacket.data = tmpPacket.data + processedLength; -Index: gazebo-11.10.1/gazebo/common/VideoEncoder.cc -=================================================================== ---- gazebo-11.10.1.orig/gazebo/common/VideoEncoder.cc -+++ gazebo-11.10.1/gazebo/common/VideoEncoder.cc -@@ -224,7 +224,7 @@ bool VideoEncoder::Start(const std::stri - - // The remainder of this function handles FFMPEG initialization of a video - // stream -- AVOutputFormat *outputFormat = nullptr; -+ const AVOutputFormat *outputFormat = nullptr; - - // This 'if' and 'free' are just for safety. We chech the value of formatCtx - // below. -@@ -294,7 +294,7 @@ bool VideoEncoder::Start(const std::stri - } - - // find the video encoder -- AVCodec *encoder = avcodec_find_encoder( -+ const AVCodec *encoder = avcodec_find_encoder( - this->dataPtr->formatCtx->oformat->video_codec); - if (!encoder) - { diff --git a/sci-electronics/gazebo/gazebo-11.10.2.ebuild b/sci-electronics/gazebo/gazebo-11.10.2.ebuild deleted file mode 100644 index d813f60aea22..000000000000 --- a/sci-electronics/gazebo/gazebo-11.10.2.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic - -DESCRIPTION="A 3D multiple robot simulator with dynamics" -HOMEPAGE="http://gazebosim.org/" -SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2" - -LICENSE="Apache-2.0" -# Subslot = major version = soname of libs -SLOT="0/11" -KEYWORDS="~amd64" -IUSE="cpu_flags_x86_sse2 test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/protobuf-2:= - virtual/opengl - media-libs/openal - net-misc/curl - dev-libs/tinyxml - >=dev-libs/tinyxml2-6:= - dev-libs/libtar - dev-cpp/tbb:= - >=dev-games/ogre-1.7.4:=[freeimage] - =media-libs/freeimage-3.15.4[png] - sci-libs/libccd - >=media-video/ffmpeg-2.6:0= - sci-libs/gts - >=sci-physics/bullet-2.82:= - >=dev-libs/sdformat-9.1:= - dev-qt/qtwidgets:5 - dev-qt/qtcore:5 - dev-qt/qtopengl:5 - dev-libs/boost:= - sci-libs/gdal:= - virtual/libusb:1 - dev-libs/libspnav - media-libs/freeimage - sci-libs/hdf5:=[cxx] - sys-apps/util-linux - media-gfx/graphviz - net-libs/ignition-msgs:5= - sci-libs/ignition-math:6= - net-libs/ignition-transport:8= - sci-libs/ignition-common:3= - sci-libs/ignition-fuel-tools:4= - x11-libs/qwt:6=[qt5(+)] -" -DEPEND="${RDEPEND} - dev-qt/qttest:5 - x11-apps/mesa-progs - test? ( dev-libs/libxslt ) -" -BDEPEND=" - || ( app-text/ronn-ng app-text/ronn ) - app-arch/gzip - virtual/pkgconfig -" -CMAKE_BUILD_TYPE=RelWithDebInfo -PATCHES=( - "${FILESDIR}/qwt2.patch" - "${FILESDIR}/cmake.patch" - "${FILESDIR}/ffmpeg5.patch" - "${FILESDIR}/ffmpeg4.patch" -) - -src_configure() { - # find OGRE properly - sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die - - local mycmakeargs=( - "-DUSE_UPSTREAM_CFLAGS=OFF" - "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)" - "-DUSE_HOST_CFLAGS=FALSE" - "-DBUILD_TESTING=$(usex test TRUE FALSE)" - "-DENABLE_SCREEN_TESTS=FALSE" - "-DUSE_EXTERNAL_TINYXML2=TRUE" - ) - cmake_src_configure -} diff --git a/sci-electronics/gazebo/gazebo-11.11.0.ebuild b/sci-electronics/gazebo/gazebo-11.11.0.ebuild deleted file mode 100644 index 4eac05330fc9..000000000000 --- a/sci-electronics/gazebo/gazebo-11.11.0.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic - -DESCRIPTION="A 3D multiple robot simulator with dynamics" -HOMEPAGE="http://gazebosim.org/" -SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2" - -LICENSE="Apache-2.0" -# Subslot = major version = soname of libs -SLOT="0/11" -KEYWORDS="~amd64" -IUSE="cpu_flags_x86_sse2 test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/protobuf-2:= - virtual/opengl - media-libs/openal - net-misc/curl - dev-libs/tinyxml - >=dev-libs/tinyxml2-6:= - dev-libs/libtar - dev-cpp/tbb:= - >=dev-games/ogre-1.7.4:=[freeimage] - =media-libs/freeimage-3.15.4[png] - sci-libs/libccd - >=media-video/ffmpeg-2.6:0= - sci-libs/gts - >=sci-physics/bullet-2.82:= - >=dev-libs/sdformat-9.8:= - dev-qt/qtwidgets:5 - dev-qt/qtcore:5 - dev-qt/qtopengl:5 - dev-libs/boost:= - sci-libs/gdal:= - virtual/libusb:1 - dev-libs/libspnav - media-libs/freeimage - sci-libs/hdf5:=[cxx] - sys-apps/util-linux - >=media-gfx/graphviz-4 - net-libs/ignition-msgs:5= - sci-libs/ignition-math:6= - net-libs/ignition-transport:8= - sci-libs/ignition-common:3= - sci-libs/ignition-fuel-tools:4= - x11-libs/qwt:6=[qt5(+)] -" -DEPEND="${RDEPEND} - dev-qt/qttest:5 - x11-apps/mesa-progs - test? ( dev-libs/libxslt ) -" -BDEPEND=" - || ( app-text/ronn-ng app-text/ronn ) - app-arch/gzip - virtual/pkgconfig -" -CMAKE_BUILD_TYPE=RelWithDebInfo -PATCHES=( - "${FILESDIR}/qwt2.patch" - "${FILESDIR}/cmake.patch" -) - -src_configure() { - # find OGRE properly - sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die - - local mycmakeargs=( - "-DUSE_UPSTREAM_CFLAGS=OFF" - "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)" - "-DUSE_HOST_CFLAGS=FALSE" - "-DBUILD_TESTING=$(usex test TRUE FALSE)" - "-DENABLE_SCREEN_TESTS=FALSE" - "-DUSE_EXTERNAL_TINYXML2=TRUE" - ) - cmake_src_configure -} diff --git a/sci-electronics/gazebo/gazebo-11.12.0.ebuild b/sci-electronics/gazebo/gazebo-11.12.0.ebuild index 4eac05330fc9..79c54a12daca 100644 --- a/sci-electronics/gazebo/gazebo-11.12.0.ebuild +++ b/sci-electronics/gazebo/gazebo-11.12.0.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake flag-o-matic +inherit cmake DESCRIPTION="A 3D multiple robot simulator with dynamics" -HOMEPAGE="http://gazebosim.org/" +HOMEPAGE="https://gazebosim.org/home" SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2" LICENSE="Apache-2.0" -- cgit v1.2.3