[arch-commits] Commit in amarok/trunk (PKGBUILD amarok-2.5.0-ffmpeg-fixes.patch)

[Evangelos Foutras]

    Date: Thursday, June 7, 2012 @ 09:33:51
  Author: foutrelis
Revision: 160957

upgpkg: amarok 2.5.0-3

FFmpeg 0.11 rebuild.

Added:
  amarok/trunk/amarok-2.5.0-ffmpeg-fixes.patch
Modified:
  amarok/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |    9 ++++++---
 amarok-2.5.0-ffmpeg-fixes.patch |   19 +++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-07 12:57:33 UTC (rev 160956)
+++ PKGBUILD	2012-06-07 13:33:51 UTC (rev 160957)
@@ -6,7 +6,7 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.5.0
-pkgrel=2
+pkgrel=3
 pkgdesc="The powerful music player for KDE"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org"
@@ -22,14 +22,17 @@
             "libmygpo-qt: gpodder.net Internet Service")
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-	"toolbarfix.patch")
+	"toolbarfix.patch"
+	"amarok-2.5.0-ffmpeg-fixes.patch")
 sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2'
-          'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f')
+          'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f'
+          '61193ccc48e9f99b4856eef27fe7a4aaf465feec')
 
 build() {
   cd "${srcdir}"
 
   patch -Np0 -i "${srcdir}"/toolbarfix.patch
+  patch -Np0 -i "${srcdir}"/amarok-2.5.0-ffmpeg-fixes.patch
 
   mkdir build
   cd build

Added: amarok-2.5.0-ffmpeg-fixes.patch
===================================================================
--- amarok-2.5.0-ffmpeg-fixes.patch	                        (rev 0)
+++ amarok-2.5.0-ffmpeg-fixes.patch	2012-06-07 13:33:51 UTC (rev 160957)
@@ -0,0 +1,19 @@
+diff -upr amarok-2.5.0.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp amarok-2.5.0/src/musicbrainz/MusicDNSAudioDecoder.cpp
+--- amarok-2.5.0.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp	2012-06-07 16:12:22.000000000 +0300
++++ amarok-2.5.0/src/musicbrainz/MusicDNSAudioDecoder.cpp	2012-06-07 16:14:56.000000000 +0300
+@@ -136,7 +136,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;
+@@ -259,4 +259,4 @@ MusicDNSAudioDecoder::run()
+ }
+ 
+ 
+-#include "MusicDNSAudioDecoder.moc"
+\ No newline at end of file
++#include "MusicDNSAudioDecoder.moc"