gentoo resync : 20.03.2022

6 files changed, 160 insertions, 173 deletions

diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index 2bdaad491bf4..94cb145f0b24 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,11 +1,9 @@
 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 qwt.patch 555 BLAKE2B f959e84dc5e144fd3dd35e6e6c7714507e1a4815495d41611198381165e386d135d334c4f3cb2293592abca72bbb16307b2e5a17d5903d4899c7fa2cd1790d5a SHA512 9a1138acd9bd5ce75a709d50dd585a17ca7d913d4cf37283d8db68e79fd08bf98ddd27ea5d2e459efac0a71df1369c83a67f6727419c0d26c0dd02f5a6ce22b8
-DIST gazebo-11.3.0.tar.bz2 56778002 BLAKE2B d466556c834935d8b3694461ddf6d7a7872b00d2f8f58d50d70cceb8bca3ab4ada1e72e7bb14b79404d45c48f95419e3dedd9019ecc3a8c1623afda077bcbeb2 SHA512 2e219655e45a787aeda50065dcec5d90954c18223f134d6da90b8cb43e119268262e515e527547d0b0b5ed1f73b5083d279551a01faa3d3c34ba7a580c077970
-DIST gazebo-11.5.1.tar.bz2 56486174 BLAKE2B c1bffc5067f2739a8eb2e178bb2209d9c7b5a58d0589710cc515c4bcbbca281fb94ddf16de977f3771bc4b64fb6afe8e86327dde00d19ef62754e4d7634bb65f SHA512 7c922963881cf079e926c239f510e722fc6cabd07ef5e846a4b78772364a3aecb0b68f2b690ff451d42ceb11e88e2f831c30515e5a228f12826516ecad10e53a
-DIST gazebo-11.7.0.tar.bz2 56394312 BLAKE2B 2da58a2702113c1954f0202bb779b723ad8e59cab678f9ca6fe64908785198b996ef71c845a1a85f00e2f4eddb9ed5683f815ada850917b2af4afad214eac77d SHA512 7de40908a021655b2a200a73cf979585f4bdb245064f7e9a853998f87df329223252c73882aa1e2b705bc7de5841e2a87d67f772dfef18e5735c1b06c2663192
+DIST gazebo-11.10.1.tar.bz2 56483769 BLAKE2B 9d0aa1d8c21065fddc28d706632cc7bd1b8a3429c606ff51dcbe4657ec41fdfe60e2906dfd5efdcd8d6f1847694d8419957b386bc40aafac739e3277b7c577ab SHA512 ed78aebf0d53a7848dd0900f96082ae508f64bc8fe53277859b32880147643a1b1ff9c273cddfd9e34e8ec4ec53f93d13ba74f3edca16fdcf5e2a040509c5dc3
 DIST gazebo-11.9.1.tar.bz2 56472954 BLAKE2B c7a1c3c4a03112a90e8a0cb35dde32f5bb478dafb0d8c582d8cbad15ff1f43699782df3d69a75c47efec44d8a15ad96730f1ae9c1b5b0b1ff2099fbc6b8f2e4e SHA512 51af82305ef0758950e2752624cd98bd31abe55469a1cad6432b1edde1a8f896798a554c672f8694c080f7076d13fe1aa91b182227e26f04cb99e9e0f3907694
