Updated alsa-lib to 1.1.4.

Core

    Release v1.1.4
    Drop ppc64-specific workaround for versioned symbols
    conf/ucm: broxton: add broxton-rt298 conf files

Config API

    conf: Allow dynamic top-level config directory

HWDEP API

    hwdep: add support for MOTU FireWire series and RME Fireface series
    hwdep: add Line6 USB series support

Mixer API

    conf: Allow dynamic top-level config directory

PCM API

    ALSA: pcm: Use recursive mutex
    pcm: dmix: Disable var_periodsize as default
    pcm:plugin: Fix sound capture via MMAP access
    plugin:dshare: wrong state reporting
    pcm:file: delegate htimestamping to slave instead of always getting real_htimestamp
    pcm:plug: save converter config
    dmix plugin: drain - quickfix for the previous patch
    dmix plugin: fix drain for nonblock mode
    pcm file plugin: handle snd_pcm_mmap_begin() error path in snd_pcm_file_mmap_commit()
    always handle return value from snd_config_get_id() (coverity)
    pcm_plugin: unify the snd_pcm_mmap_begin result value checking
    pcm: rate: Add capability to pass configuration node to plugins
    pcm: extplug: refinement of masks in extplug
    pcm: status dump fix timestamp formatting
    pcm: file: Enable file writing for capture path
    pcm: direct: fix race on clearing timer events
    pcm: dmix_rewind corrupts application pointer fix
    pcm: dmix: Allow disabling x86 optimizations
    pcm: Disable locking in async mode
    pcm: Avoid lock for snd_pcm_nonblock()
    pcm: multi: Drop the fixed slave_map[] in snd_pcm_multi_open()
    pcm: direct: Fix deadlock in poll_descriptors
    pcm: direct: don't return bogus buffer levels in xrun state
    pcm: direct: check state before enter poll on timer
    pcm: direct: Fix for sync issue on xrun recover
    pcm: direct: returning semop error code for semaphore up/down failures
    rate: dynamic update avail_min on slave
    plugin: dynamically update avail_min on slave
    pcm: rate: fix the hw_ptr update until the boundary available
    pcm: dshare: enable silence
    pcm: direct: allow users to configure different period sizes

RawMidi API

    rawmidi: virtual: fix reading into a small buffer

Sequencer API

    seq: improve documentation about new get pid/card functions

Timer API

    timer: obsolete legacy rtctimer instance

Topology API

    topology: Fix issue in parsing routes when generating topology binary
    conf: Allow dynamic top-level config directory
    topology: Allow a data section to contain multiple tuples objects
    topology: Group elements with the same index value into a block
    topology: Look up references for an object based on its index
    topology: Remove code parsing index value in paring each object
    topology: Insert new element based on its index value
    topology: coverity - remove dead code
    always handle return value from snd_config_get_id() (coverity)
    topology: Fix incorrect license in source comments.
    topology: fix unused-const-variable warning

Use Case Manager API

    ucm parser: fix possible string overflow in uc_mgr_import_master_config()
    ucm: Add command 'get _file' to get the config file name of the opened card
    ucm: Load device-specific configuration file based on the card long name
    ucm: Assure the user input card name not to exceed max size of card long name
    ucm: parser needs limits.h
    ucm: Add ATTRIBUTE_UNUSED for unused parameters of execute_component_seq()

ALSA Lisp

    conf: Allow dynamic top-level config directory

Configuration

    conf: topology: Fix index mismatch for skl and bxt
    conf: Allow dynamic top-level config directory
    conf: Remove dmix.direct_memory_access setup
    conf/cards: add VC4-HDMI card
    pcm: dmix: Allow disabling x86 optimizations
    conf: Add card config for Intel HDMI/DP LPE audio
    conf/cards: add support for pistachio-card.
    conf/ucm: broxton: add broxton-rt298 conf files

External Rate Converter Plugin SDK

    pcm: rate: Add capability to pass configuration node to plugins

Kernel Headers

    hwdep: add support for MOTU FireWire series and RME Fireface series
    hwdep: add Line6 USB series support
    timer: obsolete legacy rtctimer instance update to libtool 1.3.3

5 files changed, 20 insertions, 47 deletions

diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile
index 42d1d9eff2b..54d0302d797 100644
--- a/audio/alsa-lib/Makefile
+++ b/audio/alsa-lib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2017/02/22 14:48:08 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2017/05/29 12:42:25 wiz Exp $
 
