diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2012-02-28 23:30:58 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2012-02-28 23:30:58 +0000 |
| commit | 63ce7ec67e4d10995ab878dbc26722decb34bce5 (patch) | |
| tree | a131dd431b7b3be4c41388f4d991218f7653d264 /app-cdr | |
| parent | Add package to emacs herd. Don't force autoloading of uncompiled lisp file. F... (diff) | |
| download | gentoo-2-63ce7ec67e4d10995ab878dbc26722decb34bce5.tar.gz gentoo-2-63ce7ec67e4d10995ab878dbc26722decb34bce5.tar.bz2 gentoo-2-63ce7ec67e4d10995ab878dbc26722decb34bce5.zip | |
fix build with libavformat 54 (ffmpeg/libav git atm)
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
Diffstat (limited to 'app-cdr')
| -rw-r--r-- | app-cdr/k3b/ChangeLog | 8 | ||||
| -rw-r--r-- | app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch | 22 | ||||
| -rw-r--r-- | app-cdr/k3b/k3b-2.0.2-r1.ebuild | 7 |
3 files changed, 32 insertions, 5 deletions
diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog index fa322ccd734a..c24baeebd9ae 100644 --- a/app-cdr/k3b/ChangeLog +++ b/app-cdr/k3b/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-cdr/k3b -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.268 2011/11/24 01:55:23 reavertm Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.269 2012/02/28 23:30:58 aballier Exp $ + + 28 Feb 2012; Alexis Ballier <aballier@gentoo.org> k3b-2.0.2-r1.ebuild, + +files/k3b-2.0.2-libavformat54.patch: + fix build with libavformat 54 (ffmpeg/libav git atm) 24 Nov 2011; Maciej Mrozowski <reavertm@gentoo.org> k3b-2.0.2-r1.ebuild: Require kdelibs with udev (udisks) support, bug 391177 diff --git a/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch b/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch new file mode 100644 index 000000000000..174a776b8b93 --- /dev/null +++ b/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch @@ -0,0 +1,22 @@ +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 +@@ -88,7 +88,7 @@ bool K3bFFMpegFile::open() + close(); + + // open the file +- int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 ); ++ int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, NULL); + if( err < 0 ) { + kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err; + return false; +@@ -143,7 +143,7 @@ bool K3bFFMpegFile::open() + } + + // dump some debugging info +- ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 ); ++ ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 ); + + return true; + } diff --git a/app-cdr/k3b/k3b-2.0.2-r1.ebuild b/app-cdr/k3b/k3b-2.0.2-r1.ebuild index e42422721469..c8397efa43ac 100644 --- a/app-cdr/k3b/k3b-2.0.2-r1.ebuild +++ b/app-cdr/k3b/k3b-2.0.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 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-r1.ebuild,v 1.10 2011/11/24 01:55:23 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2-r1.ebuild,v 1.11 2012/02/28 23:30:58 aballier Exp $ EAPI=4 @@ -64,7 +64,8 @@ RDEPEND="${DEPEND} DOCS+=( ChangeLog ) -PATCHES=( "${FILESDIR}/${P}-ffmpeg.patch" ) +PATCHES=( "${FILESDIR}/${P}-ffmpeg.patch" + "${FILESDIR}/${P}-libavformat54.patch" ) src_configure() { mycmakeargs=( |