packages: amarok/amarok.spec, amarok/amarok-ffmpeg08.patch (NEW) - attpempt...

[lisu]

Author: lisu                         Date: Fri Jul  1 12:59:44 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- attpempt to fix build with ffmpeg 0.7 and 0.8

---- Files affected:
packages/amarok:
   amarok.spec (1.247 -> 1.248) , amarok-ffmpeg08.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/amarok/amarok.spec
diff -u packages/amarok/amarok.spec:1.247 packages/amarok/amarok.spec:1.248
--- packages/amarok/amarok.spec:1.247	Tue May 31 09:36:20 2011
+++ packages/amarok/amarok.spec	Fri Jul  1 14:59:39 2011
@@ -19,6 +19,7 @@
 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}
@@ -112,6 +113,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build
@@ -317,6 +319,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.248  2011/07/01 12:59:39  lisu
+- attpempt to fix build with ffmpeg 0.7 and 0.8
+
 Revision 1.247  2011/05/31 07:36:20  lisu
 - more TODO
 

================================================================
Index: packages/amarok/amarok-ffmpeg08.patch
diff -u /dev/null packages/amarok/amarok-ffmpeg08.patch:1.1
--- /dev/null	Fri Jul  1 14:59:44 2011
+++ packages/amarok/amarok-ffmpeg08.patch	Fri Jul  1 14:59:39 2011
@@ -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"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/amarok/amarok.spec?r1=1.247&r2=1.248&f=u