debian: Update to 0.8.2-4

This commit is contained in:
Alexander Kojevnikov 2016-01-10 18:59:30 -08:00
parent 48ce8d601a
commit afde5d55b9
4 changed files with 42 additions and 1 deletions

View File

@ -1,3 +1,9 @@
spek (0.8.2-4) unstable; urgency=low
* Fix build with FFmpeg 2.9 (Closes: #803861)
-- Alexander Kojevnikov <alexander@kojevnikov.com> Sun, 10 Jan 2016 17:52:24 -0800
spek (0.8.2-3.2) unstable; urgency=medium
* Build using the default GCC. Closes: #751331.

2
dist/debian/control vendored
View File

@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9),
libavutil-dev (>= 6:0.8),
libwxgtk3.0-dev,
wx-common
Standards-Version: 3.9.5
Standards-Version: 3.9.6
Homepage: http://spek.cc/
Vcs-Git: git://github.com/alexkay/spek.git
Vcs-Browser: https://github.com/alexkay/spek

34
dist/debian/patches/ffmpeg_2.9.patch vendored Executable file
View File

@ -0,0 +1,34 @@
Description: Replace deprecated FFmpeg API
Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
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(&this->frame);
+ av_frame_free(&this->frame);
#else
av_freep(&this->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, &got_frame, &this->packet);

View File

@ -1,2 +1,3 @@
fix-compilation-with-libav-8.patch
ffmpeg_2.9.patch