Your message dated Wed, 27 Apr 2016 07:51:20 +0000
with message-id <e1avkfk-0000gg...@franck.debian.org>
and subject line Bug#803866: fixed in vcmi 0.98+dfsg-2.1
has caused the Debian Bug report #803866,
regarding vcmi: 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.)
--
803866: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803866
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: vcmi
Version: 0.98+dfsg-2
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..09c94f3
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,64 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
+Last-Update: <2015-11-02>
+
+--- vcmi-0.98+dfsg.orig/client/CVideoHandler.cpp
++++ vcmi-0.98+dfsg/client/CVideoHandler.cpp
+@@ -155,7 +155,7 @@ bool CVideoPlayer::open(std::string fnam
+ }
+
+ // Allocate video frame
+- frame = avcodec_alloc_frame();
++ frame = av_frame_alloc();
+
+ //setup scaling
+
+@@ -201,21 +201,21 @@ bool CVideoPlayer::open(std::string fnam
+ #endif
+ { // Convert the image into YUV format that SDL uses
+ sws = sws_getContext(codecContext->width, codecContext->height, codecContext->pix_fmt,
+- pos.w, pos.h, PIX_FMT_YUV420P,
++ pos.w, pos.h, AV_PIX_FMT_YUV420P,
+ SWS_BICUBIC, nullptr, nullptr, nullptr);
+ }
+ else
+ {
+
+- PixelFormat screenFormat = PIX_FMT_NONE;
++ AVPixelFormat screenFormat = AV_PIX_FMT_NONE;
+ if (screen->format->Bshift > screen->format->Rshift)
+ {
+ // this a BGR surface
+ switch (screen->format->BytesPerPixel)
+ {
+- case 2: screenFormat = PIX_FMT_BGR565; break;
+- case 3: screenFormat = PIX_FMT_BGR24; break;
+- case 4: screenFormat = PIX_FMT_BGR32; break;
++ case 2: screenFormat = AV_PIX_FMT_BGR565; break;
++ case 3: screenFormat = AV_PIX_FMT_BGR24; break;
++ case 4: screenFormat = AV_PIX_FMT_BGR32; break;
+ default: return false;
+ }
+ }
+@@ -224,9 +224,9 @@ bool CVideoPlayer::open(std::string fnam
+ // this a RGB surface
+ switch (screen->format->BytesPerPixel)
+ {
+- case 2: screenFormat = PIX_FMT_RGB565; break;
+- case 3: screenFormat = PIX_FMT_RGB24; break;
+- case 4: screenFormat = PIX_FMT_RGB32; break;
++ case 2: screenFormat = AV_PIX_FMT_RGB565; break;
++ case 3: screenFormat = AV_PIX_FMT_RGB24; break;
++ case 4: screenFormat = AV_PIX_FMT_RGB32; break;
+ default: return false;
+ }
+ }
+@@ -411,7 +411,7 @@ void CVideoPlayer::close()
+
+ if (frame)
+ {
+- av_free(frame);
++ av_frame_free(&frame);
+ frame = nullptr;
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 31acd96..cf289da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
disable-privacy-breach
+ffmpeg_2.9.patch
--- End Message ---
--- Begin Message ---
Source: vcmi
Source-Version: 0.98+dfsg-2.1
We believe that the bug you reported is fixed in the latest version of
vcmi, 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.
Sebastian Ramacher <sramac...@debian.org> (supplier of updated vcmi 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: SHA256
Format: 1.8
Date: Sun, 24 Apr 2016 19:35:24 +0200
Source: vcmi
Binary: vcmi vcmi-dbg
Architecture: source
Version: 0.98+dfsg-2.1
Distribution: unstable
Urgency: medium
Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org>
Changed-By: Sebastian Ramacher <sramac...@debian.org>
Description:
vcmi - Rewrite of the Heroes of Might and Magic 3 game engine
vcmi-dbg - Debug symbols for vcmi package
Closes: 803866
Changes:
vcmi (0.98+dfsg-2.1) unstable; urgency=medium
.
* Non-maintainer upload.
.
[ Andreas Cadhalpun ]
* Fix build with ffmpeg 3.0. (Closes: #803866)
Checksums-Sha1:
785fffab87c2dc0a23ebdc5220dd8183d5fb22b0 2322 vcmi_0.98+dfsg-2.1.dsc
a23c28a33fbe7d0287aa6912534c77fe75f5376b 7752 vcmi_0.98+dfsg-2.1.debian.tar.xz
Checksums-Sha256:
82d4cef73f60488ae605161ce43137ae0c0b093f9e6401d25a93680005da1cbf 2322
vcmi_0.98+dfsg-2.1.dsc
0b0e120b81a5686a571e8b291ae416ce7b100e5e4c090337d4ac0e1e174f15f4 7752
vcmi_0.98+dfsg-2.1.debian.tar.xz
Files:
20432372725da4033ecc08472b7f2290 2322 contrib/games optional
vcmi_0.98+dfsg-2.1.dsc
4b3e92dcbeb86dfe2e99d5a0c0f71cdf 7752 contrib/games optional
vcmi_0.98+dfsg-2.1.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBCAAGBQJXHcS4AAoJEGny/FFupxmTG70P/idkZLxvuleupmpltPE7BOy/
awjCyHdChkyalfnl3sXUtmcujqtRbnamPmgty7mRUFkzGA0Co9gT/KdMCbiO4co4
MRy59e3uVL9aogD30ML1YkZ4E3RrxJuKJR2hgQVSV2siNwr7yYp+y5nxRkLHNRce
RQGkVGNvjhpEtXCL+0XhAt7gWvzfJ6ogQMQmDOqo3e3DjZH7Z6/um4E6UmG2Cl8m
5rWAbhEHngegQP6z4lhuEQAWL3YWH2oyL6iXC+VFFvbLctlD27GJ98Yw0UOGR7VX
qwsay7JaZYck8kfDwIsIAP2ttlKm53ICYTzpKX8SrJ/QnBr+H4e7EYvLkuQeB8hS
UWoG565BU/MvVYszdYXMExAeb2L1bwtCPL9O9pGf8GGgjTuK0xpKkoUPKCiTj1D4
iYvUMcut1vw4cfUgOYypL8a/8IMNTkMeEmIStMMY5DJtkvsHsgl4B2Dvb2JlM5qS
Motz95vMMfm9FwoIU+wRI/uUrP/BWKD/a09J9R0oACABC+WBhdzHADs7c70+9ZW7
Vl/Pk/6s4aAkI/ZooZZR7Y/BKOTY4AblVnbdQO2xH6lEzm9wD/CRwTTvofaFxrx+
SUGhUaYHKxrNNWP8Kn2xitkmauuvAveObihQotEOUPYFK5/A+Lp7UmZFKml/4V7E
pLvwsnvoEv7osurIXA+H
=Ggoy
-----END PGP SIGNATURE-----
--- End Message ---