-DISTNAME=	alsa-lib-1.1.3
+DISTNAME=	alsa-lib-1.1.4
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.alsa-project.org/pub/lib/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/alsa-lib/PLIST b/audio/alsa-lib/PLIST
index e0a9d3d1baf..2ad9baf9d90 100644
--- a/audio/alsa-lib/PLIST
+++ b/audio/alsa-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2017/02/22 14:48:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2017/05/29 12:42:25 wiz Exp $
 bin/aserver
 include/alsa/alisp.h
 include/alsa/asoundef.h
@@ -73,6 +73,7 @@ share/alsa/cards/FWSpeakers.conf
 share/alsa/cards/FireWave.conf
 share/alsa/cards/GUS.conf
 share/alsa/cards/HDA-Intel.conf
+share/alsa/cards/HdmiLpeAudio.conf
 share/alsa/cards/ICE1712.conf
 share/alsa/cards/ICE1724.conf
 share/alsa/cards/ICH-MODEM.conf
@@ -103,6 +104,8 @@ share/alsa/cards/VXPocket440.conf
 share/alsa/cards/YMF744.conf
 share/alsa/cards/aliases.alisp
 share/alsa/cards/aliases.conf
+share/alsa/cards/pistachio-card.conf
+share/alsa/cards/vc4-hdmi.conf
 share/alsa/pcm/center_lfe.conf
 share/alsa/pcm/default.conf
 share/alsa/pcm/dmix.conf
@@ -159,6 +162,10 @@ share/alsa/ucm/VEYRON-I2S/HiFi.conf
 share/alsa/ucm/VEYRON-I2S/VEYRON-I2S.conf
 share/alsa/ucm/broadwell-rt286/HiFi
 share/alsa/ucm/broadwell-rt286/broadwell-rt286.conf
+share/alsa/ucm/broxton-rt298/Hdmi1
+share/alsa/ucm/broxton-rt298/Hdmi2
+share/alsa/ucm/broxton-rt298/HiFi
+share/alsa/ucm/broxton-rt298/broxton-rt298.conf
 share/alsa/ucm/chtrt5645/HiFi.conf
 share/alsa/ucm/chtrt5645/chtrt5645.conf
 share/alsa/ucm/skylake-rt286/Hdmi1
diff --git a/audio/alsa-lib/distinfo b/audio/alsa-lib/distinfo
index 269ad8d54a6..fe63ebb8191 100644
--- a/audio/alsa-lib/distinfo
+++ b/audio/alsa-lib/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.25 2017/03/28 09:10:56 jperkin Exp $
+$NetBSD: distinfo,v 1.26 2017/05/29 12:42:25 wiz Exp $
 
-SHA1 (alsa-lib-1.1.3.tar.bz2) = 8ef0b9725296ac8f24e06f20196f5b2b62ab27a9
-RMD160 (alsa-lib-1.1.3.tar.bz2) = 36fb2c889411e23be1084a432d200d40fb70e920
-SHA512 (alsa-lib-1.1.3.tar.bz2) = f5dbe2375a8c66af14378314a5238284d4ed63dfc86a750c0c6e8f6cdb6b1ea2d8ef26f870b5d152dc0b77d9b40821cab523f6734902b91583beb08e28c66850
-Size (alsa-lib-1.1.3.tar.bz2) = 962001 bytes
+SHA1 (alsa-lib-1.1.4.tar.bz2) = 3e52a68329f32b465e7793d884caddeb89220a6e
+RMD160 (alsa-lib-1.1.4.tar.bz2) = 534350de373d14b0cccacf0a95a062f194c2c002
+SHA512 (alsa-lib-1.1.4.tar.bz2) = 8dfc5cc8872138b9e7e234934e317d797e100ac99dac86a2a2e4bdcc0d49e8a05b4089b98341051b407750bed93c2713fae5218318e5ce6cc7db2801165a1c10
+Size (alsa-lib-1.1.4.tar.bz2) = 973825 bytes
 SHA1 (patch-ad) = 79a0f048751899247ec12990cd02332b977af248
 SHA1 (patch-ae) = 7ad3a3c3ee4be2c80fa6b0a2ea28563efd399a60
 SHA1 (patch-af) = 257b06f10616c04c2724e30777b027e5e7e443f9
