Author: rathann Update of /cvs/free/rpms/k3b-extras-freeworld/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv25487 Modified Files: k3b-extras-freeworld.spec Added Files: k3b-lavc52.patch Log Message: * Mon Dec 15 2008 Dominik Mierzejewski <rpm(a)greysector.net&gt; - 1.0.5-5 - fix build with current ffmpeg k3b-lavc52.patch: --- NEW FILE k3b-lavc52.patch --- diff -up k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.lavc52 k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp --- k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.lavc52 2008-12-15 20:47:09.000000000 +0100 +++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2008-12-15 21:23:34.000000000 +0100 @@ -194,7 +194,11 @@ QString K3bFFMpegFile::typeComment() con return i18n("Windows Media v1"); case CODEC_ID_WMAV2: return i18n("Windows Media v2"); +#if LIBAVCODEC_VERSION_MAJOR < 52 case CODEC_ID_MP3LAME: +#else + case CODEC_ID_MP3: +#endif return i18n("MPEG 1 Layer III"); case CODEC_ID_AAC: return i18n("Advanced Audio Coding (AAC)"); @@ -289,8 +293,10 @@ int K3bFFMpegFile::fillOutputBuffer() #ifdef FFMPEG_BUILD_PRE_4629 int len = avcodec_decode_audio( &d->formatContext->streams[0]->codec, -#else +#elif LIBAVCODEC_VERSION_MAJOR < 52 int len = avcodec_decode_audio( d->formatContext->streams[0]->codec, +#else + int len = avcodec_decode_audio2( d->formatContext->streams[0]->codec, #endif (short*)d->outputBuffer, &d->outputBufferSize, d->packetData, d->packetSize ); Index: k3b-extras-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/k3b-extras-freeworld.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- k3b-extras-freeworld.spec 17 Sep 2008 18:55:47 -0000 1.7 +++ k3b-extras-freeworld.spec 20 Dec 2008 19:31:47 -0000 1.8 @@ -8,7 +8,7 @@ Name: k3b-extras-freeworld Version: 1.0.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Additional codec plugins for the k3b CD/DVD burning application Group: Applications/Multimedia @@ -18,6 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) Patch1: k3b-1.0.5-ffmpeg.patch +Patch2: k3b-lavc52.patch ExcludeArch: s390 s390x @@ -50,6 +51,7 @@ %if 0%{?ffmpeg:1} %patch1 -p1 -b .ffmpeg +%patch2 -p1 -b .lavc52 make -f admin/Makefile.common %endif @@ -119,6 +121,9 @@ %changelog +* Mon Dec 15 2008 Dominik Mierzejewski <rpm(a)greysector.net&gt; - 1.0.5-5 +- fix build with current ffmpeg + * Wed Sep 17 2008 Rex Dieter <rdieter(a)fedoraproject.org&gt; - 1.0.5-4 - better pkgconfig-based ffmpeg patch - optimize configure