Update alsa-utils to 1.1.0:

Core

    Release v1.1.0
    bat: don't link all binaries with fftw library, add missing header
    configure.ac: check for fftw3/m(sqrtf)/pthread only when BAT is enabled
    build: Do not try to detect cross-compiler
    BAT: Add Makefile and configures
    topology: Add command line topology tool to build topology binaries

ALSA Control (alsactl)

    alsactl: Manage both save and restore in a single unit
    alsactl: Add path condition to alsa-store and alsa-restore services
    alsactl: terminate readlink result string

Speaker Test

    speaker-test: fix option ordering
    speaker-test: Add option to specify signal scale

alsa-info.sh

    alsa-info: Don't try update when wget isn't available

alsatplg (topology)

    topology: Add command line topology tool to build topology binaries

alsaucm

    alsaucm: Drop localbuild hacks

amixer

    amixer: expand local storage for item name according to kernel code
    amixer: Don't set only the first item in sset_enum()

aplay/arecord

    aplay: fix VU meter for S24_LE etc formats
    arecord: Remove only regular files
    aplay: Fix uninterruptible aplay
    aplay: Fix type for signal flag

bat (basic audio tester)

    bat: add all headers to noinst_HEADERS
    bat: don't link all binaries with fftw library, add missing header
    BAT: Add missing locale.h header
    BAT: Add man page
    BAT: Use dynamic temp file
    BAT: Change comments and interface of usage()
    BAT: Use colon instead of comma for separation
    BAT: Remove redundant message strings
    BAT: Add Makefile and configures
    BAT: Add spectrum analysis functions
    BAT: Add converting functions
    BAT: Add signal generator
    BAT: Add playback and record functions
    BAT: Add common definitions and functions
    BAT: Add initial functions

5 files changed, 22 insertions, 30 deletions

diff --git a/audio/alsa-utils/Makefile b/audio/alsa-utils/Makefile
index 0c71afd8967..5abf961050f 100644
--- a/audio/alsa-utils/Makefile
+++ b/audio/alsa-utils/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2015/08/18 07:31:01 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.17 2016/02/18 15:16:33 wiz Exp $
 
-DISTNAME=	alsa-utils-1.0.27.2
-PKGREVISION=	2
+DISTNAME=	alsa-utils-1.1.0
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.alsa-project.org/pub/utils/
 MASTER_SITES+=	ftp://gd.tuwien.ac.at/opsys/linux/alsa/utils/
@@ -23,7 +21,8 @@ CPPFLAGS.NetBSD+=	-Dbswap_16=bswap16 -Dbswap_32=bswap32
 
 CFLAGS+=		-g
 
-REPLACE_BASH=		alsaconf/alsaconf.in
+REPLACE_BASH+=		alsaconf/alsaconf.in
+REPLACE_BASH+=		alsa-info/alsa-info.sh
 
 BUILD_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
 
@@ -31,4 +30,5 @@ CONFIGURE_ARGS+=	--disable-nls
 
 .include "../../audio/alsa-lib/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/alsa-utils/PLIST b/audio/alsa-utils/PLIST
index abbf5696cf2..b08e124a8e2 100644
--- a/audio/alsa-utils/PLIST
+++ b/audio/alsa-utils/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2014/06/09 12:34:26 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.4 2016/02/18 15:16:33 wiz Exp $
 bin/aconnect
 bin/alsaloop
 bin/alsamixer
+bin/alsatplg
 bin/alsaucm
 bin/amidi
 bin/amixer
@@ -11,6 +12,7 @@ bin/arecord
 bin/arecordmidi
 bin/aseqdump
 bin/aseqnet
+bin/bat
 bin/iecset
 bin/speaker-test
 man/fr/man8/alsaconf.8
@@ -26,10 +28,12 @@ man/man1/arecord.1
 man/man1/arecordmidi.1
 man/man1/aseqdump.1
 man/man1/aseqnet.1
+man/man1/bat.1
 man/man1/iecset.1
 man/man1/speaker-test.1
 man/man7/alsactl_init.7
 man/man8/alsaconf.8
+sbin/alsa-info.sh
 sbin/alsaconf
 sbin/alsactl
 share/alsa/init/00main
diff --git a/audio/alsa-utils/distinfo b/audio/alsa-utils/distinfo
index c96df887ceb..b9e222c7d8f 100644
--- a/audio/alsa-utils/distinfo
+++ b/audio/alsa-utils/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 01:12:24 agc Exp $
+$NetBSD: distinfo,v 1.10 2016/02/18 15:16:33 wiz Exp $
 
