[gentoo-commits] proj/kde-sunset:master commit in: media-sound/amarok/, media-sound/amarok/files/

["Roman v. Gemmeren" <strowi@hasnoname.de>]

commit:     bc9aac83932a0eab8ec721a06ee9c4ce2d6bfd3a
Author:     Roman v. Gemmeren <strowi <AT> hasnoname <DOT> de>
AuthorDate: Mon Feb 27 15:33:16 2012 +0000
Commit:     Roman v. Gemmeren <strowi <AT> hasnoname <DOT> de>
CommitDate: Mon Feb 27 15:33:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde-sunset.git;a=commit;h=bc9aac83

make kaffeine compile with >=xine-lib-1.2
	new file:   amarok-1.4.10_p20090130-r5.ebuild
	new file:   files/amarok-1.4.10-xinelib-1.2.patch

---
 .../amarok/amarok-1.4.10_p20090130-r5.ebuild       |  125 ++++++++++++++++++++
 .../amarok/files/amarok-1.4.10-xinelib-1.2.patch   |   11 ++
 2 files changed, 136 insertions(+), 0 deletions(-)

diff --git a/media-sound/amarok/amarok-1.4.10_p20090130-r5.ebuild b/media-sound/amarok/amarok-1.4.10_p20090130-r5.ebuild
new file mode 100644
index 0000000..7f10d84
--- /dev/null
+++ b/media-sound/amarok/amarok-1.4.10_p20090130-r5.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.10_p20090130-r3.ebuild,v 1.8 2009/11/07 00:39:24 ssuominen Exp $
+
+EAPI="2"
+
+ARTS_REQUIRED="never"
+
+LANGS="af ar az be bg bn br ca cs cy da de el en_GB eo es et eu fa fi
+fr ga gl he hi hu id is it ja km ko ku lo lt mk ms nb nds ne nl nn pa
+pl pt pt_BR ro ru rw se sk sl sq sr sr@Latn ss 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
+
+PKG_SUFFIX=""
+
+MY_P="${P/_*/}"
+S="${WORKDIR}/${MY_P}"
+
+SRC_URI="mirror://kde/stable/amarok/${PV/_*/}/src/${MY_P}.tar.bz2
+	mirror://kde-sunset/amarok-1.4.10-post20090130.diff.tar.bz2"
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+
+LICENSE="GPL-2"
+
+SLOT="3.5"
+KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="mp4 mysql +amazon opengl postgres
+visualization ipod ifp real njb mtp musicbrainz daap
+python"
+# kde: enables compilation of the konqueror sidebar plugin
+
+# Blocking previous amarok-1.4:0 versions
+RDEPEND="
+	!<media-sound/amarok-1.4.10_p20090130-r2
+	=dev-lang/ruby-1.8*
+	>=media-libs/taglib-1.4
+	>=media-libs/xine-lib-1.1.2_pre20060328-r8
+	ifp? ( media-libs/libifp )
+	ipod? ( >=media-libs/libgpod-0.5.2 )
+	mp4? ( media-libs/libmp4v2 )
+	mtp? ( >=media-libs/libmtp-0.3.0 )
+	musicbrainz? ( media-libs/tunepimp )
+	mysql? ( >=virtual/mysql-4.0 )
+	njb? ( >=media-libs/libnjb-2.2.4 )
+	opengl? ( virtual/opengl )
+	postgres? ( dev-db/postgresql-base )
+	real? (
+		media-libs/alsa-lib
+		media-video/realplayer
+	)
+	visualization? (
+		media-libs/libsdl
+		=media-plugins/libvisual-plugins-0.4*
+	)
+"
+
+DEPEND="${RDEPEND}"
+
+RDEPEND="${RDEPEND}
+	app-arch/unzip
+	daap? ( www-servers/mongrel )
+	python? ( dev-python/PyQt )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.9.1-libmtp-0.3.0-API.patch"
+	"${FILESDIR}/${PN}-1.4.10-gcc-4.3.patch"
+	"${FILESDIR}/${PN}-1.4.10-gcc44.patch"
+	"${FILESDIR}/${PN}-libmp4v2.patch"
+	"${FILESDIR}/${PN}-libmp4v2-2.patch"
+	"${FILESDIR}/${PN}-1.4.10-fix-autoconf-2.64.patch"
+	"${WORKDIR}/${PN}-1.4.10-post20090130.diff"
+	"${WORKDIR}/${PN}-1.4.10-desktop-entry.diff"
+	"${FILESDIR}/${PN}-1.4.10-xinelib-1.2.patch"
+)
+
+need-kde 3.5
+
+src_configure() {
+	# Extra, unsupported engines are forcefully disabled.
+	local myconf="
+		$(use_enable amazon)
+		$(use_enable mysql)
+		$(use_enable postgres postgresql)
+		$(use_with daap)
+		$(use_with ifp)
+		$(use_with ipod libgpod)
+		$(use_with mp4 mp4v2)
+		$(use_with mtp libmtp)
+		$(use_with musicbrainz)
+		$(use_with njb libnjb)
+		$(use_with opengl)
+		$(use_with real helix)
+		$(use_with visualization libvisual)
+		--with-xine
+		--without-nmm
+	"
+
+	kde_src_configure
+}
+
+src_install() {
+	kde_src_install
+
+	# As much as I respect Ian, I'd rather leave Amarok to use mongrel
+	# from Portage, for security and policy reasons.
+	rm -rf "${D}${KDEDIR}"/share/apps/amarok/ruby_lib/rbconfig \
+		"${D}${KDEDIR}"/share/apps/amarok/ruby_lib/mongrel* \
+		"${D}${KDEDIR}"/share/apps/amarok/ruby_lib/rubygems* \
+		"${D}${KDEDIR}"/share/apps/amarok/ruby_lib/gem* \
+		"${D}${KDEDIR}"/$(get_libdir)/ruby_lib
+
+	if ! use python; then
+		rm -r "${D}${KDEDIR}"/share/apps/amarok/scripts/webcontrol \
+			|| die "Unable to remove webcontrol."
+	fi
+}

diff --git a/media-sound/amarok/files/amarok-1.4.10-xinelib-1.2.patch b/media-sound/amarok/files/amarok-1.4.10-xinelib-1.2.patch
new file mode 100644
index 0000000..d202098
--- /dev/null
+++ b/media-sound/amarok/files/amarok-1.4.10-xinelib-1.2.patch
@@ -0,0 +1,11 @@
+--- amarok/src/engine/xine/xine-engine.cpp~	2008-08-13 22:21:51.000000000 +0100
++++ amarok/src/engine/xine/xine-engine.cpp	2012-02-26 08:46:25.000000000 +0000
+@@ -1148,7 +1148,7 @@
+ 
+     emit statusText(i18n("Getting AudioCD contents..."));
+ 
+-    xine_urls = xine_get_autoplay_mrls(m_xine, "CD", &num);
++    xine_urls = (char**)xine_get_autoplay_mrls(m_xine, "CD", &num);
+ 
+     if (xine_urls) {
+         while (xine_urls[i]) {