[arch-commits] CVS update of extra/multimedia/amarok-base (3 files)

Damir Perisa damir at archlinux.org
Mon Nov 19 02:04:58 UTC 2007


    Date: Sunday, November 18, 2007 @ 21:04:58
  Author: damir
    Path: /home/cvs-extra/extra/multimedia/amarok-base

   Added: 148317.patch (1.1)
Modified: PKGBUILD (1.45 -> 1.46) amarok.install (1.5 -> 1.6)

upgpkg: amarok-base 1.4.7-2


----------------+
 148317.patch   |   15 +++++++++++++++
 PKGBUILD       |   22 ++++++++++++++++------
 amarok.install |    2 +-
 3 files changed, 32 insertions(+), 7 deletions(-)


Index: extra/multimedia/amarok-base/148317.patch
diff -u /dev/null extra/multimedia/amarok-base/148317.patch:1.1
--- /dev/null	Sun Nov 18 21:04:58 2007
+++ extra/multimedia/amarok-base/148317.patch	Sun Nov 18 21:04:57 2007
@@ -0,0 +1,15 @@
+diff -urNad amarok-1.4.7/amarok/src/playlist.cpp amarok-1.4.8/amarok/src/playlist.cpp
+--- amarok-1.4.7/amarok/src/playlist.cpp	2007-08-07 18:48:28.000000000 +0100
++++ amarok-1.4.8/amarok/src/playlist.cpp	2007-11-18 15:00:25.000000000 +0100
+@@ -1227,7 +1227,10 @@
+     }
+     else
+     {
+-        if ( !AmarokConfig::randomMode() || m_prevTracks.count() <= 1 )
++        if( dynamicMode() )
++        {
++        }
++        else if( !AmarokConfig::randomMode() || m_prevTracks.count() <= 1 )
+         {
+             if( item )
+             {
Index: extra/multimedia/amarok-base/PKGBUILD
diff -u extra/multimedia/amarok-base/PKGBUILD:1.45 extra/multimedia/amarok-base/PKGBUILD:1.46
--- extra/multimedia/amarok-base/PKGBUILD:1.45	Mon Aug 13 08:10:45 2007
+++ extra/multimedia/amarok-base/PKGBUILD	Sun Nov 18 21:04:57 2007
@@ -1,28 +1,36 @@
-# $Id: PKGBUILD,v 1.45 2007/08/13 12:10:45 damir Exp $
+# $Id: PKGBUILD,v 1.46 2007/11/19 02:04:57 damir Exp $
 # Maintainer: damir <damir at archlinux.org>
 
 pkgname=amarok-base
 _origname=amarok
 replaces=("${_origname}" 'amarok-base-mysqlfree')
 pkgver=1.4.7
-pkgrel=1
+pkgrel=2
 pkgdesc="amaroK - a media player for KDE"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org"
 license=('GPL')
-depends=('amarok-engine' 'libmp4v2' 'libmysqlclient>=5.0.45' 'postgresql-libs>=8.2.4' 'ruby' 'tunepimp>=0.5.3')
-makedepends=('pkgconfig' 'kdebase>=3.5.7' 'libgpod>=0.5.2' 'libifp>=1.0.0.2' 'libmtp>=0.1.5' 'libnjb>=2.2.5' 'libvisual>=0.4.0' 'xine-lib>=1.1.7' 'sdl>=1.2.12')
+depends=('amarok-engine' 'qt3' 'libmp4v2' 'libmysqlclient>=5.0.45' 'postgresql-libs>=8.2.4' 'ruby' 'tunepimp>=0.5.3')
+makedepends=('pkgconfig' 'kdebase>=3.5.7' 'libgpod>=0.5.2' 'libifp>=1.0.0.2' 'libmtp>=0.2.2' 'libnjb>=2.2.5' 'libvisual>=0.4.0' 'xine-lib>=1.1.7' 'sdl>=1.2.12')
 # advanced scripting depends on python
 install=amarok.install
 #source=(http://mark.kollide.net/amarok-${pkgver}.tar.bz2
 source=("ftp://ftp.solnet.ch/mirror/KDE/stable/amarok/${pkgver}/src/${_origname}-${pkgver}.tar.bz2"
-	"amarok_addaspodcast.desktop")
+	"amarok_addaspodcast.desktop"
+	"148317.patch")
 
 build() {
   export MAKEFLAGS="-j1"
   cd ${startdir}/src/${_origname}-${pkgver}
-  [ -z "${QTDIR}" ] && . /etc/profile.d/qt.sh
+  [ -z "${QTDIR}" ] && . /etc/profile.d/qt3.sh
   [ -z "${KDEDIR}" ] && . /etc/profile.d/kde.sh
+   
+   # fix upstream bug	
+   # http://bugs.kde.org/show_bug.cgi?id=148317
+   # dynamic mode floods playlist and locks amarok
+    patch -Np1 -i $startdir/src/148317.patch
+
+   # prepare build
   ./configure --prefix=/opt/kde \
   	--with-gnu-ld \
 	--enable-mysql \
@@ -41,6 +49,8 @@
 	--disable-debug \
 	--enable-debug=no \
 	--without-xmms || return 1
+
+  # bulid
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1
 
Index: extra/multimedia/amarok-base/amarok.install
diff -u extra/multimedia/amarok-base/amarok.install:1.5 extra/multimedia/amarok-base/amarok.install:1.6
--- extra/multimedia/amarok-base/amarok.install:1.5	Sun Feb  4 18:19:15 2007
+++ extra/multimedia/amarok-base/amarok.install	Sun Nov 18 21:04:57 2007
@@ -17,7 +17,7 @@
   echo "     \-  iPod:                               'libgpod'    "
   echo "     \-  iRiver:                             'libifp'     "
   echo "     \-  Creative Nomad, Dell DJ and others: 'libnjb' >=2.0  "
-  echo "     \-  devices supporting Microsoft MTP:   'libmtp' >=0.1.0 "
+  echo "     \-  devices supporting Microsoft MTP:   'libmtp' >=0.2.2 "
   echo "        "
 }
 




More information about the arch-commits mailing list