-SHA1 (alsa-utils-1.0.27.2.tar.bz2) = dfec4691dde6b2cee292bbd10f0f368158713e8f
-RMD160 (alsa-utils-1.0.27.2.tar.bz2) = 05432f3f795a43a42d43e7589235060eb83298f6
-SHA512 (alsa-utils-1.0.27.2.tar.bz2) = c9a4943852ec1a71a5a8d2c99e1df0ba96a5d9d1196cabfdb6655f58c6a9a5a9d40dea62de019f5ed0fad0885800403c48a4a6c86b67af7fbd842097881c2bd6
-Size (alsa-utils-1.0.27.2.tar.bz2) = 1143802 bytes
+SHA1 (alsa-utils-1.1.0.tar.bz2) = 1ad980aa5a1f3118d686f74d3973d64909e3efc3
+RMD160 (alsa-utils-1.1.0.tar.bz2) = 7a2bb3dd79f8c4472725b1e0437ae71b277ac45e
+SHA512 (alsa-utils-1.1.0.tar.bz2) = c61f056959feba015bb4a6f49980c4beb6a0c34be09e7196864583897ea86373b593a8807999a07df9c87a3a0c714075b9aae516752e83a946d0d60bc8f90f98
+Size (alsa-utils-1.1.0.tar.bz2) = 1181085 bytes
 SHA1 (patch-aa) = 78087e7a7fe860e002d592b0c7b83e98b10ea2c3
 SHA1 (patch-ab) = 6bbdb3c16e49b6fba05120c243292c9ef51ebca4
 SHA1 (patch-ac) = 19f9570bedfb00068aad244033eb6e6436a6546d
 SHA1 (patch-ad) = 4da5adfbd3fcc0611c6394bf00f2b684e735dbd2
-SHA1 (patch-alsaloop_alsaloop.c) = 469b00a0ffa7ab3bca752bd61e458026100628fe
-SHA1 (patch-alsaloop_pcmjob.c) = ae340dde8532d3a1253d4ff38782f17fbf2d381e
+SHA1 (patch-alsaloop_alsaloop.c) = f281b7cdc75a31a4b06fbce56fc2c51b2371cd0b
+SHA1 (patch-alsaloop_pcmjob.c) = 9a09a103d390ee5d7586e19c688a2c621ee1c6f6
 SHA1 (patch-alsamixer_volume__mapping.c) = a543c74ba4f3f3b3cc7768623fbca760b06a7872
diff --git a/audio/alsa-utils/patches/patch-alsaloop_alsaloop.c b/audio/alsa-utils/patches/patch-alsaloop_alsaloop.c
index cdc3830b5c9..949366a2094 100644
--- a/audio/alsa-utils/patches/patch-alsaloop_alsaloop.c
+++ b/audio/alsa-utils/patches/patch-alsaloop_alsaloop.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-alsaloop_alsaloop.c,v 1.2 2014/06/11 14:45:09 ryoon Exp $
+$NetBSD: patch-alsaloop_alsaloop.c,v 1.3 2016/02/18 15:16:33 wiz Exp $
 
---- alsaloop/alsaloop.c.orig	2013-07-09 15:28:37.000000000 +0000
+--- alsaloop/alsaloop.c.orig	2015-10-27 16:34:26.000000000 +0000
 +++ alsaloop/alsaloop.c
 @@ -24,6 +24,16 @@
  #include <stdlib.h>
@@ -20,7 +20,7 @@ $NetBSD: patch-alsaloop_alsaloop.c,v 1.2 2014/06/11 14:45:09 ryoon Exp $
  #include <getopt.h>
  #include <alsa/asoundlib.h>
 @@ -34,6 +44,10 @@
- #include <sys/signal.h>
+ #include <signal.h>
  #include "alsaloop.h"
  
 +#if !defined(ESTRPIPE)
diff --git a/audio/alsa-utils/patches/patch-alsaloop_pcmjob.c b/audio/alsa-utils/patches/patch-alsaloop_pcmjob.c
index 99b15bd84d2..5a5214957a3 100644
--- a/audio/alsa-utils/patches/patch-alsaloop_pcmjob.c
+++ b/audio/alsa-utils/patches/patch-alsaloop_pcmjob.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-alsaloop_pcmjob.c,v 1.1 2014/06/09 12:34:26 ryoon Exp $
+$NetBSD: patch-alsaloop_pcmjob.c,v 1.2 2016/02/18 15:16:33 wiz Exp $
 
---- alsaloop/pcmjob.c.orig	2013-07-09 15:28:37.000000000 +0000
+--- alsaloop/pcmjob.c.orig	2015-10-27 16:34:26.000000000 +0000
 +++ alsaloop/pcmjob.c
 @@ -25,6 +25,10 @@
  #include <stdlib.h>
@@ -24,15 +24,3 @@ $NetBSD: patch-alsaloop_pcmjob.c,v 1.1 2014/06/09 12:34:26 ryoon Exp $
  #define XRUN_PROFILE_UNKNOWN (-10000000)
  
  static int set_rate_shift(struct loopback_handle *lhandle, double pitch);
-@@ -63,7 +71,11 @@ static const char *src_types[] = {
- #endif
- 
- static pthread_mutex_t pcm_open_mutex =
-+#if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
-                                 PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-+#else
-+				PTHREAD_MUTEX_INITIALIZER;
-+#endif
- 
- static inline void pcm_open_lock(void)
- {