Added timidity init script for alsa virtual sequencer to close bug #21258. Bump -r3 into stable for x86.

7 files changed, 91 insertions, 11 deletions

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index 8e42419a9eb7..8fcfd35ab586 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/timidity++
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.12 2004/02/01 13:32:34 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.13 2004/02/10 09:48:52 eradicator Exp $
+
+  10 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity++-2.12.0-r3.ebuild, timidity++-2.12.0.ebuild,
+  files/conf.d.timidity, files/init.d.timidity:
+  Added timidity init script for alsa virtual sequencer to close bug #21258.
+  Bump -r3 into stable for x86.
 
   01 Feb 2004; Brian Harring <ferringb@gentoo.org>
   timidity++-2.12.0-r3.ebuild, timidity++-2.12.0.ebuild,
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index 47ba68452437..218d9cd140c5 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -1,9 +1,12 @@
-MD5 121e32d286f0816da717680250d858d8 ChangeLog 2104
-MD5 3063e808b91ae966e1179cf65e5e8e87 timidity++-2.12.0-r3.ebuild 2685
-MD5 e63b4f347de25f242136d8e05618cc2c timidity++-2.12.0.ebuild 2055
-MD5 435c2037a224bf9b5a8da7e4d87b48e0 files/digest-timidity++-2.12.0 75
-MD5 435c2037a224bf9b5a8da7e4d87b48e0 files/digest-timidity++-2.12.0-r3 75
-MD5 67ee26f08d8de1243029a0a8849cd022 files/gnuconfig_update.patch 477
-MD5 c6e1c7a210aef0fcd2bc42c0cb56a650 files/long-64bit.patch 1166
+MD5 464b010a1669b09e551c7238ac61cb8e timidity++-2.12.0.ebuild 2505
+MD5 86dcf36253cbbca6f9c3f78eeea717ed ChangeLog 2378
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 6e7fd4e649e81a113bb68388b9cb3937 timidity++-2.12.0-r3.ebuild 3118
 MD5 4e4757646a4d2477f9bfe883d0b5ae88 files/timidity.cfg 2723
+MD5 c6e1c7a210aef0fcd2bc42c0cb56a650 files/long-64bit.patch 1166
+MD5 67ee26f08d8de1243029a0a8849cd022 files/gnuconfig_update.patch 477
+MD5 435c2037a224bf9b5a8da7e4d87b48e0 files/digest-timidity++-2.12.0-r3 75
+MD5 435c2037a224bf9b5a8da7e4d87b48e0 files/digest-timidity++-2.12.0 75
+MD5 2cb5592870812874d35fa4a7a0c7c81f files/conf.d.timidity 635
+MD5 62587f95efadc6cae198076fe40165be files/init.d.timidity 394
 MD5 8bbea1ed225e28e6c00e1cc57622b2d5 files/timidity++-2.12.0-alsalib-fix.patch 1355
