From 84ffb33c2438e1ce8faaa47a302f32b7c09968c8 Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Tue, 5 Sep 2006 21:21:47 +0000 Subject: The services previously in 'use' section are actually needed, make sure that restarting alsasound make pulseaudio restart. (Portage version: 2.1.1_rc1-r4) --- media-sound/pulseaudio/ChangeLog | 10 +- .../pulseaudio/files/digest-pulseaudio-0.9.5-r2 | 3 + media-sound/pulseaudio/files/pulseaudio.init.d-2 | 5 +- media-sound/pulseaudio/pulseaudio-0.9.5-r2.ebuild | 119 +++++++++++++++++++++ 4 files changed, 134 insertions(+), 3 deletions(-) create mode 100644 media-sound/pulseaudio/files/digest-pulseaudio-0.9.5-r2 create mode 100644 media-sound/pulseaudio/pulseaudio-0.9.5-r2.ebuild diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog index 6772a8de8bdf..0e6c4aed665e 100644 --- a/media-sound/pulseaudio/ChangeLog +++ b/media-sound/pulseaudio/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-sound/pulseaudio # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.27 2006/09/02 12:20:49 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.28 2006/09/05 21:21:47 flameeyes Exp $ + +*pulseaudio-0.9.5-r2 (05 Sep 2006) + + 05 Sep 2006; Diego Pettenò + files/pulseaudio.init.d-2, -pulseaudio-0.9.5-r1.ebuild, + +pulseaudio-0.9.5-r2.ebuild: + The services previously in 'use' section are actually needed, make sure that + restarting alsasound make pulseaudio restart. *pulseaudio-0.9.5-r1 (02 Sep 2006) diff --git a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.5-r2 b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.5-r2 new file mode 100644 index 000000000000..0d68de7bdc88 --- /dev/null +++ b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.5-r2 @@ -0,0 +1,3 @@ +MD5 99b5d9efd4fce35cabb4ae5d0ebb230d pulseaudio-0.9.5.tar.gz 1145930 +RMD160 67f0cef89588453e347a2af5f641c9f953d4ef4b pulseaudio-0.9.5.tar.gz 1145930 +SHA256 cd82eabcf9fa310a64b58b621730cebe5d3edae7596a9c121155db455b1e58f6 pulseaudio-0.9.5.tar.gz 1145930 diff --git a/media-sound/pulseaudio/files/pulseaudio.init.d-2 b/media-sound/pulseaudio/files/pulseaudio.init.d-2 index 5c48cb0b234b..a8efc76265d7 100644 --- a/media-sound/pulseaudio/files/pulseaudio.init.d-2 +++ b/media-sound/pulseaudio/files/pulseaudio.init.d-2 @@ -1,10 +1,11 @@ #!/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-2,v 1.2 2006/07/29 15:34:18 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/files/pulseaudio.init.d-2,v 1.3 2006/09/05 21:21:47 flameeyes Exp $ depend() { - use net@extradepend@ + use net + @neededservices@ } start() { diff --git a/media-sound/pulseaudio/pulseaudio-0.9.5-r2.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.5-r2.ebuild new file mode 100644 index 000000000000..e4c9f6a695dc --- /dev/null +++ b/media-sound/pulseaudio/pulseaudio-0.9.5-r2.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.5-r2.ebuild,v 1.1 2006/09/05 21:21:47 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 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" + +IUSE="alsa avahi caps jack lirc oss tcpd X hal" + +RDEPEND="X? ( || ( x11-libs/libX11 =media-libs/audiofile-0.2.6-r1 + >=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 ) + hal? ( >=sys-apps/hal-0.5.7 ) + app-admin/eselect-esd" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +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 pulse-access + enewgroup pulse + enewuser pulse -1 -1 /var/run/pulse pulse,audio +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${P}-esdcompat.patch" + epatch "${FILESDIR}/${P}-fbsd.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_with caps) \ + $(use_with X x) \ + --disable-ltdl-install \ + --localstatedir=/var \ + || die "econf failed" + emake || die "emake failed" +} + +src_install() { + emake 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" + use hal && neededservices="$neededservices hald" + [[ -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 + + 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 pulsedaemon 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" + + 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." + + eselect esd update --if-unset +} -- cgit v1.2.3-65-gdbad