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