From eb4c1f17fe6790f814a67378ed66bddbb93def96 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 29 Jun 2012 00:01:58 +0000 Subject: Fri Jun 29 00:01:58 UTC 2012 --- extra/amarok/PKGBUILD | 17 +++++++++++++---- extra/amarok/amarok-2.5.0-ffmpeg-fixes.patch | 19 +++++++++++++++++++ extra/amarok/contextviewfix.patch | 14 ++++++++++++++ 3 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 extra/amarok/amarok-2.5.0-ffmpeg-fixes.patch create mode 100644 extra/amarok/contextviewfix.patch (limited to 'extra/amarok') diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index 4d2825177..6a0c3169f 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 148378 2012-01-30 21:38:30Z ronald $ +# $Id: PKGBUILD 162671 2012-06-27 20:00:58Z ronald $ # Maintainer: Ronald van Haren # Contributor: Andrea Scarpino # Contributor: damir @@ -6,7 +6,7 @@ pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') pkgver=2.5.0 -pkgrel=2 +pkgrel=4 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64") url="http://amarok.kde.org" @@ -22,14 +22,23 @@ optdepends=("libgpod: support for Apple iPod audio devices" "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" + "contextviewfix.patch") sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2' - 'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f') + 'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f' + '61193ccc48e9f99b4856eef27fe7a4aaf465feec' + 'a95e3bfb177adacc268552ae479dd88b70f5f9e1') build() { cd "${srcdir}" patch -Np0 -i "${srcdir}"/toolbarfix.patch + patch -Np0 -i "${srcdir}"/amarok-2.5.0-ffmpeg-fixes.patch + + pushd ${pkgname}-${pkgver} + patch -Np1 -i "${srcdir}"/contextviewfix.patch # FS#30448 + popd mkdir build cd build diff --git a/extra/amarok/amarok-2.5.0-ffmpeg-fixes.patch b/extra/amarok/amarok-2.5.0-ffmpeg-fixes.patch new file mode 100644 index 000000000..602fe47f5 --- /dev/null +++ b/extra/amarok/amarok-2.5.0-ffmpeg-fixes.patch @@ -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" diff --git a/extra/amarok/contextviewfix.patch b/extra/amarok/contextviewfix.patch new file mode 100644 index 000000000..2363b623c --- /dev/null +++ b/extra/amarok/contextviewfix.patch @@ -0,0 +1,14 @@ +diff --git a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp +index a23305f..8fa6f9b 100644 +--- a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp ++++ b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp +@@ -129,7 +129,8 @@ Context::VerticalToolbarContainment::updateGeometry() + if(!view()) + return; + +- QRectF rect = view()->sceneRect(); ++ // mimic ContextView::resizeEvent(), nothing else seems to work, bug 292895 ++ QRectF rect( view()->pos(), view()->maximumViewportSize() ); + setGeometry( rect ); + m_applets->setGeometry( rect ); + m_applets->refresh(); \ No newline at end of file -- cgit v1.2.3-54-g00ecf