Hello community, here is the log from the commit of package kdemultimedia4 for openSUSE:Factory checked in at 2012-05-31 17:05:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdemultimedia4 (Old) and /work/SRC/openSUSE:Factory/.kdemultimedia4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdemultimedia4", Maintainer is "kde-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdemultimedia4/kdemultimedia4.changes 2012-05-08 06:45:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdemultimedia4.new/kdemultimedia4.changes 2012-05-31 17:05:59.000000000 +0200 @@ -1,0 +2,11 @@ +Tue May 29 16:37:08 UTC 2012 - toddrme2...@gmail.com + +- Add libcanberra optional buildrequires (already used elsewhere + in openSUSE KDE packages) + +------------------------------------------------------------------- +Mon May 28 21:33:05 UTC 2012 - reddw...@opensuse.org + +- Fix build with ffmpeg 0.11 + +------------------------------------------------------------------- New: ---- kdemultimedia4-4.8.3-ffmpeg_011.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdemultimedia4.spec ++++++ --- /var/tmp/diff_new_pack.PiRdpl/_old 2012-05-31 17:06:01.000000000 +0200 +++ /var/tmp/diff_new_pack.PiRdpl/_new 2012-05-31 17:06:01.000000000 +0200 @@ -27,6 +27,7 @@ %if %suse_version > 1200 BuildRequires: pkgconfig(ao) BuildRequires: pkgconfig(flac) +BuildRequires: pkgconfig(libcanberra) BuildRequires: pkgconfig(libmusicbrainz) BuildRequires: pkgconfig(libmusicbrainz3) BuildRequires: pkgconfig(libpulse) @@ -38,9 +39,10 @@ %else BuildRequires: flac-devel BuildRequires: libao-devel -BuildRequires: libpulse-devel +BuildRequires: libcanberra-devel BuildRequires: libmusicbrainz-devel BuildRequires: libmusicbrainz3-devel +BuildRequires: libpulse-devel BuildRequires: libtheora-devel BuildRequires: libtunepimp-devel BuildRequires: libvorbis-devel @@ -64,6 +66,7 @@ Url: http://www.kde.org Source: kdemultimedia-%{version}.tar.xz Patch1: kmix-autostart.diff +Patch2: kdemultimedia4-4.8.3-ffmpeg_011.patch Suggests: juk Suggests: kio_audiocd Suggests: kmix @@ -82,6 +85,7 @@ %prep %setup -q -n kdemultimedia-%{version} %patch1 +%patch2 FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%b %e %Y') sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" libkcompactdisc/wmlib/wm_helpers.c ++++++ kdemultimedia4-4.8.3-ffmpeg_011.patch ++++++ Index: ffmpegthumbs/ffmpegthumbnailer/moviedecoder.cpp =================================================================== --- ffmpegthumbs/ffmpegthumbnailer/moviedecoder.cpp.orig +++ ffmpegthumbs/ffmpegthumbnailer/moviedecoder.cpp @@ -52,12 +52,11 @@ MovieDecoder::~MovieDecoder() void MovieDecoder::initialize(const QString& filename) { av_register_all(); - avcodec_init(); avcodec_register_all(); QFileInfo fileInfo(filename); - if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, fileInfo.absoluteFilePath().toUtf8().data(), NULL, 0, NULL) != 0) { + if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, fileInfo.absoluteFilePath().toUtf8().data(), NULL, NULL) != 0) { kDebug() << "Could not open input file: " << fileInfo.absoluteFilePath(); return; } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
