Gentoo Archives: gentoo-commits

From: "Roman v. Gemmeren" <strowi@×××××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde-sunset:master commit in: media-sound/amarok/, media-sound/amarok/files/
Date: Mon, 27 Feb 2012 15:34:37
Message-Id: 1330356796.bc9aac83932a0eab8ec721a06ee9c4ce2d6bfd3a.strowi@gentoo
1 commit: bc9aac83932a0eab8ec721a06ee9c4ce2d6bfd3a
2 Author: Roman v. Gemmeren <strowi <AT> hasnoname <DOT> de>
3 AuthorDate: Mon Feb 27 15:33:16 2012 +0000
4 Commit: Roman v. Gemmeren <strowi <AT> hasnoname <DOT> de>
5 CommitDate: Mon Feb 27 15:33:16 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde-sunset.git;a=commit;h=bc9aac83
7
8 make kaffeine compile with >=xine-lib-1.2
9 new file: amarok-1.4.10_p20090130-r5.ebuild
10 new file: files/amarok-1.4.10-xinelib-1.2.patch
11
12 ---
13 .../amarok/amarok-1.4.10_p20090130-r5.ebuild | 125 ++++++++++++++++++++
14 .../amarok/files/amarok-1.4.10-xinelib-1.2.patch | 11 ++
15 2 files changed, 136 insertions(+), 0 deletions(-)
16
17 diff --git a/media-sound/amarok/amarok-1.4.10_p20090130-r5.ebuild b/media-sound/amarok/amarok-1.4.10_p20090130-r5.ebuild
18 new file mode 100644
19 index 0000000..7f10d84
20 --- /dev/null
21 +++ b/media-sound/amarok/amarok-1.4.10_p20090130-r5.ebuild
22 @@ -0,0 +1,125 @@
23 +# Copyright 1999-2010 Gentoo Foundation
24 +# Distributed under the terms of the GNU General Public License v2
25 +# $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 $
26 +
27 +EAPI="2"
28 +
29 +ARTS_REQUIRED="never"
30 +
31 +LANGS="af ar az be bg bn br ca cs cy da de el en_GB eo es et eu fa fi
32 +fr ga gl he hi hu id is it ja km ko ku lo lt mk ms nb nds ne nl nn pa
33 +pl pt pt_BR ro ru rw se sk sl sq sr sr@Latn ss sv ta tg th tr uk uz
34 +zh_CN zh_TW"
35 +
36 +LANGS_DOC="da de es et fr it nl pl pt pt_BR ru sv"
37 +
38 +USE_KEG_PACKAGING="1"
39 +
40 +inherit kde
41 +
42 +PKG_SUFFIX=""
43 +
44 +MY_P="${P/_*/}"
45 +S="${WORKDIR}/${MY_P}"
46 +
47 +SRC_URI="mirror://kde/stable/amarok/${PV/_*/}/src/${MY_P}.tar.bz2
48 + mirror://kde-sunset/amarok-1.4.10-post20090130.diff.tar.bz2"
49 +
50 +DESCRIPTION="Advanced audio player based on KDE framework."
51 +HOMEPAGE="http://amarok.kde.org/"
52 +
53 +LICENSE="GPL-2"
54 +
55 +SLOT="3.5"
56 +KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
57 +IUSE="mp4 mysql +amazon opengl postgres
58 +visualization ipod ifp real njb mtp musicbrainz daap
59 +python"
60 +# kde: enables compilation of the konqueror sidebar plugin
61 +
62 +# Blocking previous amarok-1.4:0 versions
63 +RDEPEND="
64 + !<media-sound/amarok-1.4.10_p20090130-r2
65 + =dev-lang/ruby-1.8*
66 + >=media-libs/taglib-1.4
67 + >=media-libs/xine-lib-1.1.2_pre20060328-r8
68 + ifp? ( media-libs/libifp )
69 + ipod? ( >=media-libs/libgpod-0.5.2 )
70 + mp4? ( media-libs/libmp4v2 )
71 + mtp? ( >=media-libs/libmtp-0.3.0 )
72 + musicbrainz? ( media-libs/tunepimp )
73 + mysql? ( >=virtual/mysql-4.0 )
74 + njb? ( >=media-libs/libnjb-2.2.4 )
75 + opengl? ( virtual/opengl )
76 + postgres? ( dev-db/postgresql-base )
77 + real? (
78 + media-libs/alsa-lib
79 + media-video/realplayer
80 + )
81 + visualization? (
82 + media-libs/libsdl
83 + =media-plugins/libvisual-plugins-0.4*
84 + )
85 +"
86 +
87 +DEPEND="${RDEPEND}"
88 +
89 +RDEPEND="${RDEPEND}
90 + app-arch/unzip
91 + daap? ( www-servers/mongrel )
92 + python? ( dev-python/PyQt )
93 +"
94 +
95 +PATCHES=(
96 + "${FILESDIR}/${PN}-1.4.9.1-libmtp-0.3.0-API.patch"
97 + "${FILESDIR}/${PN}-1.4.10-gcc-4.3.patch"
98 + "${FILESDIR}/${PN}-1.4.10-gcc44.patch"
99 + "${FILESDIR}/${PN}-libmp4v2.patch"
100 + "${FILESDIR}/${PN}-libmp4v2-2.patch"
101 + "${FILESDIR}/${PN}-1.4.10-fix-autoconf-2.64.patch"
102 + "${WORKDIR}/${PN}-1.4.10-post20090130.diff"
103 + "${WORKDIR}/${PN}-1.4.10-desktop-entry.diff"
104 + "${FILESDIR}/${PN}-1.4.10-xinelib-1.2.patch"
105 +)
106 +
107 +need-kde 3.5
108 +
109 +src_configure() {
110 + # Extra, unsupported engines are forcefully disabled.
111 + local myconf="
112 + $(use_enable amazon)
113 + $(use_enable mysql)
114 + $(use_enable postgres postgresql)
115 + $(use_with daap)
116 + $(use_with ifp)
117 + $(use_with ipod libgpod)
118 + $(use_with mp4 mp4v2)
119 + $(use_with mtp libmtp)
120 + $(use_with musicbrainz)
121 + $(use_with njb libnjb)
122 + $(use_with opengl)
123 + $(use_with real helix)
124 + $(use_with visualization libvisual)
125 + --with-xine
126 + --without-nmm
127 + "
128 +
129 + kde_src_configure
130 +}
131 +
132 +src_install() {
133 + kde_src_install
134 +
135 + # As much as I respect Ian, I'd rather leave Amarok to use mongrel
136 + # from Portage, for security and policy reasons.
137 + rm -rf "${D}${KDEDIR}"/share/apps/amarok/ruby_lib/rbconfig \
138 + "${D}${KDEDIR}"/share/apps/amarok/ruby_lib/mongrel* \
139 + "${D}${KDEDIR}"/share/apps/amarok/ruby_lib/rubygems* \
140 + "${D}${KDEDIR}"/share/apps/amarok/ruby_lib/gem* \
141 + "${D}${KDEDIR}"/$(get_libdir)/ruby_lib
142 +
143 + if ! use python; then
144 + rm -r "${D}${KDEDIR}"/share/apps/amarok/scripts/webcontrol \
145 + || die "Unable to remove webcontrol."
146 + fi
147 +}
148
149 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
150 new file mode 100644
151 index 0000000..d202098
152 --- /dev/null
153 +++ b/media-sound/amarok/files/amarok-1.4.10-xinelib-1.2.patch
154 @@ -0,0 +1,11 @@
155 +--- amarok/src/engine/xine/xine-engine.cpp~ 2008-08-13 22:21:51.000000000 +0100
156 ++++ amarok/src/engine/xine/xine-engine.cpp 2012-02-26 08:46:25.000000000 +0000
157 +@@ -1148,7 +1148,7 @@
158 +
159 + emit statusText(i18n("Getting AudioCD contents..."));
160 +
161 +- xine_urls = xine_get_autoplay_mrls(m_xine, "CD", &num);
162 ++ xine_urls = (char**)xine_get_autoplay_mrls(m_xine, "CD", &num);
163 +
164 + if (xine_urls) {
165 + while (xine_urls[i]) {