From: Pacho Ramos Date: Tue, 1 Nov 2011 11:54:05 +0000 (+0000) Subject: Add a fix for smiley face curve equalizer, drop old. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3a0aa8182c8a28d5a64f4a54e958f331ecb8a8e2;p=gentoo.git Add a fix for smiley face curve equalizer, drop old. Package-Manager: portage-2.1.10.32/cvs/Linux x86_64 --- diff --git a/media-sound/banshee/ChangeLog b/media-sound/banshee/ChangeLog index 16076bbec9e5..ad501afd763e 100644 --- a/media-sound/banshee/ChangeLog +++ b/media-sound/banshee/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-sound/banshee # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.140 2011/10/20 22:54:37 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.141 2011/11/01 11:54:05 pacho Exp $ + +*banshee-2.2.0-r1 (01 Nov 2011) + + 01 Nov 2011; Pacho Ramos +banshee-2.2.0-r1.ebuild, + +files/banshee-2.2.0-fix-equalizer-values.patch, -banshee-2.0.1.ebuild, + -banshee-2.2.0.ebuild, -files/banshee-2.0.1-audiocd-metadata.patch, + -files/banshee-2.0.1-musicbrainz-useragent-fixes.patch, + -files/banshee-2.0.1-musicbrainz-useragent.patch: + Add a fix for smiley face curve equalizer, drop old. 20 Oct 2011; Pacho Ramos banshee-2.2.0.ebuild: soundmenu needs a properly maintained and updated indicate-sharp, disabling diff --git a/media-sound/banshee/Manifest b/media-sound/banshee/Manifest index 1ee0db6d2fc8..6e98758d67bc 100644 --- a/media-sound/banshee/Manifest +++ b/media-sound/banshee/Manifest @@ -2,21 +2,17 @@ Hash: SHA1 AUX banshee-1.7.4-make-webkit-optional.patch 2151 RMD160 70ad41d04763a5023f9863809f3e35c77f103ada SHA1 6acad219469ee67ada7a89508fb639922db12e22 SHA256 5f5ceea4e09dd9f9dca776b9775d6998faa641c7daa8968241b9bbddd6f72ecf -AUX banshee-2.0.1-audiocd-metadata.patch 1750 RMD160 da6936171366c1798854b8518e1d781f6a9e8c0f SHA1 3ea5c4b3548b651fb19aaaa98dc10165e6f7d9ab SHA256 3078c2e85cc4a4c550b28c5ea5a9da7c4daf8c78327fdccad9a80c20ba153b3c -AUX banshee-2.0.1-musicbrainz-useragent-fixes.patch 1582 RMD160 dbcebdfd5097913abcd8b4d1dfaa2617c1c19cf4 SHA1 4d5c9ad3ef7559dc1d0ee6e2459e76bb54282852 SHA256 840af69f4210d9885022b3d258ccacec39046dd3f2c1365907157e4bcf2ad098 -AUX banshee-2.0.1-musicbrainz-useragent.patch 1647 RMD160 1556834e0d6e2ceec7782e36ec5fb1471ba2d485 SHA1 86074f2ecfee521aa8714f33ba9e7256098028cc SHA256 d033b0c9a491d5dba03e31370529f0668651ec7e1c2f03c228d1820ba2a77497 +AUX banshee-2.2.0-fix-equalizer-values.patch 1385 RMD160 086766a26e01a7cdb078bca1e10110b939bf9301 SHA1 358e8d458187d2a98fdaacdcb3af6b11426a1482 SHA256 23752f3da13c3b87d378a8fb7b42a6c1b3062f12432f74da8f80427b71434f08 DIST banshee-2.0.0.tar.bz2 3575359 RMD160 11ef5f5773761546dbb1f33c9fdb09658dad171c SHA1 2b67fda2a15aa7eb5bc2a1e88f7013f3896913a4 SHA256 c6618d551556e1b994b16cc46bb5b4597b707e6c2dfda691ee852e0d1f544916 -DIST banshee-2.0.1.tar.bz2 3635807 RMD160 30b307b229a31a5c180791f89143932d73bc2298 SHA1 6167814da2f1b07e08b40a9a3fd116a6d7e4e164 SHA256 9812820c3c6eca523ed58873bb8c911f287ffce7c2925110511cbf6f5fde9c74 DIST banshee-2.2.0.tar.xz 3069044 RMD160 b36900677265a4cf4264501e4c0f6a385189cb51 SHA1 08a1b28688cf545512fae039cef7555a8e3ac8e9 SHA256 85026f270777be15b778a8bf676d2c6e1a0d3d9758145515809bf209f7ab1815 EBUILD banshee-2.0.0.ebuild 4033 RMD160 ecb18238d758bcc72c864f60badfa4ee4def2cea SHA1 b8d87c7cf2960f371cf87edda59ca28d05e6e282 SHA256 471ac04fb111990e196c4350b310132d9372e24d8d2b8778a6cad4cbb2d21c5b -EBUILD banshee-2.0.1.ebuild 4370 RMD160 cbce0c3a17cb7e940d12319ff385ff8b57c349a0 SHA1 e1ba9ef3a0f31da8dc19cb6cf4f765fa5b186430 SHA256 9b10d29efa829a024b19faba62ca71036c2ab518381ce3d9a2a235e8ed1290ee -EBUILD banshee-2.2.0.ebuild 3780 RMD160 67d30d2b7c4220b603410f48c9f1b2385ab9a9e1 SHA1 c8ea99ba70af79c2f764b4f80fbfbbb62fbde577 SHA256 b9614eb8ea83939799f6989d658280311ba3d2a027397d70d466cabe935646ac -MISC ChangeLog 26192 RMD160 c22adc218d3c92e568da7d3d151bc3e59a08416b SHA1 ae2a00edbc13c475e4600dbefe14c8f51a6a57d1 SHA256 ab329fb8d05b355fd343634a2c9ef8ff773e88bbeead5ff8edf92803783f5b55 +EBUILD banshee-2.2.0-r1.ebuild 3920 RMD160 419b2046e4af573281ec6e1b6edb54ca7d72c315 SHA1 24f0d37bec8eb3cdcf0f885b81a8557a92647754 SHA256 cf25347fc69f81bdc96b4546315f27792266c2963be9d0852e0c5ccca3dce92b +MISC ChangeLog 26607 RMD160 88f0670af993b39040e5b7deace0572a47fb054c SHA1 3059df3e1f849ad251fb025165c17fe95b248908 SHA256 e5f2cb8775967dbf51f248f2848717b5b9caaaa15b330b4740a4290f67448ce0 MISC metadata.xml 716 RMD160 a3ace5c3df28db2b8814cbbbddd3c684b1558a02 SHA1 98985189362dcfa52450c191b577d969055ae5cf SHA256 85cea10541f92ee15f7971df81dfe4f784290863c5d6c55eaf752da2cb2a12ee -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk6gprMACgkQCaWpQKGI+9ShGwCfaVNTIQiPKp0UuYDSqUPscJRk -uVcAn2pvVgK28kn75m8GjwmcNU8++mwu -=CRy9 +iEYEARECAAYFAk6v3eMACgkQCaWpQKGI+9R7oQCfU0YhFaIImIQkv4eGBG7JOHK1 +HBEAniHCnqSYzgFJ2PVV4kbYKIf7VK81 +=5mrL -----END PGP SIGNATURE----- diff --git a/media-sound/banshee/banshee-2.0.1.ebuild b/media-sound/banshee/banshee-2.0.1.ebuild deleted file mode 100644 index bb226e862948..000000000000 --- a/media-sound/banshee/banshee-2.0.1.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-2.0.1.ebuild,v 1.1 2011/07/08 16:41:18 pacho Exp $ - -EAPI="4" - -inherit eutils autotools mono gnome2-utils fdo-mime versionator - -GVER=0.10.7 - -DESCRIPTION="Import, organize, play, and share your music using a simple and powerful interface." -HOMEPAGE="http://banshee.fm/" - -#BANSHEE_V2=$(get_version_component_range 2) -#[[ $((${BANSHEE_V2} % 2)) -eq 0 ]] && RELTYPE=stable || RELTYPE=unstable -#SRC_URI="http://download.banshee-project.org/${PN}/${RELTYPE}/${PV}/${PN}-1-${PV}.tar.bz2" -SRC_URI="http://download.banshee-project.org/${PN}/stable/${PV}/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+aac +cdda boo daap doc +encode ipod karma mtp podcast test udev +web youtube" - -RDEPEND=">=dev-lang/mono-2.4.3 - gnome-base/gnome-settings-daemon - x11-themes/gnome-icon-theme - sys-apps/dbus - >=dev-dotnet/gtk-sharp-2.12:2 - >=dev-dotnet/gconf-sharp-2.24.0:2 - >=dev-dotnet/notify-sharp-0.4.0_pre20080912-r1 - >=media-libs/gstreamer-0.10.21-r3:0.10 - >=media-libs/gst-plugins-base-0.10.25.2:0.10 - >=media-libs/gst-plugins-bad-${GVER} - >=media-libs/gst-plugins-good-${GVER}:0.10 - >=media-libs/gst-plugins-ugly-${GVER}:0.10 - >=media-plugins/gst-plugins-meta-0.10-r2:0.10 - >=media-plugins/gst-plugins-gnomevfs-${GVER}:0.10 - >=media-plugins/gst-plugins-gconf-${GVER}:0.10 - cdda? ( - || ( - >=media-plugins/gst-plugins-cdparanoia-${GVER}:0.10 - >=media-plugins/gst-plugins-cdio-${GVER}:0.10 - ) - ) - media-libs/musicbrainz:1 - >=dev-dotnet/ndesk-dbus-glib-0.4.1 - >=dev-dotnet/ndesk-dbus-0.6.1a - >=dev-dotnet/mono-addins-0.4[gtk] - >=dev-dotnet/taglib-sharp-2.0.3.7 - >=dev-db/sqlite-3.4:3 - karma? ( >=media-libs/libkarma-0.1.0-r1 ) - aac? ( >=media-plugins/gst-plugins-faad-${GVER}:0.10 ) - boo? ( - >=dev-lang/boo-0.8.1 - ) - daap? ( - >=dev-dotnet/mono-zeroconf-0.8.0-r1 - ) - doc? ( - virtual/monodoc - >=app-text/gnome-doc-utils-0.17.3 - ) - encode? ( - >=media-plugins/gst-plugins-lame-${GVER}:0.10 - >=media-plugins/gst-plugins-taglib-${GVER}:0.10 - ) - ipod? ( - >=media-libs/libgpod-0.7.95[mono] - ) - mtp? ( - >=media-libs/libmtp-0.3.0 - ) - web? ( - >=net-libs/webkit-gtk-1.2.2:2 - >=net-libs/libsoup-2.26:2.4 - >=net-libs/libsoup-gnome-2.26:2.4 - ) - youtube? ( - >=dev-dotnet/google-gdata-sharp-1.4 - ) - udev? ( - dev-dotnet/gudev-sharp - dev-dotnet/gkeyfile-sharp - dev-dotnet/gtk-sharp-beans - dev-dotnet/gio-sharp - )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -DOCS="AUTHORS ChangeLog HACKING NEWS README" - -src_prepare () { - # MusicBrainz: Allow specifying a UserAgent - epatch "${FILESDIR}/${P}-musicbrainz-useragent.patch" - - # Set UserAgent when doing MusicBrainz queries (bgo#649401) - epatch "${FILESDIR}/${P}-musicbrainz-useragent-fixes.patch" - - # AudioCd: Fix metadata fetching with multiple results (bgo#587264) - epatch "${FILESDIR}/${P}-audiocd-metadata.patch" - - epatch "${FILESDIR}/${PN}-1.7.4-make-webkit-optional.patch" # upstream bug 628518 - AT_M4DIR="-I build/m4/banshee -I build/m4/shamrock -I build/m4/shave" \ - eautoreconf -} - -src_configure() { - local myconf="--disable-dependency-tracking - --disable-static - --enable-gnome - --enable-schemas-install - --with-gconf-schema-file-dir=/etc/gconf/schemas - --with-vendor-build-id=Gentoo/${PN}/${PVR} - --enable-gapless-playback - --disable-gst-sharp - --disable-hal - --disable-torrent - --disable-shave - --disable-ubuntuone - --enable-soundmenu" - - econf \ - $(use_enable doc docs) \ - $(use_enable doc user-help) \ - $(use_enable boo) \ - $(use_enable mtp) \ - $(use_enable daap) \ - $(use_enable ipod appledevice) --disable-ipod \ - $(use_enable podcast) \ - $(use_enable karma) \ - $(use_enable web webkit) \ - $(use_enable youtube) \ - $(use_enable udev gio) \ - $(use_enable udev gio_hardware) \ - ${myconf} -} - -src_compile() { - emake MCS=/usr/bin/gmcs -} - -src_install() { - emake DESTDIR="${D}" install - find "${ED}" -name '*.la' -exec rm -f {} + -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - ewarn - ewarn "If ${PN} doesn't play some format, please check your" - ewarn "USE flags on media-plugins/gst-plugins-meta" - ewarn - - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update -} diff --git a/media-sound/banshee/banshee-2.2.0.ebuild b/media-sound/banshee/banshee-2.2.0-r1.ebuild similarity index 95% rename from media-sound/banshee/banshee-2.2.0.ebuild rename to media-sound/banshee/banshee-2.2.0-r1.ebuild index bc0ecb65979c..502a81075c80 100644 --- a/media-sound/banshee/banshee-2.2.0.ebuild +++ b/media-sound/banshee/banshee-2.2.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-2.2.0.ebuild,v 1.2 2011/10/20 22:54:37 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-2.2.0-r1.ebuild,v 1.1 2011/11/01 11:54:05 pacho Exp $ EAPI="4" @@ -87,6 +87,9 @@ DEPEND="${RDEPEND} DOCS="AUTHORS ChangeLog HACKING NEWS README" src_prepare () { + # EqualizerManager: Update values for the Smiley Face preset (bgo#661224) + epatch "${FILESDIR}/${PN}-2.2.0-fix-equalizer-values.patch" + epatch "${FILESDIR}/${PN}-1.7.4-make-webkit-optional.patch" # upstream bug 628518 AT_M4DIR="-I build/m4/banshee -I build/m4/shamrock -I build/m4/shave" \ eautoreconf diff --git a/media-sound/banshee/files/banshee-2.0.1-audiocd-metadata.patch b/media-sound/banshee/files/banshee-2.0.1-audiocd-metadata.patch deleted file mode 100644 index b465b70a381f..000000000000 --- a/media-sound/banshee/files/banshee-2.0.1-audiocd-metadata.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d6274af6f2a0240d16854b9c78a0175bada255ec Mon Sep 17 00:00:00 2001 -From: Bertrand Lorentz -Date: Sat, 28 May 2011 14:21:20 +0000 -Subject: AudioCd: Fix metadata fetching with multiple results (bgo#587264) - -When looking for CD metadata on MusicBrainz, we were looking for a -perfect match: only one release with a score of 100. If the search -returned more than one result with a score of 100, we would reject all -results. -MusicBrainz recently started to return multiple releases much more -often, causing our metadata fetching to fail quite a lot. - -We now use the first result if it has a score of 100, ignoring any other -results. - -This also fixes a NRE when no results were found. ---- -diff --git a/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs b/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs -index 51a35d0..2e7a7db 100644 ---- a/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs -+++ b/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs -@@ -123,10 +123,15 @@ namespace Banshee.AudioCd - - OnMetadataQueryStarted (mb_disc); - -- Release release = Release.Query (mb_disc).PerfectMatch (); -+ Release release = Release.Query (mb_disc).First (); - -+ if (release == null || release.Score < 100) { -+ OnMetadataQueryFinished (false); -+ return; -+ } -+ - var tracks = release.GetTracks (); -- if (release == null || tracks.Count != Count) { -+ if (tracks.Count != Count) { - OnMetadataQueryFinished (false); - return; - } --- -cgit v0.9 diff --git a/media-sound/banshee/files/banshee-2.0.1-musicbrainz-useragent-fixes.patch b/media-sound/banshee/files/banshee-2.0.1-musicbrainz-useragent-fixes.patch deleted file mode 100644 index b0a836e77f98..000000000000 --- a/media-sound/banshee/files/banshee-2.0.1-musicbrainz-useragent-fixes.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 727355c16234603734e33c16b713ccfffbcef972 Mon Sep 17 00:00:00 2001 -From: Gabriel Burt -Date: Wed, 04 May 2011 21:05:00 +0000 -Subject: Set UserAgent when doing MusicBrainz queries (bgo#649401) - -Our Audio CD metadata lookup and coverart lookup that depend on MB were -broken without this. ---- -diff --git a/src/Core/Banshee.Services/Banshee.Metadata.MusicBrainz/MusicBrainzQueryJob.cs b/src/Core/Banshee.Services/Banshee.Metadata.MusicBrainz/MusicBrainzQueryJob.cs -index 7dc9248..490bd34 100644 ---- a/src/Core/Banshee.Services/Banshee.Metadata.MusicBrainz/MusicBrainzQueryJob.cs -+++ b/src/Core/Banshee.Services/Banshee.Metadata.MusicBrainz/MusicBrainzQueryJob.cs -@@ -83,6 +83,7 @@ namespace Banshee.Metadata.MusicBrainz - public MusicBrainzQueryJob (IBasicTrackInfo track) - { - Track = track; -+ MusicBrainzService.UserAgent = Banshee.Web.Browser.UserAgent; - } - - public override void Run () -diff --git a/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs b/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs -index 24b6972..51a35d0 100644 ---- a/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs -+++ b/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs -@@ -74,6 +74,8 @@ namespace Banshee.AudioCd - { - this.volume = volume; - disc_title = Catalog.GetString ("Audio CD"); -+ -+ MusicBrainzService.UserAgent = Banshee.Web.Browser.UserAgent; - } - - public void NotifyUpdated () --- -cgit v0.9 diff --git a/media-sound/banshee/files/banshee-2.0.1-musicbrainz-useragent.patch b/media-sound/banshee/files/banshee-2.0.1-musicbrainz-useragent.patch deleted file mode 100644 index c0a681b11888..000000000000 --- a/media-sound/banshee/files/banshee-2.0.1-musicbrainz-useragent.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7e756d97b13be1301c487375a5589060a8befb76 Mon Sep 17 00:00:00 2001 -From: Gabriel Burt -Date: Wed, 04 May 2011 21:03:32 +0000 -Subject: MusicBrainz: Allow specifying a UserAgent - -MB now requires a UserAgent to be set. This change will let Banshee set -one. ---- -diff --git a/src/Libraries/MusicBrainz/MusicBrainz/MusicBrainzObject.cs b/src/Libraries/MusicBrainz/MusicBrainz/MusicBrainzObject.cs -index 1a2732a..d83261e 100644 ---- a/src/Libraries/MusicBrainz/MusicBrainz/MusicBrainzObject.cs -+++ b/src/Libraries/MusicBrainz/MusicBrainz/MusicBrainzObject.cs -@@ -389,7 +389,8 @@ namespace MusicBrainz - if (min_interval > time) - Thread.Sleep ((min_interval - time).Milliseconds); - -- WebRequest request = WebRequest.Create (url); -+ var request = WebRequest.Create (url) as HttpWebRequest; -+ request.UserAgent = MusicBrainzService.UserAgent; - if (cache_implemented == null) { - try { - request.CachePolicy = MusicBrainzService.CachePolicy; -diff --git a/src/Libraries/MusicBrainz/MusicBrainz/MusicBrainzService.cs b/src/Libraries/MusicBrainz/MusicBrainz/MusicBrainzService.cs -index 5e860db..f868e2b 100644 ---- a/src/Libraries/MusicBrainz/MusicBrainz/MusicBrainzService.cs -+++ b/src/Libraries/MusicBrainz/MusicBrainz/MusicBrainzService.cs -@@ -36,6 +36,8 @@ namespace MusicBrainz - } - } - -+ public static string UserAgent { get; set; } -+ - static RequestCachePolicy cache_policy; - public static RequestCachePolicy CachePolicy { - get { return cache_policy; } --- -cgit v0.9 diff --git a/media-sound/banshee/files/banshee-2.2.0-fix-equalizer-values.patch b/media-sound/banshee/files/banshee-2.2.0-fix-equalizer-values.patch new file mode 100644 index 000000000000..074163768a41 --- /dev/null +++ b/media-sound/banshee/files/banshee-2.2.0-fix-equalizer-values.patch @@ -0,0 +1,24 @@ +From 705b1767b5767c7c734cb69cfdea468553978935 Mon Sep 17 00:00:00 2001 +From: Pacho Ramos +Date: Sun, 09 Oct 2011 09:12:27 +0000 +Subject: EqualizerManager: Update values for the Smiley Face preset (bgo#661224) + +Signed-off-by: Bertrand Lorentz +--- +diff --git a/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs b/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs +index b379f5b..9effe5a 100644 +--- a/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs ++++ b/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs +@@ -291,8 +291,8 @@ namespace Banshee.Equalizer + yield return new EqualizerSetting (this, Catalog.GetString ("Ska"), -1.1, new [] { + -2.4, -4.8, -4, -1.1, 4, 5.6, 8.8, 9.6, 11.2, 9.6 + }); +- yield return new EqualizerSetting (this, Catalog.GetString ("Smiley Face Curve"), -7.1, new [] { +- 11.9, 8.1, 6.2, 3.1, 0.7, -0.1, 3, 5.7, 8.4, 11.9 ++ yield return new EqualizerSetting (this, Catalog.GetString ("Smiley Face Curve"), -7, new [] { ++ 12, 8, 6, 3, 0.0, 0.0, 3, 6, 8, 12 + }); + yield return new EqualizerSetting (this, Catalog.GetString ("Soft"), -1.1, new [] { + 4.8, 1.6, -1.1, -2.4, -1.1, 4, 8, 9.6, 11.2, 12, +-- +cgit v0.9.0.2