From 5b2ebde9aafd4075e7f9e0e48416903d373cd0d2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Wed, 29 Nov 2006 13:41:31 +0000 Subject: [PATCH] Add patch to fix musicbrainz support, and add the useflag back now that it does work when cancelling. Package-Manager: portage-2.1.2_rc2-r2 --- media-sound/amarok/ChangeLog | 9 ++- media-sound/amarok/Manifest | 29 ++++++- media-sound/amarok/amarok-1.4.4-r1.ebuild | 80 +++++++++++++++++++ .../files/amarok-1.4.4-musicbrainz.patch | 12 +++ .../amarok/files/digest-amarok-1.4.4-r1 | 3 + 5 files changed, 128 insertions(+), 5 deletions(-) create mode 100644 media-sound/amarok/amarok-1.4.4-r1.ebuild create mode 100644 media-sound/amarok/files/amarok-1.4.4-musicbrainz.patch create mode 100644 media-sound/amarok/files/digest-amarok-1.4.4-r1 diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog index 32f7316b2304..c1624db3fa0f 100644 --- a/media-sound/amarok/ChangeLog +++ b/media-sound/amarok/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-sound/amarok # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.179 2006/11/23 17:40:51 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.180 2006/11/29 13:41:31 flameeyes Exp $ + +*amarok-1.4.4-r1 (29 Nov 2006) + + 29 Nov 2006; Diego Pettenò + +files/amarok-1.4.4-musicbrainz.patch, +amarok-1.4.4-r1.ebuild: + Add patch to fix musicbrainz support, and add the useflag back now that it + does work when cancelling. 23 Nov 2006; Francesco Riosa amarok-1.4.3-r1.ebuild, amarok-1.4.4.ebuild: diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest index 4d0637ed77fd..f9458a9299ab 100644 --- a/media-sound/amarok/Manifest +++ b/media-sound/amarok/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX amarok-1.4.3-playlist-encoding.patch 365 RMD160 5add54202bcc34ad1d695b938c075dd030bf6705 SHA1 9d2eacaf4d8f35cf88e3a2358258ca83c1d35fee SHA256 71ac78fbac11d404017ab1c9a942b0b72ac24638739498ca6f761298a906b11d MD5 0e211053265ad86a0f6656c07463b43a files/amarok-1.4.3-playlist-encoding.patch 365 RMD160 5add54202bcc34ad1d695b938c075dd030bf6705 files/amarok-1.4.3-playlist-encoding.patch 365 @@ -6,6 +9,10 @@ AUX amarok-1.4.4-asneeded.patch 913 RMD160 741f0922030462bc532dfc9936e6ba5feb5e5 MD5 b62b6de4b6c4fd25c70ef2578b32d37a files/amarok-1.4.4-asneeded.patch 913 RMD160 741f0922030462bc532dfc9936e6ba5feb5e5f46 files/amarok-1.4.4-asneeded.patch 913 SHA256 578181192829e82892ab75ae0944f8547bf35e0d203a46c8ad2a111bd33bcb30 files/amarok-1.4.4-asneeded.patch 913 +AUX amarok-1.4.4-musicbrainz.patch 689 RMD160 29603a73a4f3b7b95763fe4aadb5840b8c2dad53 SHA1 89ddce92308186f7544e8dc7c12b9211eed13a5f SHA256 bcfdc90e0ec0f22816ed6a7777a507b0368f1bd3cf949207488ed416b452a864 +MD5 e9751b4bc77b342662cdd9c9191ee058 files/amarok-1.4.4-musicbrainz.patch 689 +RMD160 29603a73a4f3b7b95763fe4aadb5840b8c2dad53 files/amarok-1.4.4-musicbrainz.patch 689 +SHA256 bcfdc90e0ec0f22816ed6a7777a507b0368f1bd3cf949207488ed416b452a864 files/amarok-1.4.4-musicbrainz.patch 689 AUX amarok-1.4.4-podcast-fix.patch 1149 RMD160 f2c7a47f36bd06788ffefa697a0b5264933a0b49 SHA1 72ab2f91b307e1bf7274b17e8ebdb35eb7a84114 SHA256 b595d0009d7c60e1631004348b3ceadcb8539e69ef83573d02b2547b9ad4bfe4 MD5 78734806316aa6acc2b742334cfdadfd files/amarok-1.4.4-podcast-fix.patch 1149 RMD160 f2c7a47f36bd06788ffefa697a0b5264933a0b49 files/amarok-1.4.4-podcast-fix.patch 1149 @@ -20,14 +27,18 @@ EBUILD amarok-1.4.3-r1.ebuild 2101 RMD160 5b7fe84275fb2a82c0fe57bfc69dd9e328c89e MD5 3b1d014c5ece65e1cccca4200f37a54b amarok-1.4.3-r1.ebuild 2101 RMD160 5b7fe84275fb2a82c0fe57bfc69dd9e328c89e93 amarok-1.4.3-r1.ebuild 2101 SHA256 c292d18ebaa672369f9cc2431fc6665f27fd1e365fe3e43d905a204dea28216f amarok-1.4.3-r1.ebuild 2101 +EBUILD amarok-1.4.4-r1.ebuild 2292 RMD160 20b42210c88ec8c2a6621381a074749996968876 SHA1 26985a395c0b1ed68f0eca4155a557c6f4d67f85 SHA256 4d6d98266bfc06d4247c36db4931b28958be684ed7147ebb9ced79ee74eea7b4 +MD5 cabdd03388186d985b4451b02aae46e1 amarok-1.4.4-r1.ebuild 2292 +RMD160 20b42210c88ec8c2a6621381a074749996968876 amarok-1.4.4-r1.ebuild 2292 +SHA256 4d6d98266bfc06d4247c36db4931b28958be684ed7147ebb9ced79ee74eea7b4 amarok-1.4.4-r1.ebuild 2292 EBUILD amarok-1.4.4.ebuild 2215 RMD160 8199dca69ca68a0ec2223d198a08fa558568dd11 SHA1 e6a135fc0756781885e096bb930d493ea5eb4a4d SHA256 a98c2b0f4dd378b626be255f44e458720aa1245473ba709bb3865e4552cd4a0d MD5 d47f708aa6a827e0d6241a0d9daee811 amarok-1.4.4.ebuild 2215 RMD160 8199dca69ca68a0ec2223d198a08fa558568dd11 amarok-1.4.4.ebuild 2215 SHA256 a98c2b0f4dd378b626be255f44e458720aa1245473ba709bb3865e4552cd4a0d amarok-1.4.4.ebuild 2215 -MISC ChangeLog 29219 RMD160 f2d40c81e67aaffea096fa6a4296e60ed9a79c86 SHA1 9449183d35034429567f3105a6ba14f1e18171ea SHA256 5d7491cdd781ab58a8a41404bc969e0e2d95176a68437dcc1502f5981449f5f9 -MD5 da9f2235f7a506497b8d9d06559725f6 ChangeLog 29219 -RMD160 f2d40c81e67aaffea096fa6a4296e60ed9a79c86 ChangeLog 29219 -SHA256 5d7491cdd781ab58a8a41404bc969e0e2d95176a68437dcc1502f5981449f5f9 ChangeLog 29219 +MISC ChangeLog 29482 RMD160 067f12475f58efb702e34ccc20ff23dbbaea1b0e SHA1 2871c53249eac412abb956dabfad78c44cd3ac90 SHA256 9510f451847d18f1bf8efa4c10d4903d73b858c8b9a5ad74c641ec0e5545e058 +MD5 8af2e45ba98e3fec43391490565b2b65 ChangeLog 29482 +RMD160 067f12475f58efb702e34ccc20ff23dbbaea1b0e ChangeLog 29482 +SHA256 9510f451847d18f1bf8efa4c10d4903d73b858c8b9a5ad74c641ec0e5545e058 ChangeLog 29482 MISC metadata.xml 266 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e SHA1 d41658ffae344562e8579d219bd3f746d4cba624 SHA256 c2f316075bb660460a285a5474235615f5946bb47df6e6f0c9c4de9ed64edf26 MD5 986cc6d7e9a21474e34336045796ffaa metadata.xml 266 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e metadata.xml 266 @@ -38,3 +49,13 @@ SHA256 30a763884b75f16b9a733b1eeb468f2316f2b6ae1e7500459463fee5cbd94493 files/di MD5 9f156ab461bfba79010fb33bc4ad4fe5 files/digest-amarok-1.4.4 247 RMD160 29ee4c16ee0ddf9601876f19a0d5da8363bc2bab files/digest-amarok-1.4.4 247 SHA256 f64c0ac76dac35f78b85d46ff97aa000a0ccdeedac69dfc7f0259c28fb81acac files/digest-amarok-1.4.4 247 +MD5 9f156ab461bfba79010fb33bc4ad4fe5 files/digest-amarok-1.4.4-r1 247 +RMD160 29ee4c16ee0ddf9601876f19a0d5da8363bc2bab files/digest-amarok-1.4.4-r1 247 +SHA256 f64c0ac76dac35f78b85d46ff97aa000a0ccdeedac69dfc7f0259c28fb81acac files/digest-amarok-1.4.4-r1 247 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iD8DBQFFbY4UAiZjviIA2XgRAsdyAJ0f3EF7wbmOrS0WVLT3bYorDEgR+gCffP6N +MA95rczz97l46KWqlYUc0O8= +=GEUF +-----END PGP SIGNATURE----- diff --git a/media-sound/amarok/amarok-1.4.4-r1.ebuild b/media-sound/amarok/amarok-1.4.4-r1.ebuild new file mode 100644 index 000000000000..d5bc8e111c38 --- /dev/null +++ b/media-sound/amarok/amarok-1.4.4-r1.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.4-r1.ebuild,v 1.1 2006/11/29 13:41:31 flameeyes Exp $ + +LANGS="af ar az bg br ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it +ja ka km ko lt ms nb nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta tg +th tr uk uz zh_CN zh_TW" +LANGS_DOC="da de es et fr it nl pl pt pt_BR ru sv" + +USE_KEG_PACKAGING=1 + +inherit kde eutils flag-o-matic + +PKG_SUFFIX="" + +MY_P="${P/_/-}" +S="${WORKDIR}/${P/_/-}" + +DESCRIPTION="Advanced audio player based on KDE framework." +HOMEPAGE="http://amarok.kde.org/" + +SRC_URI="mirror://kde/stable/amarok/${PV}/src/${MY_P}.tar.bz2" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x86-fbsd" +IUSE="aac kde mysql noamazon opengl postgres +visualization ipod ifp real njb mtp musicbrainz" +# kde: enables compilation of the konqueror sidebar plugin + +DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) ) + >=media-libs/xine-lib-1.1.2_pre20060328-r8 + >=media-libs/taglib-1.4 + mysql? ( >=virtual/mysql-4.0 ) + postgres? ( dev-db/postgresql ) + opengl? ( virtual/opengl ) + visualization? ( media-libs/libsdl + =media-plugins/libvisual-plugins-0.4* ) + ipod? ( >=media-libs/libgpod-0.3 ) + aac? ( media-libs/libmp4v2 ) + ifp? ( media-libs/libifp ) + real? ( media-video/realplayer ) + njb? ( >=media-libs/libnjb-2.2.4 ) + mtp? ( media-libs/libmtp ) + musicbrainz? ( media-libs/tunepimp ) + =dev-lang/ruby-1.8*" + +RDEPEND="${DEPEND}" + +DEPEND="${DEPEND} + >=dev-util/pkgconfig-0.9.0" + +need-kde 3.3 + +PATCHES="${FILESDIR}/${P}-podcast-fix.patch + ${FILESDIR}/${P}-sparc.patch + ${FILESDIR}/${P}-asneeded.patch + ${FILESDIR}/${P}-musicbrainz.patch" + +src_compile() { + append-flags -fno-inline + + # Extra, unsupported engines are forcefully disabled. + local myconf="$(use_enable mysql) $(use_enable postgres postgresql) + $(use_with opengl) --without-xmms + $(use_with visualization libvisual) + $(use_enable !noamazon amazon) + $(use_with ipod libgpod) + $(use_with aac mp4v2) + $(use_with ifp) + $(use_with real helix) + $(use_with njb libnjb) + $(use_with mtp libmtp) + $(use_with musicbrainz) + --with-xine + --without-mas + --without-nmm" + + kde_src_compile +} diff --git a/media-sound/amarok/files/amarok-1.4.4-musicbrainz.patch b/media-sound/amarok/files/amarok-1.4.4-musicbrainz.patch new file mode 100644 index 000000000000..76af067cbb5f --- /dev/null +++ b/media-sound/amarok/files/amarok-1.4.4-musicbrainz.patch @@ -0,0 +1,12 @@ +Index: amarok-1.4.4/amarok/src/tagdialog.cpp +=================================================================== +--- amarok-1.4.4.orig/amarok/src/tagdialog.cpp ++++ amarok-1.4.4/amarok/src/tagdialog.cpp +@@ -286,6 +286,7 @@ TagDialog::musicbrainzQuery() //SLOT + m_mbTrack = m_bundle.url(); + KTRMLookup* ktrm = new KTRMLookup( m_mbTrack.path(), true ); + connect( ktrm, SIGNAL( sigResult( KTRMResultList, QString ) ), SLOT( queryDone( KTRMResultList, QString ) ) ); ++ connect( pushButton_cancel, SIGNAL(clicked()), ktrm, SLOT(deleteLater())); + + pushButton_musicbrainz->setEnabled( false ); + pushButton_musicbrainz->setText( i18n( "Generating audio fingerprint..." ) ); diff --git a/media-sound/amarok/files/digest-amarok-1.4.4-r1 b/media-sound/amarok/files/digest-amarok-1.4.4-r1 new file mode 100644 index 000000000000..9f4ed3ac99e9 --- /dev/null +++ b/media-sound/amarok/files/digest-amarok-1.4.4-r1 @@ -0,0 +1,3 @@ +MD5 56a9aec42088c338b81252f8e0651781 amarok-1.4.4.tar.bz2 17635707 +RMD160 61cd2748ce0111f4ba388a71e9504abb7362b0d7 amarok-1.4.4.tar.bz2 17635707 +SHA256 760d30337cb73c86b9298e5c2c9836b3a753c39805b54f75b1eea82c15e9a0ea amarok-1.4.4.tar.bz2 17635707 -- 2.26.2