@@ -13,7 +13,7 @@ SHA1 (patch-bg) = b726769272dd214e67f2407ed5a0199189540557
 SHA1 (patch-bi) = 7e74ebe53cc2ab273f5235775e391a6ef28d1006
 SHA1 (patch-bj) = 5b7a36747e57e41eddb05cd1b1d9771a36b0c4f7
 SHA1 (patch-bk) = 55754e4d0ac947c2e7e59b604a21fb5798ae5b39
-SHA1 (patch-configure.ac) = 1c407e8a9d9ea745ab1b79175f6fc0ec6d475acc
+SHA1 (patch-configure.ac) = 897ae894de00857ed58553808ba40e24c0666b15
 SHA1 (patch-include_sound_asound.h) = 04e80f66542473b3b858427972046f2de320f871
 SHA1 (patch-include_type__compat.h) = 3cb245d8ea171f987859e1b5a89b0908c2037492
 SHA1 (patch-src_conf.c) = 432e04179798c54a76f5ce072dd9c0b79221df85
@@ -21,4 +21,3 @@ SHA1 (patch-src_control_control__hw.c) = 07cfe3abe586b32f6b989403cd162599da07e86
 SHA1 (patch-src_pcm_pcm__mmap.c) = 2d0f05aa53b30cef1ec083aa4f5d559d0a679058
 SHA1 (patch-src_seq_seq__midi__event.c) = 2a5de492d6ca19a0f0c564e8f5a065e5fc57ea5c
 SHA1 (patch-src_shmarea.c) = d6d0876ae7911ff16138bb82a3b1c79e795218cf
-SHA1 (patch-src_ucm_parser.c) = ebb986cc3048061adcf9fc6bc60a9d3ffd52ceec
diff --git a/audio/alsa-lib/patches/patch-configure.ac b/audio/alsa-lib/patches/patch-configure.ac
index 05d90e9dadf..7dfe9d5870c 100644
--- a/audio/alsa-lib/patches/patch-configure.ac
+++ b/audio/alsa-lib/patches/patch-configure.ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-configure.ac,v 1.1 2016/04/15 08:47:50 wiz Exp $
+$NetBSD: patch-configure.ac,v 1.2 2017/05/29 12:42:25 wiz Exp $
 
---- configure.ac.orig	2016-02-24 08:33:29.000000000 +0000
+--- configure.ac.orig	2017-05-12 08:01:45.000000000 +0000
 +++ configure.ac
-@@ -665,6 +671,15 @@ AC_OUTPUT(Makefile doc/Makefile doc/pict
- 	  test/Makefile test/lsb/Makefile \
+@@ -687,6 +687,15 @@ AC_OUTPUT(Makefile doc/Makefile doc/pict
+ 	  src/conf/ucm/broxton-rt298/Makefile \
  	  utils/Makefile utils/alsa-lib.spec utils/alsa.pc)
  
 +case $host_os in
diff --git a/audio/alsa-lib/patches/patch-src_ucm_parser.c b/audio/alsa-lib/patches/patch-src_ucm_parser.c
deleted file mode 100644
index b22017f5563..00000000000
--- a/audio/alsa-lib/patches/patch-src_ucm_parser.c
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-src_ucm_parser.c,v 1.5 2017/03/28 09:10:57 jperkin Exp $
-
-* SunOS has no dirent d_type
-* Include limits.h for PATH_MAX.
-
---- src/ucm/parser.c.orig	2016-12-20 14:43:20.000000000 +0000
-+++ src/ucm/parser.c
-@@ -32,6 +32,7 @@
- 
- #include "ucm_local.h"
- #include <dirent.h>
-+#include <limits.h>
- 
- /** The name of the environment variable containing the UCM directory */
- #define ALSA_CONFIG_UCM_VAR "ALSA_CONFIG_UCM"
-@@ -1368,9 +1369,17 @@ int uc_mgr_import_master_config(snd_use_
- 
- static int filename_filter(const struct dirent *dirent)
- {
-+#ifdef __sun
-+	struct stat s;
-+#endif
- 	if (dirent == NULL)
- 		return 0;
-+#ifdef __sun
-+	stat(dirent->d_name, &s);
-+	if (s.st_mode & S_IFDIR) {
-+#else
- 	if (dirent->d_type == DT_DIR) {
-+#endif
- 		if (dirent->d_name[0] == '.') {
- 			if (dirent->d_name[1] == '\0')
- 				return 0;