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

[Eric Bélanger]

    Date: Saturday, September 27, 2014 @ 04:46:55
  Author: eric
Revision: 223374

upgpkg: timidity++ 2.14.0-6

Add patch to improve tk 8.6 fix, Fix jack support (close FS#40906)

Added:
  timidity++/trunk/timidity-jack.patch
  timidity++/trunk/timidity-tk86.patch
Modified:
  timidity++/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   25 ++++++++++++++++---------
 timidity-jack.patch |   11 +++++++++++
 timidity-tk86.patch |   39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-27 01:22:14 UTC (rev 223373)
+++ PKGBUILD	2014-09-27 02:46:55 UTC (rev 223374)
@@ -3,7 +3,7 @@
 
 pkgname=timidity++
 pkgver=2.14.0
-pkgrel=5
+pkgrel=6
 pkgdesc="A MIDI to WAVE converter and player"
 arch=('i686' 'x86_64')
 url="http://timidity.sourceforge.net"
@@ -10,19 +10,26 @@
 license=('GPL')
 depends=('libao' 'jack')
 makedepends=('xaw3d' 'gtk2' 'tk' 'libxaw')
-optdepends=('gtk2: for using the GTK+ interface' 'tk: for using the Tk interface' \
+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.xz \
-        timidity.cfg timidity.service)
+source=(http://downloads.sourceforge.net/timidity/TiMidity++-${pkgver}.tar.xz
+        timidity.cfg timidity.service timidity-tk86.patch timidity-jack.patch)
 sha1sums=('15ec27f1ea3e718a8d61603521fc16df5c0dd24b'
           '660b3afbb720d26e8f008034cee66dd8da082d6e'
-          'f0351b9eb8928d3d82c380107654a7dbe7cd2d54')
+          'f0351b9eb8928d3d82c380107654a7dbe7cd2d54'
+          '5c6022a79c20fbb31afc28b9713c903fccff93c8'
+          'c0d58d1cb4bd0eb82a965531ffe83cc3f540e318')
 
+prepare() {
+  cd TiMidity++-${pkgver}
+  patch -p1 -i "${srcdir}/timidity-tk86.patch"
+  patch -p1 -i "${srcdir}/timidity-jack.patch"
+}
+
 build() {
-  cd "${srcdir}/TiMidity++-${pkgver}"
-  sed -i -e 's/tcl8.5/tcl8.6 tcl8.5/' -e 's/tk8.5/tk8.6 tk8.5/' configure
-  sed -i 's/my_interp->result/(char *) Tcl_GetObjResult(my_interp)/' interface/tk_c.c
+  cd TiMidity++-${pkgver}
   ./configure --prefix=/usr --mandir=/usr/share/man --with-default-path=/etc/timidity++/ \
     --enable-server --enable-alsaseq --enable-spectrogram --enable-network --enable-xft \
     --enable-audio=alsa,oss,ao,vorbis,flac,jack \
@@ -31,7 +38,7 @@
 }
 
 package() {
-  cd "${srcdir}/TiMidity++-${pkgver}"
+  cd TiMidity++-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -D -m644 ../timidity.cfg "${pkgdir}/etc/timidity++/timidity.cfg"
   install -D -m644 ../timidity.service "${pkgdir}/usr/lib/systemd/system/timidity.service"

Added: timidity-jack.patch
===================================================================
--- timidity-jack.patch	                        (rev 0)
+++ timidity-jack.patch	2014-09-27 02:46:55 UTC (rev 223374)
@@ -0,0 +1,11 @@
+diff -Naur TiMidity++-2.14.0-orig/timidity/jack_a.c TiMidity++-2.14.0/timidity/jack_a.c
+--- TiMidity++-2.14.0-orig/timidity/jack_a.c	2014-09-26 22:08:51.531559553 -0400
++++ TiMidity++-2.14.0/timidity/jack_a.c	2014-09-26 22:11:12.864659285 -0400
+@@ -508,6 +508,7 @@
+ 				pthread_cond_wait(&ctx->cond, &ctx->lock);
+ 		}
+ 		/* fallthrough */
++	case PM_REQ_PLAY_START:
+ 	case PM_REQ_DISCARD:
+ 		ctx->running = 0;
+ 		ringbuf_clear(&ctx->rbuf);

Added: timidity-tk86.patch
===================================================================
--- timidity-tk86.patch	                        (rev 0)
+++ timidity-tk86.patch	2014-09-27 02:46:55 UTC (rev 223374)
@@ -0,0 +1,39 @@
+--- a/interface/tk_c.c
++++ b/interface/tk_c.c
+@@ -65,6 +65,9 @@
+ #define TKPROGPATH PKGLIBDIR "/tkmidity.tcl"
+ #endif /* TKPROGPATH */
+ 
++#if (TCL_MAJOR_VERSION < 8)
++#define Tcl_GetStringResult(interp) (interp->result)
++#endif
+ 
+ static void ctl_refresh(void);
+ static void ctl_total_time(int tt);
+@@ -117,7 +120,7 @@
+ 
+ static void start_panel(void);
+ 
+-#define MAX_TK_MIDI_CHANNELS	16
++#define MAX_TK_MIDI_CHANNELS	32
+ 
+ typedef struct {
+ 	int reset_panel;
+@@ -933,7 +936,7 @@
+ }
+ 
+ /* evaluate Tcl script */
+-static char *v_eval(char *fmt, ...)
++static const char *v_eval(char *fmt, ...)
+ {
+ 	char buf[256];
+ 	va_list ap;
+@@ -941,7 +944,7 @@
+ 	vsnprintf(buf, sizeof(buf), fmt, ap);
+ 	Tcl_Eval(my_interp, buf);
+ 	va_end(ap);
+-	return my_interp->result;
++	return Tcl_GetStringResult(my_interp);
+ }
+ 
+ static const char *v_get2(const char *v1, const char *v2)