From: Diego Elio Pettenò Date: Thu, 30 Nov 2006 13:21:46 +0000 (+0000) Subject: Add patch to fix Last.FM playback with xine-lib 1.1.3. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5d472a79e0c2cfb884f0783cd3ebee60790325af;p=gentoo.git Add patch to fix Last.FM playback with xine-lib 1.1.3. Package-Manager: portage-2.1.2_rc2-r3 --- diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog index c1624db3fa0f..255b92976b97 100644 --- a/media-sound/amarok/ChangeLog +++ b/media-sound/amarok/ChangeLog @@ -1,6 +1,12 @@ # 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.180 2006/11/29 13:41:31 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.181 2006/11/30 13:21:46 flameeyes Exp $ + +*amarok-1.4.4-r2 (30 Nov 2006) + + 30 Nov 2006; Diego Pettenò + +files/amarok-1.4.4-lastfm+xine-lib-1.1.3.patch, +amarok-1.4.4-r2.ebuild: + Add patch to fix Last.FM playback with xine-lib 1.1.3. *amarok-1.4.4-r1 (29 Nov 2006) diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest index f9458a9299ab..a8e0dda1643e 100644 --- a/media-sound/amarok/Manifest +++ b/media-sound/amarok/Manifest @@ -9,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-lastfm+xine-lib-1.1.3.patch 1204 RMD160 f6b2fcd7512a94943cca13865ba16cc400c3b73e SHA1 8b3fd4b7ff8d3705e8b995780b95edae0eaa7334 SHA256 6af69567fa879f4158bf1d8add56ee3c64a157674e344906b6c4689ce6c0f24c +MD5 a6f6df181f4cc032a9d53057a94692c4 files/amarok-1.4.4-lastfm+xine-lib-1.1.3.patch 1204 +RMD160 f6b2fcd7512a94943cca13865ba16cc400c3b73e files/amarok-1.4.4-lastfm+xine-lib-1.1.3.patch 1204 +SHA256 6af69567fa879f4158bf1d8add56ee3c64a157674e344906b6c4689ce6c0f24c files/amarok-1.4.4-lastfm+xine-lib-1.1.3.patch 1204 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 @@ -31,14 +35,18 @@ EBUILD amarok-1.4.4-r1.ebuild 2292 RMD160 20b42210c88ec8c2a6621381a0747499969688 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-r2.ebuild 2338 RMD160 7c76c9c3f39eecad762a491743f5f096f203d882 SHA1 b2867827f4940debdebd86f7969d04c0d8b729f5 SHA256 ac0e92f8380d69c33b8da69b020f2c0bcd7235cdf95c46f37b4ae9c6450c9d84 +MD5 7778c6de18ecb8196b6e835e162b862f amarok-1.4.4-r2.ebuild 2338 +RMD160 7c76c9c3f39eecad762a491743f5f096f203d882 amarok-1.4.4-r2.ebuild 2338 +SHA256 ac0e92f8380d69c33b8da69b020f2c0bcd7235cdf95c46f37b4ae9c6450c9d84 amarok-1.4.4-r2.ebuild 2338 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 29482 RMD160 067f12475f58efb702e34ccc20ff23dbbaea1b0e SHA1 2871c53249eac412abb956dabfad78c44cd3ac90 SHA256 9510f451847d18f1bf8efa4c10d4903d73b858c8b9a5ad74c641ec0e5545e058 -MD5 8af2e45ba98e3fec43391490565b2b65 ChangeLog 29482 -RMD160 067f12475f58efb702e34ccc20ff23dbbaea1b0e ChangeLog 29482 -SHA256 9510f451847d18f1bf8efa4c10d4903d73b858c8b9a5ad74c641ec0e5545e058 ChangeLog 29482 +MISC ChangeLog 29701 RMD160 90ca7eb807cbc3be6b882d426e21494301afb3a8 SHA1 da5332865678cae1fc8a13734d5ecf9022839047 SHA256 d533782f659cb92787f74c89a4a91f247a9a02fb22d205684779678feaf50584 +MD5 2ba3f79f23f33b18d5efe705874007e2 ChangeLog 29701 +RMD160 90ca7eb807cbc3be6b882d426e21494301afb3a8 ChangeLog 29701 +SHA256 d533782f659cb92787f74c89a4a91f247a9a02fb22d205684779678feaf50584 ChangeLog 29701 MISC metadata.xml 266 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e SHA1 d41658ffae344562e8579d219bd3f746d4cba624 SHA256 c2f316075bb660460a285a5474235615f5946bb47df6e6f0c9c4de9ed64edf26 MD5 986cc6d7e9a21474e34336045796ffaa metadata.xml 266 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e metadata.xml 266 @@ -52,10 +60,13 @@ SHA256 f64c0ac76dac35f78b85d46ff97aa000a0ccdeedac69dfc7f0259c28fb81acac files/di 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 +MD5 9f156ab461bfba79010fb33bc4ad4fe5 files/digest-amarok-1.4.4-r2 247 +RMD160 29ee4c16ee0ddf9601876f19a0d5da8363bc2bab files/digest-amarok-1.4.4-r2 247 +SHA256 f64c0ac76dac35f78b85d46ff97aa000a0ccdeedac69dfc7f0259c28fb81acac files/digest-amarok-1.4.4-r2 247 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFbY4UAiZjviIA2XgRAsdyAJ0f3EF7wbmOrS0WVLT3bYorDEgR+gCffP6N -MA95rczz97l46KWqlYUc0O8= -=GEUF +iD8DBQFFbtr8AiZjviIA2XgRAlS3AKCSGQCpTqF8s/nx4HocWJLR4IHMEACeJOgX +VhuRMnVdWX3gkEgwQ+Yd9Hs= +=2YTk -----END PGP SIGNATURE----- diff --git a/media-sound/amarok/amarok-1.4.4-r2.ebuild b/media-sound/amarok/amarok-1.4.4-r2.ebuild new file mode 100644 index 000000000000..e843b93d13d2 --- /dev/null +++ b/media-sound/amarok/amarok-1.4.4-r2.ebuild @@ -0,0 +1,81 @@ +# 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-r2.ebuild,v 1.1 2006/11/30 13:21:46 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 + ${FILESDIR}/${P}-lastfm+xine-lib-1.1.3.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-lastfm+xine-lib-1.1.3.patch b/media-sound/amarok/files/amarok-1.4.4-lastfm+xine-lib-1.1.3.patch new file mode 100644 index 000000000000..fde2e41bd301 --- /dev/null +++ b/media-sound/amarok/files/amarok-1.4.4-lastfm+xine-lib-1.1.3.patch @@ -0,0 +1,25 @@ +Index: amarok-1.4.4/amark/src/amarok_proxy.rb +=================================================================== +--- amarok-1.4.4/amarok/src/amarok_proxy.rb (revision 609364) ++++ amarok-1.4.4/amarok/src/amarok_proxy.rb (revision 609365) +@@ -117,6 +117,11 @@ + def cp_to_empty_outward( income, output ) + myputs "cp_to_empty_outward( income => #{income.inspect}, output => #{output.inspect}" + income.each_line do |data| ++ if data =~ /User-Agent: xine\/([0-9.]+)/ ++ version = $1.split(".").collect { |v| v.to_i } ++ myputs("Found xine user agent version #{version.join(".")}") ++ @xineworkaround = ( version[0] <= 1 && version[1] <= 1 && version[2] <= 2 ) ++ end + myputs( data ) + data.chomp! + safe_write( output, data ) +@@ -142,7 +147,7 @@ + + def cp_all_inward( income, output ) + myputs( "cp_all( income => #{income.inspect}, output => #{output.inspect}" ) +- if self.is_a?( LastFM ) and @engine == 'xine-engine' ++ if self.is_a?( LastFM ) and @xineworkaround + myputs( "Using buffer fill workaround." ) + filler = Array.new( 4096, 0 ) + safe_write( output, filler ) # HACK: Fill xine's buffer so that xine_open() won't block diff --git a/media-sound/amarok/files/digest-amarok-1.4.4-r2 b/media-sound/amarok/files/digest-amarok-1.4.4-r2 new file mode 100644 index 000000000000..9f4ed3ac99e9 --- /dev/null +++ b/media-sound/amarok/files/digest-amarok-1.4.4-r2 @@ -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