[arch-commits] Commit in amarok/repos (3 files)

Andrea Scarpino andrea at archlinux.org
Mon Jan 11 19:47:42 EST 2010


    Date: Monday, January 11, 2010 @ 19:47:41
  Author: andrea
Revision: 62781

Merged revisions 61491,62422-62423,62780 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/amarok/trunk

........
  r61491 | andrea | 2009-12-16 21:18:44 +0100 (Wed, 16 Dec 2009) | 2 lines
  
  upgpkg: amarok 2.2.1.90-1
      upstream beta release
........
  r62422 | andrea | 2010-01-08 18:27:56 +0100 (Fri, 08 Jan 2010) | 1 line
  
  cleanup
........
  r62423 | andrea | 2010-01-08 18:29:45 +0100 (Fri, 08 Jan 2010) | 1 line
  
  undo. I hate SVN and my stupidity
........
  r62780 | andrea | 2010-01-12 01:46:51 +0100 (Tue, 12 Jan 2010) | 2 lines
  
  upgpkg: amarok 2.2.2-1
      upstream release; moved some depends as optional
........

Modified:
  amarok/repos/extra-i686/	(properties)
  amarok/repos/extra-i686/PKGBUILD
Deleted:
  amarok/repos/extra-i686/fix-random-with-repeat.patch

------------------------------+
 PKGBUILD                     |   24 +---
 fix-random-with-repeat.patch |  206 -----------------------------------------
 2 files changed, 10 insertions(+), 220 deletions(-)


Property changes on: amarok/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /amarok/trunk:1-59141
   + /amarok/trunk:1-62780

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2010-01-12 00:46:51 UTC (rev 62780)
+++ extra-i686/PKGBUILD	2010-01-12 00:47:41 UTC (rev 62781)
@@ -4,26 +4,22 @@
 
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.2.1
-pkgrel=2
+pkgver=2.2.2
+pkgrel=1
 pkgdesc="A media player for KDE"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org"
 license=('GPL2' 'LGPL2' 'FDL')
-depends=('mysql>=5.1.41' 'kdebase-runtime>=4.3' 'libmtp>=0.3.7' 'libgpod>=0.7.2'
-	'qtscriptgenerator>=0.1.0' 'taglib-extras>=1.0.1' 'liblastfm>=0.3.0'
-	'loudmouth>=1.4.3' 'qca')
-makedepends=('pkgconfig' 'automoc4' 'cmake')
-install=amarok.install
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-	'fix-random-with-repeat.patch')
-md5sums=('4f6f45f0c25f85f2a2a1fff169ac7193'
-         '4932796051747035e67a6ff68b4ea561')
+depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras' 'liblastfm' 'qca')
+makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth')
+optdepends=("libgpod: support Apple iPod audio devices"
+	"libmtp: support for portable media devices"
+	"loudmouth: backend needed by mp3tunes for syncing")
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('c2c4ae2f2ff7154a064b554cdee557a9')
 
 build() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   patch -Np1 -i ${srcdir}/fix-random-with-repeat.patch || return 1
-
    cd ${srcdir}
    mkdir build
    cd build