diff --git a/media-sound/timidity++/files/conf.d.timidity b/media-sound/timidity++/files/conf.d.timidity
new file mode 100644
index 000000000000..4d1d82eff795
--- /dev/null
+++ b/media-sound/timidity++/files/conf.d.timidity
@@ -0,0 +1,18 @@
+# TIMIDITY_OPTS
+# Command line arguements to be passed to timidity. -iA is always used
+# Common options:
+# -Os : Output to ALSA pcm device
+# -Oe : Output to esd
+# -On : Output to NAS
+#
+# -B<n>,<m> :  Set number of buffer fragments(n), and buffer size(2^m)
+#
+# -EFreverb=0         : Disable MIDI reverb effect control
+# -EFreverb=1[,level] : Enable MIDI reverb effect control
+#                       `level' is optional to specify reverb level [0..127]
+#                       This effect is only available in stereo
+#                       (default)
+# -EFreverb=2         : Global reverb effect
+
+TIMIDITY_OPTS="-B2,8 -Os -EFreverb=0"
+
diff --git a/media-sound/timidity++/files/init.d.timidity b/media-sound/timidity++/files/init.d.timidity
new file mode 100644
index 000000000000..7482f5ffbc5c
--- /dev/null
+++ b/media-sound/timidity++/files/init.d.timidity
@@ -0,0 +1,19 @@
+#!/sbin/runscript
+ 
+depend() {
+	need alsasound
+	use esound
+}
+ 
+start() {
+	ebegin "Starting Timidity Virtual Midi Sequencer"
+	start-stop-daemon --start --quiet --background \
+		--make-pidfile --pidfile /var/run/timidity.pid \
+		--exec /usr/bin/timidity -- -iA ${TIMIDITY_OPTS}
+	eend $?
+}
+ 
+stop() {
+	ebegin "Stopping Timidity"
+	start-stop-daemon --stop --quiet --pidfile /var/run/timidity.pid
+}
diff --git a/media-sound/timidity++/metadata.xml b/media-sound/timidity++/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/timidity++/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/timidity++/timidity++-2.12.0-r3.ebuild b/media-sound/timidity++/timidity++-2.12.0-r3.ebuild
index 27c57e5c0bef..2fecd361ebc9 100644
--- a/media-sound/timidity++/timidity++-2.12.0-r3.ebuild
+++ b/media-sound/timidity++/timidity++-2.12.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.12.0-r3.ebuild,v 1.8 2004/02/01 13:32:34 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.12.0-r3.ebuild,v 1.9 2004/02/10 09:48:52 eradicator Exp $
 
 MY_P=TiMidity++-${PV}-pre1
 S=${WORKDIR}/${MY_P}
@@ -10,7 +10,7 @@ SRC_URI="http://www.goice.co.jp/member/mo/timidity/dist/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="x86 ~ppc ~amd64 ~sparc"
 IUSE="oss nas esd motif X gtk oggvorbis tcltk slang alsa"
 inherit gnuconfig
 
@@ -88,6 +88,14 @@ src_install () {
 	doins ${FILESDIR}/timidity.cfg
 	dodoc AUTHORS COPYING ChangeLog* INSTALL*
 	dodoc NEWS README*
+
+	if use alsa; then
+		insinto /etc/conf.d
+		newins ${FILESDIR}/conf.d.timidity timidity
+
+		exeinto /etc/init.d
+		newexe ${FILESDIR}/init.d.timidity timidity
+	fi
 }
 
 pkg_postinst () {
@@ -97,4 +105,9 @@ pkg_postinst () {
 	einfo "file must to copied into /usr/share/timidity/"
 	einfo "and edited to match your configuration."
 	einfo ""
+	if use alsa; then
+		einfo "An init script for the alsa timidity sequencer has been installed."
+		einfo "If you wish to use the timidity virtual sequencer, edit /etc/conf.d/timidity"
+		einfo "and run 'rc-update add timidity <runlevel> && /etc/init.d/timidity start'"
+	fi
 }
diff --git a/media-sound/timidity++/timidity++-2.12.0.ebuild b/media-sound/timidity++/timidity++-2.12.0.ebuild
index 7f2132226a45..a81f77695962 100644
--- a/media-sound/timidity++/timidity++-2.12.0.ebuild
+++ b/media-sound/timidity++/timidity++-2.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.12.0.ebuild,v 1.9 2004/02/01 13:32:34 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.12.0.ebuild,v 1.10 2004/02/10 09:48:52 eradicator Exp $
 
 MY_P=TiMidity++-${PV}-pre1
 S=${WORKDIR}/${MY_P}
@@ -74,4 +74,20 @@ src_install () {
 	make DESTDIR=${D} install || die
 	dodoc AUTHORS COPYING ChangeLog* INSTALL*
 	dodoc NEWS README*
+
+	if use alsa; then
+		insinto /etc/conf.d
+		newins ${FILESDIR}/conf.d.timidity timidity
+
+		exeinto /etc/init.d
+		newexe ${FILESDIR}/init.d.timidity timidity
+	fi
+}
+
+pkg_postinst() {
+if use alsa; then
+	einfo "An init script for the alsa timidity sequencer has been installed."
+	einfo "If you wish to use the timidity virtual sequencer, edit /etc/conf.d/timidity"
+	einfo "and run 'rc-update add timidity <runlevel> && /etc/init.d/timidity start'"
+fi
 }