[rpms/amarok] epel10.2: - add patchset 1 from the amarok devs

[rpms/amarok] epel10.2: - add patchset 1 from the amarok devs

[Aurelien Bompard]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : 7a8a139dd02a4ceee7b64a940360f06c48e2a1f1
Author : Aurelien Bompard <abompard@fedoraproject.org>
Date   : 2006-09-01T14:33:21+00:00
Stats  : +174/-7 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/7a8a139dd02a4ceee7b64a940360f06c48e2a1f1?branch=epel10.2

Log:
- add patchset 1 from the amarok devs

---
diff --git a/amarok.spec b/amarok.spec
index e422ae4..9fe43f0 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -13,7 +13,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4.2
-Release:    1%{?dist}
+Release:    2%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
@@ -24,6 +24,21 @@ Source0:    http://mirrors.ibiblio.org/pub/mirrors/kde/stable/amarok/1.4.2/src/a
 #Patch1:     amarok-1.4.1-gstreamer.patch
 # Gstreamer default sink should be autoaudiosink
 #Patch2:     amarok-1.4-engines-cfg.patch
+
+# Thoses patches are published by the Amarok devs
+
+# AudioCD playback would stutter and sometimes freeze Amarok. (BR 133015)
+Patch3:     audiocd.diff
+# Fixed bug which prevented Amarok from creating the collection database
+# in rare circumstances using SQLite. (BR 133072)
+Patch4:     collection.diff
+# MTP mediadevice support would not compile against libmtp versions >=
+# 0.0.12. (fixed in SVN revision 576121)
+Patch5:     mtp.diff
+# Collection scanner would only restart a maximum of 2 times instead of
+# 20. (fixed in SVN revision 578922)
+Patch6:     scanner.diff
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -44,8 +59,6 @@ BuildRequires:  libifp-devel, libusb-devel
 BuildRequires:  libgpod-devel
 # Creative Nomad Jukebox
 BuildRequires:  libnjb-devel
-# Akode engine
-#BuildRequires:  akode-devel
 # Gstreamer engine
 %if "%{gst10}" == "1"
 BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel
@@ -113,6 +126,14 @@ touch --reference aclocal.m4 amarok/src/engine/gst10/Makefile.in
 touch --reference aclocal.m4 amarok/src/engine/gst10/config/Makefile.in
 touch --reference aclocal.m4 amarok/src/engine/gst10/equalizer/Makefile.in
 %endif
+cd amarok
+%patch3 -p0 -b audiocd
+%patch4 -p0 -b collection
+%patch5 -p0 -b mtp
+%patch6 -p0 -b scanner
+cd ..
+
+
 
 
 %build
@@ -127,8 +148,8 @@ export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
      --enable-postgresql \
      --with-ifp \
      --with-libgpod \
-     --without-xine \
      --without-mp4v2 \
+     --without-xine \
 %ifnarch ppc64 x86_64 s390 s390x ia64
      --with-helix=%{_libdir}/helix \
 %endif
@@ -250,9 +271,6 @@ rm -fr $RPM_BUILD_ROOT
 %{_datadir}/services/amarok_gst10engine_plugin.desktop
 %{_libdir}/kde3/libamarok_gst10engine_plugin.*
 %endif
-# Akode engine - disabled in beta3
-#%{_datadir}/services/amarok_aKode-engine.desktop
-#%{_libdir}/kde3/libamarok_aKode-engine.*
 # Helix engine
 %ifnarch ppc64 x86_64 s390 s390x ia64
 %{_libdir}/kde3/libamarok_helixengine_plugin.*
@@ -270,6 +288,9 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 31 2006 Aurelien Bompard <abompard@fedoraproject.org> 1.4.2-2
+- add amarok patchset 1
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard@fedoraproject.org> 1.4.2-1
 - update to 1.4.2
 - don't build on x86_64 (requested by the amarok devs)

diff --git a/audiocd.diff b/audiocd.diff
new file mode 100644
index 0000000..4351582
--- /dev/null
+++ b/audiocd.diff
@@ -0,0 +1,33 @@
+Index: src/collectiondb.cpp
+===================================================================
+--- src/collectiondb.cpp	(Revision 578457)
++++ src/collectiondb.cpp	(Revision 578458)
+@@ -3463,28 +3463,6 @@
+             bundle->copyFrom( peb );
+             valid = true;
+         }
+-        else if( bundle->url().protocol() == "audiocd" || bundle->url().protocol() == "cdda" )
+-        {
+-            // try to see if the engine has some info about the
+-            // item (the intended behaviour should be that if the
+-            // item is an AudioCD track, the engine can return
+-            // CDDB data for it)
+-            Engine::SimpleMetaBundle smb;
+-            if ( EngineController::engine()->metaDataForUrl( bundle->url(), smb ) )
+-            {
+-                valid = true;
+-                bundle->setTitle( smb.title );
+-                bundle->setArtist( smb.artist );
+-                bundle->setAlbum( smb.album );
+-                bundle->setComment( smb.comment );
+-                bundle->setGenre( smb.genre );
+-                bundle->setBitrate( smb.bitrate.toInt() );
+-                bundle->setSampleRate( smb.samplerate.toInt() );
+-                bundle->setLength( smb.length.toInt() );
+-                bundle->setYear( smb.year.toInt() );
+-                bundle->setTrack( smb.tracknr.toInt() );
+-            }
+-        }
+     }
+ 
+     return valid;

