Bug#888365: gazebo: FTBFS with FFmpeg 4.0

[James Cowgill]

Control: tags -1 patch fixed-upstream

Hi,

On 24/04/18 16:15, James Cowgill wrote:
> Control: reopen -1 9.0.0+dfsg5-4
> 
> Hi,
> 
> On Fri, 23 Mar 2018 20:13:24 +0100 Jose Luis Rivero
> <jrivero at openrobotics.org> wrote:
>> Code in gazebo9 should be compatible with ffmpeg 4.0
> 
> Gazebo 9.0.0+dfsg5-4 FTBFS against ffmpeg 4.0 in another test rebuild I
> just ran.
> 
> https://people.debian.org/~jcowgill/ffmpeg-4.0-20180424/gazebo_amd64-2018-04-23T16:03:04Z.build
> 
>> /<<BUILDDIR>>/gazebo-9.0.0+dfsg5/gazebo/common/AudioDecoder.cc: In member function 'bool gazebo::common::AudioDecoder::SetFile(const string&)':
>> /<<BUILDDIR>>/gazebo-9.0.0+dfsg5/gazebo/common/AudioDecoder.cc:258:35: error: 'CODEC_CAP_TRUNCATED' was not declared in this scope
>>    if (this->codec->capabilities & CODEC_CAP_TRUNCATED)
>>                                    ^~~~~~~~~~~~~~~~~~~
>> /<<BUILDDIR>>/gazebo-9.0.0+dfsg5/gazebo/common/AudioDecoder.cc:258:35: note: suggested alternative: 'AV_CODEC_CAP_TRUNCATED'
>>    if (this->codec->capabilities & CODEC_CAP_TRUNCATED)
>>                                    ^~~~~~~~~~~~~~~~~~~
>>                                    AV_CODEC_CAP_TRUNCATED
>> /<<BUILDDIR>>/gazebo-9.0.0+dfsg5/gazebo/common/AudioDecoder.cc:259:30: error: 'CODEC_FLAG_TRUNCATED' was not declared in this scope
>>      this->codecCtx->flags |= CODEC_FLAG_TRUNCATED;
>>                               ^~~~~~~~~~~~~~~~~~~~
>> /<<BUILDDIR>>/gazebo-9.0.0+dfsg5/gazebo/common/AudioDecoder.cc:259:30: note: suggested alternative: 'AV_CODEC_FLAG_TRUNCATED'
>>      this->codecCtx->flags |= CODEC_FLAG_TRUNCATED;
>>                               ^~~~~~~~~~~~~~~~~~~~
>>                               AV_CODEC_FLAG_TRUNCATED
>> make[3]: *** [gazebo/common/CMakeFiles/gazebo_common.dir/build.make:114: gazebo/common/CMakeFiles/gazebo_common.dir/AudioDecoder.cc.o] Error 1

The attached patch (from upstream) fixes these issues.

James
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0008-FFmpeg-4.0.patch
Type: text/x-patch
Size: 1470 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/debian-science-maintainers/attachments/20180529/8d478a49/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <http://alioth-lists.debian.net/pipermail/debian-science-maintainers/attachments/20180529/8d478a49/attachment.sig>