[arch-commits] Commit in timidity++/repos/extra-x86_64 (10 files)
Felix Yan
felixonmars at archlinux.org
Thu Jun 7 06:16:38 UTC 2018
Date: Thursday, June 7, 2018 @ 06:16:37
Author: felixonmars
Revision: 326128
archrelease: copy trunk to extra-x86_64
Added:
timidity++/repos/extra-x86_64/PKGBUILD
(from rev 326127, timidity++/trunk/PKGBUILD)
timidity++/repos/extra-x86_64/timidity-jack.patch
(from rev 326127, timidity++/trunk/timidity-jack.patch)
timidity++/repos/extra-x86_64/timidity-tk86.patch
(from rev 326127, timidity++/trunk/timidity-tk86.patch)
timidity++/repos/extra-x86_64/timidity.cfg
(from rev 326127, timidity++/trunk/timidity.cfg)
timidity++/repos/extra-x86_64/timidity.service
(from rev 326127, timidity++/trunk/timidity.service)
Deleted:
timidity++/repos/extra-x86_64/PKGBUILD
timidity++/repos/extra-x86_64/timidity-jack.patch
timidity++/repos/extra-x86_64/timidity-tk86.patch
timidity++/repos/extra-x86_64/timidity.cfg
timidity++/repos/extra-x86_64/timidity.service
---------------------+
PKGBUILD | 90 +++++++++++++++++++++++++-------------------------
timidity-jack.patch | 22 ++++++------
timidity-tk86.patch | 78 +++++++++++++++++++++----------------------
timidity.cfg | 58 ++++++++++++++++----------------
timidity.service | 18 +++++-----
5 files changed, 133 insertions(+), 133 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-06-07 06:16:09 UTC (rev 326127)
+++ PKGBUILD 2018-06-07 06:16:37 UTC (rev 326128)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=timidity++
-pkgver=2.14.0
-pkgrel=7
-pkgdesc="A MIDI to WAVE converter and player"
-arch=('i686' 'x86_64')
-url="http://timidity.sourceforge.net"
-license=('GPL')
-depends=('libao' 'jack')
-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.xz
- timidity.cfg timidity.service timidity-tk86.patch timidity-jack.patch)
-sha1sums=('15ec27f1ea3e718a8d61603521fc16df5c0dd24b'
- '660b3afbb720d26e8f008034cee66dd8da082d6e'
- 'f0351b9eb8928d3d82c380107654a7dbe7cd2d54'
- '5c6022a79c20fbb31afc28b9713c903fccff93c8'
- 'c0d58d1cb4bd0eb82a965531ffe83cc3f540e318')
-
-prepare() {
- cd TiMidity++-${pkgver}
- patch -p1 -i "${srcdir}/timidity-tk86.patch"
- patch -p1 -i "${srcdir}/timidity-jack.patch"
-}
-
-build() {
- 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 \
- --enable-dynamic=ncurses,tcltk,vt100,xaw,gtk
- make
-}
-
-package() {
- 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"
-}
Copied: timidity++/repos/extra-x86_64/PKGBUILD (from rev 326127, timidity++/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-06-07 06:16:37 UTC (rev 326128)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=timidity++
+pkgver=2.14.0
+pkgrel=8
+pkgdesc="A MIDI to WAVE converter and player"
+arch=('x86_64')
+url="http://timidity.sourceforge.net"
+license=('GPL')
+depends=('libao' 'jack')
+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.xz
+ timidity.cfg timidity.service timidity-tk86.patch timidity-jack.patch)
+sha512sums=('d8fc06fa36e4dd42de80c61943da4cd9aec5f8aaf31057a9ededa633d2d48e64c4e53391378d82a7a46ffe4f96c756b010ea9727270f80b134ae1f8bad535bd3'
+ '054cd39bef913314e9901171566398af6280236531ac13ece683eaeb642c52b3280116adaa6328054c94bd79b0ab88c253281e386012a2c6d67f4b85c38e4859'
+ 'b77e460c9803300db67d571d5298edbf4c29a469593c41640057ff8d173ed6edf8b9c2d6cd9a35f6cf1cc32d5b92be38513105f927991fd451725802abb1108b'
+ 'f7c711fd7aaf924b4469f61780f8b6a282c11246e093b121597a098190ee3ab96964dcc0eb772dfe8232eb95bcfa8819e105eb0f7956b723f84a4df13e72ca98'
+ '51c075da04aeedca4edecb5a7f1926ccb80637b550f8fafca6d68be466cd4353a77bbb832878941919ec354c279a6014403e995b9152a47a3817c99890a4afeb')
+
+prepare() {
+ cd TiMidity++-${pkgver}
+ patch -p1 -i "${srcdir}/timidity-tk86.patch"
+ patch -p1 -i "${srcdir}/timidity-jack.patch"
+}
+
+build() {
+ 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 \
+ --enable-dynamic=ncurses,tcltk,vt100,xaw,gtk
+ make
+}
+
+package() {
+ 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"
+}
Deleted: timidity-jack.patch
===================================================================
--- timidity-jack.patch 2018-06-07 06:16:09 UTC (rev 326127)
+++ timidity-jack.patch 2018-06-07 06:16:37 UTC (rev 326128)
@@ -1,11 +0,0 @@
-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);
Copied: timidity++/repos/extra-x86_64/timidity-jack.patch (from rev 326127, timidity++/trunk/timidity-jack.patch)
===================================================================
--- timidity-jack.patch (rev 0)
+++ timidity-jack.patch 2018-06-07 06:16:37 UTC (rev 326128)
@@ -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);
Deleted: timidity-tk86.patch
===================================================================
--- timidity-tk86.patch 2018-06-07 06:16:09 UTC (rev 326127)
+++ timidity-tk86.patch 2018-06-07 06:16:37 UTC (rev 326128)
@@ -1,39 +0,0 @@
---- 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)
Copied: timidity++/repos/extra-x86_64/timidity-tk86.patch (from rev 326127, timidity++/trunk/timidity-tk86.patch)
===================================================================
--- timidity-tk86.patch (rev 0)
+++ timidity-tk86.patch 2018-06-07 06:16:37 UTC (rev 326128)
@@ -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)
Deleted: timidity.cfg
===================================================================
--- timidity.cfg 2018-06-07 06:16:09 UTC (rev 326127)
+++ timidity.cfg 2018-06-07 06:16:37 UTC (rev 326128)
@@ -1,29 +0,0 @@
-# details on this file and other examples see here:
-# http://www.onicos.com/staff/iz/timidity/dist/cfg/sndfont.cfg
-# http://www.onicos.com/staff/iz/timidity/dist/cfg/
-#----------------------------------------------------------------
-# SoundFont extension configuration
-#
-# soundfont <filename> [order={0|1}] [remove]
-# <filename> is the path of SoundFont file.
-# order: 0(preload) or 1(load after GUS).
-# remove: disable specified soundfont.
-#
-# font exclude <tonebank> [<preset> [<keynote>]]
-# font order {0|1} <tonebank> [<preset> [<keynote>]]
-# <tonebank>: 0-127
-#
-# font exclude 128 [<drumset> [<key>]]
-# font order {0|1} 128 [<drumset> [<key>]]
-#----------------------------------------------------------------
-
-# change the next line to point to a soundfont you have
-# soundfonts can be found e.g. here: http://www.hammersound.net/
-# soundfont /usr/share/soundfonts/DX7Piano.SF2
-
-# you can do manipulations of the soundfont you load like this:
-# e.g. removing drumset 99
-# font exclude 128 99
-
-# load drum samples after GUS patches
-# font order 1 128
Copied: timidity++/repos/extra-x86_64/timidity.cfg (from rev 326127, timidity++/trunk/timidity.cfg)
===================================================================
--- timidity.cfg (rev 0)
+++ timidity.cfg 2018-06-07 06:16:37 UTC (rev 326128)
@@ -0,0 +1,29 @@
+# details on this file and other examples see here:
+# http://www.onicos.com/staff/iz/timidity/dist/cfg/sndfont.cfg
+# http://www.onicos.com/staff/iz/timidity/dist/cfg/
+#----------------------------------------------------------------
+# SoundFont extension configuration
+#
+# soundfont <filename> [order={0|1}] [remove]
+# <filename> is the path of SoundFont file.
+# order: 0(preload) or 1(load after GUS).
+# remove: disable specified soundfont.
+#
+# font exclude <tonebank> [<preset> [<keynote>]]
+# font order {0|1} <tonebank> [<preset> [<keynote>]]
+# <tonebank>: 0-127
+#
+# font exclude 128 [<drumset> [<key>]]
+# font order {0|1} 128 [<drumset> [<key>]]
+#----------------------------------------------------------------
+
+# change the next line to point to a soundfont you have
+# soundfonts can be found e.g. here: http://www.hammersound.net/
+# soundfont /usr/share/soundfonts/DX7Piano.SF2
+
+# you can do manipulations of the soundfont you load like this:
+# e.g. removing drumset 99
+# font exclude 128 99
+
+# load drum samples after GUS patches
+# font order 1 128
Deleted: timidity.service
===================================================================
--- timidity.service 2018-06-07 06:16:09 UTC (rev 326127)
+++ timidity.service 2018-06-07 06:16:37 UTC (rev 326128)
@@ -1,9 +0,0 @@
-[Unit]
-Description=TiMidity++ Daemon
-After=sound.target
-
-[Service]
-ExecStart=/usr/bin/timidity -iA
-
-[Install]
-WantedBy=multi-user.target
Copied: timidity++/repos/extra-x86_64/timidity.service (from rev 326127, timidity++/trunk/timidity.service)
===================================================================
--- timidity.service (rev 0)
+++ timidity.service 2018-06-07 06:16:37 UTC (rev 326128)
@@ -0,0 +1,9 @@
+[Unit]
+Description=TiMidity++ Daemon
+After=sound.target
+
+[Service]
+ExecStart=/usr/bin/timidity -iA
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list