1 |
scarabeus 09/07/31 14:20:52 |
2 |
|
3 |
Modified: ChangeLog phonon-kde-4.2.4.ebuild |
4 |
Log: |
5 |
Phonon needs more upstream love to make alsa optional. Deffered to 4.3.1/2. |
6 |
(Portage version: 2.2_rc33/cvs/Linux i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.20 kde-base/phonon-kde/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/phonon-kde/ChangeLog?rev=1.20&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/phonon-kde/ChangeLog?rev=1.20&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/phonon-kde/ChangeLog?r1=1.19&r2=1.20 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v |
18 |
retrieving revision 1.19 |
19 |
retrieving revision 1.20 |
20 |
diff -u -r1.19 -r1.20 |
21 |
--- ChangeLog 30 Jul 2009 14:44:56 -0000 1.19 |
22 |
+++ ChangeLog 31 Jul 2009 14:20:52 -0000 1.20 |
23 |
@@ -1,6 +1,11 @@ |
24 |
# ChangeLog for kde-base/phonon-kde |
25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.19 2009/07/30 14:44:56 scarabeus Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.20 2009/07/31 14:20:52 scarabeus Exp $ |
28 |
+ |
29 |
+ 31 Jul 2009; Tomáš Chvátal <scarabeus@g.o> |
30 |
+ phonon-kde-4.2.4.ebuild: |
31 |
+ Phonon needs more upstream love to make alsa optional. Deffered to |
32 |
+ 4.3.1/2. |
33 |
|
34 |
30 Jul 2009; Tomáš Chvátal <scarabeus@g.o> |
35 |
phonon-kde-4.2.4.ebuild: |
36 |
|
37 |
|
38 |
|
39 |
1.4 kde-base/phonon-kde/phonon-kde-4.2.4.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.2.4.ebuild?rev=1.4&view=markup |
42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.2.4.ebuild?rev=1.4&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.2.4.ebuild?r1=1.3&r2=1.4 |
44 |
|
45 |
Index: phonon-kde-4.2.4.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.2.4.ebuild,v |
48 |
retrieving revision 1.3 |
49 |
retrieving revision 1.4 |
50 |
diff -u -r1.3 -r1.4 |
51 |
--- phonon-kde-4.2.4.ebuild 30 Jul 2009 17:45:13 -0000 1.3 |
52 |
+++ phonon-kde-4.2.4.ebuild 31 Jul 2009 14:20:52 -0000 1.4 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2009 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.2.4.ebuild,v 1.3 2009/07/30 17:45:13 scarabeus Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.2.4.ebuild,v 1.4 2009/07/31 14:20:52 scarabeus Exp $ |
58 |
|
59 |
EAPI="2" |
60 |
|
61 |
@@ -13,11 +13,11 @@ |
62 |
|
63 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" |
64 |
LICENSE="GPL-2" |
65 |
-IUSE="alsa debug pulseaudio +xine" |
66 |
+IUSE="debug pulseaudio +xine" |
67 |
|
68 |
DEPEND=" |
69 |
+ media-libs/alsa-lib |
70 |
media-sound/phonon[xine?] |
71 |
- alsa? ( media-libs/alsa-lib ) |
72 |
pulseaudio? ( media-sound/pulseaudio ) |
73 |
" |
74 |
RDEPEND="${DEPEND} |
75 |
@@ -32,8 +32,6 @@ |
76 |
# Disable automagic |
77 |
sed -e 's/find_package(Xine)/macro_optional_find_package(Xine)/' \ |
78 |
-i phonon/kcm/xine/CMakeLists.txt || die "Failed to make xine optional" |
79 |
- sed -e "s:FIND_PACKAGE(Alsa):macro_optional_find_package(Alsa):" \ |
80 |
- -i phonon/CMakeLists.txt || die "Failed to make alsa optional" |
81 |
|
82 |
kde4-meta_src_prepare |
83 |
} |