Package: gazebo
Version: 6.5.0+dfsg-1
Severity: important
Tags: patch
User: pkg-multimedia-maintain...@lists.alioth.debian.org
Usertags: ffmpeg2.9
Dear Maintainer,
your package fails to build with the upcoming ffmpeg 2.9.
This bug will become release-critical at some point when the
ffmpeg2.9 transition gets closer.
Attached is a patch replacing the deprecated functionality.
It also works with ffmpeg 2.8.
Please apply this patch and forward it upstream, if necessary.
These changes have little regression potential.
Best regards,
Andreas
diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 0000000..20ff187
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,33 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
+Last-Update: <2015-11-02>
+
+--- gazebo-6.5.0+dfsg.orig/gazebo/common/Video.cc
++++ gazebo-6.5.0+dfsg/gazebo/common/Video.cc
+@@ -70,7 +70,7 @@ void Video::Cleanup()
+ {
+ #ifdef HAVE_FFMPEG
+ // Free the YUV frame
+- av_free(this->avFrame);
++ av_frame_free(&this->avFrame);
+
+ // Close the video file
+ avformat_close_input(&this->formatCtx);
+@@ -147,7 +147,7 @@ bool Video::Load(const std::string &_fil
+ return false;
+ }
+
+- avpicture_alloc(this->pic, PIX_FMT_RGB24, this->codecCtx->width,
++ avpicture_alloc(this->pic, AV_PIX_FMT_RGB24, this->codecCtx->width,
+ this->codecCtx->height);
+
+ this->swsCtx = sws_getContext(
+@@ -156,7 +156,7 @@ bool Video::Load(const std::string &_fil
+ this->codecCtx->pix_fmt,
+ this->codecCtx->width,
+ this->codecCtx->height,
+- PIX_FMT_RGB24,
++ AV_PIX_FMT_RGB24,
+ SWS_BICUBIC, NULL, NULL, NULL);
+
+ if (this->swsCtx == NULL)
diff --git a/debian/patches/series b/debian/patches/series
index 1ac001d..bfbf34d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
0002_use_system_gtest.patch
0005-fix-problems-on-manpage.patch
0008-arial-font-removed-in-dfsg.patch
+ffmpeg_2.9.patch
--
debian-science-maintainers mailing list
debian-science-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers
