Fix automagic detection of audio if no audio backend is selected in USE (bug #233602).

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.2 i686

4 files changed, 35 insertions, 24 deletions

diff --git a/media-libs/swfdec/ChangeLog b/media-libs/swfdec/ChangeLog
index 20c712d0f71d..18866987efee 100644
--- a/media-libs/swfdec/ChangeLog
+++ b/media-libs/swfdec/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/swfdec
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/swfdec/ChangeLog,v 1.46 2008/08/12 13:53:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/swfdec/ChangeLog,v 1.47 2008/08/17 20:27:46 ford_prefect Exp $
+
+  17 Aug 2008; Arun Raghavan <ford_prefect@gentoo.org> swfdec-0.6.8.ebuild,
+  swfdec-0.7.4.ebuild:
+  Fix automagic detection of audio if no audio backend is selected in USE
+  (bug #233602).
 
   12 Aug 2008; Raúl Porcel <armin76@gentoo.org> swfdec-0.6.6-r1.ebuild:
   alpha/ia64/sparc stable wrt #229709
diff --git a/media-libs/swfdec/Manifest b/media-libs/swfdec/Manifest
index c8b04cfcde88..45a72bd5ad2b 100644
--- a/media-libs/swfdec/Manifest
+++ b/media-libs/swfdec/Manifest
@@ -5,7 +5,7 @@ DIST swfdec-0.7.4.tar.gz 9900428 RMD160 85e52e483b27d19fecc0558cc81f2a17cd66e028
 EBUILD swfdec-0.6.4.ebuild 2377 RMD160 2015e92cb953e9a4cc54ce984aef5b079ed04c50 SHA1 e807c43102fe0d65e1bb4dbbff6740cab79509d1 SHA256 2f237a5025a106deaad46a73aef6919242c2bc56df838e38ae1e49c23c853145
 EBUILD swfdec-0.6.6-r1.ebuild 2449 RMD160 8628b55ce937c265c0872b1d4ac9dd8e3b62c704 SHA1 c6ac7c7b43b9956a94eb0b08b835a413b15d081e SHA256 199ed3b20fa23e568c1f133365e9d2720fb28b4d3c789d014c91951cd6234125
 EBUILD swfdec-0.6.6.ebuild 2399 RMD160 263623fc4b4f56481373f10108a783c9c0ad2c86 SHA1 9a9d4ee8d023d1cdea4993a7bad6a8307abe7690 SHA256 46d63b47602c00d4444e62a228fb3f38574a0bd5d92be8485b3b927d25737097
-EBUILD swfdec-0.6.8.ebuild 2451 RMD160 98e3ca996b7c021dfff140ae74d131ca6d373e84 SHA1 dab5be7de9b9417458adfc80855adffa79870a80 SHA256 3558e7afa0fa49e2c1a31bb38054ca002c62b127f9bedee233a0fb51e2872278
-EBUILD swfdec-0.7.4.ebuild 2454 RMD160 80277c5e7f543933891ad270b25264bc7a6e8501 SHA1 1e5da1e98ee896a854a0b548eed917037c0b6fb5 SHA256 fd303f246ee90d01dd4070e8de260881822f0c7ece4a9460b1f2e52c337c1639
-MISC ChangeLog 6296 RMD160 ea790f0731e3f83c834ab54fea9c58fe695af02c SHA1 c7a6b4cb26a1e798669609838869904567a0236a SHA256 88fe7d090c74d7a9afeb53ace708ac3db3a8e1872b4523a87e0e3b13b2994a23
+EBUILD swfdec-0.6.8.ebuild 2497 RMD160 4f17dfd24d93ae1f02f8d8bb776dacf4e7c0c3d8 SHA1 742f2a4560606af37d0b08dc897cfd157de37d62 SHA256 a1d3e725780840248b0dadfed5c4b7a712c14be9c3d516342976f61151390b92
+EBUILD swfdec-0.7.4.ebuild 2500 RMD160 ef3c710e3fad0b9dc031ae041c297625d1e1b3ad SHA1 02d2cb0dd494e3196c9fbfd8d765af546bfd6366 SHA256 5d1477ae9cc9d5c8d9a735f3df6f50dd0543f7881e3809d4d4eb68fd295e254c
+MISC ChangeLog 6492 RMD160 d41d963513d391a908ceeeea0b995017a5f4f878 SHA1 90c17f1486c474e78a6880347383fb21cf932c3e SHA256 a281b0ece07128cd67b165d76bc84f95d357d4b66a8075581c367e03917de36a
 MISC metadata.xml 1197 RMD160 543e40925641592b75a363bc1f9db769309d82f9 SHA1 819ff9c27d8ba627c7f311993e5e298fb813790d SHA256 fb65f78bc11ff515ef2ec1a27cad533f1787af1a823aef7cfa8ed9cd1f86a348
diff --git a/media-libs/swfdec/swfdec-0.6.8.ebuild b/media-libs/swfdec/swfdec-0.6.8.ebuild
index f23d21ba8bdc..620e3b4a754f 100644
--- a/media-libs/swfdec/swfdec-0.6.8.ebuild
+++ b/media-libs/swfdec/swfdec-0.6.8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/swfdec/swfdec-0.6.8.ebuild,v 1.1 2008/07/30 15:39:06 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/swfdec/swfdec-0.6.8.ebuild,v 1.2 2008/08/17 20:27:46 ford_prefect Exp $
 
 EAPI=1
 
-inherit eutils versionator confutils
+inherit eutils versionator
 
 MY_PV=$(get_version_component_range 1-2)
 DESCRIPTION="Macromedia Flash decoding library"
@@ -51,16 +51,19 @@ pkg_setup() {
 		ewarn "as such it requires the 'gstreamer' USE flag to be enabled."
 	fi
 
-	confutils_use_conflict oss alsa pulseaudio
+	if use alsa && use pulseaudio; then
+		ewarn
+		ewarn "Pulseaudio and ALSA selected. Selecting mature ALSA backend."
+	fi
 }
 
 src_compile() {
-	local myconf=
-
-	#--with-audio=[auto/alsa/oss/none]
-	use oss && myconf="${myconf} --with-audio=oss"
-	use pulseaudio && myconf="${myconf} --with-audio=pa"
-	use alsa && myconf="${myconf} --with-audio=alsa"
+	# Backend logic is from configure.ac:
+	# alsa > pulseaudio > oss
+	local audio="none"
+	use oss && audio="oss"
+	use pulseaudio && audio="pa"
+	use alsa && audio="alsa"
 
 	# bug #216009
 	# avoid writing to /root/.gstreamer-0.10/registry.xml
@@ -74,7 +77,7 @@ src_compile() {
 		$(use_enable gtk) \
 		--disable-ffmpeg \
 		--disable-mad \
-		${myconf} || die "configure failed"
+		--with-audio=${audio} || die "configure failed"
 
 	# bug #216284 image tests are not ready yet
 	cat  >test/image/Makefile <<EOF
diff --git a/media-libs/swfdec/swfdec-0.7.4.ebuild b/media-libs/swfdec/swfdec-0.7.4.ebuild
index 9a04093f6c8a..abe5d31ed1bd 100644
--- a/media-libs/swfdec/swfdec-0.7.4.ebuild
+++ b/media-libs/swfdec/swfdec-0.7.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/swfdec/swfdec-0.7.4.ebuild,v 1.1 2008/07/30 15:47:36 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/swfdec/swfdec-0.7.4.ebuild,v 1.2 2008/08/17 20:27:46 ford_prefect Exp $
 
 EAPI=1
 
-inherit eutils versionator confutils
+inherit eutils versionator
 
 MY_PV=$(get_version_component_range 1-2)
 DESCRIPTION="Macromedia Flash decoding library"
@@ -51,16 +51,19 @@ pkg_setup() {
 		ewarn "as such it requires the 'gstreamer' USE flag to be enabled."
 	fi
 
-	confutils_use_conflict oss alsa pulseaudio
+	if use alsa && use pulseaudio; then
+		ewarn
+		ewarn "Pulseaudio and ALSA selected. Selecting mature ALSA backend."
+	fi
 }
 
 src_compile() {
-	local myconf=
-
-	#--with-audio=[auto/alsa/oss/none]
-	use oss && myconf="${myconf} --with-audio=oss"
-	use pulseaudio && myconf="${myconf} --with-audio=pulse"
-	use alsa && myconf="${myconf} --with-audio=alsa"
+	# Backend logic is from configure.ac:
+	# alsa > pulseaudio > oss
+	local audio="none"
+	use oss && audio="oss"
+	use pulseaudio && audio="pulse"
+	use alsa && audio="alsa"
 
 	# bug #216009
 	# avoid writing to /root/.gstreamer-0.10/registry.xml
@@ -74,7 +77,7 @@ src_compile() {
 		$(use_enable gtk) \
 		--disable-ffmpeg \
 		--disable-mad \
-		${myconf} || die "configure failed"
+		--with-audio=${audio} || die "configure failed"
 
 	# bug #216284 image tests are not ready yet
 	cat  >test/image/Makefile <<EOF