Fix for new ffmpeg API, bug 242000, thanks to Alexis Ballier.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-rc8 x86_64

4 files changed, 34 insertions, 5 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 12c1427e518e..3f8eaf9c2728 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.210 2008/08/08 20:36:43 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.211 2008/10/15 11:09:44 loki_val Exp $
+
+  15 Oct 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/k3b-1.0.5-ffmpeg-0.4.9_p20081014-API.patch, k3b-1.0.5-r3.ebuild:
+  Fix for new ffmpeg API, bug 242000, thanks to Alexis Ballier.
 
 *k3b-1.0.5-r3 (08 Aug 2008)
 
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 4c7169080f34..37b52a06be23 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -6,6 +6,7 @@ AUX k3b-1.0.4-eject_186173.patch 3382 RMD160 2635fd05f35fd68a2eb9fac0f481accf711
 AUX k3b-1.0.5-desktop-entry.diff 1756 RMD160 540b5336fde1206eba74ac25a4fd0276978ad9c6 SHA1 d817a1da34cc6207a1d5fcac0d5ba67a3964afc0 SHA256 3d89ee4194abe8312e7373161bac8b9134850906be9c6e738571f9de7adfb34b
 AUX k3b-1.0.5-eject_186173.patch 3382 RMD160 2635fd05f35fd68a2eb9fac0f481accf711b81c3 SHA1 d7c52ee27631fd2abf0492d12a635d2ab9f33cdb SHA256 dccc64f4163b734122df739b7887e4fd2fe9cdd4d5522f9b02a43548fc77d2f2
 AUX k3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch 2991 RMD160 8d0204a12cfe1eabe03e66b6201e2164f01cd80d SHA1 6bab88b9e4619a7f61b82c6e59af9a7ef784f71b SHA256 e2db198914acbda0c33c20537449cf7b729345f9d8af0052701259de0b27ff21
+AUX k3b-1.0.5-ffmpeg-0.4.9_p20081014-API.patch 1049 RMD160 022fecbc707775adc782b828bfdd571eccb95936 SHA1 270f19b05ce7ca35aee0dd7009556fec9b66f90c SHA256 e99f6b309e6c20d085860c495c2aa9d34d6d69a864e0be11aac01e0b3a6ac67d
 DIST k3b-0.12.17.tar.bz2 4008650 RMD160 bb791d7d003285f6623229eae213cf224fd3a128 SHA1 ae23be594b6e2c116fd4c2af8cefb438423d1285 SHA256 067ef9d621bed9a1c385c201b13810f11305edf03a7da0793cb059bb578700b7
 DIST k3b-1.0.3.tar.bz2 5092806 RMD160 b51dcc8cd0bd4c0b1e9b97221596360a9d6be2f1 SHA1 cf9eee45eebd280a069c7f94924237bdec6bbd06 SHA256 c5d1afe150de90c898f6566e14bf1e3d868dc4a9e8523c2065b283108b410eb9
 DIST k3b-1.0.4.tar.bz2 5115790 RMD160 495090c36744e9a5ccd02621209eda2462c93476 SHA1 c420c6ca3a1f7405081a85014ef3e3f70e269223 SHA256 2b384127c330bf6c9ef5d08733b0da2d815aec66893a8fc628b746181f06d4bb
@@ -19,7 +20,7 @@ EBUILD k3b-1.0.3.ebuild 4282 RMD160 8c3d0aaa89efc01c1fea0379ae974ef0c0f8ac50 SHA
 EBUILD k3b-1.0.4-r1.ebuild 4514 RMD160 749783ccd4372193dbf23f29c992d68a79f1de5b SHA1 03f3720bdac1b3decb723414f080354c0dee3984 SHA256 5e8d38b6d3e3984c99d3e985e5935b026632fe3d0049242bc1fb9ad72e8d50a4
 EBUILD k3b-1.0.4.ebuild 4255 RMD160 ccdc0eb639e96ac360907d6bc67841633f949cb6 SHA1 804b49671d2f687b4cb83b5a5309500879b9588f SHA256 5fb468f6cb7676cbee6e814f73eb00767a13ec6232f6bdca2fd19b4f442b9a37
 EBUILD k3b-1.0.5-r1.ebuild 4318 RMD160 235579de927264771e00721a57ae44c849553f3a SHA1 113e3811175947fade6b69537b0fa06199888822 SHA256 bebf54e81d25dcf1d2fe34ac3aaf7bc99543fb5a0c5f55e830fa6055f7479f07
