Re: libmtp7 -> libmtp8 transition

[Rafael Laboissiere <rafael@debian.org>]

* Adeodato Simó <dato@net.com.org.es> [2009-02-21 21:56]:

> * Rafael Laboissiere [Sun, 15 Feb 2009 14:22:54 +0100]:
> 
> >   The version currently in experimental (2.0.1.1-1) depends already on
> >   libmtp8.  Nothing to do here.
> 
> Such version of Amarok depends on KDE4, and I don't think it'll be
> uploaded to unstable in time for the libmtp transition. Can you look
> into whether the unstable version of amarok (1.4.10-2) can be built
> against libmtp8 as-is, or with some minor patch? Thanks.

amarok 1.4.10-2 compiles fine with the debdiff patch attached below.  I did
not test it, though.

-- 
Rafael

diff -u amarok-1.4.10/debian/changelog amarok-1.4.10/debian/changelog
--- amarok-1.4.10/debian/changelog
+++ amarok-1.4.10/debian/changelog
@@ -1,3 +1,9 @@
+amarok (1.4.10-2.1) UNRELEASED; urgency=low
+
+  * Builds against libmtp8
+
+ -- Rafael Laboissiere <rafael@debian.org>  Sat, 21 Feb 2009 23:56:43 +0100
+
 amarok (1.4.10-2) unstable; urgency=high
 
   * Add 20_security_audible_tags.diff patch to fix integer overflow while
only in patch2:
unchanged:
--- amarok-1.4.10.orig/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
+++ amarok-1.4.10/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
@@ -298,7 +298,7 @@
     debug() << "Sending track... " << bundle.url().path().utf8() << endl;
     int ret = LIBMTP_Send_Track_From_File(
         m_device, bundle.url().path().utf8(), trackmeta,
-        progressCallback, this, parent_id
+        progressCallback, this
     );
     m_critical_mutex.unlock();
 
@@ -529,7 +529,7 @@
         for( MtpMediaItem *it = dynamic_cast<MtpMediaItem*>(items->first()); it; it = dynamic_cast<MtpMediaItem*>(items->next()) )
             album_object->tracks[i++] = it->track()->id();
         album_object->no_tracks = items->count();
-        ret = LIBMTP_Create_New_Album( m_device, album_object, 0 );
+        ret = LIBMTP_Create_New_Album( m_device, album_object );
         if( ret != 0 )
         {
             debug() << "creating album failed : " << ret << endl;
@@ -608,7 +608,7 @@
 {
     debug() << "Creating new folder '" << name << "' as a child of "<< parent_id << endl;
     char *name_copy = qstrdup( name );
-    uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, parent_id );
+    uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, parent_id, 0 );
     delete(name_copy);
     debug() << "New folder ID: " << new_folder_id << endl;
     if( new_folder_id == 0 )
@@ -913,7 +913,7 @@
     if( item->playlist()->id() == 0 )
     {
         debug() << "creating new playlist : " << metadata->name << endl;
-        int ret = LIBMTP_Create_New_Playlist( m_device, metadata, 0 );
+        int ret = LIBMTP_Create_New_Playlist( m_device, metadata );
         if( ret == 0 )
         {
             item->playlist()->setId( metadata->playlist_id );