[arch-commits] Commit in timidity++/trunk (3 files)

[Eric Bélanger]

    Date: Monday, August 30, 2010 @ 02:14:52
  Author: eric
Revision: 89194

upgpkg: timidity++ 2.13.2-10
Fixed excessive polling (close FS#20652), Added optdepends, Removed old ChangeLog

Added:
  timidity++/trunk/timidity++-2.13.2-polling.patch
Modified:
  timidity++/trunk/PKGBUILD
Deleted:
  timidity++/trunk/ChangeLog

---------------------------------+
 ChangeLog                       |    5 ---
 PKGBUILD                        |   56 +++++++++++++++++++-------------------
 timidity++-2.13.2-polling.patch |   34 +++++++++++++++++++++++
 3 files changed, 62 insertions(+), 33 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2010-08-30 03:40:01 UTC (rev 89193)
+++ ChangeLog	2010-08-30 06:14:52 UTC (rev 89194)
@@ -1,5 +0,0 @@
-2008-12-14  Eric Belanger  <eric at archlinux.org>
-
-	* timidity++ 2.13.2-8
-	* Rebuilt against xaw3d 1.5E
-	* Added ChangeLog

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-30 03:40:01 UTC (rev 89193)
+++ PKGBUILD	2010-08-30 06:14:52 UTC (rev 89194)
@@ -4,50 +4,50 @@
 
 pkgname=timidity++
 pkgver=2.13.2
-pkgrel=9
+pkgrel=10
 pkgdesc="A MIDI to WAVE converter and player"
 arch=('i686' 'x86_64')
 url="http://timidity.sourceforge.net"
 license=('GPL')
 depends=('libao' 'libvorbis' 'jack' 'ncurses')
 makedepends=('xaw3d' 'gtk2' 'tk' 'libxaw')
+optdepends=('gtk2: for using the GTK+ interface' 'tk: for using the Tk interface' \
+            'xaw3d: for using the Xaw interface')
 backup=('etc/timidity++/timidity.cfg')
-source=(http://downloads.sourceforge.net/timidity/TiMidity++-${pkgver}.tar.gz \
-	timidity.cfg timidity++.sh 2.13.2-gcc4.patch TiMidity++-2.13.2+flac-1.1.3.patch \
-	timidity++-2.13.2-exiterror.patch timidity++-2.13.2-gtk26.patch)
-md5sums=('4a1644d1893437b372769cf331611e76' '3fcc8f065c959205113fa7e9ab2be3c6'\
+source=(http://downloads.sourceforge.net/timidity/TiMidity++-${pkgver}.tar.bz2 \
+        timidity.cfg timidity++.sh 2.13.2-gcc4.patch TiMidity++-2.13.2+flac-1.1.3.patch \
+        timidity++-2.13.2-exiterror.patch timidity++-2.13.2-gtk26.patch \
+        timidity++-2.13.2-polling.patch)
+md5sums=('a82ceeb2245e22f4de2b41da21eaee32' '3fcc8f065c959205113fa7e9ab2be3c6'\
          '35606c12af9c6be9361d64fc536f046f' '0868926c5290817cacb9a1849bc043c2'\
          'fcbd27ff83066f69a3f8bd2442a3b3e2' '31bdaea612f18e2c3d45a8a73ab44c81'\
-         '16a4adec164836d4390dc6b0f9a69ce9')
-sha1sums=('8d1762aeda0ed765f2f49e5560a8700f490c1853'
-	  '660b3afbb720d26e8f008034cee66dd8da082d6e'
-	  '9f3e732a7ca1e97119a76df62ecf154df04d4f77'
-	  '8d50618a2379c078b07e8d0fc59457855c16106c'
-	  '59b0dbe3cde8f7b41d83676d8c37809255d3fb36'
-	  '7cd697b4f7cb1ce45cec46c2e0f6e5e8bf1d9d60'
-	  'ce115e84d99708f0bdb5b57bd98b0c3514fa2bf4')
+         '16a4adec164836d4390dc6b0f9a69ce9' '3f0034ead451cdd1078868e9e9b0494c')
+sha1sums=('8e603146e1164335303a5ac5dff291f369241b4e' '660b3afbb720d26e8f008034cee66dd8da082d6e'\
+         '9f3e732a7ca1e97119a76df62ecf154df04d4f77' '8d50618a2379c078b07e8d0fc59457855c16106c'\
+         '59b0dbe3cde8f7b41d83676d8c37809255d3fb36' '7cd697b4f7cb1ce45cec46c2e0f6e5e8bf1d9d60'\
+         'ce115e84d99708f0bdb5b57bd98b0c3514fa2bf4' '6abaedaecdecabf9dc76c062f7157571aed53984')
 
 build() {
-  cd ${srcdir}/TiMidity++-${pkgver}
-  patch -p1 < ../2.13.2-gcc4.patch || return 1
-  patch -p1 < ../TiMidity++-2.13.2+flac-1.1.3.patch || return 1
-  patch -p1 < ../timidity++-2.13.2-exiterror.patch || return 1
-  patch -p0 < ../timidity++-2.13.2-gtk26.patch || return 1
+  cd "${srcdir}/TiMidity++-${pkgver}"
+  patch -p1 < ../2.13.2-gcc4.patch
+  patch -p1 < ../TiMidity++-2.13.2+flac-1.1.3.patch
+  patch -p1 < ../timidity++-2.13.2-exiterror.patch
+  patch -p0 < ../timidity++-2.13.2-gtk26.patch
+  patch -p0 < ../timidity++-2.13.2-polling.patch
+  sed -i 's/tcl8.4/tcl8.5/' configure
+  sed -i 's/tk8.4/tk8.5/' configure
 
-  autoconf || return 1
-  sed -i 's/tcl8.4/tcl8.5/' configure || return 1
-  sed -i 's/tk8.4/tk8.5/' configure || return 1
-  ./configure --prefix=/usr --with-default-path=/etc/timidity++/ \
+  ./configure --prefix=/usr --mandir=/usr/share/man --with-default-path=/etc/timidity++/ \
 	--enable-server --enable-alsaseq --enable-spectrogram \
 	--enable-audio=alsa,oss,ao,vorbis,flac,esd,jack \
 	--enable-dynamic=ncurses,tcltk,vt100,xaw,gtk \
-	--disable-gtktest || return 1
-  make || return 1
+	--disable-gtktest
+  make
 }
 
 package() {
-  cd ${srcdir}/TiMidity++-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
-  install -D -m644 ../timidity.cfg ${pkgdir}/etc/timidity++/timidity.cfg || return 1
-  install -D -m755 ../timidity++.sh ${pkgdir}/etc/rc.d/timidity++ || return 1
+  cd "${srcdir}/TiMidity++-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 ../timidity.cfg "${pkgdir}/etc/timidity++/timidity.cfg"
+  install -D -m755 ../timidity++.sh "${pkgdir}/etc/rc.d/timidity++"
 }

Added: timidity++-2.13.2-polling.patch
===================================================================
--- timidity++-2.13.2-polling.patch	                        (rev 0)
+++ timidity++-2.13.2-polling.patch	2010-08-30 06:14:52 UTC (rev 89194)
@@ -0,0 +1,34 @@
+--- interface/alsaseq_c.c	2006/12/13 23:22:53	1.28
++++ interface/alsaseq_c.c	2008/04/16 00:14:45	1.29
+@@ -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;
+ 		}
+ 	}
+