commit: d237d82ef8ecdc197e3211900c726619a2278189
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 18 15:50:02 2018 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Apr 20 07:47:44 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d237d82e
sci-electronics/gazebo: fix build with ffmpeg 4
Package-Manager: Portage-2.3.30, Repoman-2.3.9
sci-electronics/gazebo/files/ffmpeg4.patch | 30 ++++++++++++++++++++++++++++++
sci-electronics/gazebo/gazebo-9.0.0.ebuild | 2 +-
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/sci-electronics/gazebo/files/ffmpeg4.patch
b/sci-electronics/gazebo/files/ffmpeg4.patch
new file mode 100644
index 00000000000..7bd8777dea3
--- /dev/null
+++ b/sci-electronics/gazebo/files/ffmpeg4.patch
@@ -0,0 +1,30 @@
+Index: gazebo-9.0.0/gazebo/common/AudioDecoder.cc
+===================================================================
+--- gazebo-9.0.0.orig/gazebo/common/AudioDecoder.cc
++++ gazebo-9.0.0/gazebo/common/AudioDecoder.cc
+@@ -255,8 +255,8 @@ bool AudioDecoder::SetFile(const std::st
+ return false;
+ }
+
+- if (this->codec->capabilities & CODEC_CAP_TRUNCATED)
+- this->codecCtx->flags |= CODEC_FLAG_TRUNCATED;
++ if (this->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
++ this->codecCtx->flags |= AV_CODEC_FLAG_TRUNCATED;
+
+ // Open codec
+ if (avcodec_open2(this->codecCtx, this->codec, nullptr) < 0)
+Index: gazebo-9.0.0/gazebo/common/Video.cc
+===================================================================
+--- gazebo-9.0.0.orig/gazebo/common/Video.cc
++++ gazebo-9.0.0/gazebo/common/Video.cc
+@@ -143,8 +143,8 @@ bool Video::Load(const std::string &_fil
+
+ // Inform the codec that we can handle truncated bitstreams -- i.e.,
+ // bitstreams where frame boundaries can fall in the middle of packets
+- if (codec->capabilities & CODEC_CAP_TRUNCATED)
+- this->codecCtx->flags |= CODEC_FLAG_TRUNCATED;
++ if (codec->capabilities & AV_CODEC_CAP_TRUNCATED)
++ this->codecCtx->flags |= AV_CODEC_FLAG_TRUNCATED;
+
+ // Open codec
+ if (avcodec_open2(this->codecCtx, codec, nullptr) < 0)
diff --git a/sci-electronics/gazebo/gazebo-9.0.0.ebuild
b/sci-electronics/gazebo/gazebo-9.0.0.ebuild
index 76ad65771aa..77f42540c99 100644
--- a/sci-electronics/gazebo/gazebo-9.0.0.ebuild
+++ b/sci-electronics/gazebo/gazebo-9.0.0.ebuild
@@ -57,7 +57,7 @@ DEPEND="${RDEPEND}
test? ( dev-libs/libxslt )
"
CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/qwt.patch" )
+PATCHES=( "${FILESDIR}/qwt.patch" "${FILESDIR}/ffmpeg4.patch" )
src_configure() {
# doesnt build without it
