Hello community, here is the log from the commit of package k3b for openSUSE:Factory checked in at Tue Aug 23 15:31:02 CEST 2011.
-------- --- KDE/k3b/k3b.changes 2011-04-27 22:35:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/k3b/k3b.changes 2011-08-14 18:43:20.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Aug 14 16:41:53 UTC 2011 - [email protected] + +- Add k3b-2.0.2-ffmpeg08.patch to allow it to compile against the + new ffmpeg versions. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- k3b-2.0.2-ffmpeg08.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ k3b.spec ++++++ --- /var/tmp/diff_new_pack.6sMzMN/_old 2011-08-23 15:29:22.000000000 +0200 +++ /var/tmp/diff_new_pack.6sMzMN/_new 2011-08-23 15:29:22.000000000 +0200 @@ -22,7 +22,7 @@ Name: k3b Version: 2.0.2 -Release: 12 +Release: 14 Summary: CD/DVD/Blu-ray Burning Application for KDE License: GPLv2+ @@ -33,6 +33,8 @@ Patch0: initial-preference.diff # PATCH-FIX-OPENSUSE add_mimetypes_bnc661777.diff bnc#661777 [email protected] -- Add a few mimetypes to the desktop file for better integration in GNOME Patch1: add_mimetypes_bnc661777.diff +# PATCH-FIX-UPSTREAM %{name}-2.0.2-ffmpeg08.diff kde#274817 [email protected] -- Make it compile with the latest ffmpeg. +Patch2: %{name}-2.0.2-ffmpeg08.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # only needed to patch broken images in the upstream tarball @@ -97,6 +99,9 @@ %setup -q %patch0 %patch1 +%if %{with ffmpeg} +%patch2 -p1 +%endif # patch image with wrong dimensions - fix rpmlint warning "wrong-icon-size" pushd src/icons/actions ++++++ k3b-2.0.2-ffmpeg08.patch ++++++ --- k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.old 2011-01-15 21:47:29.000000000 +0100 +++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2011-06-22 14:14:58.637253378 +0200 @@ -109,7 +109,13 @@ #else ::AVCodecContext* codecContext = d->formatContext->streams[0]->codec; #endif - if( codecContext->codec_type != CODEC_TYPE_AUDIO ) { + if( codecContext->codec_type != +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) + AVMEDIA_TYPE_AUDIO) +#else + CODEC_TYPE_AUDIO) +#endif + { kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename; return false; } @@ -225,8 +231,11 @@ QString K3bFFMpegFile::title() const { // FIXME: is this UTF8 or something?? - if( d->formatContext->title[0] != '\0' ) - return QString::fromLocal8Bit( d->formatContext->title ); + AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 ); + if( ade == NULL ) + return QString(); + if( ade->value != '\0' ) + return QString::fromLocal8Bit( ade->value ); else return QString(); } @@ -235,8 +244,11 @@ QString K3bFFMpegFile::author() const { // FIXME: is this UTF8 or something?? - if( d->formatContext->author[0] != '\0' ) - return QString::fromLocal8Bit( d->formatContext->author ); + AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "ARTIST", NULL, 0 ); + if( ade == NULL ) + return QString(); + if( ade->value != '\0' ) + return QString::fromLocal8Bit( ade->value ); else return QString(); } @@ -245,8 +257,11 @@ QString K3bFFMpegFile::comment() const { // FIXME: is this UTF8 or something?? - if( d->formatContext->comment[0] != '\0' ) - return QString::fromLocal8Bit( d->formatContext->comment ); + AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "COMMENT", NULL, 0 ); + if( ade == NULL ) + return QString(); + if( ade->value != '\0' ) + return QString::fromLocal8Bit( ade->value ); else return QString(); } @@ -309,8 +324,13 @@ #if LIBAVCODEC_VERSION_MAJOR < 52 int len = ::avcodec_decode_audio( #else - int len = ::avcodec_decode_audio2( + #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) + int len = ::avcodec_decode_audio3( + #else + int len = ::avcodec_decode_audio2( + #endif #endif + #ifdef FFMPEG_BUILD_PRE_4629 &d->formatContext->streams[0]->codec, #else @@ -318,7 +338,11 @@ #endif (short*)d->alignedOutputBuffer, &d->outputBufferSize, +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) + &d->packet ); +#else d->packetData, d->packetSize ); +#endif if( d->packetSize <= 0 || len < 0 ) ::av_free_packet( &d->packet ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
