Bug#803861: spek: FTBFS with FFmpeg 2.9

[Andreas Cadhalpun]

Hi Alexander,

On 11.01.2016 03:49, Alexander Kojevnikov wrote:
> On Sun, Jan 10, 2016 at 2:14 AM, Andreas Cadhalpun
>  wrote:
>>
>> [...]
>>
>>> feel free to update and NMU the Debian package.
>>
>> I think it would be better if you made a maintainer upload,
>> as the package otherwise looks a bit unmaintained with only
>> two NMUs in the last two years...
>> (I'm sure Felipe Sateler would be willing to sponsor such an upload,
>> like he did for dvbcut[1].)
> 
> Felipe, could you sponsor the upload? It's on m.d.n:
> http://mentors.debian.net/package/spek

Thanks for preparing the upload. I confirm that it builds with FFmpeg
from git master.

There are two things that would be nice to get fixed, though:
 * obsolete-url-in-packaging: The watchfile should use github instead
   of the obsolete code.google.com.
 * FFmpeg upstream introduced new deprecations in git master,
   in particular deprecating av_free_packet in favor of av_packet_unref.
   Since the replacement has been available already since quite some
   time (libavcodec 55.25.100 / 55.16.0) it would be nice if you
   would use it. That way spek should be API compatible with FFmpeg
   for at least the next two years. Patch:
--- spek-0.8.2.orig/src/spek-audio.cc
+++ spek-0.8.2/src/spek-audio.cc
@@ -224,7 +224,7 @@ AudioFileImpl::~AudioFileImpl()
 this->packet.data -= this->offset;
 this->packet.size += this->offset;
 this->offset = 0;
-av_free_packet(>packet);
+av_packet_unref(>packet);
 }
 if (this->format_context) {
 if (this->audio_stream >= 0) {
@@ -299,7 +299,7 @@ int AudioFileImpl::read()
 this->packet.data -= this->offset;
 this->packet.size += this->offset;
 this->offset = 0;
-av_free_packet(>packet);
+av_packet_unref(>packet);
 }
 
 int res = 0;
@@ -307,7 +307,7 @@ int AudioFileImpl::read()
 if (this->packet.stream_index == this->audio_stream) {
 break;
 }
-av_free_packet(>packet);
+av_packet_unref(>packet);
 }
 if (res < 0) {
 // End of file or error.

Best regards,
Andreas

Bug#803861: spek: FTBFS with FFmpeg 2.9

[Alexander Kojevnikov]

On Sun, Jan 10, 2016 at 2:14 AM, Andreas Cadhalpun
 wrote:
>
> [...]
>
>> feel free to update and NMU the Debian package.
>
> I think it would be better if you made a maintainer upload,
> as the package otherwise looks a bit unmaintained with only
> two NMUs in the last two years...
> (I'm sure Felipe Sateler would be willing to sponsor such an upload,
> like he did for dvbcut[1].)

Felipe, could you sponsor the upload? It's on m.d.n:
http://mentors.debian.net/package/spek

Bug#803861: spek: FTBFS with FFmpeg 2.9

[Andreas Cadhalpun]

Hi Alexander,

On 10.01.2016 02:38, Alexander Kojevnikov wrote:
> I committed your patch upstream[0],

Thanks!

> feel free to update and NMU the Debian package.

I think it would be better if you made a maintainer upload,
as the package otherwise looks a bit unmaintained with only
two NMUs in the last two years...
(I'm sure Felipe Sateler would be willing to sponsor such an upload,
like he did for dvbcut[1].)

> Thank you and sorry it took so long to get back.

Don't worry, it's still in time.

Best regards,
Andreas


1: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803809#20

Bug#803861: spek: FTBFS with FFmpeg 2.9

[Alexander Kojevnikov]

On Thu, Jan 7, 2016 at 3:45 PM, Andreas Cadhalpun
 wrote:
> Dear Maintainer,
>
> the next version of FFmpeg is planned to be released this month
> (and it might be called 3.0 instead of 2.9).
>
> Since I haven't heard back from you during the past two month
> I'm wondering what the status of this bug is:
>  * Are you aware of the patch I provided?
>  * Do you plan an upload soon?
>  * Is upstream aware of the problem?
>
> If this bug isn't fixed soon, it will become release critical and
> thus the package will either get NMUed or removed from testing.

Hi Andreas,

I committed your patch upstream[0], feel free to update and NMU the
Debian package.

Thank you and sorry it took so long to get back.

Cheers,
Alex

[0]: https://github.com/alexkay/spek/commit/696e28b

Bug#803861: spek: FTBFS with FFmpeg 2.9

[Andreas Cadhalpun]

Dear Maintainer,

the next version of FFmpeg is planned to be released this month
(and it might be called 3.0 instead of 2.9).

Since I haven't heard back from you during the past two month
I'm wondering what the status of this bug is:
 * Are you aware of the patch I provided?
 * Do you plan an upload soon?
 * Is upstream aware of the problem?

If this bug isn't fixed soon, it will become release critical and
thus the package will either get NMUed or removed from testing.

Best regards,
Andreas

Bug#803861: spek: FTBFS with FFmpeg 2.9

[Andreas Cadhalpun]

Package: spek
Version: 0.8.2-3.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 000..b123a96
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,33 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun 
+Last-Update: <2015-11-02>
+
+--- spek-0.8.2.orig/src/spek-audio.cc
 spek-0.8.2/src/spek-audio.cc
+@@ -199,7 +199,7 @@ AudioFileImpl::AudioFileImpl(
+ this->packet.data = nullptr;
+ this->packet.size = 0;
+ this->offset = 0;
+-this->frame = avcodec_alloc_frame();
++this->frame = av_frame_alloc();
+ this->buffer_size = 0;
+ this->buffer = nullptr;
+ this->frames_per_interval = 0;
+@@ -215,7 +215,7 @@ AudioFileImpl::~AudioFileImpl()
+ if (this->frame) {
+ // TODO: Remove this check after Debian switches to libav 9.
+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 28, 0)
+-avcodec_free_frame(>frame);
++av_frame_free(>frame);
+ #else
+ av_freep(>frame);
+ #endif
+@@ -255,7 +255,7 @@ int AudioFileImpl::read()
+ 
+ for (;;) {
+ while (this->packet.size > 0) {
+-avcodec_get_frame_defaults(this->frame);
++av_frame_unref(this->frame);
+ auto codec_context = this->format_context->streams[this->audio_stream]->codec;
+ int got_frame = 0;
+ int len = avcodec_decode_audio4(codec_context, this->frame, _frame, >packet);
diff --git a/debian/patches/series b/debian/patches/series
index 8215fd9..d33812b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix-compilation-with-libav-8.patch
 
+ffmpeg_2.9.patch