diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog index b7be7140..4e8e92b2 100644 --- a/app-cdr/k3b/ChangeLog +++ b/app-cdr/k3b/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 10 Dec 2008; Mario Fetka + +files/k3b-2.0_pre20081208-lame.patch, k3b-2.0_pre20081208.ebuild: + add lame patch + 08 Dec 2008; Mario Fetka ++, -k3b-2.0_pre20081104.ebuild: Bump diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest index 00e66527..e48999f4 100644 --- a/app-cdr/k3b/Manifest +++ b/app-cdr/k3b/Manifest @@ -1,4 +1,5 @@ AUX k3b-2.0_pre20080808-ffmpeg-1.patch 1461 RMD160 3b84f493f4e497ea3404b23319864f25942e85f2 SHA1 edcd9d0e6d6887c0b919b50c09675973dfeddffb SHA256 8a803ffad28d037d5cc60a4e43c48ccce52a09dd8e0b16142c66ba0f1bb5628d -EBUILD k3b-2.0_pre20081208.ebuild 3440 RMD160 8bce54207e50524eb4b02b4a8a035191d6cecb35 SHA1 f95d9290c9f183a0ca8e646c10db9a836c0c89f8 SHA256 9ca58a87628137547498d337f79209d65b6348caaa80471c951656843285e1e1 -MISC ChangeLog 312 RMD160 2237acbf24c1fa6968fd6becde3b3ab98f548b26 SHA1 cf8af5e11a8ca951b891fb048bcec5f694fc935f SHA256 956fc45035d2b2a680af60740459f3d0ee279853dd8a888916cd03c01ec7710d +AUX k3b-2.0_pre20081208-lame.patch 756 RMD160 b56f6eb1e2c6a74b342dfc09566b94c5639ed192 SHA1 aadd4d92bddcf2ba7f27051da55a6f90a7bee13a SHA256 6cf351917fe03655877ba62b370224b059a283147c23683aee45157e72c9ff3b +EBUILD k3b-2.0_pre20081208.ebuild 3435 RMD160 673abee5ba1ed2da9c45a6cf973017d57ff23a0f SHA1 2a6e45fd05d372d5b0a6fce030a9a9d7345cf02c SHA256 69e4153e97e2b6fd532e02def2950b19bdaf54c9383fa19d850d217575a39c70 +MISC ChangeLog 450 RMD160 f047cf53be1fdb59c711f3e26268057bf036ec27 SHA1 47a8b4313d72658c97a8ce149f28cac48f8457af SHA256 46f48fc11b52c2d6f013ac21e54ec9f009ab2cb3c8e12f0e203f0d4d0255dfe6 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/app-cdr/k3b/files/k3b-2.0_pre20081208-lame.patch b/app-cdr/k3b/files/k3b-2.0_pre20081208-lame.patch new file mode 100644 index 00000000..8a563155 --- /dev/null +++ b/app-cdr/k3b/files/k3b-2.0_pre20081208-lame.patch @@ -0,0 +1,20 @@ +--- k3b-2.0_pre20081208/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.orig 2008-12-10 06:52:00.000000000 +0100 ++++ k3b-2.0_pre20081208/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2008-12-10 07:19:34.271258226 +0100 +@@ -198,7 +198,7 @@ + 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)"); +@@ -291,7 +291,7 @@ + + d->outputBufferPos = d->outputBuffer; + +- int len = avcodec_decode_audio( ++ int len = avcodec_decode_audio2( + #ifdef FFMPEG_BUILD_PRE_4629 + &d->formatContext->streams[0]->codec, + #else diff --git a/app-cdr/k3b/k3b-2.0_pre20081208.ebuild b/app-cdr/k3b/k3b-2.0_pre20081208.ebuild index bf06966f..ae9307cc 100644 --- a/app-cdr/k3b/k3b-2.0_pre20081208.ebuild +++ b/app-cdr/k3b/k3b-2.0_pre20081208.ebuild @@ -74,7 +74,7 @@ pkg_setup() { } src_compile() { -# epatch "${FILESDIR}"/k3b-2.0_pre20080808-ffmpeg-1.patch + epatch "${FILESDIR}"/k3b-2.0_pre20081208-lame.patch if use debug; then mycmakeargs="${mycmakeargs} -DADD_K3B_DEBUG=On" else