diff options
| author |   Johannes Huber <johu@gentoo.org> | 2014-04-04 07:47:15 +0000 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2014-04-04 07:47:15 +0000 |
| commit | e92b68b6f8f9d2d968e5cac41535411f46328b11 (patch) | |
| tree | 1d812b8a734836fb6a0a3e1ef25be44a40475d67 /app-cdr/k9copy/files | |
| parent | Remove old. (diff) | |
| download | gentoo-2-e92b68b6f8f9d2d968e5cac41535411f46328b11.tar.gz gentoo-2-e92b68b6f8f9d2d968e5cac41535411f46328b11.tar.bz2 gentoo-2-e92b68b6f8f9d2d968e5cac41535411f46328b11.zip | |
Add patch to fix build with ffmpeg-2.2 by eroen <eroen@faith.eroen.eu>, bug #505196.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Diffstat (limited to 'app-cdr/k9copy/files')
| -rw-r--r-- | app-cdr/k9copy/files/k9copy-2.3.8-ffmpeg-2.1.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/app-cdr/k9copy/files/k9copy-2.3.8-ffmpeg-2.1.patch b/app-cdr/k9copy/files/k9copy-2.3.8-ffmpeg-2.1.patch new file mode 100644 index 000000000000..5b84c247f8be --- /dev/null +++ b/app-cdr/k9copy/files/k9copy-2.3.8-ffmpeg-2.1.patch @@ -0,0 +1,20 @@ +See: https://bugs.gentoo.org/show_bug.cgi?id=505196 + +Generated from: https://505196.bugs.gentoo.org/attachment.cgi?id=373958 +- Split out the existing two patches already applied in the ebuild. +- Version check to keep compatibility with older ffmpeg. +diff -u k9copy-2.3.8-Source/src/import/k9avidecode.h k9copy-2.3.8-Source/src/import/k9avidecode.h +--- k9copy-2.3.8-Source/src/import/k9avidecode.h 2012-11-23 10:12:56.000000000 +0100 ++++ k9copy-2.3.8-Source/src/import/k9avidecode.h 2014-03-31 07:47:35.119092120 +0100 +@@ -40,7 +40,11 @@ + #else + typedef int (*av_find_stream_info_t)(AVFormatContext *); + #endif ++#if LIBAVCODEC_VERSION_MAJOR < 55 + typedef AVCodec* (*avcodec_find_decoder_t)(enum CodecID); ++#else ++typedef AVCodec* (*avcodec_find_decoder_t)(enum AVCodecID); ++#endif + #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0) + typedef int (*avcodec_open2_t)(AVCodecContext *, AVCodec *, AVDictionary **); + #else |