summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2013-04-23 23:54:55 +0000
committerLuca Barbato <lu_zero@gentoo.org>2013-04-23 23:54:55 +0000
commitab9327c412107fa30fd59f0fec340c394d41edec (patch)
treee263914fc3af054863127a5f02da0412ef66a257 /app-cdr/k3b
parentSet AUTOTOOLS_AUTORECONF=1 so autotools deps are properly pulled in. (diff)
downloadgentoo-2-ab9327c412107fa30fd59f0fec340c394d41edec.tar.gz
gentoo-2-ab9327c412107fa30fd59f0fec340c394d41edec.tar.bz2
gentoo-2-ab9327c412107fa30fd59f0fec340c394d41edec.zip
Add libav9 support, patch derived from upstream, thanks to Jiří Moravec <qjim@volny.cz> for preparing it.
(Portage version: 2.1.11.62/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'app-cdr/k3b')
-rw-r--r--app-cdr/k3b/ChangeLog9
-rw-r--r--app-cdr/k3b/files/k3b-2.0.2-libav9.patch22
-rw-r--r--app-cdr/k3b/k3b-2.0.2-r4.ebuild5
3 files changed, 32 insertions, 4 deletions
diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 1a987323c691..3aa2f53c5aaf 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-cdr/k3b
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.279 2012/12/10 16:56:44 kensington Exp $
+# 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 $
+
+ 23 Apr 2013; Luca Barbato <lu_zero@gentoo.org> k3b-2.0.2-r4.ebuild,
+ +files/k3b-2.0.2-libav9.patch:
+ Add libav9 support, patch derived from upstream, thanks to Jiří Moravec
+ <qjim@volny.cz> for preparing it.
10 Dec 2012; Michael Palimaka <kensington@gentoo.org> k3b-2.0.2-r4.ebuild,
metadata.xml:
diff --git a/app-cdr/k3b/files/k3b-2.0.2-libav9.patch b/app-cdr/k3b/files/k3b-2.0.2-libav9.patch
new file mode 100644
index 000000000000..42ec6632da68
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-2.0.2-libav9.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 2013-04-22 17:46:13.523959500 +0200
++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2013-04-22 18:40:49.890007513 +0200
+@@ -95,7 +95,7 @@ bool K3bFFMpegFile::open()
+ }
+
+ // analyze the streams
+- ::av_find_stream_info( d->formatContext );
++ ::avformat_find_stream_info( d->formatContext, 0 );
+
+ // we only handle files containing one audio stream
+ if( d->formatContext->nb_streams != 1 ) {
+@@ -129,7 +129,7 @@ bool K3bFFMpegFile::open()
+
+ // open the codec on our context
+ kDebug() << "(K3bFFMpegFile) found codec for " << m_filename;
+- if( ::avcodec_open( codecContext, d->codec ) < 0 ) {
++ if( ::avcodec_open2( codecContext, d->codec, 0 ) < 0 ) {
+ kDebug() << "(K3bFFMpegDecoderFactory) could not open codec.";
+ return false;
+ }
diff --git a/app-cdr/k3b/k3b-2.0.2-r4.ebuild b/app-cdr/k3b/k3b-2.0.2-r4.ebuild
index 1dbe5f12f00e..f1748a13d4e4 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-2012 Gentoo Foundation
+# 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.5 2012/12/10 16:56:44 kensington Exp $
+# $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 $
EAPI=4
@@ -64,6 +64,7 @@ DOCS+=( ChangeLog )
PATCHES=(
"${FILESDIR}/${P}-ffmpeg.patch"
"${FILESDIR}/${P}-libavformat54.patch"
+ "${FILESDIR}/${P}-libav9.patch"
)
REQUIRED_USE="