diff options
author | nat <nat@pkgsrc.org> | 2017-03-30 18:44:13 +0000 |
---|---|---|
committer | nat <nat@pkgsrc.org> | 2017-03-30 18:44:13 +0000 |
commit | 9685f8309220bd7a67135eea054958b6f0fe4669 (patch) | |
tree | c25d41259bf455f1959bef0ec1d5d5c584ce5f77 /audio/timidity | |
parent | 8705f8378c323f203d366bf4796f2bb89302f3b9 (diff) | |
download | pkgsrc-9685f8309220bd7a67135eea054958b6f0fe4669.tar.gz |
Fix playback on NetBSD-current as of 20170322. Ensure that the audioctl
device operates on the correct channel.
Addresses PR kern/52075.
Bump PKGREVISION.
Diffstat (limited to 'audio/timidity')
-rw-r--r-- | audio/timidity/Makefile | 4 | ||||
-rw-r--r-- | audio/timidity/distinfo | 7 | ||||
-rw-r--r-- | audio/timidity/patches/patch-ac | 6 | ||||
-rw-r--r-- | audio/timidity/patches/patch-timidity_midi_a__c.c | 6 | ||||
-rw-r--r-- | audio/timidity/patches/patch-timidity_sun__a.c | 20 |
5 files changed, 32 insertions, 11 deletions
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile index 458c1429c5e..c2475a361c7 100644 --- a/audio/timidity/Makefile +++ b/audio/timidity/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.104 2017/02/12 06:25:06 ryoon Exp $ +# $NetBSD: Makefile,v 1.105 2017/03/30 18:44:13 nat Exp $ DISTNAME= TiMidity++-2.14.0 PKGNAME= ${DISTNAME:S/TiMidity++/timidity/} -PKGREVISION= 20 +PKGREVISION= 21 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=timidity/} EXTRACT_SUFX= .tar.bz2 diff --git a/audio/timidity/distinfo b/audio/timidity/distinfo index 7b55d65803e..daf25b57a9e 100644 --- a/audio/timidity/distinfo +++ b/audio/timidity/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.18 2015/11/03 01:12:52 agc Exp $ +$NetBSD: distinfo,v 1.19 2017/03/30 18:44:13 nat Exp $ SHA1 (TiMidity++-2.14.0.tar.bz2) = 3d1d18ddf3e52412985af9a49dbe7ad345b478a8 RMD160 (TiMidity++-2.14.0.tar.bz2) = f12d56a1576931f90672304af6dcf8d653151b8a SHA512 (TiMidity++-2.14.0.tar.bz2) = 274b2a700cd10c7034ffae50b989419f971c79eac71c8e20649e4138f9710be0505bd99379b23e772b5af5aa86a636e4070e522f43d06007ceacc25f61261c8a Size (TiMidity++-2.14.0.tar.bz2) = 1611424 bytes -SHA1 (patch-ac) = 7e7d849bba481a2374eb830da9010f633a2aed29 +SHA1 (patch-ac) = ae602b2a1b3fc8013dcc9a15ed2bb12909804da5 SHA1 (patch-interface_server__c.c) = 5a37bcb4a6aaa93fd80ab210ba64a2a1a5d04480 -SHA1 (patch-timidity_midi_a__c.c) = 171bcd9ddd54487ce3cffa9a6966afb96c00671c +SHA1 (patch-timidity_midi_a__c.c) = ae04cddc6ad8fc5bbbd82ce64fb2ff5dea161822 +SHA1 (patch-timidity_sun__a.c) = f9bb6c92a9eca27bdaa262395fe358efc5e9b600 diff --git a/audio/timidity/patches/patch-ac b/audio/timidity/patches/patch-ac index 5b3f5b567a0..3486275b2c4 100644 --- a/audio/timidity/patches/patch-ac +++ b/audio/timidity/patches/patch-ac @@ -1,11 +1,11 @@ -$NetBSD: patch-ac,v 1.5 2012/07/08 09:51:31 wiz Exp $ +$NetBSD: patch-ac,v 1.6 2017/03/30 18:44:13 nat Exp $ Unconditionally include errno.h since extern int errno does not conform to POSIX in general. ---- timidity/timidity.h.orig 2005-12-07 19:35:02.000000000 +0000 +--- timidity/timidity.h.orig 2012-06-01 03:40:44.000000000 +0000 +++ timidity/timidity.h -@@ -449,10 +449,7 @@ typedef double FLOAT_T; +@@ -451,10 +451,7 @@ typedef double FLOAT_T; #include <stdio.h> diff --git a/audio/timidity/patches/patch-timidity_midi_a__c.c b/audio/timidity/patches/patch-timidity_midi_a__c.c index 3e1e5e310b2..098b4b548dc 100644 --- a/audio/timidity/patches/patch-timidity_midi_a__c.c +++ b/audio/timidity/patches/patch-timidity_midi_a__c.c @@ -1,10 +1,10 @@ -$NetBSD: patch-timidity_midi_a__c.c,v 1.1 2012/07/24 19:47:44 jperkin Exp $ +$NetBSD: patch-timidity_midi_a__c.c,v 1.2 2017/03/30 18:44:13 nat Exp $ Some MIDI definitions are missing on some platform's soundcard.h, so just use internal definitions everywhere. ---- timidity/midi_a.c.orig 2012-07-24 00:44:02.879194950 +0300 -+++ timidity/midi_a.c 2012-07-24 00:44:21.200309747 +0300 +--- timidity/midi_a.c.orig 2009-03-14 15:49:59.000000000 +0000 ++++ timidity/midi_a.c @@ -49,14 +49,7 @@ #endif #include <fcntl.h> diff --git a/audio/timidity/patches/patch-timidity_sun__a.c b/audio/timidity/patches/patch-timidity_sun__a.c new file mode 100644 index 00000000000..daa94557efe --- /dev/null +++ b/audio/timidity/patches/patch-timidity_sun__a.c @@ -0,0 +1,20 @@ +$NetBSD: patch-timidity_sun__a.c,v 1.1 2017/03/30 18:44:13 nat Exp $ + +Ensure to set the channel for the audioctl device. +This is required due to the virtual channels in audio. + +--- timidity/sun_a.c.orig 2009-12-23 11:57:03.000000000 +0000 ++++ timidity/sun_a.c +@@ -204,6 +204,12 @@ static int open_output(void) + return -1; + } + ++#ifdef AUDIO_GETCHAN ++ int chan; ++ if (ioctl(dpm.fd, AUDIO_GETCHAN, &chan) >= 0) ++ ioctl(audioctl_fd, AUDIO_SETCHAN, &chan); ++#endif ++ + if(stat(dpm.name, &sb) < 0) + { + ctl->cmsg(CMSG_ERROR, VERB_NORMAL, |