rpms/amarok/devel amarok-1.3.6-libtunepimp040.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 amarok.spec, 1.30, 1.31 sources, 1.16, 1.17

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14346/devel

Modified Files:
	.cvsignore amarok.spec sources 
Added Files:
	amarok-1.3.6-libtunepimp040.patch 
Log Message:
- version 1.3.7

amarok-1.3.6-libtunepimp040.patch:

--- NEW FILE amarok-1.3.6-libtunepimp040.patch ---
--- amarok-1.3.6/amarok/src/ktrm.cpp.tp 2005-11-07 16:19:18.000000000 -0600
+++ amarok-1.3.6/amarok/src/ktrm.cpp    2005-11-17 13:09:35.000000000 -0600
@@ -42,7 +42,7 @@
 
 extern "C"
 {
-    static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId);
+    static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFileStatus status);
 }
 
 /**
@@ -66,7 +66,8 @@
         int id;
 
         if(!m_fileMap.contains(lookup->file())) {
-            id = tp_AddFile(m_pimp, QFile::encodeName(lookup->file()));
+            // Not sure if 3rd field should be 0 or 1, guessing 1 -- Rex
+            id = tp_AddFile(m_pimp, QFile::encodeName(lookup->file()),1);
             m_fileMap.insert(lookup->file(), id);
         }
         else {
@@ -121,7 +122,6 @@
         tp_SetAutoSaveThreshold(m_pimp, -1);
         tp_SetMoveFiles(m_pimp, false);
         tp_SetRenameFiles(m_pimp, false);
-        tp_SetUseUTF8(m_pimp, true);
         tp_SetNotifyCallback(m_pimp, TRMNotifyCallback, 0);
 
         if(KProtocolManager::useProxy()) {
@@ -245,13 +245,13 @@
  * Callback fuction for TunePimp lookup events.
  */
 
-static void TRMNotifyCallback(tunepimp_t pimp, void *, TPCallbackEnum type, int fileId)
+static void TRMNotifyCallback(tunepimp_t pimp, void *, TPCallbackEnum type, int fileId, TPFileStatus status)
 {
     if(type != tpFileChanged)
         return;
 
     track_t track = tp_GetTrack(pimp, fileId);
-    TPFileStatus status = tr_GetStatus(track);
+    status = tr_GetStatus(track);
 
     switch(status) {
     case eRecognized:
@@ -556,10 +556,10 @@
                 KTRMResult result;
 
                 result.d->title = QString::fromUtf8(tracks[i]->name);
-                result.d->artist = QString::fromUtf8(tracks[i]->artist->name);
-                result.d->album = QString::fromUtf8(tracks[i]->album->name);
+                result.d->artist = QString::fromUtf8(tracks[i]->artist.name);
+                result.d->album = QString::fromUtf8(tracks[i]->album.name);
                 result.d->track = tracks[i]->trackNum;
-                result.d->year = tracks[i]->album->releaseYear;
+                result.d->year = tracks[i]->album.releaseYear;
                 result.d->relevance =
                     4 * stringSimilarity(strList,result.d->title) +
                     2 * stringSimilarity(strList,result.d->artist) +



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	11 Nov 2005 13:41:17 -0000	1.16
+++ .cvsignore	9 Dec 2005 10:24:54 -0000	1.17
@@ -1 +1 @@
-amarok-1.3.6.tar.bz2
+amarok-1.3.7.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- amarok.spec	11 Nov 2005 13:41:17 -0000	1.30
+++ amarok.spec	9 Dec 2005 10:24:54 -0000	1.31
@@ -6,14 +6,15 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.3.6
+Version:    1.3.7
 Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.3.6.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.3.7.tar.bz2
 Patch0:     amarok-1.3.4-helix-libs.patch
+Patch1:     amarok-1.3.6-libtunepimp040.patch
 Patch2:     amarok-1.3-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,6 +27,7 @@
 BuildRequires:  libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  mysql-devel, postgresql-devel
+BuildRequires:  libtunepimp-devel >= 0.4.0
 %ifnarch ppc64 x86_64 s390 s390x ia64
 BuildRequires:  HelixPlayer
 %endif
@@ -83,6 +85,8 @@
 %setup -q
 # Discover the helix libs
 %patch0 -p1 -b .helix-libs
+# Use libtunepimp 0.4.0 (api changed)
+%patch1 -p1 -b .libtunepimp040
 # Gstreamer default sink should be autoaudiosink
 %patch2 -p1 -b .engines-cfg
 
@@ -197,8 +201,6 @@
 %{_datadir}/services/amarok_helixengine_plugin.desktop
 %endif
 
-%exclude %{_datadir}/apps/zeroconf/_shoutcast._tcp
-
 
 %files visualisation
 %defattr(-,root,root)
@@ -216,6 +218,13 @@
 
 
 %changelog
+* Wed Dec 07 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3.7-1
+- version 1.3.7
+
+* Sun Nov 20 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3.6-2
+- build with libtunepimp
+- add patch to use libtunepimp 0.4.0 (api changed)
+
 * Tue Nov 08 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3.6-1
 - version 1.3.6
 - BR libGL instead of xorg-x11-Mesa-libGL to prepare for X11R7


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	11 Nov 2005 13:41:17 -0000	1.16
+++ sources	9 Dec 2005 10:24:54 -0000	1.17
@@ -1 +1 @@
-f97ac51a8c2f150ffc4cc0ef49c59a2f  amarok-1.3.6.tar.bz2
+e2297042070643c105f8bb0e524c73ad  amarok-1.3.7.tar.bz2