Hello community,
here is the log from the commit of package amarok for openSUSE:Factory checked
in at 2012-05-31 17:02:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/amarok (Old)
and /work/SRC/openSUSE:Factory/.amarok.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amarok", Maintainer is "kde-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/amarok/amarok.changes 2012-05-09
07:24:44.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.amarok.new/amarok.changes 2012-05-31
17:02:22.000000000 +0200
@@ -1,0 +2,5 @@
+Mon May 28 21:06:39 UTC 2012 - reddw...@opensuse.org
+
+- Fix build with ffmpeg 0.11
+
+-------------------------------------------------------------------
New:
----
amarok-ffmpeg11.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ amarok.spec ++++++
--- /var/tmp/diff_new_pack.PnfKZH/_old 2012-05-31 17:02:25.000000000 +0200
+++ /var/tmp/diff_new_pack.PnfKZH/_new 2012-05-31 17:02:25.000000000 +0200
@@ -38,6 +38,7 @@
# PATCH-FIX-UPSTREAM kde#290123 idoen...@suse.de -- Fix for kde bug 290123
Patch4: kde-290123.patch
Patch5: revert_solid_workaround.diff
+Patch6: amarok-ffmpeg11.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Required for the fdupes macro
@@ -101,6 +102,7 @@
%endif
%patch4 -p1
%patch5 -p1
+%patch6 -p1
# Remove build time references so build-compare can do its work
FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e
%%Y')
++++++ amarok-ffmpeg11.patch ++++++
Index: amarok-2.5.0/src/musicbrainz/MusicDNSAudioDecoder.cpp
===================================================================
--- amarok-2.5.0.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp
+++ amarok-2.5.0/src/musicbrainz/MusicDNSAudioDecoder.cpp
@@ -135,8 +135,7 @@ MusicDNSAudioDecoder::run()
foreach( Meta::TrackPtr track, m_tracks )
{
- //TODO replace with "avformat_open_input" since av_open_input_file is
deprecated
- if( av_open_input_file( &pFormatCtx, ( const char *
)track->playableUrl().toLocalFile().toAscii(), NULL, 0, NULL ) )
+ if( avformat_open_input( &pFormatCtx, ( const char *
)track->playableUrl().toLocalFile().toAscii(), NULL, NULL ) )
{
warning() << QLatin1String( "Unable to open input file: " ) +
track->playableUrl().toLocalFile();
continue;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
