Add polling patch by Stas Sergeev wrt #200466, thanks to Miguel Marte for reporting.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 216 insertions, 1 deletions

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index 5bd3d714b0cd..cab054d13565 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/timidity++
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.110 2009/05/12 15:16:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.111 2009/05/12 16:00:46 ssuominen Exp $
+
+*timidity++-2.13.2-r9 (12 May 2009)
+
+  12 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +timidity++-2.13.2-r9.ebuild, +files/timidity++-2.13.2-polling.patch:
+  Add polling patch by Stas Sergeev wrt #200466, thanks to Miguel Marte
+  for reporting
 
 *timidity++-2.13.2-r8 (12 May 2009)
 
diff --git a/media-sound/timidity++/files/timidity++-2.13.2-polling.patch b/media-sound/timidity++/files/timidity++-2.13.2-polling.patch
new file mode 100644
index 000000000000..5e24339ad02c
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.13.2-polling.patch
@@ -0,0 +1,34 @@
+--- /var/tmp/portage/media-sound/timidity++-2.13.2-r6/work/TiMidity++-2.13.2/interface/alsaseq_c.c	2007-11-27 14:08:14.000000000 -0500
++++ TiMidity++-2.13.2/interface/alsaseq_c.c	2007-11-27 14:13:49.000000000 -0500
+@@ -501,6 +501,8 @@
+ 
+ static void doit(struct seq_context *ctxp)
+ {
++	fd_set rfds;
++	struct timeval timeout;
+ 	for (;;) {
+ 		while (snd_seq_event_input_pending(ctxp->handle, 1)) {
+ 			if (do_sequencer(ctxp))
+@@ -528,15 +530,17 @@
+ 			play_event(&ev);
+ 			aq_fill_nonblocking();
+ 		}
+-		if (! ctxp->active || ! IS_STREAM_TRACE) {
+-			fd_set rfds;
+-			struct timeval timeout;
+-			FD_ZERO(&rfds);
+-			FD_SET(ctxp->fd, &rfds);
++		
++		FD_ZERO(&rfds);
++		FD_SET(ctxp->fd, &rfds);
++		if (ctxp->active) { 
+ 			timeout.tv_sec = 0;
+ 			timeout.tv_usec = 10000; /* 10ms */
+ 			if (select(ctxp->fd + 1, &rfds, NULL, NULL, &timeout) < 0)
+ 				goto __done;
++		} else {
++			if (select(ctxp->fd + 1, &rfds, NULL, NULL, NULL) < 0)
++				goto __done; 
+ 		}
+ 	}
+ 
diff --git a/media-sound/timidity++/timidity++-2.13.2-r9.ebuild b/media-sound/timidity++/timidity++-2.13.2-r9.ebuild
new file mode 100644
index 000000000000..9aed017235c3
--- /dev/null
+++ b/media-sound/timidity++/timidity++-2.13.2-r9.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r9.ebuild,v 1.1 2009/05/12 16:00:46 ssuominen Exp $
+
+inherit eutils elisp-common
+
+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 mirror://gentoo/${P}-exiterror.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="oss nas esd motif X gtk vorbis tk slang alsa arts jack emacs ao speex flac ncurses"
+
+DEPEND="ncurses? ( >=sys-libs/ncurses-5 )
+	emacs? ( virtual/emacs )
+	gtk? ( >=x11-libs/gtk+-2 )
+	tk? ( >=dev-lang/tk-8.1 )
+	motif? ( x11-libs/openmotif )
+	esd? ( >=media-sound/esound-0.2.22 )
+	nas? ( >=media-libs/nas-1.4 )
+	alsa? ( media-libs/alsa-lib )
+	slang? ( sys-libs/slang )
+	arts? ( kde-base/arts )
+	jack? ( media-sound/jack-audio-connection-kit )
+	vorbis? ( media-libs/libvorbis )
+	flac? ( media-libs/flac )
+	speex? ( media-libs/speex )
+	ao? ( >=media-libs/libao-0.8.5 )"
+RDEPEND="${DEPEND}
+	alsa? ( media-sound/alsa-utils )
+	app-admin/eselect-timidity"
+
+PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-shompatches media-sound/timidity-freepats )"
+
+SITEFILE=50${PN}-gentoo.el
+
+pkg_setup() {
+	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror ""
+		eerror "To be able to build TiMidity++ with ALSA support you need"
+		eerror "to have built media-libs/alsa-lib with midi USE flag."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+
+	enewgroup audio 18 # Just make sure it exists
+	enewuser timidity -1 -1 /var/lib/timidity audio
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${DISTDIR}"/${P}-exiterror.patch
+	epatch "${FILESDIR}"/${P}-gtk26.patch
+	epatch "${FILESDIR}"/${P}-gcc4.patch
+	epatch "${FILESDIR}"/${P}-flac.patch
+	epatch "${FILESDIR}"/${P}-flac113.patch
+	epatch "${FILESDIR}"/${P}-protos.patch
+	epatch "${FILESDIR}"/${P}-polling.patch
+
+	# fix header location of speex
+	sed -i -e "s:#include <speex:#include <speex/speex:g" configure* timidity/speex_a.c
+}
+
+src_compile() {
+	local myconf
+	local audios
+
+	use flac && audios="${audios},flac"
+	use speex && audios="${audios},speex"
+	use vorbis && audios="${audios},vorbis"
+
+	use oss && audios="${audios},oss"
+	use esd && audios="${audios},esd"
+	use arts && audios="${audios},arts"
+	use jack && audios="${audios},jack"
+	use ao && audios="${audios},ao"
+
+	if use nas; then
+		audios="${audios},nas"
+		myconf="${myconf} --with-nas-library=/usr/$(get_libdir)/libaudio.so --with-x"
+		use X || ewarn "Basic X11 support will be enabled because required by nas."
+	fi
+
+	if use alsa; then
+		audios="${audios},alsa"
+		myconf="${myconf} --with-default-output=alsa --enable-alsaseq"
+	fi
+
+	# We disable motif by default and then only enable it if it's requested.
+	if use motif; then
+		myconf="${myconf} --enable-motif --with-x"
+		use X || ewarn "Basic X11 support will be enabled because required by motif."
+	fi
+
+	econf \
+		--localstatedir=/var/state/timidity++ \
+		--with-lispdir="${SITELISP}/${PN}" \
+		--with-elf \
+		--enable-audio=${audios} \
+		--enable-server \
+		--enable-network \
+		--enable-dynamic \
+		--enable-vt100 \
+		--enable-spline=cubic \
+		$(use_enable emacs) \
+		$(use_enable slang) \
+		$(use_enable ncurses) \
+		$(use_with X x) \
+		$(use_enable X spectrogram) \
+		$(use_enable X wrd) \
+		$(use_enable X xskin) \
+		$(use_enable X xaw) \
+		$(use_enable gtk) \
+		$(use_enable tk tcltk) \
+		--disable-motif \
+		${myconf} || die
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog*
+	dodoc NEWS README* "${FILESDIR}/timidity.cfg-r1"
+
+	# these are only for the ALSA sequencer mode
+	if use alsa; then
+		newconfd "${FILESDIR}/conf.d.timidity" timidity
+		newinitd "${FILESDIR}/init.d.timidity.3" timidity
+	fi
+
+	insinto /etc
+	newins "${FILESDIR}/timidity.cfg-r1" timidity.cfg
+
+	dodir /usr/share/timidity
+	dosym /etc/timidity.cfg /usr/share/timidity/timidity.cfg
+
+	if use emacs ; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	diropts -o timidity -g nobody -m 0700
+	keepdir /var/lib/timidity
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	elog "A timidity config file has been installed in /etc/timidity.cfg."
+	elog "Do not edit this file as it will interfere with the eselect timidity tool."
+	elog "The tool 'eselect timidity' can be used to switch between installed patchsets."
+
+	if use alsa; then
+		elog "An init script for the alsa timidity sequencer has been installed."
+		elog "If you wish to use the timidity virtual sequencer, edit /etc/conf.d/timidity"
+		elog "and run 'rc-update add timidity <runlevel> && /etc/init.d/timidity start'"
+	fi
+
+	if use sparc; then
+		ewarn "sparc support is experimental. oss, alsa, and esd do not work."
+		ewarn "-Ow (save to wave file) does..."
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}