ALSA fix, added init scripts

7 files changed, 154 insertions, 6 deletions

diff --git a/media-sound/esound/ChangeLog b/media-sound/esound/ChangeLog
index f39569c6b79e..3c276695b82f 100644
--- a/media-sound/esound/ChangeLog
+++ b/media-sound/esound/ChangeLog
@@ -1,10 +1,19 @@
 # ChangeLog for media-sound/esound
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/ChangeLog,v 1.17 2003/02/12 07:27:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/ChangeLog,v 1.18 2003/05/29 22:36:51 utx Exp $
+
+*esound-0.2.29-r1 (30 May 2003)
+
+  30 May 2003; Stanislav Brabec <utx@gentoo.org> esound-0.2.29-r1.ebuild,
+  files/esound-0.2.29-alsa-period.diff, files/esound.conf.d,
+  files/esound.init.d:
+  Added init scripts for remote sound access. Fixed ALSA maximum periods (CVS
+  fix from Takashi Iwai <tiwai@suse.de>).
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *esound-0.2.29 (06 Sep 2002)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
   17 Sep 2002; Spider <spider@gentoo.org> esound-0.2.29.ebuild :
   added ppc keyword 
   
diff --git a/media-sound/esound/Manifest b/media-sound/esound/Manifest
index f480bd7c1188..343be3a3934e 100644
--- a/media-sound/esound/Manifest
+++ b/media-sound/esound/Manifest
@@ -1,10 +1,10 @@
 MD5 fae8132d80bf05c52fc6a8a9fbfaa6fa esound-0.2.28-r1.ebuild 1219
 MD5 9c603a83589f11f690e43e0eebbb3dc4 esound-0.2.29.ebuild 1116
-MD5 3c433dac58e1d3aec22a282a6ca452c8 ChangeLog 2025
-MD5 f2b8a8bdf91bae62638bb4d6bbe075fc esound-0.2.29-r1.ebuild 1667
+MD5 40af381488967ec8a9c4347a2cd64bb2 ChangeLog 2333
+MD5 5479d1f86fce317f99fd3f9762f4437a esound-0.2.29-r1.ebuild 1667
 MD5 ff77029d87c0470ecc3ce2b013f84fa6 files/digest-esound-0.2.28-r1 66
 MD5 249e1fd14f662bce76093bb7685f7eb2 files/digest-esound-0.2.29 66
 MD5 340b8af9191cda014c7963617ede9b77 files/esound-0.2.29-alsa-period.diff 473
 MD5 6644892a9c43e55f65f7bb3a2656eb72 files/esound.conf.d 479
-MD5 2e3225b9445a793f3e36d09f7ec48e76 files/esound.init.d 542
+MD5 fd4987d840ec07fed696a5b780b7be45 files/esound.init.d 640
 MD5 249e1fd14f662bce76093bb7685f7eb2 files/digest-esound-0.2.29-r1 66