-EBUILD gazebo-11.3.0-r4.ebuild 1905 BLAKE2B a40989966fd5b5ff6af51a2451228c62d724ddc3393555111bc6fbd27e7b32156c14779a625bb6be4e68db1d41e15c9847fe7ab3d2d98693d938eb33b125667d SHA512 7b828b121533ca25db7f70d44ed81367b858c3958de21edad1cabb371d4cbb3ab32b3a71aae2102d534e4b6a86956db0def40d77fdfd38b2dc9d789b78fd16ac
-EBUILD gazebo-11.5.1-r4.ebuild 1905 BLAKE2B a40989966fd5b5ff6af51a2451228c62d724ddc3393555111bc6fbd27e7b32156c14779a625bb6be4e68db1d41e15c9847fe7ab3d2d98693d938eb33b125667d SHA512 7b828b121533ca25db7f70d44ed81367b858c3958de21edad1cabb371d4cbb3ab32b3a71aae2102d534e4b6a86956db0def40d77fdfd38b2dc9d789b78fd16ac
-EBUILD gazebo-11.7.0-r3.ebuild 1905 BLAKE2B a40989966fd5b5ff6af51a2451228c62d724ddc3393555111bc6fbd27e7b32156c14779a625bb6be4e68db1d41e15c9847fe7ab3d2d98693d938eb33b125667d SHA512 7b828b121533ca25db7f70d44ed81367b858c3958de21edad1cabb371d4cbb3ab32b3a71aae2102d534e4b6a86956db0def40d77fdfd38b2dc9d789b78fd16ac
+EBUILD gazebo-11.10.1.ebuild 1970 BLAKE2B 36e71e0bf16f643a997d56d8a83235e33d336b70cd1951fe4b14c3a8ec80109f2ea61b25ddb3c1f2c368e1cda088c161d7bd5d968fc962523e935dd2f33ac57c SHA512 d889a779064d00ba0ad9e8070ee7946a4086be50689e95218ed2ed6037084218d011f3d49ea0e2ed6d7815c10fa48204b9e46b8afb8014107c70cafdf4337625
 EBUILD gazebo-11.9.1-r1.ebuild 1912 BLAKE2B ab1806c0767335f5d3d51f9bf1832cb7e75c44c9ad47560153867167451019d1b296fce5a7c66cb4d1db7379b59970f3612f2b180ecb2a3a963b64e2389b152f SHA512 77e581310235fcba1f4e140d44b0525ba2fd5a29aa0810c9013937defe94cf75cb9a1560544f86a8c35db8de1bb01c29ed75931d6e2a46a387a7b756fdd58b56
 MISC metadata.xml 244 BLAKE2B 5a5426f4a80c61e49915e23ab7298bd1e53d89bd5361ad61fdaa3a50c88e7f27ea69205fd8c407addfdfde991e10cbe70aa554bfd737daf9d3d639c4eddd5934 SHA512 052b13f84da2d92069cdab006492e4b72274519bae5081f01ee4605215c7dca16bade6fa3856a7fec9435d1b564e607c9c52e0f9fdf199363af330778bf6c0af
diff --git a/sci-electronics/gazebo/files/ffmpeg4.patch b/sci-electronics/gazebo/files/ffmpeg4.patch
new file mode 100644
index 000000000000..7b7c8d7270fd
--- /dev/null
+++ b/sci-electronics/gazebo/files/ffmpeg4.patch
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 000000000000..e55bab3c311f
--- /dev/null
+++ b/sci-electronics/gazebo/files/ffmpeg5.patch
@@ -0,0 +1,137 @@
+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.3.0-r4.ebuild b/sci-electronics/gazebo/gazebo-11.10.1.ebuild
index 22a15762cc2c..3291c74fa777 100644
--- a/sci-electronics/gazebo/gazebo-11.3.0-r4.ebuild
+++ b/sci-electronics/gazebo/gazebo-11.10.1.ebuild
@@ -49,7 +49,7 @@ RDEPEND="
 	net-libs/ignition-transport:8=
 	sci-libs/ignition-common:3=
 	sci-libs/ignition-fuel-tools:4=
-	x11-libs/qwt:6=[qt5(+)]
+	<x11-libs/qwt-6.2.0:6=[qt5(+)]
 "
 DEPEND="${RDEPEND}
 	dev-qt/qttest:5
@@ -65,6 +65,8 @@ CMAKE_BUILD_TYPE=RelWithDebInfo
 PATCHES=(
 	"${FILESDIR}/qwt.patch"
 	"${FILESDIR}/cmake.patch"
+	"${FILESDIR}/ffmpeg5.patch"
+	"${FILESDIR}/ffmpeg4.patch"
 )
 
 src_configure() {
diff --git a/sci-electronics/gazebo/gazebo-11.5.1-r4.ebuild b/sci-electronics/gazebo/gazebo-11.5.1-r4.ebuild
deleted file mode 100644
index 22a15762cc2c..000000000000
--- a/sci-electronics/gazebo/gazebo-11.5.1-r4.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-2021:=
-	>=dev-games/ogre-1.7.4:=[freeimage]
-	<dev-games/ogre-1.10
-	>=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:=[threads(+)]
-	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}/qwt.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.7.0-r3.ebuild b/sci-electronics/gazebo/gazebo-11.7.0-r3.ebuild
deleted file mode 100644
index 22a15762cc2c..000000000000
--- a/sci-electronics/gazebo/gazebo-11.7.0-r3.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-2021:=
-	>=dev-games/ogre-1.7.4:=[freeimage]
-	<dev-games/ogre-1.10
-	>=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:=[threads(+)]
-	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}/qwt.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
-}