From: lisu <lisu@pld-linux.org>
Date: Fri, 1 Jul 2011 12:59:39 +0000 (+0000)
Subject: - attpempt to fix build with ffmpeg 0.7 and 0.8
X-Git-Tag: auto/ti/amarok-2_4_3-1~14
X-Git-Url: http://git.pld-linux.org/?p=packages%2Famarok.git;a=commitdiff_plain;h=9cda017bfb0241e3eb51da92cd2ac0855b06e979

- attpempt to fix build with ffmpeg 0.7 and 0.8

Changed files:
    amarok-ffmpeg08.patch -> 1.1
    amarok.spec -> 1.248
---

diff --git a/amarok-ffmpeg08.patch b/amarok-ffmpeg08.patch
new file mode 100644
index 0000000..a371dc2
--- /dev/null
+++ b/amarok-ffmpeg08.patch
@@ -0,0 +1,18 @@
+--- amarok-2.4.1/src/musicbrainz/MusicDNSAudioDecoder.cpp~	2011-05-05 21:06:53.000000000 +0200
++++ amarok-2.4.1/src/musicbrainz/MusicDNSAudioDecoder.cpp	2011-07-01 14:57:41.811795115 +0200
+@@ -150,7 +150,7 @@
+ 
+         audioStream = -1;
+         for(i = 0; i < ( int )pFormatCtx->nb_streams; i++ )
+-            if( pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO )
++            if( pFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDI )
+             {
+                 audioStream = i;
+                 break;
+@@ -252,4 +252,4 @@
+ }
+ 
+ 
+-#include "MusicDNSAudioDecoder.moc"
+\ Brak znaku nowej linii na końcu pliku
++#include "MusicDNSAudioDecoder.moc"
diff --git a/amarok.spec b/amarok.spec
index 260fb2b..3876ca8 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -18,6 +18,7 @@ Group:		X11/Applications/Multimedia
 Source0:	ftp://ftp.kde.org/pub/kde/%{state}/amarok/%{version}/src/%{name}-%{version}.tar.bz2
 # Source0-md5:	4c65c5cd4d7bd267bdbef8e912fd6cb6
 Patch0:		%{name}-disable_qtscriptbindings_check_fix.patch
+Patch1:		%{name}-ffmpeg08.patch
 URL:		http://amarok.kde.org/
 BuildRequires:	QtNetwork-devel >= %{qtver}
 BuildRequires:	QtSql-devel >= %{qtver}
@@ -111,6 +112,7 @@ Więcej o skryptach w amaroKu można dowiedzieć się stąd:
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build