diff options
Diffstat (limited to 'media-libs/swfdec')
| -rw-r--r-- | media-libs/swfdec/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/swfdec/swfdec-0.6.8.ebuild | 23 | ||||
| -rw-r--r-- | media-libs/swfdec/swfdec-0.7.4.ebuild | 23 |
3 files changed, 32 insertions, 21 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/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 |