[patch] Patch to ebuild to fix audio=none issue, and pa/alsa/oss order issues

fix-swfdec-audio-backend-logic.patch (text/plain), 1.34 KB, created by Nirbheek Chauhan (RETIRED) on 2008-08-07 00:43:55 UTC

--- /usr/portage/media-libs/swfdec/swfdec-0.6.8.ebuild	2008-07-30 21:09:06.000000000 +0530
+++ /usr/local/portage/media-libs/swfdec/swfdec-0.6.8.ebuild	2008-08-05 01:38:32.120950697 +0530
@@ -4,7 +4,7 @@
 
 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,20 @@
 		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 +78,7 @@
 		$(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