diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-05-12 22:00:48 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-05-12 22:00:48 +0000 |
| commit | 9607f4048b5f85bd928255da111d9f8f2280cdcb (patch) | |
| tree | 5bfdebba27e6e59d6e038ff5dd9cd835d4c98857 /media-sound | |
| parent | stable x86, bug 266986 (diff) | |
| download | historical-9607f4048b5f85bd928255da111d9f8f2280cdcb.tar.gz historical-9607f4048b5f85bd928255da111d9f8f2280cdcb.tar.bz2 historical-9607f4048b5f85bd928255da111d9f8f2280cdcb.zip | |
Fix #254740
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/alsa-patch-bay/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/alsa-patch-bay/Manifest | 4 | ||||
| -rw-r--r-- | media-sound/alsa-patch-bay/alsa-patch-bay-1.0.0-r4.ebuild | 20 |
3 files changed, 20 insertions, 10 deletions
diff --git a/media-sound/alsa-patch-bay/ChangeLog b/media-sound/alsa-patch-bay/ChangeLog index d12969ce923a..bc4b4de36afc 100644 --- a/media-sound/alsa-patch-bay/ChangeLog +++ b/media-sound/alsa-patch-bay/ChangeLog @@ -1,10 +1,12 @@ # ChangeLog for media-sound/alsa-patch-bay # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-patch-bay/ChangeLog,v 1.34 2009/05/12 16:15:49 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-patch-bay/ChangeLog,v 1.35 2009/05/12 22:00:48 ssuominen Exp $ 12 May 2009; Samuli Suominen <ssuominen@gentoo.org> alsa-patch-bay-1.0.0-r4.ebuild: - Fix automagic ladcca dep wrt #242652, thanks to Mikael Magnusson. + Both audio outputs cannot be disabled, so enable USE alsa by default, and + force --enable-alsa in such case wrt #254740. Fix automagic ladcca dep wrt + #242652, thanks to Mikael Magnusson. 15 Dec 2008; Ben de Groot <yngwin@gentoo.org> alsa-patch-bay-1.0.0-r4.ebuild: diff --git a/media-sound/alsa-patch-bay/Manifest b/media-sound/alsa-patch-bay/Manifest index f84e6b909964..7a2f15327891 100644 --- a/media-sound/alsa-patch-bay/Manifest +++ b/media-sound/alsa-patch-bay/Manifest @@ -1,6 +1,6 @@ AUX alsa-patch-bay-1.0.0-amd64.patch 2030 RMD160 ce9b54704f567e8ebf0b819311b99a9649bc9ace SHA1 67bf42a9379726380716a0437d6dddec43090358 SHA256 884a2009f98a8068f5af3975a80b262c98c9c196b0e604ef59598026f282d4b9 AUX alsa-patch-bay-1.0.0-gcc43.patch 1566 RMD160 d60410d7468a0da2bd501e8906726317330a60b2 SHA1 eaa90c8f318e46b18ad83e30edc6a066dd5faf47 SHA256 7800ad85209f414b33759d984672b7b4ae034ad49384aef6c40a3bf0d967880d DIST alsa-patch-bay-1.0.0.tar.gz 249481 RMD160 198dc55b6ec531ab958ddecb853f8d843a4d0678 SHA1 9fcc2258be8c87d9873dfa488421a7bc0f6017b0 SHA256 7099812c7a1ee421636006498b7d0fe94ebe134f877ca193e00384efdc640e41 -EBUILD alsa-patch-bay-1.0.0-r4.ebuild 1196 RMD160 ac5a7cfb24988fba4b6413484b5402fc0071c754 SHA1 91939a3412d4e4d75d1d60704e5528c685ac6ef1 SHA256 4b7d67d3645ffe00a4ae7162cfd53bfdc59ffde432fbafba68b2a99a1cc5416b -MISC ChangeLog 5096 RMD160 613444fb04c60c89073b7ce78560d270ac9be684 SHA1 2964a10bda50065e9a0accd6177e1b4214a0b8fc SHA256 5d2d2d3c19965f1842b2e88e6858496bfb42dc774ca669cbc6e4250ab97a7d37 +EBUILD alsa-patch-bay-1.0.0-r4.ebuild 1398 RMD160 017a31f2f46a15220e21d31df0067878cde353e7 SHA1 f21d304e0108264f57173c1321d4c9c5a42e0bf9 SHA256 1d82d532069291a5b8d32e0f0d71dbb78dae12051c07a6bed6c78c67efac1e5e +MISC ChangeLog 5220 RMD160 8f2391f26c4cc4b9f26ea847dabdc5fee3787198 SHA1 cf89d9ff60701ae35f76734b5592da417440a32f SHA256 b85ebcdca43ac4c84aecb897c8c9b4221ca7800afe71acea12f1cf4eabc94075 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b diff --git a/media-sound/alsa-patch-bay/alsa-patch-bay-1.0.0-r4.ebuild b/media-sound/alsa-patch-bay/alsa-patch-bay-1.0.0-r4.ebuild index 5cbdbb1ad24b..ee34c54da973 100644 --- a/media-sound/alsa-patch-bay/alsa-patch-bay-1.0.0-r4.ebuild +++ b/media-sound/alsa-patch-bay/alsa-patch-bay-1.0.0-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $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 $ EAPI=2 inherit eutils @@ -12,12 +12,14 @@ SRC_URI="http://pkl.net/~node/software/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc sparc x86" -IUSE="alsa jack ladcca" +IUSE="+alsa jack ladcca" -DEPEND="x11-libs/fltk:1.1 - alsa? ( >=media-libs/alsa-lib-0.9.0_rc1 ) +RDEPEND="x11-libs/fltk:1.1 + alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) - ladcca? ( media-libs/ladcca )" + ladcca? ( media-libs/ladcca ) + !alsa? ( !jack? ( media-libs/alsa-lib ) )" +DEPEND="${RDEPEND}" src_prepare() { epatch "${FILESDIR}"/${P}-amd64.patch \ @@ -25,12 +27,18 @@ src_prepare() { } src_configure() { + if ! use alsa && ! use jack; then + ewarn "You cannot disable both audio outputs, enabling alsa." + local myconf="--enable-alsa" + fi + econf \ --enable-fltk \ --disable-gtkmm \ $(use_enable alsa) \ $(use_enable jack) \ - $(use_enable ladcca) + $(use_enable ladcca) \ + ${myconf} } src_install() { |