Added TIMIDITY_PCM_NAME option to conf.d file. Closes bug #44863. Version bump.

6 files changed, 131 insertions, 4 deletions

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index 0528029ff616..45cbdc90d5f0 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,13 @@
 # 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.14 2004/02/21 20:18:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.15 2004/03/19 17:51:23 eradicator Exp $
+
+*timidity++-2.13.0_rc2 (19 Mar 2004)
+
+  19 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity++-2.13.0_rc2.ebuild, files/conf.d.timidity, files/init.d.timidity:
+  Added TIMIDITY_PCM_NAME option to conf.d file. Closes bug #44863. Version
+  bump.
 
 *timidity++-2.13.0_rc1 (21 Feb 2004)
 
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index 64afe30351c1..083b9bc12856 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -1,12 +1,14 @@
-MD5 80da516a19c3e7d2463fc508e02f28f8 ChangeLog 2696
+MD5 4cdbe3e2345877c239097725e938d765 timidity++-2.13.0_rc2.ebuild 3172
+MD5 9a1a79af9a941306ead2a3bc4739e3da ChangeLog 2954
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 1b4ad1a9ba29f4e7123f66670992776d timidity++-2.12.0-r3.ebuild 3140
 MD5 26140718b81fcc8c3363ba875d053707 timidity++-2.13.0_rc1.ebuild 3035
 MD5 d324de8cc3fd3761f47c8d23d4016669 files/digest-timidity++-2.13.0_rc1 75
+MD5 009bc790e82f147c3764c4b8fbf40029 files/digest-timidity++-2.13.0_rc2 75
 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 2cb5592870812874d35fa4a7a0c7c81f files/conf.d.timidity 635
-MD5 bced07afc5aaa96209cfb7350034d5b2 files/init.d.timidity 403
+MD5 dbfc5d45b6177ffaf7dd74d4971a520a files/conf.d.timidity 912
+MD5 a216b305951cefced3806b5be686dbbe files/init.d.timidity 461
 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
index 4d1d82eff795..8e2ecf9643a0 100644
--- a/media-sound/timidity++/files/conf.d.timidity
+++ b/media-sound/timidity++/files/conf.d.timidity
@@ -16,3 +16,9 @@
 
 TIMIDITY_OPTS="-B2,8 -Os -EFreverb=0"
 
