Add patch from Markus Kaufhold in KDE bug #127388 to fix audiocd playing with xine engine.

(Portage version: 2.1_rc1-r1)

4 files changed, 109 insertions, 1 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index d19b691bfdfc..81717d4f28d9 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,14 @@
 # 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.134 2006/05/15 15:35:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.135 2006/05/15 21:35:03 flameeyes Exp $
+
+*amarok-1.4.0-r1 (15 May 2006)
+
+  15 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.4.0-audiocd.patch, -amarok-1.4.0.ebuild,
+  +amarok-1.4.0-r1.ebuild:
+  Add patch from Markus Kaufhold in KDE bug #127388 to fix audiocd playing
+  with xine engine.
 
   15 May 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-1.4.0.ebuild:
   Force usage of gentoo mirrors.
diff --git a/media-sound/amarok/amarok-1.4.0-r1.ebuild b/media-sound/amarok/amarok-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..248d282acd56
--- /dev/null
+++ b/media-sound/amarok/amarok-1.4.0-r1.ebuild
@@ -0,0 +1,84 @@
+# 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.0-r1.ebuild,v 1.1 2006/05/15 21:35:03 flameeyes Exp $
+
+LANGS="az bg br ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it ja km
+ko lt nb nl nn pa pl pt pt_BR ro ru rw sl sr sr@Latn sv ta tg th tr uk uz xx
+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_PV="${PV/_rc/_RC}"
+MY_PV="${MY_PV/_beta/-beta}${PKG_SUFFIX}"
+S="${WORKDIR}/${PN}-${MY_PV/_RC*/}"
+
+DESCRIPTION="amaroK - the audio player for KDE."
+HOMEPAGE="http://amarok.kde.org/"
+
+if [[ ${MY_PV} == ${MY_PV/_RC*/} ]]; then
+#	SRC_URI="mirror://sourceforge/amarok/${PN}-${MY_PV}.tar.bz2"
+	SRC_URI="mirror://gentoo/${PN}-${MY_PV}.tar.bz2"
+else
+	RESTRICT="nomirror"
+	SRC_URI="http://rokymotion.pwsp.net/nightly-builds/${MY_PV/_RC*/}/${PN}-${MY_PV}.tar.bz2"
+fi
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aac exscalibar flac kde mysql noamazon opengl postgres
+xmms visualization musicbrainz ipod ifp real"
+# kde: enables compilation of the konqueror sidebar plugin
+
+DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
+	>=media-libs/xine-lib-1_rc4
+	musicbrainz? ( >=media-libs/tunepimp-0.3 )
+	>=media-libs/taglib-1.4
+	mysql? ( >=dev-db/mysql-4.0.16 )
+	postgres? ( dev-db/postgresql )
+	opengl? ( virtual/opengl )
+	xmms? ( >=media-sound/xmms-1.2 )
+	visualization? ( media-libs/libsdl
+	                 >=media-plugins/libvisual-plugins-0.2 )
+	ipod? ( media-libs/libgpod )
+	aac? ( media-libs/libmp4v2 )
+	exscalibar? ( media-libs/exscalibar )
+	ifp? ( media-libs/libifp )
+	real? ( media-video/realplayer )"
+
+RDEPEND="${DEPEND}
+	dev-lang/ruby"
+
+DEPEND="${DEPEND}
+	>=dev-util/pkgconfig-0.9.0"
+
+PATCHES="${FILESDIR}/${P}-audiocd.patch"
+
+need-kde 3.3
+
+src_compile() {
+	append-flags -fno-inline
+
+	# Extra, unsupported engines are forcefully disabled.
+	local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
+	              $(use_with opengl) $(use_with xmms)
+	              $(use_with visualization libvisual)
+	              $(use_enable !noamazon amazon)
+	              $(use_with musicbrainz)
+	              $(use_with exscalibar)
+				  $(use_with ipod libgpod)
+				  $(use_with aac mp4v2)
+				  $(use_with ifp)
+				  $(use_with real helix)
+				  --with-xine
+	              --without-mas
+	              --without-nmm"
+
+	kde_src_compile
+}
+
diff --git a/media-sound/amarok/files/amarok-1.4.0-audiocd.patch b/media-sound/amarok/files/amarok-1.4.0-audiocd.patch
new file mode 100644
index 000000000000..0a55f1dbbd0b
--- /dev/null
+++ b/media-sound/amarok/files/amarok-1.4.0-audiocd.patch
@@ -0,0 +1,13 @@
+Index: /home/user/workspace/amarok/src/metabundle.cpp
+===================================================================
+--- /home/user/workspace/amarok/src/metabundle.cpp	(revision 541169)
++++ /home/user/workspace/amarok/src/metabundle.cpp	(working copy)
+@@ -293,7 +293,7 @@
+ bool
+ MetaBundle::checkExists()
+ {
+-    const bool exists = isStream() || ( url().protocol() == "file" && QFile::exists( url().path() ) );
++    const bool exists = isStream() || url().protocol() == "cdda" || ( url().protocol() == "file" && QFile::exists( url().path() ) );
+ 
+     if( exists )
+         m_flags |= Flags::Exists;
diff --git a/media-sound/amarok/files/digest-amarok-1.4.0-r1 b/media-sound/amarok/files/digest-amarok-1.4.0-r1
new file mode 100644
index 000000000000..eda3a290db41
--- /dev/null
+++ b/media-sound/amarok/files/digest-amarok-1.4.0-r1
@@ -0,0 +1,3 @@
+MD5 d716442c46a4446954492d1016f8af02 amarok-1.4.0.tar.bz2 12900236
+RMD160 bdc10c80c4a94a42ffdd0b22da12e7b2710a9772 amarok-1.4.0.tar.bz2 12900236
+SHA256 376de34693c1128a0c34ac7d9bded7a1217f67bfb31bda79a520216e4a22afb8 amarok-1.4.0.tar.bz2 12900236