commit: 218f0e9d77cc20c2c6f37cbe2d25e608ba80ea09 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Wed Mar 2 17:27:32 2022 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Wed Mar 2 17:45:01 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=218f0e9d
sci-electronics/gazebo: fix build with ffmpeg4 Closes: https://bugs.gentoo.org/833868 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> sci-electronics/gazebo/files/ffmpeg4.patch | 16 ++++++++++++++++ sci-electronics/gazebo/gazebo-11.10.1.ebuild | 1 + 2 files changed, 17 insertions(+) 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/gazebo-11.10.1.ebuild b/sci-electronics/gazebo/gazebo-11.10.1.ebuild index 4641556896a7..3291c74fa777 100644 --- a/sci-electronics/gazebo/gazebo-11.10.1.ebuild +++ b/sci-electronics/gazebo/gazebo-11.10.1.ebuild @@ -66,6 +66,7 @@ PATCHES=( "${FILESDIR}/qwt.patch" "${FILESDIR}/cmake.patch" "${FILESDIR}/ffmpeg5.patch" + "${FILESDIR}/ffmpeg4.patch" ) src_configure() {
