Bug#516557: amarok: FTBFS against libmtp-dev 0.3.6 now in unstable

[Rafael Laboissiere]

Package: amarok
Version: 1.4.10-2
Severity: serious
Tags: patch
Justification: FTBFS on unstable


The libmtp package version 0.3.6 has been recently uploaded unstable.  This
version had a shlibs bump libmtp7 -> libmtp8.  The API has changed and
amarok FTBFS against this version of libmtp.

You will find attached below a patch in a debdiff form that fixes the
problem.  The package build fine but I did not test it, though.

I know that Amarok 1 is dead upstream but please apply this simple patch and
upload to unstable, otherwise the libmtp transition will be blocked.

Thanks,

Rafael Laboissiere

-- System Information:
Debian Release: lenny/sid
  APT prefers testing
  APT policy: (650, 'testing'), (600, 'unstable'), (500, 'oldstable'), (1, 
'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.26-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.utf8 (charmap=UTF-8) (ignored: LC_ALL 
set to en_US.UTF-8)
Shell: /bin/sh linked to /bin/bash

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 <raf...@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 );