gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

sci-electronics/gazebo: fix build with ffmpeg 4

Browse Source 
Package-Manager: Portage-2.3.30, Repoman-2.3.9
This commit is contained in:
Alexis Ballier
2018-04-18 17:50:02 +02:00
parent a38b46cfa8
commit d237d82ef8
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
sci-electronics/gazebo/files/ffmpeg4.patch Normal file
View File

@@ -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)

2
sci-electronics/gazebo/gazebo-9.0.0.ebuild
View File

@@ -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