+# TIMIDITY_PCM_NAME
+# This option can be used to choose an alternate ALSA pcm device.  This will
+# be most useful for users of the dmix alsa plugin or those with multiple
+# cards.  If you don't know what this is, chances are you want the default.
+
+#TIMIDITY_PCM_NAME="default"
diff --git a/media-sound/timidity++/files/digest-timidity++-2.13.0_rc2 b/media-sound/timidity++/files/digest-timidity++-2.13.0_rc2
new file mode 100644
index 000000000000..fb2ba31d919f
--- /dev/null
+++ b/media-sound/timidity++/files/digest-timidity++-2.13.0_rc2
@@ -0,0 +1 @@
+MD5 cf76d9b90d296a96fb36078337d35805 TiMidity++-2.13.0-rc2.tar.bz2 1367867
diff --git a/media-sound/timidity++/files/init.d.timidity b/media-sound/timidity++/files/init.d.timidity
index 790ed849c507..8f8c98d426df 100644
--- a/media-sound/timidity++/files/init.d.timidity
+++ b/media-sound/timidity++/files/init.d.timidity
@@ -7,6 +7,7 @@ depend() {
  
 start() {
 	ebegin "Starting Timidity Virtual Midi Sequencer"
+	test -n "$TIMIDITY_PCM_NAME" && export TIMIDITY_PCM_NAME
 	start-stop-daemon --start --quiet --background \
 		--make-pidfile --pidfile /var/run/timidity.pid \
 		--exec /usr/bin/timidity -- -iA ${TIMIDITY_OPTS}
diff --git a/media-sound/timidity++/timidity++-2.13.0_rc2.ebuild b/media-sound/timidity++/timidity++-2.13.0_rc2.ebuild
new file mode 100644
index 000000000000..206d917342ed
--- /dev/null
+++ b/media-sound/timidity++/timidity++-2.13.0_rc2.ebuild
@@ -0,0 +1,110 @@
+# 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.13.0_rc2.ebuild,v 1.1 2004/03/19 17:51:23 eradicator Exp $
+
+MY_PV=${PV/_/-}
+MY_P=TiMidity++-${MY_PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="A handy MIDI to WAV converter with OSS and ALSA output support"
+HOMEPAGE="http://timidity.sourceforge.net/"
+SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.bz2"
+RESTRICT="nomirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+IUSE="oss nas esd motif X gtk oggvorbis tcltk slang alsa kde jack portaudio"
+
+inherit gnuconfig
+
+RDEPEND=">=sys-libs/ncurses-5.0
+	X? ( >=x11-base/xfree-4.0 )
+	esd? ( >=media-sound/esound-0.2.22 )
+	gtk? ( =x11-libs/gtk+-1.2* )
+	nas? ( >=media-libs/nas-1.4 )
+	alsa? ( media-libs/alsa-lib )
+	motif? ( >=x11-libs/openmotif-2.1 )
+	slang? ( >=sys-libs/slang-1.4 )
+	tcltk? ( >=dev-lang/tk-8.1 )
+	kde? ( kde-base/arts )
+	jack? ( !sparc? ( virtual/jack ) )
+	portaudio? ( x86? ( media-libs/portaudio ) )
+	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
+
+DEPEND="${RDEPEND}
+	sys-devel/autoconf"
+
+src_compile() {
+	local myconf
+	local audios
+	local interfaces
+
+	use amd64 && ( epatch ${FILESDIR}/gnuconfig_update.patch
+		epatch ${FILESDIR}/long-64bit.patch
+		gnuconfig_update )
+
+	interfaces="dynamic,ncurses,emacs,vt100"
+
+	if use X; then
+		myconf="${myconf} --with-x --enable-spectrogram --enable-wrd"
+		interfaces="${interfaces},xskin,xaw"
+		use gtk && interfaces="${interfaces},gtk"
+		use motif && interfaces="${interfaces},motif"
+	else
+		myconf="${myconf} --without-x"
+	fi
+
+	use slang && interfaces="${interfaces},slang"
+
+	use oss && audios="${audios},oss"
+	use esd && audios="${audios},esd"
+	use oggvorbis && audios="${audios},vorbis"
+	use nas && audios="${audios},nas"
+	use kde && audios="${audios},arts"
+	use sparc || (use jack && audios="${audios},jack")
+	use x86 use portaudio && audios="${audios},portaudio"
+
+	use alsa \
+		&& audios="${audios},alsa" \
+		&& interfaces="${interfaces},alsaseq" \
+		&& myconf="${myconf} --with-default-output=alsa"
+
+	econf \
+		--localstatedir=/var/state/timidity++ \
+		--with-elf \
+		--enable-audio=${audios} \
+		--enable-interface=${interfaces} \
+		--enable-server \
+		--enable-network \
+		${myconf} || die
+
+	emake || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	dodir /usr/share/timidity/config
+	insinto /usr/share/timidity/config
+	doins ${FILESDIR}/timidity.cfg
+	dodoc AUTHORS COPYING ChangeLog* INSTALL*
+	dodoc NEWS README*
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/conf.d.timidity timidity
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/init.d.timidity timidity
+}
+
+pkg_postinst () {
+	einfo ""
+	einfo "A timidity config file has been installed in"
+	einfo "/usr/share/timitidy/config/timidity.cfg. This"
+	einfo "file must to copied into /usr/share/timidity/"
+	einfo "and edited to match your configuration."
+	einfo ""
+	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'"
+}