diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-08-06 21:29:26 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-08-06 21:29:26 +0000 |
| commit | 9edd92ef4d4aa2908418e4a79032bbfdc5daa56c (patch) | |
| tree | 1b05d1fd6f17e267446e0cfd15bd8f9596d808d5 /app-cdr | |
| parent | Version bump (diff) | |
| download | gentoo-2-9edd92ef4d4aa2908418e4a79032bbfdc5daa56c.tar.gz gentoo-2-9edd92ef4d4aa2908418e4a79032bbfdc5daa56c.tar.bz2 gentoo-2-9edd92ef4d4aa2908418e4a79032bbfdc5daa56c.zip | |
Fix build with ffmpeg 2, bug #476494
(Portage version: 2.2.0_alpha194/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'app-cdr')
| -rw-r--r-- | app-cdr/k3b/ChangeLog | 6 | ||||
| -rw-r--r-- | app-cdr/k3b/files/k3b-2.0.2-ffmpeg2.patch | 19 | ||||
| -rw-r--r-- | app-cdr/k3b/k3b-2.0.2-r4.ebuild | 3 |
3 files changed, 26 insertions, 2 deletions
diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog index 3aa2f53c5aaf..fe484ccbc330 100644 --- a/app-cdr/k3b/ChangeLog +++ b/app-cdr/k3b/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-cdr/k3b # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.280 2013/04/23 23:54:55 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.281 2013/08/06 21:29:26 aballier Exp $ + + 06 Aug 2013; Alexis Ballier <aballier@gentoo.org> k3b-2.0.2-r4.ebuild, + +files/k3b-2.0.2-ffmpeg2.patch: + Fix build with ffmpeg 2, bug #476494 23 Apr 2013; Luca Barbato <lu_zero@gentoo.org> k3b-2.0.2-r4.ebuild, +files/k3b-2.0.2-libav9.patch: diff --git a/app-cdr/k3b/files/k3b-2.0.2-ffmpeg2.patch b/app-cdr/k3b/files/k3b-2.0.2-ffmpeg2.patch new file mode 100644 index 000000000000..5c34e0891ded --- /dev/null +++ b/app-cdr/k3b/files/k3b-2.0.2-ffmpeg2.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/show_bug.cgi?id=476494 + +A better patch using avcodec_decode_audio4 will be needed but for now this +fixes the problem. + +Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +=================================================================== +--- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp ++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +@@ -37,6 +37,9 @@ extern "C" { + + #include <klocale.h> + ++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE (192000 * 4) ++#endif + + #if LIBAVFORMAT_BUILD < 4629 + #define FFMPEG_BUILD_PRE_4629 diff --git a/app-cdr/k3b/k3b-2.0.2-r4.ebuild b/app-cdr/k3b/k3b-2.0.2-r4.ebuild index f1748a13d4e4..47b0b30a127d 100644 --- a/app-cdr/k3b/k3b-2.0.2-r4.ebuild +++ b/app-cdr/k3b/k3b-2.0.2-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2-r4.ebuild,v 1.6 2013/04/23 23:54:55 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2-r4.ebuild,v 1.7 2013/08/06 21:29:26 aballier Exp $ EAPI=4 @@ -65,6 +65,7 @@ PATCHES=( "${FILESDIR}/${P}-ffmpeg.patch" "${FILESDIR}/${P}-libavformat54.patch" "${FILESDIR}/${P}-libav9.patch" + "${FILESDIR}/${P}-ffmpeg2.patch" ) REQUIRED_USE=" |