Add patch for bug 233869. Kudos to Salah Coronya <salahx@yahoo.com>, who produced this.

(Portage version: 2.2_rc8/cvs/Linux 2.6.25.8 i686)

1 files changed, 85 insertions, 0 deletions

diff --git a/media-sound/banshee/files/banshee-1.2.1-libmtp-0.3.0-API.patch b/media-sound/banshee/files/banshee-1.2.1-libmtp-0.3.0-API.patch
new file mode 100644
index 000000000000..e97766ab166f
--- /dev/null
+++ b/media-sound/banshee/files/banshee-1.2.1-libmtp-0.3.0-API.patch
@@ -0,0 +1,85 @@
+diff -u -r banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Album.cs banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Album.cs
+--- banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Album.cs	2008-05-21 09:17:47.000000000 -0500
++++ banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Album.cs	2008-09-03 00:57:00.000000000 -0500
+@@ -131,7 +131,7 @@
+             if (saved) {
+                 saved = LIBMTP_Update_Album (device.Handle, ref album) == 0;
+             } else {
+-                saved = LIBMTP_Create_New_Album (device.Handle, ref album, 0) == 0;
++                saved = LIBMTP_Create_New_Album (device.Handle, ref album) == 0;
+             }
+ 
+             if (album.tracks != IntPtr.Zero) {
+@@ -190,7 +190,7 @@
+ 
+         public static Album GetById (MtpDevice device, uint id)
+         {
+-            IntPtr ptr = Album.LIBMTP_Get_Album (device.Handle, id);
++            IntPtr ptr = Album.LIBMTP_Get_Album (device.Handle);
+             if (ptr == IntPtr.Zero) {
+                 return null;
+             } else {
+@@ -208,10 +208,10 @@
+ 		internal static extern IntPtr LIBMTP_Get_Album_List (MtpDeviceHandle handle); // LIBMTP_album_t*
+ 
+ 		[DllImport("libmtp.dll")]
+-		internal static extern IntPtr LIBMTP_Get_Album (MtpDeviceHandle handle, uint albumId); // LIBMTP_album_t*
++		internal static extern IntPtr LIBMTP_Get_Album (MtpDeviceHandle handle); // LIBMTP_album_t*
+ 
+ 		[DllImport("libmtp.dll")]
+-		internal static extern int LIBMTP_Create_New_Album (MtpDeviceHandle handle, ref AlbumStruct album, uint parentId);
++		internal static extern int LIBMTP_Create_New_Album (MtpDeviceHandle handle, ref AlbumStruct album);
+ 
+ 		[DllImport("libmtp.dll")]
+ 		internal static extern int LIBMTP_Update_Album (MtpDeviceHandle handle, ref AlbumStruct album);
+@@ -221,6 +221,8 @@
+     internal struct AlbumStruct
+     {
+         public uint album_id;
++	public uint parent_id;
++	public uint storage_id;
+ 
+         [MarshalAs(UnmanagedType.LPStr)]
+         public string name;
+diff -u -r banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Folder.cs banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Folder.cs
+--- banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Folder.cs	2008-04-07 22:59:11.000000000 -0500
++++ banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Folder.cs	2008-09-03 00:11:53.000000000 -0500
+@@ -210,6 +210,7 @@
+ 	{
+ 		public uint folder_id;
+ 		public uint parent_id;
++		public uint storage_id;
+ 		[MarshalAs(UnmanagedType.LPStr)] public string name;
+ 		public IntPtr sibling; // LIBMTP_folder_t*
+ 		public IntPtr child;   // LIBMTP_folder_t*
+diff -u -r banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Track.cs banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Track.cs
+--- banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Track.cs	2008-04-23 14:20:58.000000000 -0500
++++ banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Track.cs	2008-09-03 00:14:10.000000000 -0500
+@@ -195,7 +195,7 @@
+ 
+ 		internal static void SendTrack (MtpDeviceHandle handle, string path, ref TrackStruct metadata, ProgressFunction callback, IntPtr data, uint parent)
+ 		{
+-			if (LIBMTP_Send_Track_From_File (handle, path, ref metadata, callback, data, parent) != 0)
++			if (LIBMTP_Send_Track_From_File (handle, path, ref metadata, callback, data) != 0)
+ 			{
+ 				LibMtpException.CheckErrorStack (handle);
+ 				throw new LibMtpException (ErrorCode.General, "Could not upload the track");
+@@ -227,7 +227,7 @@
+ 		private static extern int LIBMTP_Get_Track_To_File (MtpDeviceHandle handle, uint trackId, string path, ProgressFunction callback, IntPtr data);
+ 
+ 		[DllImport("libmtp.dll")]
+-		private static extern int LIBMTP_Send_Track_From_File (MtpDeviceHandle handle, string path, ref TrackStruct track, ProgressFunction callback, IntPtr data, uint parentHandle);
++		private static extern int LIBMTP_Send_Track_From_File (MtpDeviceHandle handle, string path, ref TrackStruct track, ProgressFunction callback, IntPtr data);
+ 
+ 		[DllImport("libmtp.dll")]
+ 	    private static extern int LIBMTP_Update_Track_Metadata (MtpDeviceHandle handle, ref TrackStruct metadata);
+@@ -244,7 +244,8 @@
+ 	{
+ 		public uint item_id;
+ 		public uint parent_id;
+-		
++		public uint storage_id;
++
+ 		[MarshalAs(UnmanagedType.LPStr)] public string title;
+ 		[MarshalAs(UnmanagedType.LPStr)] public string artist;
+ 		[MarshalAs(UnmanagedType.LPStr)] public string genre;