diff --git a/collection.diff b/collection.diff
new file mode 100644
index 0000000..e514b85
--- /dev/null
+++ b/collection.diff
@@ -0,0 +1,40 @@
+Index: src/collectiondb.cpp
+===================================================================
+--- src/collectiondb.cpp	(Revision 577764)
++++ src/collectiondb.cpp	(Revision 577765)
+@@ -5761,7 +5761,8 @@
+ {
+ 
+     QStringList values;
+-    int error, rc;
++    int error;
++    int rc = 0;
+     const char* tail;
+     sqlite3_stmt* stmt;
+     int busyCnt = 0;
+@@ -5787,6 +5788,7 @@
+             Debug::error() << sqlite3_errmsg( m_db ) << endl;
+             Debug::error() << "on query: " << statement << endl;
+             values = QStringList();
++            break;
+         }
+         else
+         {
+@@ -5851,7 +5853,8 @@
+ 
+ int SqliteConnection::insert( const QString& statement, const QString& /* table */ )
+ {
+-    int error, rc;
++    int error;
++    int rc = 0;
+     const char* tail;
+     sqlite3_stmt* stmt;
+     int busyCnt = 0;
+@@ -5876,6 +5879,7 @@
+             Debug::error() << k_funcinfo << " sqlite3_compile error:" << endl;
+             Debug::error() << sqlite3_errmsg( m_db ) << endl;
+             Debug::error() << "on insert: " << statement << endl;
++            break;
+         }
+         else
+         {

diff --git a/mtp.diff b/mtp.diff
new file mode 100644
index 0000000..4774e30
--- /dev/null
+++ b/mtp.diff
@@ -0,0 +1,60 @@
+Index: src/mediadevice/mtp/mtpmediadevice.cpp
+===================================================================
+--- src/mediadevice/mtp/mtpmediadevice.cpp	(Revision 576120)
++++ src/mediadevice/mtp/mtpmediadevice.cpp	(Revision 576121)
+@@ -631,7 +631,11 @@
+ 	}
+ 
+     QString modelname = QString( LIBMTP_Get_Modelname( m_device ) );
++#if LIBMTP_FRIENDLY_NAME 
++    QString ownername = QString( LIBMTP_Get_Friendlyname( m_device ) );
++#else
+     QString ownername = QString( LIBMTP_Get_Ownername( m_device ) );
++#endif
+     m_name = modelname;
+     if(! ownername.isEmpty() )
+     {
+Index: src/mediadevice/mtp/Makefile.am
+===================================================================
+--- src/mediadevice/mtp/Makefile.am	(Revision 576120)
++++ src/mediadevice/mtp/Makefile.am	(Revision 576121)
+@@ -9,6 +9,7 @@
+     -I$(top_srcdir)/amarok/src/engine \
+     -I$(top_builddir)/amarok/src/engine \
+     -I$(top_srcdir)/amarok/src/mediadevice \
++    -DLIBMTP_FRIENDLY_NAME=$(LIBMTP_FRIENDLY_NAME) \
+     $(taglib_includes) \
+     $(all_includes)
+ 
+Index: configure.in.in
+===================================================================
+--- configure.in.in	(Revision 576120)
++++ configure.in.in	(Revision 576121)
+@@ -808,16 +808,22 @@
+     [build_libmtp=$withval],
+     [build_libmtp=yes]
+ )
+-
+     if test "$build_libmtp" != "no"; then
+         if test "$PKGCONFIGFOUND" = "yes" ; then
++            have_libmtp=no
++            LIBMTP_FRIENDLY_NAME=0
++            PKG_CHECK_MODULES(LIBMTP, libmtp >= 0.0.12,
++            [
++                LIBMTP_FRIENDLY_NAME=1
++                have_libmtp=yes
++            ],
++            [
++                PKG_CHECK_MODULES(LIBMTP, libmtp < 0.0.12, have_libmtp=yes, have_libmtp=no)
++            ])
+ 
+-        # check for libmtp
+-        have_libmtp=no
+-
+-        PKG_CHECK_MODULES(LIBMTP, libmtp, have_libmtp=yes,have_libmtp=no)
+         if test "x$have_libmtp" != "xno"; then
+             AC_DEFINE(HAVE_LIBMTP, 1, [have libmtp])
++            AC_SUBST(LIBMTP_FRIENDLY_NAME)
+         fi
+     fi
+ fi

diff --git a/scanner.diff b/scanner.diff
new file mode 100644
index 0000000..bd18c7a
--- /dev/null
+++ b/scanner.diff
@@ -0,0 +1,13 @@
+Index: src/scancontroller.h
+===================================================================
+--- src/scancontroller.h	(Revision 578921)
++++ src/scancontroller.h	(Revision 578922)
+@@ -99,7 +99,7 @@
+         void customEvent( QCustomEvent* );
+ 
+         // Member variables:
+-        static const uint MAX_RESTARTS = 2;
++        static const uint MAX_RESTARTS = 20;
+ 
+         KProcIO* m_scanner;
+         QStringList m_folders;