Hello community, here is the log from the commit of package k3b for openSUSE:Factory checked in at 2012-07-30 17:12:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/k3b (Old) and /work/SRC/openSUSE:Factory/.k3b.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "k3b", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/k3b/k3b.changes 2012-04-19 08:49:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.k3b.new/k3b.changes 2012-07-30 17:13:01.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jul 25 21:52:32 UTC 2012 - [email protected] + +- Fix build with ffmpeg 0.11. Took from Packman. + +------------------------------------------------------------------- Old: ---- k3b-2.0.2-ffmpeg08.patch New: ---- k3b-2.0.2-ffmpeg011.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ k3b.spec ++++++ --- /var/tmp/diff_new_pack.1eNy0o/_old 2012-07-30 17:13:27.000000000 +0200 +++ /var/tmp/diff_new_pack.1eNy0o/_new 2012-07-30 17:13:27.000000000 +0200 @@ -35,8 +35,8 @@ Patch1: add_mimetypes_bnc661777.diff # PATCH-FIX-UPSTREAM k3b-short-trackinfo.patch bko #268307 [email protected] -- Too short track info dataLen returned at least on HL-DT-ST BH10LS30 Patch2: k3b-short-trackinfo.patch -# PATCH-FIX-UPSTREAM %{name}-2.0.2-ffmpeg08.diff kde#274817 [email protected] -- Make it compile with the latest ffmpeg. -Patch3: %{name}-2.0.2-ffmpeg08.patch +# PATCH-FIX-UPSTREAM k3b-2.0.2-ffmpeg011.patch [email protected] -- Make it compile with the latest ffmpeg. +Patch3: k3b-2.0.2-ffmpeg011.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # only needed to patch broken images in the upstream tarball @@ -58,7 +58,11 @@ BuildRequires: libmusicbrainz-devel BuildRequires: libsamplerate-devel BuildRequires: libsndfile-devel -BuildRequires: libtag-devel +%if %suse_version > 1200 +BuildRequires: pkgconfig(taglib) +%else +BuildRequires: taglib-devel +%endif BuildRequires: libvorbis-devel %if 0%{?suse_version} BuildRequires: update-desktop-files ++++++ k3b-2.0.2-ffmpeg08.patch -> k3b-2.0.2-ffmpeg011.patch ++++++ --- /work/SRC/openSUSE:Factory/k3b/k3b-2.0.2-ffmpeg08.patch 2011-09-23 02:04:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.k3b.new/k3b-2.0.2-ffmpeg011.patch 2012-07-30 17:13:01.000000000 +0200 @@ -1,5 +1,15 @@ ---- 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 +diff -ur k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +--- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2011-01-15 21:47:29.000000000 +0100 ++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2012-05-27 20:30:32.174569308 +0200 +@@ -88,7 +88,7 @@ + close(); + + // open the file +- int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 ); ++ int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, 0 ); + if( err < 0 ) { + kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err; + return false; @@ -109,7 +109,13 @@ #else ::AVCodecContext* codecContext = d->formatContext->streams[0]->codec; @@ -15,6 +25,15 @@ kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename; return false; } +@@ -137,7 +143,7 @@ + } + + // dump some debugging info +- ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 ); ++ ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 ); + + return true; + } @@ -225,8 +231,11 @@ QString K3bFFMpegFile::title() const { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
