Add libav9 support, patch derived from upstream, thanks to Jiří Moravec <qjim@volny.cz> for preparing it.

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64

4 files changed, 35 insertions, 20 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/Manifest b/app-cdr/k3b/Manifest
index 67bfc739695b..6bd7477e5856 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,20 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX k3b-2.0.2-ffmpeg.patch 3298 SHA256 4285080dd207ba7282bde1de73b98c49c80e0d02e7ab53cb0317a94b08a2a547 SHA512 ceea638638bbeb9c8d83b8ff3a660f5968dacf75a57e066782fc368396206584657372f1be55e435582e43284a50ff7df82371e63e9d51a657e06362ac7d1968 WHIRLPOOL b1aa447ed842a8f0c8a688728a59189e68ecd8000faf7b0449a71ddca54ca72ccc81bc4bcb4af2ab10d50b1c4a77192ad7c0d3eca352a73112c5dc59ee079946
+AUX k3b-2.0.2-libav9.patch 991 SHA256 fc69fb52fc6c0e1a6420c7b33600095f21c444397e188aa5d41e067ef5d9d1ef SHA512 3c33390b92f92ee6c914b58ead112671a90060b5a9d2a3d23564c30f2eb1f604b88675081b60cd4dbaf707f32a2c019f322ada4707c7fd0607e9f2b055f65eec WHIRLPOOL df0af01f885aa25f636cd11da2f63bc791c88f113ee9fccef088f50e7eb99f6f64b38c166616611aca1d283efe17b53de6d6b3d21a0f6f1cb271b48b21993fc0
 AUX k3b-2.0.2-libavformat54.patch 917 SHA256 516efa7ad0d9806c603f761769f8d1457fe9fa047a7475e7f11615db89ee1271 SHA512 bb43a19ce8a0b506a63dbe0472b558c24b543684981f10b35721e83903b2b4d2fdbc5893a0634463b0d37763f6d3efdec127f2ac7d937ce8ed0f3a5b8cda8b53 WHIRLPOOL 0fe3cf36bcb50886a1ee9e9f29ddf2844a3cf4087ca9c7a752335f32f4680d031a0cec972d8354818718c8036c714951b8b4c81e7f123dc48dc492ce663260dc
 DIST k3b-2.0.2.tar.bz2 12833321 SHA256 af176f29c1d2339c4648d461476227cb07bcd0c75056f2a4006f253e3ef5b7cd SHA512 e0a3d357decf7120a67d391d2311aaa5992f42cddbd20c5dc67f3d0e2ce15d6c53c0978cf2de6c09b96d57d273bca915fbbc0ca28547d708e2db20c795b86aa9 WHIRLPOOL 0dc975344962c98c20f9a03e3fb9225499668bed206ed61ea58b17ebe4594c2f71e237cdfc94e84a85e08b585cad6d1eee1415b129e998da3664d0544218a171
-EBUILD k3b-2.0.2-r4.ebuild 3247 SHA256 5f185507eb85cd783352ba7ed20de963a88f96e8214a52fc5ca5de70354840f2 SHA512 7c3308e5df55c45133ca06b432dd87ea75191a26f43c111ca9a16e2b5d3199e8e4af1a05261c6d8188f9461a874406f135a425f417e152de7c820dcabb4bf1c3 WHIRLPOOL 4da0ec989f2b76e197fe056b8144f674947eaafabe774b4a14b3fa8511f2b7cfe40305f04411e4d224f704ecd3aad1e566cfb22f5cd6fb8616ca1ab64b2793ff
-MISC ChangeLog 40771 SHA256 6998cd1a5038071774b83aab12ada48dcd893a8f9715f5f210aa96756c3ae6c5 SHA512 0cb17d5db8ffac1387e812ef177e9a73614b8aea858bb1f0d1ac733b66a51d75d3781135fd6467f2546d282aac5748386bf66089c16e940a31b05e326decafec WHIRLPOOL a44d0b2381931e839089474c9ee55399c29254e72461311db422cc61952fcbbd195867c920bf82919a3a193c21373fce8e34b8936c31951f46d4887104d867b8
+EBUILD k3b-2.0.2-r4.ebuild 3277 SHA256 f03729171a6c8fcc3fa6c47528a66b31cf577ebb195c7de271e02b4b968a25df SHA512 f48c01005ebb7dda487d6e8133422332f1a6f042f7a59ca14840293a25c4ef5ce1671b4bec15f1958650549d7bd29111ba55196134cf28f210dd9143d8988a17 WHIRLPOOL bdb9f198b8b7154f0f83f131f543e4648c3b7929cd2955ce99f2bc6c9c73b4798afe6d70ce3e55f0c5e96e4d078c77ddbc91fef6c2bf713e721737dc05a331ca
+MISC ChangeLog 40984 SHA256 0ea5b39b0f65cfe74e2a62244906682664bdb5ce1d5e8ea2db37e920bdbdee59 SHA512 75a07d800bcac852a54a92919e7210936984e25bfc914c3de32b3f1b4a5c6e05941b9001dc8bc391fb13d88c585ee3519a4bd7dd93c3465d1ce82e53bd16efa9 WHIRLPOOL fae867670235ba6eaa1b3a88adad242a74bfd884f416aee05f4c1df063155d5412a89100d8676522c8a85a2f3ce5b2915b2fcdf631810b5856db3599894ceb13
 MISC metadata.xml 265 SHA256 3dea268ff3e546f9a3d7df20a050528dbf48f83fe0142cf490b63312eed88cc6 SHA512 8c7a8d5e962e26b742feb0cda67f3920db24b9266f44cc2404514e50fa0214544f0307404cc7d226a33475da8d26eae830238ea1704c350da28bb99c641ea841 WHIRLPOOL b31fdfe2e9545569ae68416695e172fffefbf0422ec04b09d83d82a9d146738456435d8ac60983105ef8c72169c67ee8ec0f3f76e978609ad9ca7e9e7fddecbd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQxhPZAAoJEMbwO6tnXQ0sHPoH/RQ74kEo5mjr1our7i6azXhE
-sBEWKxuHeOnQiw/9mC8YvFvJUrkbRAbEpsulWCpOWXJvupVNTTc6/xwPs3xcfAjQ
-8dYIBpcraQ+IqU4tjEAHPHb8o+VbkoPS1BCwuZ9u6xopdVJDZz/XXPcZCyBxgzjt
-SAh6x3ehohJMz+qiD7jDcV8aBMth8eZCDWJ+iTthSO2lFAPNW/8TOneBr8fU2NEb
-kvNUxngn1pxgI10pISbYvm6e6iBtUMK/GUkGxtDkHv833OwtOEBoWsT682U2dDTy
-3uBxlGznRZ4q7JgyMLEy1WvtebOCanJRhyYi9NZJj2feZDxGqnM5o0D2xp+1Iqc=
-=y+ZI
------END PGP SIGNATURE-----
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="