From 174450b34f37137dd616173bb36e459cb0806cfa Mon Sep 17 00:00:00 2001 From: Peter Alfredsen Date: Wed, 10 Sep 2008 13:51:48 +0000 Subject: Probably definitely fix bug #233869, thanks again to Salah Colonya. Also fix bug #236886 with fix from upstream. Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25.8 i686 --- media-sound/banshee/ChangeLog | 11 ++- media-sound/banshee/Manifest | 7 +- media-sound/banshee/banshee-1.2.1-r1.ebuild | 99 -------------------- media-sound/banshee/banshee-1.2.1-r2.ebuild | 101 +++++++++++++++++++++ .../files/banshee-1.2.1-libmtp-0.3.0-API.patch | 44 ++++----- .../files/banshee-1.2.1-notification-crash.patch | 20 ++++ 6 files changed, 158 insertions(+), 124 deletions(-) delete mode 100644 media-sound/banshee/banshee-1.2.1-r1.ebuild create mode 100644 media-sound/banshee/banshee-1.2.1-r2.ebuild create mode 100644 media-sound/banshee/files/banshee-1.2.1-notification-crash.patch (limited to 'media-sound/banshee') diff --git a/media-sound/banshee/ChangeLog b/media-sound/banshee/ChangeLog index 7c0c8f4080a8..7ff5b77907d8 100644 --- a/media-sound/banshee/ChangeLog +++ b/media-sound/banshee/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-sound/banshee # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.70 2008/09/03 10:13:52 loki_val Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.71 2008/09/10 13:51:47 loki_val Exp $ + +*banshee-1.2.1-r2 (10 Sep 2008) + + 10 Sep 2008; Peter Alfredsen + files/banshee-1.2.1-libmtp-0.3.0-API.patch, + +files/banshee-1.2.1-notification-crash.patch, -banshee-1.2.1-r1.ebuild, + +banshee-1.2.1-r2.ebuild: + Probably definitely fix bug #233869, thanks again to Salah Colonya. Also + fix bug #236886 with fix from upstream. *banshee-1.2.1-r1 (03 Sep 2008) diff --git a/media-sound/banshee/Manifest b/media-sound/banshee/Manifest index 625685431451..156856c6bbeb 100644 --- a/media-sound/banshee/Manifest +++ b/media-sound/banshee/Manifest @@ -1,5 +1,6 @@ AUX banshee-1.0.0-notification-icon.patch 1388 RMD160 dccac57924fad30d2b02ff4ce80b39754c77b900 SHA1 8c3d2bed53a0bc9b586dc5b0cd7b1913ccfda99d SHA256 48b9bc53bc33c0e582bd2f93d88d09bf79ffbef18d27870d08a733cf45429a08 -AUX banshee-1.2.1-libmtp-0.3.0-API.patch 4226 RMD160 7cf5244c40a8a429f08ed1a6cd53bb6cb2269dec SHA1 44566fd0e5c6b04257c42b622eef7e9bbcf30148 SHA256 5d1a6987c79bee0beea4d06cca9e3bbea240dda87504970de30ce9822ffd5c0e +AUX banshee-1.2.1-libmtp-0.3.0-API.patch 4166 RMD160 349747a7780fa23d8dd5ae8bc7ea77935664a49c SHA1 4f7475bef777a1f49c6d5840f9e31f9711ed03ac SHA256 d54d2ece34c72f0a3ed178c819b5f95df37b9e248fd4f384b9f769095d407a7a +AUX banshee-1.2.1-notification-crash.patch 1096 RMD160 fa6debffc2aafcc58ddfc5ce5497ac40e04e9f13 SHA1 667e6cd02d556ac320785420cdc4482d6c57b2da SHA256 38d22284dc037138839991d46bf565591f8de05e3cbc6f5dd820d42e60ebef43 DIST banshee-0.12.1.tar.gz 3081707 RMD160 87b826cb306e57e08adf35d37fab5b3196d85686 SHA1 578077486d23368998f1e31a237db427f0968d37 SHA256 1d858b3c83d233790f62bc35440e900bcebf40964ad1aba9eae4cc017da74ed7 DIST banshee-0.13.1.tar.gz 2999635 RMD160 fdefaeeb3e66bf6073e081e364270dcf912ebf6c SHA1 e39358c04ea38505ec626c4fef66312edd176c6a SHA256 ea095023f8c3f731aef3f96653e53c9dad6622f1113a2347aa10ebb269351a19 DIST banshee-1-1.0.0.tar.bz2 1993777 RMD160 8148af02fc421b4d9f6716f96f65f10c4346876b SHA1 8467e114d6857cc1f37b3364cbde9618a2067e30 SHA256 0df0d12187752a27fa64037595491710e26be17e9ea87a73f751b8b686394012 @@ -7,7 +8,7 @@ DIST banshee-1-1.2.1.tar.bz2 2115306 RMD160 ca29158c81ed6d49bceaaf25f315a93624dd EBUILD banshee-0.12.1.ebuild 3033 RMD160 7aa0c63a0c428c8d3be2594aa931bdd902cbbe99 SHA1 1a4d7c6c92cf896eb44418e9488f889c18290b63 SHA256 97bc43f8bc5e0ee9dbbcb64b54a501d36fa40499fd23effbe1064503c110fa48 EBUILD banshee-0.13.1.ebuild 2995 RMD160 ea90307f7745259bdb12b22dae8d428de7cba7b2 SHA1 96064831a620d79e153dacf8f8645c8d58c08071 SHA256 421ce751a47477460e8463764d55bc4633aeb82d44509efc57913b3add2ce7e6 EBUILD banshee-1.0.0-r1.ebuild 2202 RMD160 fcaaa6d71fd03c43569c1cb2953836d9b444da5f SHA1 05b90c39aabc619e7b9833fc018d9b724a951db0 SHA256 69ccfb5570b7200dd7bd08a24efee1b91920ba4a71910356b1a6d257e77ffc86 -EBUILD banshee-1.2.1-r1.ebuild 2269 RMD160 18a9cb6569cd04c4b12e7f0c5a5058022707f37c SHA1 3055f747b6dcd743398350da4dfadc1cc6388683 SHA256 f70000f95280406b1f608ef02d244074d8d433cd36dab3555d8f82a1d8956685 +EBUILD banshee-1.2.1-r2.ebuild 2335 RMD160 8667fba2eecedcc96ab6c266ad74f9e2751ccda5 SHA1 39451794dc0bb1de88b28d8767bbe1dba26c9df5 SHA256 f00da028931c3156b395efc087a490f2abdea1a32f753d5ff477356a0705fb0a EBUILD banshee-1.2.1.ebuild 2210 RMD160 34b20e9e66f736db60934a712545ee9bba3203da SHA1 100317bfad927a9279a5da868923f0c196669889 SHA256 8a13cc436483124f120fe137b2fd2107521e466189340f3ea3cfa66cc106b591 -MISC ChangeLog 12779 RMD160 7c601cd6e7da602ee0b95d4368f4b98d5147e3a7 SHA1 6c5403fe47523c2cdf71a469fe513e283d69c9d6 SHA256 423a812be8d2a8bba0b0c6e40f6b908990b46a528bc5cddd1c4fd094ea655c9a +MISC ChangeLog 13132 RMD160 46d9425a5df9f6c3fa3b8f76334f2b9d9cfac8cc SHA1 0c609f2778309ef47674b72360d7258502b2e503 SHA256 96f2cdae0bf2cbc020ecff5d1a9559ceb3b4cee0af46c38bf718242ec8be57fc MISC metadata.xml 499 RMD160 58c90a5fa64f948def14ea188bd7815294e36f35 SHA1 5d463e6bbad5600e2fb46e20dd35be871bcb48a8 SHA256 77f493966e62f6e00073371783c5234cee51f5a4462571c8214c6e301860cd5a diff --git a/media-sound/banshee/banshee-1.2.1-r1.ebuild b/media-sound/banshee/banshee-1.2.1-r1.ebuild deleted file mode 100644 index d4d220964c1f..000000000000 --- a/media-sound/banshee/banshee-1.2.1-r1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-1.2.1-r1.ebuild,v 1.1 2008/09/03 10:13:52 loki_val Exp $ - -EAPI=1 - -inherit base gnome2 mono - -GVER=0.10.3 - -DESCRIPTION="Import, organize, play, and share your music using a simple and powerful interface." -HOMEPAGE="http://banshee-project.org" -SRC_URI="http://download.banshee-project.org/${PN}/${PN}-1-${PV}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+aac +boo daap doc +encode +flac ipod +mad mtp +podcast test +vorbis" - -RDEPEND=">=dev-lang/mono-1.2.6 - >=dev-dotnet/gtk-sharp-2.10 - >=dev-dotnet/gconf-sharp-2.8 - >=dev-dotnet/gnome-sharp-2.8 - >=media-libs/gst-plugins-bad-${GVER} - >=media-libs/gst-plugins-good-${GVER} - >=media-libs/gst-plugins-ugly-${GVER} - >=media-plugins/gst-plugins-alsa-${GVER} - >=media-plugins/gst-plugins-gnomevfs-${GVER} - >=media-plugins/gst-plugins-gconf-${GVER} - || ( - >=media-plugins/gst-plugins-cdparanoia-${GVER} - >=media-plugins/gst-plugins-cdio-${GVER} - ) - media-libs/musicbrainz:1 - >=dev-dotnet/dbus-glib-sharp-0.3 - >=dev-dotnet/dbus-sharp-0.5 - >=dev-dotnet/mono-addins-0.3.1 - >=dev-dotnet/taglib-sharp-2.0.3 - >=dev-db/sqlite-3.4 - aac? ( - >=media-plugins/gst-plugins-faad-${GVER} - ) - boo? ( - >=dev-lang/boo-0.8.1 - ) - daap? ( - >=dev-dotnet/mono-zeroconf-0.7.3 - ) - doc? ( - dev-util/monodoc - ) - encode? ( - >=media-plugins/gst-plugins-lame-${GVER} - >=media-plugins/gst-plugins-taglib-${GVER} - ) - flac? ( - >=media-plugins/gst-plugins-flac-${GVER} - ) - ipod? ( - >=dev-dotnet/ipod-sharp-0.8.0 - ) - mad? ( - >=media-plugins/gst-plugins-mad-${GVER} - ) - mtp? ( - >=media-libs/libmtp-0.3 - ) - vorbis? ( - >=media-plugins/gst-plugins-ogg-${GVER} - >=media-plugins/gst-plugins-vorbis-${GVER} - )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -DOCS="AUTHORS ChangeLog HACKING NEWS README" - -S=${WORKDIR}/${PN}-1-${PV} - -PATCHES=( "${FILESDIR}/${P}-libmtp-0.3.0-API.patch" ) - -pkg_setup() { - G2CONF="${G2CONF} - $(use_enable doc docs) - $(use_enable boo) - $(use_enable mtp) - $(use_enable daap) - $(use_enable ipod) - $(use_enable podcast) - $(use_enable test tests)" - - MAKEOPTS="${MAKEOPTS} -j1" -} - -src_unpack() { - base_src_unpack - gnome2_omf_fix - elibtoolize -} diff --git a/media-sound/banshee/banshee-1.2.1-r2.ebuild b/media-sound/banshee/banshee-1.2.1-r2.ebuild new file mode 100644 index 000000000000..4e0edb9368ea --- /dev/null +++ b/media-sound/banshee/banshee-1.2.1-r2.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-1.2.1-r2.ebuild,v 1.1 2008/09/10 13:51:47 loki_val Exp $ + +EAPI=1 + +inherit base gnome2 mono autotools + +GVER=0.10.3 + +DESCRIPTION="Import, organize, play, and share your music using a simple and powerful interface." +HOMEPAGE="http://banshee-project.org" +SRC_URI="http://download.banshee-project.org/${PN}/${PN}-1-${PV}.tar.bz2" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+aac +boo daap doc +encode +flac ipod +mad mtp +podcast test +vorbis" + +RDEPEND=">=dev-lang/mono-1.2.6 + >=dev-dotnet/gtk-sharp-2.10 + >=dev-dotnet/gconf-sharp-2.8 + >=dev-dotnet/gnome-sharp-2.8 + >=media-libs/gst-plugins-bad-${GVER} + >=media-libs/gst-plugins-good-${GVER} + >=media-libs/gst-plugins-ugly-${GVER} + >=media-plugins/gst-plugins-alsa-${GVER} + >=media-plugins/gst-plugins-gnomevfs-${GVER} + >=media-plugins/gst-plugins-gconf-${GVER} + || ( + >=media-plugins/gst-plugins-cdparanoia-${GVER} + >=media-plugins/gst-plugins-cdio-${GVER} + ) + media-libs/musicbrainz:1 + >=dev-dotnet/dbus-glib-sharp-0.3 + >=dev-dotnet/dbus-sharp-0.5 + >=dev-dotnet/mono-addins-0.3.1 + >=dev-dotnet/taglib-sharp-2.0.3 + >=dev-db/sqlite-3.4 + aac? ( + >=media-plugins/gst-plugins-faad-${GVER} + ) + boo? ( + >=dev-lang/boo-0.8.1 + ) + daap? ( + >=dev-dotnet/mono-zeroconf-0.7.3 + ) + doc? ( + dev-util/monodoc + ) + encode? ( + >=media-plugins/gst-plugins-lame-${GVER} + >=media-plugins/gst-plugins-taglib-${GVER} + ) + flac? ( + >=media-plugins/gst-plugins-flac-${GVER} + ) + ipod? ( + >=dev-dotnet/ipod-sharp-0.8.0 + ) + mad? ( + >=media-plugins/gst-plugins-mad-${GVER} + ) + mtp? ( + >=media-libs/libmtp-0.3 + ) + vorbis? ( + >=media-plugins/gst-plugins-ogg-${GVER} + >=media-plugins/gst-plugins-vorbis-${GVER} + )" + +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +DOCS="AUTHORS ChangeLog HACKING NEWS README" + +S=${WORKDIR}/${PN}-1-${PV} + +PATCHES=( "${FILESDIR}/${P}-libmtp-0.3.0-API.patch" + "${FILESDIR}/${P}-notification-crash.patch" ) + +pkg_setup() { + G2CONF="${G2CONF} + $(use_enable doc docs) + $(use_enable boo) + $(use_enable mtp) + $(use_enable daap) + $(use_enable ipod) + $(use_enable podcast) + $(use_enable test tests)" + + MAKEOPTS="${MAKEOPTS} -j1" +} + +src_unpack() { + base_src_unpack + cd "${S}" + gnome2_omf_fix + elibtoolize +} 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 index e97766ab166f..6fff6394c595 100644 --- 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 @@ -1,6 +1,6 @@ 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 ++++ banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Album.cs 2008-09-09 22:30:48.000000000 -0500 @@ -131,7 +131,7 @@ if (saved) { saved = LIBMTP_Update_Album (device.Handle, ref album) == 0; @@ -10,21 +10,8 @@ diff -u -r banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Album.cs banshee-1-1.2.1/sr } 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* +@@ -211,7 +211,7 @@ + internal static extern IntPtr LIBMTP_Get_Album (MtpDeviceHandle handle, uint albumId); // LIBMTP_album_t* [DllImport("libmtp.dll")] - internal static extern int LIBMTP_Create_New_Album (MtpDeviceHandle handle, ref AlbumStruct album, uint parentId); @@ -43,7 +30,7 @@ diff -u -r banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Album.cs banshee-1-1.2.1/sr 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 ++++ banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Folder.cs 2008-09-09 22:30:48.000000000 -0500 @@ -210,6 +210,7 @@ { public uint folder_id; @@ -54,8 +41,20 @@ diff -u -r banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Folder.cs banshee-1-1.2.1/s 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 @@ ++++ banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Track.cs 2008-09-09 22:44:13.000000000 -0500 +@@ -129,6 +129,11 @@ + set { trackStruct.usecount = value; } + } + ++ public string Composer { ++ get { return trackStruct.composer; } ++ set { trackStruct.composer = value; } ++ } ++ + public Track (string filename, ulong filesize) : this (new TrackStruct (), null) + { + this.trackStruct.filename = filename; +@@ -195,7 +200,7 @@ internal static void SendTrack (MtpDeviceHandle handle, string path, ref TrackStruct metadata, ProgressFunction callback, IntPtr data, uint parent) { @@ -64,7 +63,7 @@ diff -u -r banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Track.cs banshee-1-1.2.1/sr { LibMtpException.CheckErrorStack (handle); throw new LibMtpException (ErrorCode.General, "Could not upload the track"); -@@ -227,7 +227,7 @@ +@@ -227,7 +232,7 @@ private static extern int LIBMTP_Get_Track_To_File (MtpDeviceHandle handle, uint trackId, string path, ProgressFunction callback, IntPtr data); [DllImport("libmtp.dll")] @@ -73,7 +72,7 @@ diff -u -r banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Track.cs banshee-1-1.2.1/sr [DllImport("libmtp.dll")] private static extern int LIBMTP_Update_Track_Metadata (MtpDeviceHandle handle, ref TrackStruct metadata); -@@ -244,7 +244,8 @@ +@@ -244,9 +249,11 @@ { public uint item_id; public uint parent_id; @@ -82,4 +81,7 @@ diff -u -r banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Track.cs banshee-1-1.2.1/sr + [MarshalAs(UnmanagedType.LPStr)] public string title; [MarshalAs(UnmanagedType.LPStr)] public string artist; ++ [MarshalAs(UnmanagedType.LPStr)] public string composer; [MarshalAs(UnmanagedType.LPStr)] public string genre; + [MarshalAs(UnmanagedType.LPStr)] public string album; + [MarshalAs(UnmanagedType.LPStr)] public string date; diff --git a/media-sound/banshee/files/banshee-1.2.1-notification-crash.patch b/media-sound/banshee/files/banshee-1.2.1-notification-crash.patch new file mode 100644 index 000000000000..7810410dc8ac --- /dev/null +++ b/media-sound/banshee/files/banshee-1.2.1-notification-crash.patch @@ -0,0 +1,20 @@ +Index: src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs +=================================================================== +--- src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs (revision 4464) ++++ src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs (working copy) +@@ -276,10 +276,12 @@ + { + if (rating_menu_item.Visible) { + TrackInfo track = ServiceManager.PlayerEngine.CurrentTrack; +- if (track is DatabaseTrackInfo) { +- (track as DatabaseTrackInfo).Refresh (); ++ if (track != null) { ++ if (track is DatabaseTrackInfo) { ++ (track as DatabaseTrackInfo).Refresh (); ++ } ++ rating_menu_item.Reset (track.Rating); + } +- rating_menu_item.Reset (track.Rating); + } + menu.Popup (null, null, notif_area.PositionMenu, 3, Gtk.Global.CurrentEventTime); + } -- cgit v1.2.3-65-gdbad