[pkgsrc/trunk]: pkgsrc/audio/timidity Support PM_REQ_GETQSIZ and PM_REQ_GETFR...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f3722f549896
branches:  trunk
changeset: 529649:f3722f549896
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Jun 08 17:18:53 2007 +0000

description:
Support PM_REQ_GETQSIZ and PM_REQ_GETFRAGSIZ in sun_a.c to improve
playback. From Sergey Svishchev in PR 35772.

Bump PKGREVISION.

diffstat:

 audio/timidity/Makefile         |   4 +-
 audio/timidity/distinfo         |   4 +-
 audio/timidity/patches/patch-aa |  61 ++++++++++++++++++++++++++++++++--------
 3 files changed, 53 insertions(+), 16 deletions(-)

diffs (98 lines):

diff -r 8e34f9ae306f -r f3722f549896 audio/timidity/Makefile
--- a/audio/timidity/Makefile   Fri Jun 08 17:14:09 2007 +0000
+++ b/audio/timidity/Makefile   Fri Jun 08 17:18:53 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.60 2007/01/11 00:27:37 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2007/06/08 17:18:53 wiz Exp $
 
 DISTNAME=      TiMidity++-2.13.2
 PKGNAME=       ${DISTNAME:S/TiMidity++/timidity/}
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=     audio
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=timidity/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 8e34f9ae306f -r f3722f549896 audio/timidity/distinfo
--- a/audio/timidity/distinfo   Fri Jun 08 17:14:09 2007 +0000
+++ b/audio/timidity/distinfo   Fri Jun 08 17:18:53 2007 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2005/12/11 19:40:16 joerg Exp $
+$NetBSD: distinfo,v 1.13 2007/06/08 17:18:53 wiz Exp $
 
 SHA1 (TiMidity++-2.13.2.tar.bz2) = 8e603146e1164335303a5ac5dff291f369241b4e
 RMD160 (TiMidity++-2.13.2.tar.bz2) = 0156221846a88abef9312700a050972d85084fd8
 Size (TiMidity++-2.13.2.tar.bz2) = 1581230 bytes
-SHA1 (patch-aa) = 3e006fe39bcc2644b7cea30ffce318091e1b8915
+SHA1 (patch-aa) = ccae42f9629b287da55f0b834557d154719f23d3
 SHA1 (patch-ab) = 6c4938e1b31dc066354aebd364c848bb88b20eb4
 SHA1 (patch-ac) = 56e738ef60dc8040d27bb50722ed5e0294d343e4
 SHA1 (patch-ae) = 3f55ea58e91bd97ff42fbe67e8c89514c29aa2e9
diff -r 8e34f9ae306f -r f3722f549896 audio/timidity/patches/patch-aa
--- a/audio/timidity/patches/patch-aa   Fri Jun 08 17:14:09 2007 +0000
+++ b/audio/timidity/patches/patch-aa   Fri Jun 08 17:18:53 2007 +0000
@@ -1,16 +1,53 @@
-$NetBSD: patch-aa,v 1.6 2004/04/14 14:41:34 adam Exp $
+$NetBSD: patch-aa,v 1.7 2007/06/08 17:18:53 wiz Exp $
 
---- timidity/sun_a.c.orig      2002-07-19 00:43:58.000000000 +0000
+--- timidity/sun_a.c.orig      2007-06-08 17:14:22.000000000 +0000
 +++ timidity/sun_a.c
-@@ -70,7 +70,11 @@
- #define SUNAUDIO_AENC_SIGWORD AENC_SIGWORDB
- #endif
- 
-+#ifndef __NetBSD__
- #define AUDIO_DEV    "/dev/audio"
-+#else
-+#define AUDIO_DEV    "/dev/sound"
-+#endif
- #define AUDIO_CTLDEV "/dev/audioctl"
+@@ -300,6 +300,18 @@ int output_data(char *buff, int32 nbytes
  
  
+ #if !defined(I_FLUSH) || !defined(FLUSHW)
++#  if defined(AUDIO_FLUSH)    /* NetBSD */
++static int sun_discard_playing(void)
++{
++    if(ioctl(dpm.fd, AUDIO_FLUSH, NULL) < 0)
++    {
++      ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: (ioctl) %s",
++                dpm.name, strerror(errno));
++      return -1;
++    }
++    return 0;
++}
++#  else
+ static void null_proc(){}
+ static int sun_discard_playing(void)
+ {
+@@ -312,6 +324,7 @@ static int sun_discard_playing(void)
+     signal(SIGALRM, orig_alarm_handler);
+     return open_output();
+ }
++#  endif
+ #else
+ static int sun_discard_playing(void)
+ {
+@@ -332,6 +345,21 @@ static int acntl(int request, void *arg)
+ 
+     switch(request)
+     {
++#ifdef __NetBSD__
++      case PM_REQ_GETQSIZ:
++      if(ioctl(audioctl_fd, AUDIO_GETINFO, &auinfo) < 0)
++          return -1;
++      return auinfo.play.buffer_size;
++
++      case PM_REQ_GETFRAGSIZ:
++      if(ioctl(audioctl_fd, AUDIO_GETINFO, &auinfo) < 0)
++          return -1;
++      return auinfo.blocksize;
++
++      case PM_REQ_OUTPUT_FINISH:
++      return ioctl(audioctl_fd, AUDIO_DRAIN, NULL);
++#endif
++
+       case PM_REQ_GETFILLED:
+       if(ioctl(audioctl_fd, AUDIO_GETINFO, &auinfo) < 0)
+           return -1;