Deleted: extra-i686/fix-random-with-repeat.patch
===================================================================
--- extra-i686/fix-random-with-repeat.patch	2010-01-12 00:46:51 UTC (rev 62780)
+++ extra-i686/fix-random-with-repeat.patch	2010-01-12 00:47:41 UTC (rev 62781)
@@ -1,206 +0,0 @@
---- amarok-2.2.1/src/playlist/navigators/RandomTrackNavigator.cpp~	2009-11-11 22:09:13.000000000 +0100
-+++ amarok-2.2.1/src/playlist/navigators/RandomTrackNavigator.cpp	2009-11-20 13:24:12.310019258 +0100
-@@ -33,13 +33,15 @@
- Playlist::RandomTrackNavigator::RandomTrackNavigator()
- {
-     m_model = Playlist::ModelStack::instance()->top();
-+
-+    reset();
-+
-     connect( model(), SIGNAL( insertedIds( const QList<quint64>& ) ),
-              this, SLOT( recvInsertedIds( const QList<quint64>& ) ) );
-     connect( model(), SIGNAL( removedIds( const QList<quint64>& ) ),
-              this, SLOT( recvRemovedIds( const QList<quint64>& ) ) );
--    connect( model(), SIGNAL( layoutChanged() ), this, SLOT( modelLayoutChanged() ) );
--
--    reset();
-+    connect( model(), SIGNAL( activeTrackChanged( const quint64 ) ),
-+             this, SLOT( recvActiveTrackChanged( const quint64 ) ) );
- }
- 
- void
-@@ -51,12 +53,6 @@
-         {
-             m_unplayedRows.append( t );
-         }
--        else
--        {
--            // insert a new, but played, track at a random position
--            int pos = KRandom::random() % m_playedRows.size();
--            m_playedRows.insert( pos, t );
--        }
-     }
- 
-     std::random_shuffle( m_unplayedRows.begin(), m_unplayedRows.end() );
-@@ -75,7 +71,11 @@
- void
- Playlist::RandomTrackNavigator::recvActiveTrackChanged( const quint64 id )
- {
--    if ( m_unplayedRows.contains( id ) )
-+    if( m_replayedRows.contains( id ) )
-+    {
-+        m_playedRows.prepend( m_replayedRows.takeAt( m_replayedRows.indexOf( id ) ) );
-+    }
-+    else if( m_unplayedRows.contains( id ) )
-     {
-         m_playedRows.prepend( m_unplayedRows.takeAt( m_unplayedRows.indexOf( id ) ) );
-     }
-@@ -86,7 +86,7 @@
- {
-     if( !m_queue.isEmpty() )
-         return m_queue.takeFirst();
--    if( m_unplayedRows.isEmpty() && m_playedRows.isEmpty() )
-+    if( m_model->tracks().isEmpty() )
-         return 0;
-     else if( m_unplayedRows.isEmpty() && !m_repeatPlaylist )
-         return 0;
-@@ -94,8 +94,8 @@
-     {
-         if ( m_unplayedRows.isEmpty() )
-         {
--            m_unplayedRows = m_playedRows;
--            m_playedRows.clear();
-+            // reset when playlist finishes
-+            reset();
-         }
- 
-         quint64 requestedTrack = 0;
-@@ -106,14 +106,22 @@
-             // remove the id from the unplayed rows list
-             m_unplayedRows.removeAll( requestedTrack );
-         }
--        else if ( !m_unplayedRows.isEmpty() )
-+        else if ( !m_replayedRows.isEmpty() )
-+        {
-+            requestedTrack = m_replayedRows.takeFirst();
-+        }
-+        else if (!m_unplayedRows.isEmpty() )
-+        {
-             requestedTrack = m_unplayedRows.takeFirst();
-+        }
- 
-         if ( requestedTrack == m_model->activeId())
-         {
-             m_playedRows.prepend( requestedTrack );
--            if ( !m_unplayedRows.isEmpty() )
--                requestedTrack = m_unplayedRows.takeFirst();
-+            if ( !m_replayedRows.isEmpty() )
-+                requestedTrack = m_replayedRows.takeFirst();
-+            else if ( !m_unplayedRows.isEmpty() )
-+                 requestedTrack = m_unplayedRows.takeFirst();
-         }
- 
-         m_playedRows.prepend( requestedTrack );
-@@ -133,6 +141,7 @@
-         if ( m_playedRows.isEmpty() )
-         {
-             m_playedRows = m_unplayedRows;
-+            m_replayedRows.clear();
-             m_unplayedRows.clear();
-         }
- 
-@@ -140,12 +149,12 @@
- 
-         if ( requestedTrack == m_model->activeId())
-         {
--            m_unplayedRows.prepend( requestedTrack );
-+            m_replayedRows.prepend( requestedTrack );
-             if ( !m_playedRows.isEmpty() )
-                 requestedTrack = m_playedRows.takeFirst();
-         }
- 
--        m_unplayedRows.prepend( requestedTrack );
-+        m_replayedRows.prepend( requestedTrack );
-         return requestedTrack;
-     }
- }
-@@ -155,26 +164,15 @@
-     DEBUG_BLOCK
- 
-     m_unplayedRows.clear();
-+    m_replayedRows.clear();
-     m_playedRows.clear();
- 
-     const int max = m_model->rowCount();
-     for ( int i = 0; i < max; i++ )
-     {
--        if (( m_model->stateOfRow( i ) == Item::Unplayed ) || ( m_model->stateOfRow( i ) == Item::NewlyAdded ) )
--        {
--            m_unplayedRows.append( m_model->idAt( i ) );
--        }
--        else
--        {
--            m_playedRows.append( m_model->idAt( i ) );
--        }
-+        // everything is unplayed upon reset
-+        m_unplayedRows.append( m_model->idAt( i ) );
-     }
- 
-     std::random_shuffle( m_unplayedRows.begin(), m_unplayedRows.end() );
--    std::random_shuffle( m_playedRows.begin(), m_playedRows.end() );
--}
--
--void Playlist::RandomTrackNavigator::modelLayoutChanged()
--{
--    reset();
- }
---- amarok-2.2.1/src/playlist/navigators/RandomTrackNavigator.h~	2009-11-11 22:09:13.000000000 +0100
-+++ amarok-2.2.1/src/playlist/navigators/RandomTrackNavigator.h	2009-11-20 13:26:06.773339397 +0100
-@@ -44,11 +44,10 @@
-         void recvRemovedIds( const QList<quint64>& );
-         void recvActiveTrackChanged( const quint64 );
- 
--        void modelLayoutChanged();
--
-     private:
-         QList<quint64> m_playedRows;
-         QList<quint64> m_unplayedRows;
-+        QList<quint64> m_replayedRows;
- 
-     };
- }
---- a/src/playlist/PlaylistActions.cpp
-+++ b/src/playlist/PlaylistActions.cpp
-@@ -272,17 +272,8 @@
- 
-     m_navigator = 0;
- 
--    if ( Amarok::repeatEnabled() )
-+    if ( Amarok::randomEnabled() ) // random track navigators need to deal with repeat
-     {
--        if ( Amarok::repeatTrack() )
--            m_navigator = new RepeatTrackNavigator();
--        else if ( Amarok::repeatAlbum() )
--            m_navigator = new RepeatAlbumNavigator();
--        else
--            m_navigator = new StandardTrackNavigator(); // this navigator handles playlist repeat
--    }
--    else if ( Amarok::randomEnabled() )
--    {
-         if ( Amarok::randomTracks() )
-         {
-             if( Amarok::favorNone() )
-@@ -295,12 +286,21 @@
-         else
-             m_navigator = new StandardTrackNavigator(); // crap -- something went wrong
-     }
-+    else if ( Amarok::repeatEnabled() )
-+    {
-+        if ( Amarok::repeatTrack() )
-+            m_navigator = new RepeatTrackNavigator();
-+        else if ( Amarok::repeatAlbum() )
-+            m_navigator = new RepeatAlbumNavigator();
-+        else
-+            m_navigator = new StandardTrackNavigator(); // this navigator handles playlist repeat
-+    }
-     else
-+    {
-         m_navigator = new StandardTrackNavigator();
-+    }
- 
--
-     m_navigator->queueIds( currentQueue );
--
- }
- 
- void



More information about the arch-commits mailing list