Changes of Revision 26
| [-] | Changed | amarok.spec |
|
x 1 2 Patch52: amarok-continue.diff3 Patch56: undefined-entity.diff4 Patch80: amarok-1.4.7-fix-docbook-with-broken-meinproc.patch5 +Patch81: amarok-1.4.9.1-libmtp-0.3.0-API.patch6 URL: http://amarok.kde.org7 Group: Productivity/Multimedia/Sound/Players8 License: GNU General Public License (GPL)9 10 BuildRequires: libnjb-devel11 %endif12 %if %{?with_libmtp:1}013 -BuildRequires: libmtp-devel >= 0.2.3 libmtp714 +BuildRequires: libmtp-devel >= 0.2.315 BuildConflicts: libmtp2-devel16 %endif17 BuildRequires: ruby18 19 %patch8020 %__rm -rf doc/pl21 %endif22 +%patch8123 24 pushd "../modplug_artsplugin-%{modplug_version}"25 %patch826 |
||
| [+] | Added | amarok-1.4.9.1-libmtp-0.3.0-API.patch ^ |
| @@ -0,0 +1,44 @@ +--- 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 ); | ||