Control: tags 888365 + pending Dear maintainer,
I've prepared an NMU for gazebo (versioned as 9.0.0+dfsg5-4.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Cheers -- Sebastian Ramacher
diff -Nru gazebo-9.0.0+dfsg5/debian/changelog gazebo-9.0.0+dfsg5/debian/changelog --- gazebo-9.0.0+dfsg5/debian/changelog 2018-03-01 13:12:16.000000000 +0100 +++ gazebo-9.0.0+dfsg5/debian/changelog 2018-07-11 22:07:57.000000000 +0200 @@ -1,3 +1,11 @@ +gazebo (9.0.0+dfsg5-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches: Fix build with ffmpeg 4.0. Thanks to James Cowgill for the + patch. (Closes: #888365) + + -- Sebastian Ramacher <sramac...@debian.org> Wed, 11 Jul 2018 22:07:57 +0200 + gazebo (9.0.0+dfsg5-4) unstable; urgency=medium * libqtpropertybrowser-dev is not an optional dependency. Remove arch conditionals diff -Nru gazebo-9.0.0+dfsg5/debian/patches/0009-ffmpeg4.0.patch gazebo-9.0.0+dfsg5/debian/patches/0009-ffmpeg4.0.patch --- gazebo-9.0.0+dfsg5/debian/patches/0009-ffmpeg4.0.patch 1970-01-01 01:00:00.000000000 +0100 +++ gazebo-9.0.0+dfsg5/debian/patches/0009-ffmpeg4.0.patch 2018-07-11 22:07:28.000000000 +0200 @@ -0,0 +1,38 @@ +Description: Fix FTBFS with FFmpeg 4.0 +Author: Steve Peters <scpet...@openrobotics.org> +Origin: upstream, https://bitbucket.org/osrf/gazebo/commits/0c6e09de8c20d8465b59a364dbb887c462f72afa +Bug-Debian: https://bugs.debian.org/888365 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/gazebo/common/AudioDecoder.cc ++++ b/gazebo/common/AudioDecoder.cc +@@ -255,8 +255,13 @@ bool AudioDecoder::SetFile(const std::st + return false; + } + ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(56, 60, 100) ++ if (this->codec->capabilities & AV_CODEC_CAP_TRUNCATED) ++ this->codecCtx->flags |= AV_CODEC_FLAG_TRUNCATED; ++#else + if (this->codec->capabilities & CODEC_CAP_TRUNCATED) + this->codecCtx->flags |= CODEC_FLAG_TRUNCATED; ++#endif + + // Open codec + if (avcodec_open2(this->codecCtx, this->codec, nullptr) < 0) +--- a/gazebo/common/Video.cc ++++ b/gazebo/common/Video.cc +@@ -143,8 +143,13 @@ 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 LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(56, 60, 100) ++ if (codec->capabilities & AV_CODEC_CAP_TRUNCATED) ++ this->codecCtx->flags |= AV_CODEC_FLAG_TRUNCATED; ++#else + if (codec->capabilities & CODEC_CAP_TRUNCATED) + this->codecCtx->flags |= CODEC_FLAG_TRUNCATED; ++#endif + + // Open codec + if (avcodec_open2(this->codecCtx, codec, nullptr) < 0) diff -Nru gazebo-9.0.0+dfsg5/debian/patches/series gazebo-9.0.0+dfsg5/debian/patches/series --- gazebo-9.0.0+dfsg5/debian/patches/series 2018-02-16 02:09:07.000000000 +0100 +++ gazebo-9.0.0+dfsg5/debian/patches/series 2018-07-11 22:07:34.000000000 +0200 @@ -3,3 +3,4 @@ 0003-use-system-qtpropertybrowser.patch 0005-fix-problems-on-manpage.patch 0008-arial-dejavu-fonts-removed-in-dfsg.patch +0009-ffmpeg4.0.patch
signature.asc
Description: PGP signature
