mgorny 14/12/05 15:26:17 Modified: metadata.xml pulseaudio-5.0-r6.ebuild ChangeLog Log: USE default-enabled USE=alsa-plugin to control installing the plugin, as agreed between the maintainers and QA. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.29 media-sound/pulseaudio/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/metadata.xml?rev=1.29&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/metadata.xml?rev=1.29&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/metadata.xml?r1=1.28&r2=1.29 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/metadata.xml,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- metadata.xml 16 Feb 2014 21:30:36 -0000 1.28 +++ metadata.xml 5 Dec 2014 15:26:17 -0000 1.29 @@ -10,6 +10,11 @@ flag if you want to use a system wide instance. If unsure, enable this flag. </flag> + <flag name="alsa-plugin"> + Request installing <pkg>media-sound/alsa-plugins</pkg> with + PulseAudio plugin enabled. This ensures that clients supporting + ALSA only will use PulseAudio. + </flag> <flag name="gnome"> Use GConf to store user preferences on streams and so on. Don't enable this flag if you want to use a system wide instance. If 1.3 media-sound/pulseaudio/pulseaudio-5.0-r6.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r6.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r6.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r6.ebuild?r1=1.2&r2=1.3 Index: pulseaudio-5.0-r6.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r6.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pulseaudio-5.0-r6.ebuild 5 Dec 2014 10:30:55 -0000 1.2 +++ pulseaudio-5.0-r6.ebuild 5 Dec 2014 15:26:17 -0000 1.3 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r6.ebuild,v 1.2 2014/12/05 10:30:55 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r6.ebuild,v 1.3 2014/12/05 15:26:17 mgorny Exp $ EAPI="5" inherit autotools bash-completion-r1 eutils flag-o-matic linux-info readme.gentoo systemd user versionator udev multilib-minimal @@ -18,8 +18,8 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="+alsa +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib gnome -gtk ipv6 jack libsamplerate lirc neon +orc oss qt4 realtime ssl systemd +IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib +gnome gtk ipv6 jack libsamplerate lirc neon +orc oss qt4 realtime ssl systemd system-wide tcpd test +udev +webrtc-aec +X xen zeroconf" # See "*** BLUEZ support not found (requires D-Bus)" in configure.ac @@ -88,6 +88,8 @@ dev-util/intltool >=sys-devel/gettext-0.18.1 " +# This is a PDEPEND to avoid a circular dep +PDEPEND="alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] )" # alsa-utils dep is for the alsasound init.d script (see bug #155707) # bluez dep is for the bluetooth init.d script @@ -350,10 +352,4 @@ elog "This will build the equalizer module, but the 'qpaeq' tool" elog "which is required to set equalizer levels will not work." fi - - if use alsa && ! has_version 'media-plugins/alsa-plugins[pulseaudio]'; then - ewarn - ewarn "You will need to install media-plugins/alsa-plugins[pulseaudio]" - ewarn "if you want ALSA-only apps to automatically use PulseAudio." - fi } 1.361 media-sound/pulseaudio/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/ChangeLog?rev=1.361&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/ChangeLog?rev=1.361&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/ChangeLog?r1=1.360&r2=1.361 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v retrieving revision 1.360 retrieving revision 1.361 diff -u -r1.360 -r1.361 --- ChangeLog 5 Dec 2014 10:30:55 -0000 1.360 +++ ChangeLog 5 Dec 2014 15:26:17 -0000 1.361 @@ -1,6 +1,11 @@ # ChangeLog for media-sound/pulseaudio # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.360 2014/12/05 10:30:55 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.361 2014/12/05 15:26:17 mgorny Exp $ + + 05 Dec 2014; Michał Górny <[email protected]> metadata.xml, + pulseaudio-5.0-r6.ebuild: + USE default-enabled USE=alsa-plugin to control installing the plugin, as + agreed between the maintainers and QA. 05 Dec 2014; Pacho Ramos <[email protected]> pulseaudio-5.0-r6.ebuild: Increase severity of the messages as people wanting to run pulseaudio[alsa]
