diff options
author | rxg <rxg> | 2014-02-27 03:40:10 +0000 |
---|---|---|
committer | rxg <rxg> | 2014-02-27 03:40:10 +0000 |
commit | 77c746e17bebbfc3236898bbcf550f9eed40fa1a (patch) | |
tree | 8466afbf4ee4982ec381b35d45eab9a737c28eb5 /audio/xmp | |
parent | 0640869c634fcd492235db8f9930955798f7bc2f (diff) | |
download | pkgsrc-77c746e17bebbfc3236898bbcf550f9eed40fa1a.tar.gz |
4.0.7 (20140224):
- Fix NetBSD sound driver (by shattered)
- Fix Haiku sound driver
- Fix info message display time
- Start instrument numbering at 1
- Minor cosmetic fixes
Diffstat (limited to 'audio/xmp')
-rw-r--r-- | audio/xmp/Makefile | 5 | ||||
-rw-r--r-- | audio/xmp/distinfo | 10 | ||||
-rw-r--r-- | audio/xmp/patches/patch-src_drivers_netbsd.c | 28 |
3 files changed, 8 insertions, 35 deletions
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile index 77d0845fa7c..19af85f68d6 100644 --- a/audio/xmp/Makefile +++ b/audio/xmp/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.41 2014/02/24 20:41:17 adam Exp $ +# $NetBSD: Makefile,v 1.42 2014/02/27 03:40:10 rxg Exp $ -DISTNAME= xmp-4.0.6 -PKGREVISION= 2 +DISTNAME= xmp-4.0.7 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmp/} diff --git a/audio/xmp/distinfo b/audio/xmp/distinfo index 3c6c14c06d0..68c59566d4c 100644 --- a/audio/xmp/distinfo +++ b/audio/xmp/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.15 2013/12/10 07:14:45 rxg Exp $ +$NetBSD: distinfo,v 1.16 2014/02/27 03:40:10 rxg Exp $ -SHA1 (xmp-4.0.6.tar.gz) = 61a7d68e4c37e7407bd35c783821bfbc2b639c87 -RMD160 (xmp-4.0.6.tar.gz) = 1eb6834cefd450d88de9b018e14ec4f88b8c015b -Size (xmp-4.0.6.tar.gz) = 208541 bytes +SHA1 (xmp-4.0.7.tar.gz) = 0817146ff66ba3557963b8857aa80b4f63a56fc8 +RMD160 (xmp-4.0.7.tar.gz) = 26e6bde1b307001a5fa39bc7b5c12cccd795236b +Size (xmp-4.0.7.tar.gz) = 177879 bytes SHA1 (patch-etc_Makefile) = 5816b82a6253a627b39ff2ca262bfb5675ca97e3 -SHA1 (patch-src_drivers_netbsd.c) = eb3b77cafc86dc9fba298c5bdfbeb0b889d9ea9c +SHA1 (patch-src_drivers_netbsd.c) = 6bbb1a40b7bb95ecdad6fe5f76be2a51a8940906 SHA1 (patch-src_options.c) = f372d1336e795b77c7ce38230bf69dd363da02c2 SHA1 (patch-src_sound_oss.c) = 251a09075ade185e33938be67776e7740473a6a5 diff --git a/audio/xmp/patches/patch-src_drivers_netbsd.c b/audio/xmp/patches/patch-src_drivers_netbsd.c index 832e9f4a6ad..f6192fa2f43 100644 --- a/audio/xmp/patches/patch-src_drivers_netbsd.c +++ b/audio/xmp/patches/patch-src_drivers_netbsd.c @@ -1,33 +1,7 @@ -$NetBSD: patch-src_drivers_netbsd.c,v 1.2 2013/11/16 07:41:02 shattered Exp $ +$NetBSD: patch-src_drivers_netbsd.c,v 1.3 2014/02/27 03:40:10 rxg Exp $ --- src/sound_netbsd.c.orig 2013-04-06 13:38:02.000000000 +0000 +++ src/sound_netbsd.c -@@ -68,21 +68,23 @@ static int init(struct options *options) - - AUDIO_INITINFO(&ainfo); - -+ ainfo.mode = AUMODE_PLAY_ALL; - ainfo.play.sample_rate = options->rate; - ainfo.play.channels = options->format & XMP_FORMAT_MONO ? 1 : 2; - - if (options->format & XMP_FORMAT_8BIT) { - ainfo.play.precision = 8; -- ainfo.play.precision = AUDIO_ENCODING_ULINEAR; -+ ainfo.play.encoding = AUDIO_ENCODING_ULINEAR; - options->format |= XMP_FORMAT_UNSIGNED; - } else { - ainfo.play.precision = 16; -- ainfo.play.precision = AUDIO_ENCODING_SLINEAR; -+ ainfo.play.encoding = AUDIO_ENCODING_SLINEAR; - options->format &= ~XMP_FORMAT_UNSIGNED; - } - - ainfo.play.gain = gain; - ainfo.play.buffer_size = bsize; -+ ainfo.blocksize = 0; - - if (ioctl(audio_fd, AUDIO_SETINFO, &ainfo) == -1) { - close(audio_fd); @@ -99,7 +101,7 @@ static void play(void *b, int i) while (i) { if ((j = write(audio_fd, b, i)) > 0) { |