Your message dated Tue, 10 Nov 2015 22:51:42 +0000
with message-id <e1zwhlo-0008mo...@franck.debian.org>
and subject line Bug#803816: fixed in gazebo 6.5.0+dfsg-2
has caused the Debian Bug report #803816,
regarding gazebo: FTBFS with FFmpeg 2.9
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
803816: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803816
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
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

--- End Message ---
--- Begin Message ---
Source: gazebo
Source-Version: 6.5.0+dfsg-2

We believe that the bug you reported is fixed in the latest version of
gazebo, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 803...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Anton Gladky <gl...@debian.org> (supplier of updated gazebo package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Tue, 10 Nov 2015 21:41:54 +0100
Source: gazebo
Binary: gazebo6-common gazebo6 libgazebo6 libgazebo6-dev gazebo6-plugin-base 
libgazebo6-dbg gazebo6-doc
Architecture: source
Version: 6.5.0+dfsg-2
Distribution: unstable
Urgency: medium
Maintainer: Debian Science Maintainers 
<debian-science-maintainers@lists.alioth.debian.org>
Changed-By: Anton Gladky <gl...@debian.org>
Description:
 gazebo6    - Open Source Robotics Simulator - Binaries
 gazebo6-common - Open Source Robotics Simulator - Shared files
 gazebo6-doc - Open Source Robotics Simulator - Documentation
 gazebo6-plugin-base - Open Source Robotics Simulator - base plug-ins
 libgazebo6 - Open Source Robotics Simulator - shared library
 libgazebo6-dbg - Open Source Robotics Simulator - Debugging Symbols
 libgazebo6-dev - Open Source Robotics Simulator - Development Files
Closes: 802032 803816
Changes:
 gazebo (6.5.0+dfsg-2) unstable; urgency=medium
 .
   [ Jose Luis Rivero ]
   * [7a3cc42] Remove player as dependency. (Closes: #802032)
 .
   [ Anton Gladky ]
   * [6f51db4] Replace deprecated FFmpeg API. (Closes: #803816)
   * [7c0b8f1] Apply cme fix dpkg-control.
   * [37f9b28] Add myself to uploaders.
Checksums-Sha1:
 1e29b88db8d6ab86f603563308fb3d3e50b62558 3037 gazebo_6.5.0+dfsg-2.dsc
 eddb62426f47db7eaf4466926655ebd0960a17af 20696 
gazebo_6.5.0+dfsg-2.debian.tar.xz
Checksums-Sha256:
 e93ae4e53c74b2634729a60be47d4d4741e597ea16e69e07bbde1590d0e649a8 3037 
gazebo_6.5.0+dfsg-2.dsc
 c6abb772d0d72e66f2c2a9a7ec02b1d52ccb2a078afacb7a8f05d95c2b77f6e2 20696 
gazebo_6.5.0+dfsg-2.debian.tar.xz
Files:
 a6f475776147b46e8ba3531fdc20cfbb 3037 science optional gazebo_6.5.0+dfsg-2.dsc
 2067fbaa3aad0f444e5a798b61bcaa06 20696 science optional 
gazebo_6.5.0+dfsg-2.debian.tar.xz

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAEBAgAGBQJWQnAdAAoJENPhc4PPp/8Gx4gP/RAfLWYwGtHBgtXjkR/wBwxc
sxgjrrgoRHmFvx5Am2Ga2Lxlu8+vkxlJ73TEy3M+mMKLPVo/AL87nNe64L+ivque
96AyPM8ID1wHrqhndyAstlk2r6d8Uilq49RoraLV0qlFIq2DbQKdrZwrHlf+LuRP
jqtdVWQv0gQaoBUKNe0uhacrU6kxOxuINdhQ2oA6GQmJvDQFDVkt4KyHoglQ5AeR
hMH46CZ+Vcw5NuYWdA+6zaNpjgXmhcYu+c+MvI08IorAeNdRcu7k+nNZhC/b5mmi
wTVV66mkAmghlLHJg+gUYT8Idrrt2UPVugGnRjkth7ww7Dbgp979rC8cFVXlzRYl
zO6wojHCASWNg1AB0YsWKnJkwLvS/fTOxomwuA6Xjewgaof7wT53rWmeBIAoWwT0
N/brgxNEQIm9FJcACYq+BU+8w4rR0zbkiVoBUCMqcbHx3OTt9WvN5yxf6WREftke
QDfALHuRq/sENsLv6xxqGNLju8GOCiNLcqntOJPLkbS17K7rnLgxhtd/irnPUIHj
LUUaDqpPPyOzjO/VXZ28wULgq5LPHqfAwjPAUg9sVikmWVtTpXB01uA9JNm7Y2Wu
sPp5YAMdyk+AtkdhDzyj+UuvOtWKK1L3sCYmeVI13GW0fSK+lsEFI6KEaURXwYtY
eepGkw2beOuqCSQY/8T4
=xHV5
-----END PGP SIGNATURE-----

--- End Message ---
-- 
debian-science-maintainers mailing list
debian-science-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers

Reply via email to