diff --git a/media-sound/esound/esound-0.2.29-r1.ebuild b/media-sound/esound/esound-0.2.29-r1.ebuild
new file mode 100644
index 000000000000..0ead81b4b06c
--- /dev/null
+++ b/media-sound/esound/esound-0.2.29-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.29-r1.ebuild,v 1.1 2003/05/29 22:36:51 utx Exp $
+
+IUSE="tcpd alsa"
+
+inherit libtool
+
+S=${WORKDIR}/${P}
+DESCRIPTION="The Enlightened Sound Daemon"
+SRC_URI="mirror://gnome/2.0.1/sources/${PN}/${P}.tar.bz2" 
+
+HOMEPAGE="http://www.tux.org/~ricdude/EsounD.html"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 sparc ppc alpha"
+
+DEPEND=" >=media-libs/audiofile-0.1.9
+	alsa? ( >=media-libs/alsa-lib-0.5.9 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/esound-0.2.29-alsa-period.diff
+}
+
+src_compile() {
+	elibtoolize
+
+	local myconf=""
+	use tcpd && myconf="${myconf} --with-libwrap" \
+		|| myconf="${myconf} --without-libwrap"
+
+	use alsa && myconf="${myconf} --enable-alsa" \
+		|| myconf="${myconf} --enable-alsa=no"
+
+	econf \
+		--sysconfdir=/etc/esd \
+		${myconf} || die
+
+	make || die
+}
+
+src_install() {                               
+	einstall \
+		sysconfdir=${D}/etc/esd \
+		|| die
+
+	dodoc AUTHORS COPYING* ChangeLog README TODO NEWS TIPS
+	dodoc docs/esound.ps
+
+	dohtml -r docs/html
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/esound.conf.d esound
+
+        exeinto /etc/init.d
+	use tcpd && extradepend=" portmap" \
+		|| extradepend=""
+        sed "s/@extradepend@/$extradepend/" <${FILESDIR}/esound.init.d >${T}/esound
+	doexe ${T}/esound
+
+}
+
+pkg_postinst() {
+        # rebuild init deps to include deps on esound
+        /etc/init.d/depscan.sh
+}
+
+pkg_postrm() {
+        # rebuild init deps to remove deps on esound
+        /etc/init.d/depscan.sh
+}
diff --git a/media-sound/esound/files/digest-esound-0.2.29-r1 b/media-sound/esound/files/digest-esound-0.2.29-r1
new file mode 100644
index 000000000000..cbad10c92690
--- /dev/null
+++ b/media-sound/esound/files/digest-esound-0.2.29-r1
@@ -0,0 +1 @@
+MD5 58bea6f744613da37a5970e1c18a04f8 esound-0.2.29.tar.bz2 297742
diff --git a/media-sound/esound/files/esound-0.2.29-alsa-period.diff b/media-sound/esound/files/esound-0.2.29-alsa-period.diff
new file mode 100644
index 000000000000..6e30fdf50432
--- /dev/null
+++ b/media-sound/esound/files/esound-0.2.29-alsa-period.diff
@@ -0,0 +1,17 @@
+--- audio_alsa09.c-dist	2002-11-29 17:19:32.000000000 +0100
++++ audio_alsa09.c	2002-11-29 17:20:47.000000000 +0100
+@@ -168,6 +168,14 @@
+ 		return handle;
+ 	}
+   
++	periods = 64;
++	err = snd_pcm_hw_params_set_periods_max(handle, hwparams, &periods, 0);
++	if (err < 0) {
++		if (alsadbg)
++			fprintf(stderr, "%s\n", snd_strerror(err));
++		alsaerr = -1;
++		return handle;
++	}
+   
+ 	err = snd_pcm_hw_params_set_buffer_size_near(handle, hwparams, BUFFERSIZE); 
+ 	if (err < 0) { 
diff --git a/media-sound/esound/files/esound.conf.d b/media-sound/esound/files/esound.conf.d
new file mode 100644
index 000000000000..0a3faa37dbec
--- /dev/null
+++ b/media-sound/esound/files/esound.conf.d
@@ -0,0 +1,23 @@
+# Config file for /etc/init.d/esound
+
+# Note: You need to start esound on boot, only if you want to use it over network.
+
+# For more see "esd -h".
+
+
+# Startup options
+
+# Do not beep on start. Free device after 2 sec.
+ESD_START="-nobeeps -as 2"
+
+
+# Network behavior. Use one of following.
+
+# Local only (useful for root-only soundcard access)
+#ESD_OPTIONS=""
+
+# Public TCP access.
+ESD_OPTIONS="-tcp -public"
+
+# TCP access with bind to address.
+#ESD_OPTIONS="-tcp -bind $HOSTNAME"
diff --git a/media-sound/esound/files/esound.init.d b/media-sound/esound/files/esound.init.d
new file mode 100644
index 000000000000..ae1efd1449eb
--- /dev/null
+++ b/media-sound/esound/files/esound.init.d
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/files/esound.init.d,v 1.1 2003/05/29 22:36:51 utx Exp $
+
+# Note: You need to start esound on boot, only if you want to use it over network.
+
+. /etc/conf.d/esound
+
+depend() {
+	use net@extradepend@
+}
+
+start() {
+	ebegin "Starting esound"
+	start-stop-daemon --start --quiet --background --exec /usr/bin/esd -- $ESD_START $ESD_OPTIONS
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping esound"
+	start-stop-daemon --stop --quiet --exec /usr/bin/esd
+	eend $?
+}