[arch-commits] Commit in timidity++/trunk (3 files)
David Runge
dvzrv at archlinux.org
Fri Sep 4 19:03:19 UTC 2020
Date: Friday, September 4, 2020 @ 19:03:19
Author: dvzrv
Revision: 698531
upgpkg: timidity++ 2.15.0-4: Rebuild to move default config dir.
Switch to correct license (GPL2).
Add all direct depedencies.
Add all available sodeps in package() and the respective packages in makedepends.
Move the default config directory to /etc/timidity (for backwards compatibility and compatibility with mpd).
Add timidity to provides as timidity++ effectively is timidity (just maintained by other people since the late 90s.
Remove undocumented patch for JACK.
Turn modification for full RELRO into a proper patch.
Install docs.
Update maintainer info.
Added:
timidity++/trunk/timidity++-2.15.0-ldflags.patch
Modified:
timidity++/trunk/PKGBUILD
Deleted:
timidity++/trunk/timidity-jack.patch
---------------------------------+
PKGBUILD | 66 +++++++++++++---------
timidity++-2.15.0-ldflags.patch | 113 ++++++++++++++++++++++++++++++++++++++
timidity-jack.patch | 11 ---
3 files changed, 154 insertions(+), 36 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-09-04 18:28:06 UTC (rev 698530)
+++ PKGBUILD 2020-09-04 19:03:19 UTC (rev 698531)
@@ -1,57 +1,73 @@
-# Maintainer: David Runge <dave at sleepmap.de>
+# Maintainer: David Runge <dvzrv at archlinux.org>
# Contributor: Eric Bélanger <eric at archlinux.org>
-_name=TiMidity++
+_upstream=TiMidity++
+_name=timidity
pkgname=timidity++
pkgver=2.15.0
-pkgrel=3
+pkgrel=4
pkgdesc="A MIDI to WAVE converter and player"
arch=('x86_64')
url="http://timidity.sourceforge.net"
-license=('GPL')
+license=('GPL2')
groups=('pro-audio')
-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')
-provides=('soundfont-synthesizer')
-backup=('etc/timidity++/timidity.cfg')
-source=("http://downloads.sourceforge.net/timidity/${_name}-${pkgver}.tar.xz"
- timidity.cfg timidity.service timidity-jack.patch)
+depends=('gcc-libs' 'glibc')
+makedepends=('alsa-lib' 'flac' 'glib2' 'gtk2' 'jack' 'libao' 'libogg'
+'libvorbis' 'libxaw' 'tk' 'xaw3d')
+optdepends=('gtk2: for the GTK+ interface'
+ 'ncurses: for the ncurses interface'
+ 'tk: for the Tk interface'
+ 'xaw3d: for the Xaw interface')
+provides=('soundfont-synthesizer' 'timidity')
+backup=('etc/timidity/timidity.cfg')
+source=("https://downloads.sourceforge.net/${_name}/${_upstream}-${pkgver}.tar.xz"
+ "${pkgname}-2.15.0-ldflags.patch"
+ "${_name}.cfg"
+ "${_name}.service")
sha512sums=('36c3c79d941903109d5d6d529963d12e8192a857e80402ad5ab0d1e223451a7cf5dc8fdd046b22ae7da96f413d68db8587a8fce348635838eba2f30f7019192f'
+ 'a3bfd2fdf344a1769d11e955b62a1f514f0e506637a06fa6a797a9c038623b81a7244bb75da923ea5c394ccd99657f47a739ba9a3e0ee8ef611824fc6d13a5dd'
'054cd39bef913314e9901171566398af6280236531ac13ece683eaeb642c52b3280116adaa6328054c94bd79b0ab88c253281e386012a2c6d67f4b85c38e4859'
- 'b77e460c9803300db67d571d5298edbf4c29a469593c41640057ff8d173ed6edf8b9c2d6cd9a35f6cf1cc32d5b92be38513105f927991fd451725802abb1108b'
- '51c075da04aeedca4edecb5a7f1926ccb80637b550f8fafca6d68be466cd4353a77bbb832878941919ec354c279a6014403e995b9152a47a3817c99890a4afeb')
+ 'b77e460c9803300db67d571d5298edbf4c29a469593c41640057ff8d173ed6edf8b9c2d6cd9a35f6cf1cc32d5b92be38513105f927991fd451725802abb1108b')
+b2sums=('63612dc96ddef9b24ca35a8fa24c22fee8b0573efb09543e6017070b2d0a68494bc34afe8ffc50b5f7fe2d95397a971d5dc7afd4c9adbb524b119012e716b7f7'
+ '9557ae6c54e161f37209aabe076ab66f31c69ad24748a33f8f2072be491bf2a3038c3aa7a9304820fe6be3449f8dfb9b0aa7c4fd34dfd3bf9c04d4ea01f33b1b'
+ 'dce12f6a507c8ee1aa4b42355e02fe54e4442e4814887c36e71899e24c1bab54bf612408cb0e6e2fd24d804f52991a6f05771b44df002ab8b64c2ed6ba65a544'
+ 'f97ac534c6ce0829ccfdd2c05951dcee1d1f427c41b0a7f890296c16e525d221edc366365dd120c6a05e42b7dfcb20d747c87bf51a005e76b72df8cb9740da47')
prepare() {
- cd "${_name}-${pkgver}"
+ mv -v "${_upstream}-${pkgver}" "${pkgname}-${pkgver}"
+ cd "${pkgname}-${pkgver}"
# interface Makefile doesn't make use of LDFLAGS
# this adds full RELRO
- sed -e 's/SHLD)/SHLD) $(LDFLAGS)/g' -i interface/Makefile.am
- patch -Np1 -i "${srcdir}/timidity-jack.patch"
+ patch -Np1 -i "../${pkgname}-2.15.0-ldflags.patch"
autoreconf -vfi
}
build() {
- cd "${_name}-${pkgver}"
- # in interface/Makefile.in some bizarre custom stuff is used
+ cd "${pkgname}-${pkgver}"
+ # NOTE: for backwards compatibility the default config path is /etc/timidity/
./configure --prefix=/usr \
--mandir=/usr/share/man \
- --with-default-path=/etc/timidity++/ \
+ --with-default-path=/etc/timidity/ \
--enable-server \
--enable-alsaseq \
--enable-spectrogram \
--enable-network \
--enable-xft \
- --enable-audio=alsa,oss,ao,vorbis,flac,jack \
+ --enable-audio=alsa,ao,vorbis,flac,jack \
--enable-dynamic=ncurses,tcltk,vt100,xaw,gtk
make
}
package() {
- cd "${_name}-${pkgver}"
+ depends+=('libFLAC.so' 'libasound.so' 'libao.so' 'libglib-2.0.so'
+ 'libgobject-2.0.so' 'libjack.so' 'libogg.so' 'libvorbis.so'
+ 'libvorbisenc.so')
+ cd "${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
- install -vDm 644 ../timidity.cfg -t "${pkgdir}/etc/${pkgname}/"
- install -vDm 644 ../timidity.service -t "${pkgdir}/usr/lib/systemd/user/"
+ install -vDm 644 "../${_name}.cfg" -t "${pkgdir}/etc/timidity/"
+ install -vDm 644 "../${_name}.service" -t "${pkgdir}/usr/lib/systemd/user/"
+ install -vDm 644 doc/C/{CHANGES.*,FAQ,README.*} \
+ -t "${pkgdir}/usr/share/doc/${pkgname}"
+ install -vDm 644 {README,AUTHORS,ChangeLog,NEWS,TODO} \
+ -t "${pkgdir}/usr/share/doc/${pkgname}"
}
Added: timidity++-2.15.0-ldflags.patch
===================================================================
--- timidity++-2.15.0-ldflags.patch (rev 0)
+++ timidity++-2.15.0-ldflags.patch 2020-09-04 19:03:19 UTC (rev 698531)
@@ -0,0 +1,113 @@
+diff -ruN a/interface/Makefile.am b/interface/Makefile.am
+--- a/interface/Makefile.am 2013-12-12 03:04:52.000000000 +0100
++++ b/interface/Makefile.am 2020-09-04 14:22:48.890913333 +0200
+@@ -394,37 +394,37 @@
+ $(COMPILE) $(SHCFLAGS) -o $@ -c $<
+
+ if_ncurses.$(so): ncurs_c.$(so) support.$(so) bitset.$(so) timer.$(so)
+- $(SHLD) -o $@ ncurs_c.$(so) support.$(so) bitset.$(so) timer.$(so) $(n_so_libs)
++ $(SHLD) $(LDFLAGS) -o $@ ncurs_c.$(so) support.$(so) bitset.$(so) timer.$(so) $(n_so_libs)
+
+ if_slang.$(so): slang_c.$(so) support.$(so) timer.$(so)
+- $(SHLD) -o $@ slang_c.$(so) support.$(so) timer.$(so) $(s_so_libs)
++ $(SHLD) $(LDFLAGS) -o $@ slang_c.$(so) support.$(so) timer.$(so) $(s_so_libs)
+
+ if_motif.$(so): motif_c.$(so) support.$(so) motif_i.$(so) motif_p.$(so)
+- $(SHLD) -o $@ motif_c.$(so) support.$(so) motif_i.$(so) motif_p.$(so) $(m_so_libs)
++ $(SHLD) $(LDFLAGS) -o $@ motif_c.$(so) support.$(so) motif_i.$(so) motif_p.$(so) $(m_so_libs)
+
+ if_tcltk.$(so): tk_c.$(so) support.$(so)
+- $(SHLD) -o $@ tk_c.$(so) support.$(so) $(k_so_libs)
++ $(SHLD) $(LDFLAGS) -o $@ tk_c.$(so) support.$(so) $(k_so_libs)
+
+ if_emacs.$(so): emacs_c.$(so) support.$(so)
+- $(SHLD) -o $@ emacs_c.$(so) support.$(so) $(e_so_libs)
++ $(SHLD) $(LDFLAGS) -o $@ emacs_c.$(so) support.$(so) $(e_so_libs)
+
+ if_vt100.$(so): vt100_c.$(so) support.$(so) vt100.$(so) bitset.$(so) timer.$(so)
+- $(SHLD) -o $@ vt100_c.$(so) support.$(so) vt100.$(so) bitset.$(so) timer.$(so) $(T_so_libs)
++ $(SHLD) $(LDFLAGS) -o $@ vt100_c.$(so) support.$(so) vt100.$(so) bitset.$(so) timer.$(so) $(T_so_libs)
+
+ if_xaw.$(so): xaw_c.$(so) support.$(so) xaw_i.$(so) x_trace.${so} timer.$(so) ${XDND_SO}
+- $(SHLD) -o $@ xaw_c.$(so) support.$(so) xaw_i.$(so) x_trace.${so} timer.$(so) ${XDND_SO} $(a_so_libs)
++ $(SHLD) $(LDFLAGS) -o $@ xaw_c.$(so) support.$(so) xaw_i.$(so) x_trace.${so} timer.$(so) ${XDND_SO} $(a_so_libs)
+
+ if_xskin.$(so): xskin_c.$(so) support.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so)
+- $(SHLD) -o $@ xskin_c.$(so) support.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so) $(i_so_libs)
++ $(SHLD) $(LDFLAGS) -o $@ xskin_c.$(so) support.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so) $(i_so_libs)
+
+ if_gtk.$(so): gtk_c.$(so) support.$(so) gtk_i.$(so) gtk_p.$(so)
+- $(SHLD) -o $@ gtk_c.$(so) support.$(so) gtk_i.$(so) gtk_p.$(so) $(g_so_libs)
++ $(SHLD) $(LDFLAGS) -o $@ gtk_c.$(so) support.$(so) gtk_i.$(so) gtk_p.$(so) $(g_so_libs)
+
+ if_server.$(so): server_c.$(so) support.$(so)
+- $(SHLD) -o $@ server_c.$(so) support.$(so)
++ $(SHLD) $(LDFLAGS) -o $@ server_c.$(so) support.$(so)
+
+ if_alsaseq.$(so): alsaseq_c.$(so) support.$(so)
+- $(SHLD) -o $@ alsaseq_c.$(so) support.$(so)
++ $(SHLD) $(LDFLAGS) -o $@ alsaseq_c.$(so) support.$(so)
+
+ endif
+
+diff -ruN a/interface/Makefile.in b/interface/Makefile.in
+--- a/interface/Makefile.in 2018-08-29 01:33:39.000000000 +0200
++++ b/interface/Makefile.in 2020-09-04 14:19:07.612876650 +0200
+@@ -65,7 +65,7 @@
+ #CPPFLAGS = @CPPFLAGS@
+
+ #DEFS = @DEFS@
+-#LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@
+ #LIBS = @LIBS@
+ #SHLD = @SHLD@
+ #SHCFLAGS = @SHCFLAGS@
+@@ -1175,37 +1175,37 @@
+ @NEEDDLOPEN_TRUE@ $(COMPILE) $(SHCFLAGS) -o $@ -c $<
+
+ @NEEDDLOPEN_TRUE at if_ncurses.$(so): ncurs_c.$(so) support.$(so) bitset.$(so) timer.$(so)
+- at NEEDDLOPEN_TRUE@ $(SHLD) -o $@ ncurs_c.$(so) support.$(so) bitset.$(so) timer.$(so) $(n_so_libs)
++ at NEEDDLOPEN_TRUE@ $(SHLD) $(LDFLAGS) -o $@ ncurs_c.$(so) support.$(so) bitset.$(so) timer.$(so) $(n_so_libs)
+
+ @NEEDDLOPEN_TRUE at if_slang.$(so): slang_c.$(so) support.$(so) timer.$(so)
+- at NEEDDLOPEN_TRUE@ $(SHLD) -o $@ slang_c.$(so) support.$(so) timer.$(so) $(s_so_libs)
++ at NEEDDLOPEN_TRUE@ $(SHLD) $(LDFLAGS) -o $@ slang_c.$(so) support.$(so) timer.$(so) $(s_so_libs)
+
+ @NEEDDLOPEN_TRUE at if_motif.$(so): motif_c.$(so) support.$(so) motif_i.$(so) motif_p.$(so)
+- at NEEDDLOPEN_TRUE@ $(SHLD) -o $@ motif_c.$(so) support.$(so) motif_i.$(so) motif_p.$(so) $(m_so_libs)
++ at NEEDDLOPEN_TRUE@ $(SHLD) $(LDFLAGS) -o $@ motif_c.$(so) support.$(so) motif_i.$(so) motif_p.$(so) $(m_so_libs)
+
+ @NEEDDLOPEN_TRUE at if_tcltk.$(so): tk_c.$(so) support.$(so)
+- at NEEDDLOPEN_TRUE@ $(SHLD) -o $@ tk_c.$(so) support.$(so) $(k_so_libs)
++ at NEEDDLOPEN_TRUE@ $(SHLD) $(LDFLAGS) -o $@ tk_c.$(so) support.$(so) $(k_so_libs)
+
+ @NEEDDLOPEN_TRUE at if_emacs.$(so): emacs_c.$(so) support.$(so)
+- at NEEDDLOPEN_TRUE@ $(SHLD) -o $@ emacs_c.$(so) support.$(so) $(e_so_libs)
++ at NEEDDLOPEN_TRUE@ $(SHLD) $(LDFLAGS) -o $@ emacs_c.$(so) support.$(so) $(e_so_libs)
+
+ @NEEDDLOPEN_TRUE at if_vt100.$(so): vt100_c.$(so) support.$(so) vt100.$(so) bitset.$(so) timer.$(so)
+- at NEEDDLOPEN_TRUE@ $(SHLD) -o $@ vt100_c.$(so) support.$(so) vt100.$(so) bitset.$(so) timer.$(so) $(T_so_libs)
++ at NEEDDLOPEN_TRUE@ $(SHLD) $(LDFLAGS) -o $@ vt100_c.$(so) support.$(so) vt100.$(so) bitset.$(so) timer.$(so) $(T_so_libs)
+
+ @NEEDDLOPEN_TRUE at if_xaw.$(so): xaw_c.$(so) support.$(so) xaw_i.$(so) x_trace.${so} timer.$(so) ${XDND_SO}
+- at NEEDDLOPEN_TRUE@ $(SHLD) -o $@ xaw_c.$(so) support.$(so) xaw_i.$(so) x_trace.${so} timer.$(so) ${XDND_SO} $(a_so_libs)
++ at NEEDDLOPEN_TRUE@ $(SHLD) $(LDFLAGS) -o $@ xaw_c.$(so) support.$(so) xaw_i.$(so) x_trace.${so} timer.$(so) ${XDND_SO} $(a_so_libs)
+
+ @NEEDDLOPEN_TRUE at if_xskin.$(so): xskin_c.$(so) support.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so)
+- at NEEDDLOPEN_TRUE@ $(SHLD) -o $@ xskin_c.$(so) support.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so) $(i_so_libs)
++ at NEEDDLOPEN_TRUE@ $(SHLD) $(LDFLAGS) -o $@ xskin_c.$(so) support.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so) $(i_so_libs)
+
+ @NEEDDLOPEN_TRUE at if_gtk.$(so): gtk_c.$(so) support.$(so) gtk_i.$(so) gtk_p.$(so)
+- at NEEDDLOPEN_TRUE@ $(SHLD) -o $@ gtk_c.$(so) support.$(so) gtk_i.$(so) gtk_p.$(so) $(g_so_libs)
++ at NEEDDLOPEN_TRUE@ $(SHLD) $(LDFLAGS) -o $@ gtk_c.$(so) support.$(so) gtk_i.$(so) gtk_p.$(so) $(g_so_libs)
+
+ @NEEDDLOPEN_TRUE at if_server.$(so): server_c.$(so) support.$(so)
+- at NEEDDLOPEN_TRUE@ $(SHLD) -o $@ server_c.$(so) support.$(so)
++ at NEEDDLOPEN_TRUE@ $(SHLD) $(LDFLAGS) -o $@ server_c.$(so) support.$(so)
+
+ @NEEDDLOPEN_TRUE at if_alsaseq.$(so): alsaseq_c.$(so) support.$(so)
+- at NEEDDLOPEN_TRUE@ $(SHLD) -o $@ alsaseq_c.$(so) support.$(so)
++ at NEEDDLOPEN_TRUE@ $(SHLD) $(LDFLAGS) -o $@ alsaseq_c.$(so) support.$(so)
+
+ clean-compile:
+ -rm -f *.$(so)
Deleted: timidity-jack.patch
===================================================================
--- timidity-jack.patch 2020-09-04 18:28:06 UTC (rev 698530)
+++ timidity-jack.patch 2020-09-04 19:03:19 UTC (rev 698531)
@@ -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);
More information about the arch-commits
mailing list