Your message dated Wed, 06 Jan 2016 13:50:20 +0000
with message-id <[email protected]>
and subject line Bug#803825: fixed in hedgewars 0.9.22-dfsg-3
has caused the Debian Bug report #803825,
regarding hedgewars: 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 [email protected]
immediately.)
--
803825: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803825
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: hedgewars
Version: 0.9.22-dfsg-1
Severity: important
Tags: patch
User: [email protected]
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..3236811
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,76 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <[email protected]>
+Last-Update: <2015-11-02>
+
+--- hedgewars-0.9.22-dfsg.orig/QTfrontend/util/LibavInteraction.cpp
++++ hedgewars-0.9.22-dfsg/QTfrontend/util/LibavInteraction.cpp
+@@ -106,8 +106,8 @@ LibavInteraction::LibavInteraction() : Q
+ if (!pCodec->pix_fmts)
+ continue;
+ bool yuv420Supported = false;
+- for (const PixelFormat* pfmt = pCodec->pix_fmts; *pfmt != -1; pfmt++)
+- if (*pfmt == PIX_FMT_YUV420P)
++ for (const AVPixelFormat* pfmt = pCodec->pix_fmts; *pfmt != -1; pfmt++)
++ if (*pfmt == AV_PIX_FMT_YUV420P)
+ {
+ yuv420Supported = true;
+ break;
+--- hedgewars-0.9.22-dfsg.orig/hedgewars/avwrapper/avwrapper.c
++++ hedgewars-0.9.22-dfsg/hedgewars/avwrapper/avwrapper.c
+@@ -158,7 +158,7 @@ static void AddAudioStream()
+ else
+ g_NumSamples = g_pAudio->frame_size;
+ g_pSamples = (int16_t*)av_malloc(g_NumSamples*g_Channels*sizeof(int16_t));
+- g_pAFrame = avcodec_alloc_frame();
++ g_pAFrame = av_frame_alloc();
+ if (!g_pAFrame)
+ {
+ Log("Could not allocate frame\n");
+@@ -241,7 +241,7 @@ static int AddVideoStream()
+ g_pVideo->time_base.den = g_Framerate.num;
+ g_pVideo->time_base.num = g_Framerate.den;
+ //g_pVideo->gop_size = 12; /* emit one intra frame every twelve frames at most */
+- g_pVideo->pix_fmt = PIX_FMT_YUV420P;
++ g_pVideo->pix_fmt = AV_PIX_FMT_YUV420P;
+
+ // set quality
+ if (g_VQuality > 100)
+@@ -299,7 +299,7 @@ static int AddVideoStream()
+ #endif
+ return FatalError("Could not open video codec %s", g_pVCodec->long_name);
+
+- g_pVFrame = avcodec_alloc_frame();
++ g_pVFrame = av_frame_alloc();
+ if (!g_pVFrame)
+ return FatalError("Could not allocate frame");
+
+@@ -317,10 +317,10 @@ static int WriteFrame(AVFrame* pFrame)
+ // write interleaved audio frame
+ if (g_pAStream)
+ {
+- VideoTime = (double)g_pVStream->pts.val*g_pVStream->time_base.num/g_pVStream->time_base.den;
++ VideoTime = (double)av_stream_get_end_pts(g_pVStream)*g_pVStream->time_base.num/g_pVStream->time_base.den;
+ do
+ {
+- AudioTime = (double)g_pAStream->pts.val*g_pAStream->time_base.num/g_pAStream->time_base.den;
++ AudioTime = (double)av_stream_get_end_pts(g_pAStream)*g_pAStream->time_base.num/g_pAStream->time_base.den;
+ ret = WriteAudioFrame();
+ }
+ while (AudioTime < VideoTime && ret);
+@@ -526,14 +526,14 @@ AVWRAP_DECL int AVWrapper_Close()
+ avcodec_close(g_pVideo);
+ av_free(g_pVideo);
+ av_free(g_pVStream);
+- av_free(g_pVFrame);
++ av_frame_free(&g_pVFrame);
+ }
+ if (g_pAStream)
+ {
+ avcodec_close(g_pAudio);
+ av_free(g_pAudio);
+ av_free(g_pAStream);
+- av_free(g_pAFrame);
++ av_frame_free(&g_pAFrame);
+ av_free(g_pSamples);
+ fclose(g_pSoundFile);
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a827249
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+ffmpeg_2.9.patch
--- End Message ---
--- Begin Message ---
Source: hedgewars
Source-Version: 0.9.22-dfsg-3
We believe that the bug you reported is fixed in the latest version of
hedgewars, 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 [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Gianfranco Costamagna <[email protected]> (supplier of updated hedgewars
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 [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Tue, 03 Nov 2015 10:38:33 +0100
Source: hedgewars
Binary: hedgewars hedgewars-data hedgewars-dbg
Architecture: source
Version: 0.9.22-dfsg-3
Distribution: unstable
Urgency: low
Maintainer: Debian Games Team <[email protected]>
Changed-By: Gianfranco Costamagna <[email protected]>
Description:
hedgewars - Funny turn-based artillery game, featuring fighting Hedgehogs!
hedgewars-data - Data files for hedgewars
hedgewars-dbg - Debug symbols for Hedgewars
Closes: 803825
Changes:
hedgewars (0.9.22-dfsg-3) unstable; urgency=low
.
[ Andreas Cadhalpun, Vittorio Giovara, Gianfranco Costamagna ]
* update for ffmpeg_2.9 compatibility (Closes: #803825).
(cherry-pick from upstream, the patches from the bug report
weren't working on older libav implementation, e.g. ubuntu precise)
- debian/patches/e8654674c5ee580b2ec8392d3ae732c10195c039.patch:
- debian/patches/62e5519664f25ccdbdeb51e3e08c9017c95b25c1.patch:
- debian/patches/5de297c5621455b9117aa7caca2785d21ae1bf04.patch:
- debian/patches/9da8e039c97c4a52161bd563b75ffa35acd75ec5.patch:
- debian/patches/ab7e24456dd3dec808862f14d831c7abb14aadc9.patch:
- debian/patches/7bb49917ebcd9734dd5a44bffa645d3889e60e72.patch:
- debian/patches/2488090353fc122b4af030ea55bbff494c204c9b.patch:
- debian/patches/3e1856bb563ad889e113f5ba440196e1c9e07b50.patch:
- debian/patches/850e289b11dbe0415ba909ef87e13533c0e6ee41.patch:
- debian/patches/14a48ec6c0e4e7c4c475eacc9ae3b093656c163a.patch:
- debian/patches/a0e5bd1d4d77c1558394d9ac6b6b8a5030ef5282.patch:
- debian/patches/ce3a58617e5732376b4ef5d47fc2be73b705a154.patch:
- debian/patches/93292d80924aeadfda9f327ba78891cc4bab6c3c.patch:
- debian/patches/f121e6c350a041a429a57ba4748ad673aa8420ea.patch:
.
[ Gianfranco Costamagna ]
* change priority for dbg package.
* Fix watch file.
Checksums-Sha1:
edcefca329b543642d8293b517de0cdf2e79e65c 2935 hedgewars_0.9.22-dfsg-3.dsc
f9477287c97c20b132397b3d5e0162a397ab4109 78848
hedgewars_0.9.22-dfsg-3.debian.tar.xz
Checksums-Sha256:
666203d5b4aaa50a8eb0c3d003ead42bb598ec05182e11146a17c7c840bb3800 2935
hedgewars_0.9.22-dfsg-3.dsc
a124904cf9ce1879e22210ecf642ed6e5bba5ee6a1bf90cb058cae4e1b28317f 78848
hedgewars_0.9.22-dfsg-3.debian.tar.xz
Files:
36d40c5b726fbc60ad63e5bc0284e919 2935 games optional
hedgewars_0.9.22-dfsg-3.dsc
9d2b00cf5df4fa5be4855ad5aebdcd26 78848 games optional
hedgewars_0.9.22-dfsg-3.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBCAAGBQJWjRU0AAoJEPNPCXROn13Z1BoP/1aYNXShL7gi+0xak7A9km8I
4qZ9m3QdoiKL0Kd8KOHgR3SFT8y0ZzMg2mpgtruHSpo1OoxY1o4T3v6Don4IWB6O
f1eWI60vnMkREfzLF9vaQtRl0L2ddHJ62rUk7VPZx0CXOgMEcJZc+ujuSEnjQbe1
l6IKI/v6uo4XvvQKEWe0LOwZneWicLZtPD/M/FO8dIPNXXw2+q61J8L43o60LhVh
3TkP3c2bAMcRjQhFvSPKBWkOABeeGWx34OmybRdzrIwhy3GkUL8Snjpg5+BU7lmF
kjbkolgsJECWgtYIPD17P2PWr+0S61Yc56WkrR0EFdsZodjPPz8KARhQsWW4DQbD
ilTNBHmX7fgXmyEGhOMflm67B082f8ropB9pyQG4yL8CJev66jh3gRQistwngz1t
jGu04HjqNdwg4RjZbNrbBDbGWeM9tPiAghDG3PAI0Ib7Mw3FA7gyxM5HucJ6/dDe
Yuu4SX4vLF65Hoevunof6nohdf2lbjnOMSrUPwGOqm0cujAPyARo3u+N6nBsP4GH
umDbwJcOgefVQxvbiuAjaz6m7jMRauEG4ULQFuQpUukv+smKdQ10xSasRm2bSv9I
RJrlNhGwdZlc+n/u6MFjnQpLM1HYj+luQm8LKmxSdf+FspVwtSs6V8LFn51FmRBO
FBB5XzK+ix04+yJNgugo
=H/ws
-----END PGP SIGNATURE-----
--- End Message ---
