Version bump, remove old experimental init.d version (now 0.9.8-r1). Add better documentation of the USE flags. The new version supports bluetooth and policykit USE flags now.

(Portage version: 2.1.4_rc1)

10 files changed, 263 insertions, 13 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index bfed672ba722..3cdbbc866f43 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.73 2007/11/17 12:52:24 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.74 2007/11/23 13:09:30 flameeyes Exp $
+
+  23 Nov 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
+  Version bump, remove old experimental init.d version (now 0.9.8-r1). Add
+  better documentation of the USE flags. The new version supports bluetooth
+  and policykit USE flags now.
 
   17 Nov 2007; nixnut <nixnut@gentoo.org> pulseaudio-0.9.6-r1.ebuild:
   Stable on ppc wrt bug 197126
diff --git a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.7-r1 b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.7-r1
deleted file mode 100644
index d994f7b0e3ed..000000000000
--- a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.7-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 df623170b07854d695bc24e9f1083cac pulseaudio-0.9.7.tar.gz 1013981
-RMD160 49d0d875d6929527fe97124431462e63adf52873 pulseaudio-0.9.7.tar.gz 1013981
-SHA256 b5f3fe8fc8be435e5d1b2183894fb545220a50b5b4850bb71af6b5e14f8f6ee0 pulseaudio-0.9.7.tar.gz 1013981
diff --git a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.8 b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.8
new file mode 100644
index 000000000000..9f89ccdd6357
--- /dev/null
+++ b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.8
@@ -0,0 +1,3 @@
+MD5 184a41d5947e583d395f0a2541525fc2 pulseaudio-0.9.8.tar.gz 1089681
+RMD160 ed4c1a5f4cf53ef166fe2aad66f1cae880463a8f pulseaudio-0.9.8.tar.gz 1089681
+SHA256 359891878e19d33b15f6a97eaec9b2f7d85dab7c1e1d6723537b80d36aa36858 pulseaudio-0.9.8.tar.gz 1089681
diff --git a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.8-r1 b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.8-r1
new file mode 100644
index 000000000000..9f89ccdd6357
--- /dev/null
+++ b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.8-r1
@@ -0,0 +1,3 @@
+MD5 184a41d5947e583d395f0a2541525fc2 pulseaudio-0.9.8.tar.gz 1089681
+RMD160 ed4c1a5f4cf53ef166fe2aad66f1cae880463a8f pulseaudio-0.9.8.tar.gz 1089681
+SHA256 359891878e19d33b15f6a97eaec9b2f7d85dab7c1e1d6723537b80d36aa36858 pulseaudio-0.9.8.tar.gz 1089681
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.8-polkit.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.8-polkit.patch
new file mode 100644
index 000000000000..fcd0183ffdc3
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-0.9.8-polkit.patch
@@ -0,0 +1,18 @@
+Index: pulseaudio-0.9.8/configure.ac
+===================================================================
+--- pulseaudio-0.9.8.orig/configure.ac
++++ pulseaudio-0.9.8/configure.ac
+@@ -881,11 +881,11 @@ if test "x${polkit}" != xno ; then
+         [
+             HAVE_POLKIT=1
+             saved_LIBS="$LIBS"
+-            LIBS="$LIBS POLKIT_LIBS"
++            LIBS="$LIBS $POLKIT_LIBS"
+             AC_CHECK_FUNCS(polkit_context_is_caller_authorized)
+             LIBS="$saved_LIBS"
+             AC_DEFINE([HAVE_POLKIT], 1, [Have PolicyKit])
+-            policydir=`pkg-config --variable prefix`/usr/share/PolicyKit/policy/
++            policydir=`pkg-config polkit-dbus --variable prefix`/share/PolicyKit/policy/
+             AC_SUBST(policydir)
+         ],
+         [
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.8-svn2074.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.8-svn2074.patch
new file mode 100644
index 000000000000..707abef780f5
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-0.9.8-svn2074.patch
@@ -0,0 +1,13 @@
+Index: src/pulse/stream.c
+===================================================================
+--- src/pulse/stream.c	(revision 2073)
++++ src/pulse/stream.c	(revision 2074)
+@@ -586,7 +586,7 @@
+         }
+     }
+ 
+-    if (s->context->version >= 12) {
++    if (s->context->version >= 12 && s->direction != PA_STREAM_UPLOAD) {
+         pa_sample_spec ss;
+         pa_channel_map cm;
+         const char *dn = NULL;
diff --git a/media-sound/pulseaudio/files/pulseaudio.init.d-3 b/media-sound/pulseaudio/files/pulseaudio.init.d-3
index ce2da10aa9ec..c15c8e160a40 100644
--- a/media-sound/pulseaudio/files/pulseaudio.init.d-3
+++ b/media-sound/pulseaudio/files/pulseaudio.init.d-3
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/files/pulseaudio.init.d-3,v 1.2 2007/11/07 12:07:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/files/pulseaudio.init.d-3,v 1.3 2007/11/23 13:09:31 flameeyes Exp $
 
 depend() {
 	need localmount
@@ -36,6 +36,12 @@ depend() {
 	fi
 #endif
 
+#ifdef BLUETOOTH
+	if egrep -q '[[:space:]]*load-module[[:space:]]+module-bt-proximity' "$script"; then
+	    needs="${needs} bluetooth"
+	fi
+#endif
+
 #ifdef ALSA
 	if egrep -q '[[:space:]]*load-module[[:space:]]+module-alsa-(sink|source)' "$script" || 
 	    egrep -q '[[:space:]]*load-module[[:space:]]+module-(hal-)?detect' "$script" ||
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index e1774e3d9ad7..3fba2feb5a8b 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -2,4 +2,25 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
+<use>
+  <flag name="X">
+    Build the X11 publish module to export PulseAudio information
+    through X11 protocol for clients to make use. Don't enable this
+    flag if you want to use a system wide instance. If unsure, enable
+    this flag.
+  </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
+    unsure, enable this flag.
+  </flag>
+  <flag name="oss">
+    Enable OSS sink/source (output/input). Also build the padsp
+    script to make OSS software use PulseAudio.
+  </flag>
+  <flag name="policykit">
+    Use the PolicyKit framework (<pkg>sys-auth/policykit</pkg>) to
+    acquire high-priority and real-time scheduling for the daemon.
+  </flag>
+</use>
 </pkgmetadata>
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.7-r1.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.8-r1.ebuild
index 75da9c3d3d3e..db045bfadf04 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.7-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.8-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.7-r1.ebuild,v 1.3 2007/11/14 13:20:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.8-r1.ebuild,v 1.1 2007/11/23 13:09:30 flameeyes Exp $
 
-inherit eutils libtool # autotools
+inherit eutils libtool autotools
 
 DESCRIPTION="A networked sound server with an advanced plugin system"
 HOMEPAGE="http://0pointer.de/lennart/projects/pulseaudio/"
@@ -10,8 +10,8 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa avahi caps jack lirc oss tcpd X hal dbus libsamplerate gnome"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="alsa avahi caps jack lirc oss tcpd X hal dbus libsamplerate gnome bluetooth policykit"
 
 RDEPEND="X? ( x11-libs/libX11 )
 	caps? ( sys-libs/libcap )
@@ -31,15 +31,20 @@ RDEPEND="X? ( x11-libs/libX11 )
 	hal? ( >=sys-apps/hal-0.5.7 )
 	>=sys-apps/baselayout-2.0_rc5
 	app-admin/eselect-esd
+	bluetooth? ( >=net-wireless/bluez-libs-3 )
+	policykit? ( sys-auth/policykit )
 	>=sys-devel/libtool-1.5.24" # it's a valid RDEPEND, libltdl.so is used
 DEPEND="${RDEPEND}
 	dev-libs/libatomic_ops
 	dev-util/pkgconfig
 	dev-util/unifdef"
 
-# This is for the alsasound init.d script (see bug #155707)
+# alsa-utils dep is for the alsasound init.d script (see bug #155707)
+# bluez-utils dep is for the bluetooth init.d script
 RDEPEND="${RDEPEND}
-	alsa? ( media-sound/alsa-utils )"
+	gnome-extra/gnome-audio
+	alsa? ( media-sound/alsa-utils )
+	bluetooth? ( >=net-wireless/bluez-utils-3 )"
 
 pkg_setup() {
 	if use avahi && ! built_with_use net-dns/avahi dbus ; then
@@ -61,9 +66,10 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${P}-module-loading.patch"
+	epatch "${FILESDIR}/${P}-svn2074.patch"
+	epatch "${FILESDIR}/${P}-polkit.patch"
 
-	# eautoreconf
+	eautoreconf
 	elibtoolize
 }
 
@@ -84,6 +90,8 @@ src_compile() {
 		$(use_enable dbus) \
 		$(use_enable gnome gconf) \
 		$(use_enable libsamplerate samplerate) \
+		$(use_enable bluetooth bluez) \
+		$(use_enable policykit polkit) \
 		$(use_with caps) \
 		$(use_with X x) \
 		--disable-ltdl-install \
@@ -108,6 +116,7 @@ src_install() {
 		$(use_define hal) \
 		$(use_define avahi) \
 		$(use_define alsa) \
+		$(use_define bluetooth) \
 		> "${T}/pulseaudio"
 	doinitd "${T}/pulseaudio"
 
@@ -147,6 +156,17 @@ pkg_postinst() {
 	elog "user group: http://www.gentoo.org/proj/en/desktop/sound/realtime.xml"
 	elog "Make sure you also have baselayout installed with pam USE flag"
 	elog "enabled, if you're using the rlimit method."
+	if use bluetooth; then
+		elog
+		elog "The BlueTooth proximity module is not enabled in the default"
+		elog "configuration file. If you do enable it, you'll have to have"
+		elog "your BlueTooth controller enabled and inserted at bootup or"
+		elog "PulseAudio will refuse to start."
+		elog
+		elog "Please note that the BlueTooth proximity module seems itself"
+		elog "still experimental, so please report to upstream if you have"
+		elog "problems with it."
+	fi
 
 	eselect esd update --if-unset
 }
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.8.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.8.ebuild
new file mode 100644
index 000000000000..0107ead5854d
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-0.9.8.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.8.ebuild,v 1.1 2007/11/23 13:09:30 flameeyes Exp $
+
+inherit eutils libtool autotools
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="http://0pointer.de/lennart/projects/pulseaudio/"
+SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="alsa avahi caps jack lirc oss tcpd X hal dbus libsamplerate gnome bluetooth policykit"
+
+RDEPEND="X? ( x11-libs/libX11 )
+	caps? ( sys-libs/libcap )
+	>=media-libs/audiofile-0.2.6-r1
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
+	>=media-libs/libsndfile-1.0.10
+	>=dev-libs/liboil-0.3.6
+	alsa? ( >=media-libs/alsa-lib-1.0.10 )
+	>=dev-libs/glib-2.4.0
+	avahi? ( >=net-dns/avahi-0.6.12 )
+	>=dev-libs/liboil-0.3.0
+	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
+	tcpd? ( sys-apps/tcp-wrappers )
+	lirc? ( app-misc/lirc )
+	dbus? ( >=sys-apps/dbus-1.0.0 )
+	gnome? ( >=gnome-base/gconf-2.4.0 )
+	hal? ( >=sys-apps/hal-0.5.7 )
+	app-admin/eselect-esd
+	bluetooth? ( >=net-wireless/bluez-libs-3 )
+	policykit? ( sys-auth/policykit )
+	>=sys-devel/libtool-1.5.24" # it's a valid RDEPEND, libltdl.so is used
+DEPEND="${RDEPEND}
+	dev-libs/libatomic_ops
+	dev-util/pkgconfig"
+
+# alsa-utils dep is for the alsasound init.d script (see bug #155707)
+# bluez-utils dep is for the bluetooth init.d script
+RDEPEND="${RDEPEND}
+	gnome-extra/gnome-audio
+	alsa? ( media-sound/alsa-utils )
+	bluetooth? ( >=net-wireless/bluez-utils-3 )"
+
+pkg_setup() {
+	if use avahi && ! built_with_use net-dns/avahi dbus ; then
+		echo
+		eerror "In order to compile pulseaudio with avahi support, you need to have"
+		eerror "net-dns/avahi emerged with 'dbus' in your USE flag. Please add that"
+		eerror "flag, re-emerge avahi, and then emerge pulseaudio again."
+		die "net-dns/avahi is missing the D-Bus bindings."
+	fi
+
+	enewgroup audio 18 # Just make sure it exists
+	enewgroup realtime
+	enewgroup pulse-access
+	enewgroup pulse
+	enewuser pulse -1 -1 /var/run/pulse pulse,audio
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-svn2074.patch"
+	epatch "${FILESDIR}/${P}-polkit.patch"
+
+	eautoreconf
+	elibtoolize
+}
+
+src_compile() {
+	econf \
+		--enable-largefile \
+		--enable-glib2 \
+		--disable-solaris \
+		--disable-asyncns \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		$(use_enable lirc) \
+		$(use_enable tcpd tcpwrap) \
+		$(use_enable jack) \
+		$(use_enable lirc) \
+		$(use_enable avahi) \
+		$(use_enable hal) \
+		$(use_enable dbus) \
+		$(use_enable gnome gconf) \
+		$(use_enable libsamplerate samplerate) \
+		$(use_enable bluetooth bluez) \
+		$(use_enable policykit polkit) \
+		$(use_with caps) \
+		$(use_with X x) \
+		--disable-ltdl-install \
+		--localstatedir=/var \
+		--with-realtime-group=realtime \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "make install failed"
+
+	newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
+
+	local neededservices
+	use alsa && neededservices="$neededservices alsasound"
+	use avahi && neededservices="$neededservices avahi-daemon"
+	use hal && neededservices="$neededservices hald"
+	use bluetooth && neededservices="$neededservices bluetooth"
+	[[ -n ${neededservices} ]] && sed -e "s/@neededservices@/need $neededservices/" "${FILESDIR}/pulseaudio.init.d-2" > "${T}/pulseaudio"
+	doinitd "${T}/pulseaudio"
+
+	if ! use hal; then
+		sed -i -e '/module-hal-detect/s:^:#: ; /module-detect/s:^#::' "${D}/etc/pulse/default.pa"
+	fi
+	use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${D}/etc/pulse/default.pa"
+
+	dohtml -r doc
+	dodoc README
+
+	# Create the state directory
+	diropts -o pulse -g pulse -m0755
+	keepdir /var/run/pulse
+}
+
+pkg_postinst() {
+	elog "PulseAudio in Gentoo can use a system-wide pulseaudio daemon."
+	elog "This support is enabled by starting the pulseaudio init.d ."
+	elog "To be able to access that you need to be in the group pulse-access."
+	elog "For more information about system-wide support, please refer to"
+	elog "	 http://pulseaudio.org/wiki/SystemWideInstance"
+	if use gnome; then
+		elog
+		elog "By enabling gnome USE flag, you enabled gconf support. Pleaes note"
+		elog "that you might need to remove the gnome USE flag or disable the"
+		elog "gconf module on /etc/pulse/default.pa to be able to use PulseAudio"
+		elog "with a system-wide instance."
+	fi
+	elog
+	elog "To use the ESounD wrapper while using a system-wide daemon, you also"
+	elog "need to enable auth-anonymous for the esound-unix module, or to copy"
+	elog "/var/run/pulse/.esd_auth into each home directory."
+	elog
+	elog "If you want to make use of realtime capabilities of PulseAudio"
+	elog "you should follow the realtime guide to create and set up a realtime"
+	elog "user group: http://www.gentoo.org/proj/en/desktop/sound/realtime.xml"
+	elog "Make sure you also have baselayout installed with pam USE flag"
+	elog "enabled, if you're using the rlimit method."
+	if use bluetooth; then
+		elog
+		elog "The BlueTooth proximity module is not enabled in the default"
+		elog "configuration file. If you do enable it, you'll have to have"
+		elog "your BlueTooth controller enabled and inserted at bootup or"
+		elog "PulseAudio will refuse to start."
+		elog
+		elog "Please note that the BlueTooth proximity module seems itself"
+		elog "still experimental, so please report to upstream if you have"
+		elog "problems with it."
+	fi
+
+	eselect esd update --if-unset
+}