diff --git a/debian/control b/debian/control index 8c9b24d..67e6018 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: karlyriceditor Section: utils Priority: extra Maintainer: Martin Steghöfer -Build-Depends: debhelper (>= 8), autotools-dev, dpkg-dev (>= 1.16), qt4-qmake, libavformat-dev (>= 6:10), libavresample-dev (>= 6:10), pkg-config, libswscale-dev, libsdl1.2-dev, libqt4-dev-bin, libqt4-dev, docbook-to-man +Build-Depends: debhelper (>= 8), autotools-dev, dpkg-dev (>= 1.16), qt4-qmake, libavformat-dev (>= 6:9), libavresample-dev (>= 6:9), pkg-config, libswscale-dev, libsdl1.2-dev, libqt4-dev-bin, libqt4-dev, docbook-to-man Standards-Version: 3.9.5 Homepage: http://sourceforge.net/projects/karlyriceditor/ Vcs-Git: https://github.com/martin-steghoefer/debian-karlyriceditor.git diff --git a/debian/patches/0007-Fix-compilation-FFmpeg-Libav.patch b/debian/patches/0007-Fix-compilation-FFmpeg-Libav.patch index 34e6a02..20065eb 100644 --- a/debian/patches/0007-Fix-compilation-FFmpeg-Libav.patch +++ b/debian/patches/0007-Fix-compilation-FFmpeg-Libav.patch @@ -23,9 +23,10 @@ FFmpeg's. This patch adapts the code to several of those differences: av_free). --- src/audioplayerprivate.cpp | 4 ++-- + src/ffmpeg_headers.h | 10 ++++++++++ src/ffmpegvideodecoder.cpp | 8 ++++---- src/ffmpegvideoencoder.cpp | 32 ++++++++++++++++++++------------ - 3 files changed, 26 insertions(+), 18 deletions(-) + 4 files changed, 36 insertions(+), 18 deletions(-) diff --git a/src/audioplayerprivate.cpp b/src/audioplayerprivate.cpp index 1b6b32d..a6536cd 100644 @@ -49,6 +50,32 @@ index 1b6b32d..a6536cd 100644 if ( !m_frame ) { +diff --git a/src/ffmpeg_headers.h b/src/ffmpeg_headers.h +index 3d18808..c108c86 100644 +--- a/src/ffmpeg_headers.h ++++ b/src/ffmpeg_headers.h +@@ -34,6 +34,7 @@ extern "C" + #include + #include + #include ++#include + + }; + +@@ -41,4 +42,13 @@ void ffmpeg_init_once(); + + #define FFMPEG_FILENAME(string) ( qPrintable(string) ) + ++/* ++ * Functions were renamed in interface version 53 (=10.0), but are ++ * essentially the same (documentation literally says the same). ++ */ ++#if LIBAVUTIL_VERSION_MAJOR < 53 ++# define av_frame_alloc avcodec_alloc_frame ++# define av_frame_free avcodec_free_frame ++#endif ++ + #endif // FFMPEG_HEADERS_H diff --git a/src/ffmpegvideodecoder.cpp b/src/ffmpegvideodecoder.cpp index 2ec5969..7820f72 100644 --- a/src/ffmpegvideodecoder.cpp