Hello community, here is the log from the commit of package amarok checked in at Mon Jun 30 20:27:19 CEST 2008. -------- --- KDE/amarok/amarok.changes 2008-05-23 11:49:14.000000000 +0200 +++ amarok/amarok.changes 2008-06-30 17:26:32.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jun 30 17:26:23 CEST 2008 - meissner@suse.de + +- make build with libmtp8. Not tested if it works. + +------------------------------------------------------------------- New: ---- libmtp8-buildfix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.UI3026/_old 2008-06-30 20:27:07.000000000 +0200 +++ /var/tmp/diff_new_pack.UI3026/_new 2008-06-30 20:27:07.000000000 +0200 @@ -34,7 +34,7 @@ Group: Productivity/Multimedia/Sound/Players Summary: Media Player for KDE Version: 1.4.9.1 -Release: 22 +Release: 31 Requires: kdelibs3 >= %(rpm -q --queryformat '%{VERSION}' kdelibs3) Requires: amarok_engine >= %version Requires: ruby @@ -55,6 +55,7 @@ Patch12: undefined-entity.diff Patch13: amarok-FrameworkVersion.diff Patch15: amarok-continue.diff +Patch16: libmtp8-buildfix.diff Patch17: better-engine-name.diff %description @@ -170,6 +171,7 @@ %patch13 -p1 %endif %patch15 -p1 +%patch16 %patch17 . /etc/opt/kde3/common_options update_admin --no-unsermake @@ -309,6 +311,8 @@ %endif %changelog +* Mon Jun 30 2008 meissner@suse.de +- make build with libmtp8. Not tested if it works. * Fri May 23 2008 stbinner@suse.de - install copy of .protocol files for KDE4 (same as bnc#392795) * Fri Apr 18 2008 dmueller@suse.de ++++++ libmtp8-buildfix.diff ++++++ --- amarok/src/mediadevice/mtp/mtpmediadevice.cpp +++ amarok/src/mediadevice/mtp/mtpmediadevice.cpp @@ -293,12 +293,13 @@ parent_id = getDefaultParentId(); } debug() << "Parent id : " << parent_id << endl; + trackmeta->parent_id = parent_id; m_critical_mutex.lock(); 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 +530,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 +609,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 +914,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 ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de