-EBUILD k3b-1.0.5-r3.ebuild 4413 RMD160 7cce14aa9573bd17a21cef515d58ca1613944c91 SHA1 dda328fffdce6e5d7cf49e50bc725e29e61429f2 SHA256 c4252136f76a9d26921dd061a659ebeba40203ef89d4467bed67a6b6badd8e7b
+EBUILD k3b-1.0.5-r3.ebuild 4473 RMD160 af02904b93875062ca84074c27481fccfb2a3f7e SHA1 624def63767a9296619ded6fa412c9c82d394495 SHA256 99f046d3e0393e5c3963d84791cbfdded6f59a2718861bbad082097a68520258
 EBUILD k3b-1.0.5.ebuild 4511 RMD160 ef33c75a421e870d2e8d7a0bb32bee3f9e8a4ba5 SHA1 d65fb1262d97626904b3e91cee5ff9b3c8c913f6 SHA256 5b976a1d7598c33a250481ce473f8b429f4ca9faefb93abe82f31b785f630a00
-MISC ChangeLog 30960 RMD160 164b7fd212c26ac94e717737882d0eafa50b3355 SHA1 6a964c55e57eb08a36c38350602a2b0e2815b028 SHA256 08b5b91569d6c39d17ec9a2bfa5e69a1348dc9544ef91aa53c37ac237a4bb531
+MISC ChangeLog 31153 RMD160 17e3bc99d41254876de6399fca97768044a78418 SHA1 5ca1ee08cb5ef0b957f90a7e83c5a26d99d797bb SHA256 2a9ede473d7aa010f5ba7e3b13ec26d9c155c3709ac83bd37f5ab57b5a50e863
 MISC metadata.xml 265 RMD160 59c880c9c5efb9521978dbd903168505b105564a SHA1 c7ff34e4da0ae454589f8ae79f0c074915754879 SHA256 017dbf66cb3b0c2b77f42714c7544570e19f9605bb260245094b3678a6a34324
diff --git a/app-cdr/k3b/files/k3b-1.0.5-ffmpeg-0.4.9_p20081014-API.patch b/app-cdr/k3b/files/k3b-1.0.5-ffmpeg-0.4.9_p20081014-API.patch
new file mode 100644
index 000000000000..5ae405f662e3
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-1.0.5-ffmpeg-0.4.9_p20081014-API.patch
@@ -0,0 +1,23 @@
+Index: k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+===================================================================
+--- k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
++++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+@@ -194,7 +194,7 @@ QString K3bFFMpegFile::typeComment() con
+     return i18n("Windows Media v1");
+   case CODEC_ID_WMAV2:
+     return i18n("Windows Media v2");
+-  case CODEC_ID_MP3LAME:
++  case CODEC_ID_MP3:
+     return i18n("MPEG 1 Layer III");
+   case CODEC_ID_AAC:
+     return i18n("Advanced Audio Coding (AAC)");
+@@ -290,7 +290,8 @@ int K3bFFMpegFile::fillOutputBuffer()
+ #ifdef FFMPEG_BUILD_PRE_4629
+     int len = avcodec_decode_audio( &d->formatContext->streams[0]->codec,
+ #else
+-    int len = avcodec_decode_audio( d->formatContext->streams[0]->codec,
++    d->outputBufferSize = AVCODEC_MAX_AUDIO_FRAME_SIZE;
++    int len = avcodec_decode_audio2( d->formatContext->streams[0]->codec,
+ #endif
+ 				    (short*)d->outputBuffer, &d->outputBufferSize,
+ 				    d->packetData, d->packetSize );
diff --git a/app-cdr/k3b/k3b-1.0.5-r3.ebuild b/app-cdr/k3b/k3b-1.0.5-r3.ebuild
index 2e33de3c8d3a..e9b2a5dab23f 100644
--- a/app-cdr/k3b/k3b-1.0.5-r3.ebuild
+++ b/app-cdr/k3b/k3b-1.0.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.5-r3.ebuild,v 1.1 2008/08/08 20:36:43 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.5-r3.ebuild,v 1.2 2008/10/15 11:09:44 loki_val Exp $
 
 inherit kde eutils
 
@@ -49,7 +49,8 @@ DEPEND="${DEPEND}
 need-kde 3.5
 
 PATCHES=(	"${FILESDIR}/k3b-1.0.5-desktop-entry.diff"
-		"${FILESDIR}/k3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch"	)
+		"${FILESDIR}/k3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch"
+		"${FILESDIR}/k3b-1.0.5-ffmpeg-0.4.9_p20081014-API.patch"	)
 
 I18N="${PN}-i18n-${PV}"