| 1 |
ssuominen 09/05/12 22:00:48 |
| 2 |
|
| 3 |
Modified: ChangeLog alsa-patch-bay-1.0.0-r4.ebuild |
| 4 |
Log: |
| 5 |
Fix #254740 |
| 6 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.35 media-sound/alsa-patch-bay/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-patch-bay/ChangeLog?rev=1.35&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-patch-bay/ChangeLog?rev=1.35&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-patch-bay/ChangeLog?r1=1.34&r2=1.35 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-patch-bay/ChangeLog,v |
| 18 |
retrieving revision 1.34 |
| 19 |
retrieving revision 1.35 |
| 20 |
diff -u -r1.34 -r1.35 |
| 21 |
--- ChangeLog 12 May 2009 16:15:49 -0000 1.34 |
| 22 |
+++ ChangeLog 12 May 2009 22:00:48 -0000 1.35 |
| 23 |
@@ -1,10 +1,12 @@ |
| 24 |
# ChangeLog for media-sound/alsa-patch-bay |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-patch-bay/ChangeLog,v 1.34 2009/05/12 16:15:49 ssuominen Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-patch-bay/ChangeLog,v 1.35 2009/05/12 22:00:48 ssuominen Exp $ |
| 28 |
|
| 29 |
12 May 2009; Samuli Suominen <ssuominen@g.o> |
| 30 |
alsa-patch-bay-1.0.0-r4.ebuild: |
| 31 |
- Fix automagic ladcca dep wrt #242652, thanks to Mikael Magnusson. |
| 32 |
+ Both audio outputs cannot be disabled, so enable USE alsa by default, and |
| 33 |
+ force --enable-alsa in such case wrt #254740. Fix automagic ladcca dep wrt |
| 34 |
+ #242652, thanks to Mikael Magnusson. |
| 35 |
|
| 36 |
15 Dec 2008; Ben de Groot <yngwin@g.o> |
| 37 |
alsa-patch-bay-1.0.0-r4.ebuild: |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.7 media-sound/alsa-patch-bay/alsa-patch-bay-1.0.0-r4.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-patch-bay/alsa-patch-bay-1.0.0-r4.ebuild?rev=1.7&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-patch-bay/alsa-patch-bay-1.0.0-r4.ebuild?rev=1.7&content-type=text/plain |
| 45 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-patch-bay/alsa-patch-bay-1.0.0-r4.ebuild?r1=1.6&r2=1.7 |
| 46 |
|
| 47 |
Index: alsa-patch-bay-1.0.0-r4.ebuild |
| 48 |
=================================================================== |
| 49 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-patch-bay/alsa-patch-bay-1.0.0-r4.ebuild,v |
| 50 |
retrieving revision 1.6 |
| 51 |
retrieving revision 1.7 |
| 52 |
diff -u -r1.6 -r1.7 |
| 53 |
--- alsa-patch-bay-1.0.0-r4.ebuild 12 May 2009 16:15:49 -0000 1.6 |
| 54 |
+++ alsa-patch-bay-1.0.0-r4.ebuild 12 May 2009 22:00:48 -0000 1.7 |
| 55 |
@@ -1,6 +1,6 @@ |
| 56 |
# Copyright 1999-2009 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-patch-bay/alsa-patch-bay-1.0.0-r4.ebuild,v 1.6 2009/05/12 16:15:49 ssuominen Exp $ |
| 59 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-patch-bay/alsa-patch-bay-1.0.0-r4.ebuild,v 1.7 2009/05/12 22:00:48 ssuominen Exp $ |
| 60 |
|
| 61 |
EAPI=2 |
| 62 |
inherit eutils |
| 63 |
@@ -12,12 +12,14 @@ |
| 64 |
LICENSE="GPL-2" |
| 65 |
SLOT="0" |
| 66 |
KEYWORDS="amd64 ppc sparc x86" |
| 67 |
-IUSE="alsa jack ladcca" |
| 68 |
+IUSE="+alsa jack ladcca" |
| 69 |
|
| 70 |
-DEPEND="x11-libs/fltk:1.1 |
| 71 |
- alsa? ( >=media-libs/alsa-lib-0.9.0_rc1 ) |
| 72 |
+RDEPEND="x11-libs/fltk:1.1 |
| 73 |
+ alsa? ( media-libs/alsa-lib ) |
| 74 |
jack? ( media-sound/jack-audio-connection-kit ) |
| 75 |
- ladcca? ( media-libs/ladcca )" |
| 76 |
+ ladcca? ( media-libs/ladcca ) |
| 77 |
+ !alsa? ( !jack? ( media-libs/alsa-lib ) )" |
| 78 |
+DEPEND="${RDEPEND}" |
| 79 |
|
| 80 |
src_prepare() { |
| 81 |
epatch "${FILESDIR}"/${P}-amd64.patch \ |
| 82 |
@@ -25,12 +27,18 @@ |
| 83 |
} |
| 84 |
|
| 85 |
src_configure() { |
| 86 |
+ if ! use alsa && ! use jack; then |
| 87 |
+ ewarn "You cannot disable both audio outputs, enabling alsa." |
| 88 |
+ local myconf="--enable-alsa" |
| 89 |
+ fi |
| 90 |
+ |
| 91 |
econf \ |
| 92 |
--enable-fltk \ |
| 93 |
--disable-gtkmm \ |
| 94 |
$(use_enable alsa) \ |
| 95 |
$(use_enable jack) \ |
| 96 |
- $(use_enable ladcca) |
| 97 |
+ $(use_enable ladcca) \ |
| 98 |
+ ${myconf} |
| 99 |
} |
| 100 |
|
| 101 |
src_install() { |
Archives