diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-01 12:56:56 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-01 12:56:56 +0100 |
| commit | d17e68c6cdcbf123dbb7a8d6550baf33f15e0cb8 (patch) | |
| tree | e961d64bf8fc3add77370798a1d664e6af066820 /extra/amarok | |
| parent | e32b53a53481758f6d75a48797ad9b1cba71f07a (diff) | |
| parent | c31ace4c6175db330d7e4aac1e7388fe5ca5d4f3 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/ed/PKGBUILD
extra/qt/PKGBUILD
Diffstat (limited to 'extra/amarok')
| -rw-r--r-- | extra/amarok/PKGBUILD | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index 510062cc1..a277edadc 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165272 2012-08-14 19:57:06Z ronald $ +# $Id: PKGBUILD 172156 2012-11-30 08:00:25Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> @@ -6,13 +6,13 @@ pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') pkgver=2.6.0 -pkgrel=1 +pkgrel=3 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64" 'mips64el') url="http://amarok.kde.org" license=('GPL2' 'LGPL2.1' 'FDL') depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras' - 'liblastfm' 'ffmpeg' 'libofa' 'qjson') + 'liblastfm' 'ffmpeg' 'libofa' 'qjson' 'mesa') makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth' 'libmygpo-qt') optdepends=("libgpod: support for Apple iPod audio devices" |