Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Johannes Huber (johu)" <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/phonon: phonon-4.5.0.ebuild phonon-9999.ebuild phonon-4.4.3.ebuild phonon-4.6.0-r1.ebuild phonon-4.5.1-r1.ebuild phonon-4.4.2.ebuild ChangeLog
Date: Tue, 31 Jan 2012 15:02:05
Message-Id: 20120131150151.ACA122004B@flycatcher.gentoo.org
1 johu 12/01/31 15:01:49
2
3 Modified: phonon-4.5.0.ebuild phonon-9999.ebuild
4 phonon-4.4.3.ebuild phonon-4.6.0-r1.ebuild
5 phonon-4.5.1-r1.ebuild phonon-4.4.2.ebuild
6 ChangeLog
7 Log:
8 Remove phonon xine backend.
9
10 (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
11
12 Revision Changes Path
13 1.11 media-libs/phonon/phonon-4.5.0.ebuild
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.5.0.ebuild?rev=1.11&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.5.0.ebuild?rev=1.11&content-type=text/plain
17 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.5.0.ebuild?r1=1.10&r2=1.11
18
19 Index: phonon-4.5.0.ebuild
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.5.0.ebuild,v
22 retrieving revision 1.10
23 retrieving revision 1.11
24 diff -u -r1.10 -r1.11
25 --- phonon-4.5.0.ebuild 2 Dec 2011 19:22:19 -0000 1.10
26 +++ phonon-4.5.0.ebuild 31 Jan 2012 15:01:49 -0000 1.11
27 @@ -1,6 +1,6 @@
28 -# Copyright 1999-2011 Gentoo Foundation
29 +# Copyright 1999-2012 Gentoo Foundation
30 # Distributed under the terms of the GNU General Public License v2
31 -# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.5.0.ebuild,v 1.10 2011/12/02 19:22:19 dilfridge Exp $
32 +# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.5.0.ebuild,v 1.11 2012/01/31 15:01:49 johu Exp $
33
34 EAPI=4
35
36 @@ -13,7 +13,7 @@
37 LICENSE="LGPL-2.1"
38 KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
39 SLOT="0"
40 -IUSE="aqua debug +gstreamer pulseaudio vlc xine"
41 +IUSE="aqua debug +gstreamer pulseaudio vlc"
42
43 COMMON_DEPEND="
44 >=x11-libs/qt-core-4.6.0:4
45 @@ -34,17 +34,14 @@
46 aqua? ( media-libs/phonon-qt7 )
47 gstreamer? ( media-libs/phonon-gstreamer )
48 vlc? ( >=media-libs/phonon-vlc-0.3.2 )
49 - xine? ( >=media-libs/phonon-xine-0.4.4 )
50 -"
51 -RDEPEND="${COMMON_DEPEND}
52 - !kde-base/phonon-xine
53 "
54 +RDEPEND="${COMMON_DEPEND}"
55 DEPEND="${COMMON_DEPEND}
56 >=dev-util/automoc-0.9.87
57 dev-util/pkgconfig
58 "
59
60 -REQUIRED_USE="|| ( aqua gstreamer vlc xine )"
61 +REQUIRED_USE="|| ( aqua gstreamer vlc )"
62
63 src_configure() {
64 local mycmakeargs=(
65
66
67
68 1.14 media-libs/phonon/phonon-9999.ebuild
69
70 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-9999.ebuild?rev=1.14&view=markup
71 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-9999.ebuild?rev=1.14&content-type=text/plain
72 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-9999.ebuild?r1=1.13&r2=1.14
73
74 Index: phonon-9999.ebuild
75 ===================================================================
76 RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v
77 retrieving revision 1.13
78 retrieving revision 1.14
79 diff -u -r1.13 -r1.14
80 --- phonon-9999.ebuild 23 Dec 2011 13:17:06 -0000 1.13
81 +++ phonon-9999.ebuild 31 Jan 2012 15:01:49 -0000 1.14
82 @@ -1,6 +1,6 @@
83 -# Copyright 1999-2011 Gentoo Foundation
84 +# Copyright 1999-2012 Gentoo Foundation
85 # Distributed under the terms of the GNU General Public License v2
86 -# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.13 2011/12/23 13:17:06 johu Exp $
87 +# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.14 2012/01/31 15:01:49 johu Exp $
88
89 EAPI=4
90
91 @@ -20,7 +20,7 @@
92
93 LICENSE="LGPL-2.1"
94 SLOT="0"
95 -IUSE="aqua debug +gstreamer pulseaudio vlc xine zeitgeist"
96 +IUSE="aqua debug +gstreamer pulseaudio vlc zeitgeist"
97
98 COMMON_DEPEND="
99 !!x11-libs/qt-phonon:4
100 @@ -42,17 +42,14 @@
101 aqua? ( media-libs/phonon-qt7 )
102 gstreamer? ( media-libs/phonon-gstreamer )
103 vlc? ( >=media-libs/phonon-vlc-0.3.2 )
104 - xine? ( >=media-libs/phonon-xine-0.4.4 )
105 -"
106 -RDEPEND="${COMMON_DEPEND}
107 - !kde-base/phonon-xine
108 "
109 +RDEPEND="${COMMON_DEPEND}"
110 DEPEND="${COMMON_DEPEND}
111 >=dev-util/automoc-0.9.87
112 dev-util/pkgconfig
113 "
114
115 -REQUIRED_USE="|| ( aqua gstreamer vlc xine )"
116 +REQUIRED_USE="|| ( aqua gstreamer vlc )"
117
118 src_configure() {
119 local mycmakeargs=(
120
121
122
123 1.5 media-libs/phonon/phonon-4.4.3.ebuild
124
125 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.4.3.ebuild?rev=1.5&view=markup
126 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.4.3.ebuild?rev=1.5&content-type=text/plain
127 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.4.3.ebuild?r1=1.4&r2=1.5
128
129 Index: phonon-4.4.3.ebuild
130 ===================================================================
131 RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.4.3.ebuild,v
132 retrieving revision 1.4
133 retrieving revision 1.5
134 diff -u -r1.4 -r1.5
135 --- phonon-4.4.3.ebuild 2 Dec 2011 19:22:19 -0000 1.4
136 +++ phonon-4.4.3.ebuild 31 Jan 2012 15:01:49 -0000 1.5
137 @@ -1,6 +1,6 @@
138 -# Copyright 1999-2011 Gentoo Foundation
139 +# Copyright 1999-2012 Gentoo Foundation
140 # Distributed under the terms of the GNU General Public License v2
141 -# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.4.3.ebuild,v 1.4 2011/12/02 19:22:19 dilfridge Exp $
142 +# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.4.3.ebuild,v 1.5 2012/01/31 15:01:49 johu Exp $
143
144 EAPI="2"
145
146 @@ -13,10 +13,9 @@
147 LICENSE="LGPL-2.1"
148 SLOT="0"
149 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
150 -IUSE="alsa aqua debug gstreamer pulseaudio +xcb +xine"
151 +IUSE="alsa aqua debug +gstreamer pulseaudio"
152
153 RDEPEND="
154 - !kde-base/phonon-xine
155 !!x11-libs/qt-phonon:4
156 >=x11-libs/qt-test-4.6.0:4[aqua=]
157 >=x11-libs/qt-dbus-4.6.0:4[aqua=]
158 @@ -30,10 +29,6 @@
159 dev-libs/glib:2
160 >=media-sound/pulseaudio-0.9.21[glib]
161 )
162 - xine? (
163 - >=media-libs/xine-lib-1.1.15-r1[xcb?]
164 - xcb? ( x11-libs/libxcb )
165 - )
166 "
167 DEPEND="${RDEPEND}
168 !!x11-libs/qt-phonon:4
169 @@ -42,12 +37,6 @@
170
171 S=${WORKDIR}/${P/.0}
172
173 -pkg_setup() {
174 - if use xine && use aqua; then
175 - die "XINE backend needs X11 which is not available for USE=aqua"
176 - fi
177 -}
178 -
179 src_prepare() {
180 # Fix the qt7 backend for MacOS 10.6.
181 [[ ${CHOST} == *-darwin10 ]] && epatch "${FILESDIR}"/${PN}-4.4-qt7.patch
182 @@ -70,8 +59,8 @@
183 $(cmake-utils_use_with gstreamer GStreamerPlugins)
184 $(cmake-utils_use_with pulseaudio PulseAudio)
185 $(cmake-utils_use_with pulseaudio GLib2)
186 - $(cmake-utils_use_with xine)
187 - $(cmake-utils_use_with xcb)
188 + -DWITH_Xine=OFF
189 + -DWITH_XCB=OFF
190 )
191
192 cmake-utils_src_configure
193
194
195
196 1.2 media-libs/phonon/phonon-4.6.0-r1.ebuild
197
198 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.6.0-r1.ebuild?rev=1.2&view=markup
199 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.6.0-r1.ebuild?rev=1.2&content-type=text/plain
200 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.6.0-r1.ebuild?r1=1.1&r2=1.2
201
202 Index: phonon-4.6.0-r1.ebuild
203 ===================================================================
204 RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.6.0-r1.ebuild,v
205 retrieving revision 1.1
206 retrieving revision 1.2
207 diff -u -r1.1 -r1.2
208 --- phonon-4.6.0-r1.ebuild 24 Dec 2011 13:19:11 -0000 1.1
209 +++ phonon-4.6.0-r1.ebuild 31 Jan 2012 15:01:49 -0000 1.2
210 @@ -1,6 +1,6 @@
211 -# Copyright 1999-2011 Gentoo Foundation
212 +# Copyright 1999-2012 Gentoo Foundation
213 # Distributed under the terms of the GNU General Public License v2
214 -# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.6.0-r1.ebuild,v 1.1 2011/12/24 13:19:11 johu Exp $
215 +# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.6.0-r1.ebuild,v 1.2 2012/01/31 15:01:49 johu Exp $
216
217 EAPI=4
218
219 @@ -20,7 +20,7 @@
220
221 LICENSE="LGPL-2.1"
222 SLOT="0"
223 -IUSE="aqua debug +gstreamer pulseaudio vlc xine zeitgeist"
224 +IUSE="aqua debug +gstreamer pulseaudio vlc zeitgeist"
225
226 COMMON_DEPEND="
227 !!x11-libs/qt-phonon:4
228 @@ -42,17 +42,14 @@
229 aqua? ( media-libs/phonon-qt7 )
230 gstreamer? ( media-libs/phonon-gstreamer )
231 vlc? ( >=media-libs/phonon-vlc-0.3.2 )
232 - xine? ( >=media-libs/phonon-xine-0.4.4 )
233 -"
234 -RDEPEND="${COMMON_DEPEND}
235 - !kde-base/phonon-xine
236 "
237 +RDEPEND="${COMMON_DEPEND}"
238 DEPEND="${COMMON_DEPEND}
239 >=dev-util/automoc-0.9.87
240 dev-util/pkgconfig
241 "
242
243 -REQUIRED_USE="|| ( aqua gstreamer vlc xine )"
244 +REQUIRED_USE="|| ( aqua gstreamer vlc )"
245
246 PATCHES=(
247 "${FILESDIR}/${PN}-4.5.1-qmakeworkaround.patch"
248
249
250
251 1.3 media-libs/phonon/phonon-4.5.1-r1.ebuild
252
253 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.5.1-r1.ebuild?rev=1.3&view=markup
254 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.5.1-r1.ebuild?rev=1.3&content-type=text/plain
255 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.5.1-r1.ebuild?r1=1.2&r2=1.3
256
257 Index: phonon-4.5.1-r1.ebuild
258 ===================================================================
259 RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.5.1-r1.ebuild,v
260 retrieving revision 1.2
261 retrieving revision 1.3
262 diff -u -r1.2 -r1.3
263 --- phonon-4.5.1-r1.ebuild 2 Dec 2011 19:22:19 -0000 1.2
264 +++ phonon-4.5.1-r1.ebuild 31 Jan 2012 15:01:49 -0000 1.3
265 @@ -1,6 +1,6 @@
266 -# Copyright 1999-2011 Gentoo Foundation
267 +# Copyright 1999-2012 Gentoo Foundation
268 # Distributed under the terms of the GNU General Public License v2
269 -# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.5.1-r1.ebuild,v 1.2 2011/12/02 19:22:19 dilfridge Exp $
270 +# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.5.1-r1.ebuild,v 1.3 2012/01/31 15:01:49 johu Exp $
271
272 EAPI=4
273
274 @@ -20,7 +20,7 @@
275
276 LICENSE="LGPL-2.1"
277 SLOT="0"
278 -IUSE="aqua debug +gstreamer pulseaudio vlc xine"
279 +IUSE="aqua debug +gstreamer pulseaudio vlc"
280
281 COMMON_DEPEND="
282 !!x11-libs/qt-phonon:4
283 @@ -41,24 +41,23 @@
284 aqua? ( media-libs/phonon-qt7 )
285 gstreamer? ( media-libs/phonon-gstreamer )
286 vlc? ( >=media-libs/phonon-vlc-0.3.2 )
287 - xine? ( >=media-libs/phonon-xine-0.4.4 )
288 -"
289 -RDEPEND="${COMMON_DEPEND}
290 - !kde-base/phonon-xine
291 "
292 +RDEPEND="${COMMON_DEPEND}"
293 DEPEND="${COMMON_DEPEND}
294 >=dev-util/automoc-0.9.87
295 dev-util/pkgconfig
296 "
297
298 -REQUIRED_USE="|| ( aqua gstreamer vlc xine )"
299 +REQUIRED_USE="|| ( aqua gstreamer vlc )"
300
301 PATCHES=( "${FILESDIR}/${P}-qmakeworkaround.patch" )
302
303 src_configure() {
304 local mycmakeargs=(
305 + -DWITH_QZeitgeist=OFF
306 $(cmake-utils_use_with pulseaudio GLIB2)
307 $(cmake-utils_use_with pulseaudio PulseAudio)
308 )
309 +
310 cmake-utils_src_configure
311 }
312
313
314
315 1.4 media-libs/phonon/phonon-4.4.2.ebuild
316
317 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.4.2.ebuild?rev=1.4&view=markup
318 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.4.2.ebuild?rev=1.4&content-type=text/plain
319 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.4.2.ebuild?r1=1.3&r2=1.4
320
321 Index: phonon-4.4.2.ebuild
322 ===================================================================
323 RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.4.2.ebuild,v
324 retrieving revision 1.3
325 retrieving revision 1.4
326 diff -u -r1.3 -r1.4
327 --- phonon-4.4.2.ebuild 2 Dec 2011 19:22:19 -0000 1.3
328 +++ phonon-4.4.2.ebuild 31 Jan 2012 15:01:49 -0000 1.4
329 @@ -1,6 +1,6 @@
330 -# Copyright 1999-2011 Gentoo Foundation
331 +# Copyright 1999-2012 Gentoo Foundation
332 # Distributed under the terms of the GNU General Public License v2
333 -# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.4.2.ebuild,v 1.3 2011/12/02 19:22:19 dilfridge Exp $
334 +# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.4.2.ebuild,v 1.4 2012/01/31 15:01:49 johu Exp $
335
336 EAPI="2"
337
338 @@ -13,10 +13,9 @@
339 LICENSE="LGPL-2.1"
340 SLOT="0"
341 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
342 -IUSE="alsa aqua debug gstreamer pulseaudio +xcb +xine"
343 +IUSE="alsa aqua debug +gstreamer pulseaudio"
344
345 RDEPEND="
346 - !kde-base/phonon-xine
347 !!x11-libs/qt-phonon:4
348 >=x11-libs/qt-test-4.6.0:4[aqua=]
349 >=x11-libs/qt-dbus-4.6.0:4[aqua=]
350 @@ -30,10 +29,6 @@
351 dev-libs/glib:2
352 >=media-sound/pulseaudio-0.9.21[glib]
353 )
354 - xine? (
355 - >=media-libs/xine-lib-1.1.15-r1[xcb?]
356 - xcb? ( x11-libs/libxcb )
357 - )
358 "
359 DEPEND="${RDEPEND}
360 !!x11-libs/qt-phonon:4
361 @@ -43,13 +38,9 @@
362 S=${WORKDIR}/${P/.0}
363
364 pkg_setup() {
365 - if use !xine && use !gstreamer && use !aqua; then
366 + if use !gstreamer && use !aqua; then
367 die "you must at least select one backend for phonon"
368 fi
369 -
370 - if use xine && use aqua; then
371 - die "XINE backend needs X11 which is not available for USE=aqua"
372 - fi
373 }
374
375 src_prepare() {
376 @@ -74,8 +65,8 @@
377 $(cmake-utils_use_with gstreamer GStreamerPlugins)
378 $(cmake-utils_use_with pulseaudio PulseAudio)
379 $(cmake-utils_use_with pulseaudio GLib2)
380 - $(cmake-utils_use_with xine)
381 - $(cmake-utils_use_with xcb)
382 + -DWITH_Xine=OFF
383 + -DWITH_XCB=OFF
384 )
385
386 cmake-utils_src_configure
387
388
389
390 1.29 media-libs/phonon/ChangeLog
391
392 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/ChangeLog?rev=1.29&view=markup
393 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/ChangeLog?rev=1.29&content-type=text/plain
394 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/ChangeLog?r1=1.28&r2=1.29
395
396 Index: ChangeLog
397 ===================================================================
398 RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v
399 retrieving revision 1.28
400 retrieving revision 1.29
401 diff -u -r1.28 -r1.29
402 --- ChangeLog 24 Dec 2011 13:19:11 -0000 1.28
403 +++ ChangeLog 31 Jan 2012 15:01:49 -0000 1.29
404 @@ -1,6 +1,11 @@
405 # ChangeLog for media-libs/phonon
406 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
407 -# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.28 2011/12/24 13:19:11 johu Exp $
408 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
409 +# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.29 2012/01/31 15:01:49 johu Exp $
410 +
411 + 31 Jan 2012; Johannes Huber <johu@g.o> phonon-4.4.2.ebuild,
412 + phonon-4.4.3.ebuild, phonon-4.5.0.ebuild, phonon-4.5.1-r1.ebuild,
413 + phonon-4.6.0-r1.ebuild, phonon-9999.ebuild:
414 + Remove phonon xine backend.
415
416 *phonon-4.6.0-r1 (24 Dec 2011)
Report Message
Find on MARC Find on Google Groups