Update alsa-lib to 1.1.0:

Core

    Release v1.1.0
    support building w/out System V shared memory
    fix _GNU_SOURCE handling & header inclusion
    build: Do not try to detect cross-compiler
    core: add convenience macros to local.h
    conf: topology: Add topology file for broadwell audio DSP
    topology: autotools: Add build support for topology core
    Replace list.h with its own version
    Allow hint for ctl, hwdep, timer and seq
    conf/ucm: Add Makefile.am for broadwell-rt286 ucm config

Config API

    Replace unsafe characters with _ in card name

Control API

    control: Allow cset'ing specific values in the multi-value case
    Allow hint for ctl, hwdep, timer and seq
    namehint: Fix bad free with invalid iface name
    namehint: Fix the listing without device number
    namehint: Fix invalid list access in snd_device_name_hint()

HWDEP API

    hwdep: add FireWire digi00x/tascam driver support
    Allow hint for ctl, hwdep, timer and seq

PCM API

    support building w/out System V shared memory
    pcm: drop unused sys/shm.h inclusion
    move page helpers to common code
    pcm: dmix: Handle slave PCM xrun and unexpected states properly
    pcm: ladspa: Fix segfault due to a wrong channel reference
    pcm: route: Remove bogus ! in snd_config_get_id() checks
    pcm: ioplug,extplug: Fix logic errors in type checks
    pcm: Fix doxygen for two enums
    pcm: restore hw params on set latency failed
    pcm: add support for new STATUS_EXT ioctl
    pcm: add support for get/set_audio_htstamp_config
    pcm: add helper functions to query timestamping capabilities
    PCM: snd_pcm_xxxx_drain() maybe blocked after suspend and resume
    pcm: Fix snd_pcm_status() for dmix & co
    pcm: Don't assert in _snd_pcm_hw_params_internal()
    pcm: Remove assert() from snd_pcm_hw_params_slave()
    Allow hint for ctl, hwdep, timer and seq

RawMidi API

    Allow hint for ctl, hwdep, timer and seq

Timer API

    fix _GNU_SOURCE handling & header inclusion

Topology API

    topology: Add missing prototypes for new functions
    topology: remove little endian type from userspace header
    topology: Add C API support for PCM
    topology: Add C API support for BE and CC Links.
    topology: ABI - Change stream formats to a bitwise flag
    topology: ABI - Separate PCM & BE/CC link support and bump ABI version to 4
    topology: Add API to set a vendor specific version number
    topology: pcm: Remove unused variables
    topology: parser: Add missing return value to snd_tplg_set_manifest_data()
    topology: data: Fix wrong size check in tplg_parse_data_hex()
    topology: ctl: Fix access type checks
    topology: builder: Fix possibly uninitialized variable in write_elem_block()
    topology: A API calls to directly build topology data from templates
    topology: Add C templates structure for building topology from C programs
    core: add convenience macros to local.h
    topology: rename OBJECT_TYPE_ to SND_TPLG_TYPE_
    topology: print error prefix on error message.
    topology: treat all DAPM controls types the same when copying
    topology: update ABI to improve support for different TLV object types.
    topology: Add support for writing manifest private data.
    topology: Add element ID so we can look up references by name.
    topology: fix element object type is switch()
    topology: Fix typos
    topology: Fix missing inclusion of ctype.h
    topology: autotools: Add build support for topology core
    topology: Add binary file builder.
    topology: Add Channel map parser.
    topology: Add CTL parser
    topology: Add DAPM object parser
    topology: Add private data parser
    topology: Add operations parser
    topology: Add PCM parser.
    topology: Add text section parser.
    topology: Add topology core parser.

Use Case Manager API

    fix _GNU_SOURCE handling & header inclusion
    ucm: docs: Fix doxygen formatting for UCM main page.
    ucm: allow multiple devices in JackHWMute
    ucm: improve jack configuration documentation
    ucm: reformat snd_use_case_get() doc
    ucm: document some standard values

/include/Makefile.am

    topology: autotools: Add build support for topology core

/src/Makefile.am

    topology: autotools: Add build support for topology core

Configuration

    move page helpers to common code
    fix _GNU_SOURCE handling & header inclusion
    conf: topology: Add topology file for broadwell audio DSP
    Replace unsafe characters with _ in card name
    surround41/50.conf: Use chmap syntax for better flexibility
    conf/ucm: broadwell-rt286: change to set capture volume and capture device
    conf: Add hint descriptions to ctl, hwdep, seq and timer devices
    Allow hint for ctl, hwdep, timer and seq
    conf/ucm: broadwell-rt286: change to use the correct jack kcontrol name
    USB-audio: Sound Blaster HD iec958 is on device 1
    conf/ucm: Add Makefile.am for broadwell-rt286 ucm config
    conf/ucm: broadwell-rt286: add ucm config

Documentation

    topology: doxygen: Add doxygen support for topology core.
    docs: Add UCM link to main doxygen page.
    ucm: docs: fix doxygen exclude patch for UCM local header

Kernel Headers

    topology: ABI - Rename dai_elems to pcm_elems in manifest
    topology: ABI - Change stream formats to a bitwise flag
    topology: ABI - Use __le32 instead of __u32 in snd_soc_tplg_dapm_widget
    topology: ABI - Remove unused struct snd_soc_tplg_stream_config
    topology: ABI - Remove tdm_slot & dai_fmt from snd_soc_tplg_stream
    topology: ABI - Separate PCM & BE/CC link support and bump ABI version to 4
    topology: ABI - Add name element to snd_soc_tplg_stream
    hwdep: add FireWire digi00x/tascam driver support
    topology: Add ops support to byte control objects.
    topology: update ABI to improve support for different TLV object types.
    topology: uapi: Add UAPI headers for topology ABI
    Sync include/sound/asound.h with 4.1 kernel

SHM helpers

    support building w/out System V shared memory

Test/Example code

    test: audio_time: show report validity and accuracy
    test: fix audio_time with new get/set audio_tstamp_config
    test/pcm_min: Fix error messages
    test/pcm: Fix generated values with float PCM format

16 files changed, 122 insertions, 167 deletions

diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile
index e8d8c1f6e96..6f6c597bb29 100644
--- a/audio/alsa-lib/Makefile
+++ b/audio/alsa-lib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2014/09/10 15:59:34 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.16 2016/02/18 15:15:57 wiz Exp $
 
-DISTNAME=	alsa-lib-1.0.27.2
+DISTNAME=	alsa-lib-1.1.0
 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 4ec68c94377..7b7558b5b66 100644
--- a/audio/alsa-lib/PLIST
+++ b/audio/alsa-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2014/06/09 12:21:07 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.5 2016/02/18 15:15:57 wiz Exp $
 bin/aserver
 include/alsa/alisp.h
 include/alsa/asoundef.h
@@ -26,14 +26,17 @@ include/alsa/seq.h
 include/alsa/seq_event.h
 include/alsa/seq_midi_event.h
 include/alsa/seqmid.h
+include/alsa/sound/asoc.h
 include/alsa/sound/asound_fm.h
 include/alsa/sound/emu10k1.h
 include/alsa/sound/hdsp.h
 include/alsa/sound/hdspm.h
 include/alsa/sound/sb16_csp.h
 include/alsa/sound/sscape_ioctl.h
+include/alsa/sound/tlv.h
 include/alsa/sound/type_compat.h
 include/alsa/timer.h
+include/alsa/topology.h
 include/alsa/use-case.h
 include/alsa/version.h
 include/sys/asoundlib.h
@@ -79,6 +82,7 @@ share/alsa/cards/ICE1724.conf
 share/alsa/cards/ICH-MODEM.conf
 share/alsa/cards/ICH.conf
 share/alsa/cards/ICH4.conf
+share/alsa/cards/Loopback.conf
 share/alsa/cards/Maestro3.conf
 share/alsa/cards/NFORCE.conf
 share/alsa/cards/PC-Speaker.conf
@@ -114,6 +118,7 @@ share/alsa/pcm/iec958.conf
 share/alsa/pcm/modem.conf
 share/alsa/pcm/rear.conf
 share/alsa/pcm/side.conf
+share/alsa/pcm/surround21.conf
 share/alsa/pcm/surround40.conf
 share/alsa/pcm/surround41.conf
 share/alsa/pcm/surround50.conf
@@ -121,8 +126,14 @@ share/alsa/pcm/surround51.conf
 share/alsa/pcm/surround71.conf
 share/alsa/smixer.conf
 share/alsa/sndo-mixer.alisp
+share/alsa/topology/broadwell/broadwell.conf
 share/alsa/ucm/DAISY-I2S/DAISY-I2S.conf
 share/alsa/ucm/DAISY-I2S/HiFi.conf
+share/alsa/ucm/GoogleNyan/GoogleNyan.conf
+share/alsa/ucm/GoogleNyan/HiFi.conf
+share/alsa/ucm/PAZ00/HiFi.conf
+share/alsa/ucm/PAZ00/PAZ00.conf
+share/alsa/ucm/PAZ00/Record.conf
 share/alsa/ucm/PandaBoard/FMAnalog
 share/alsa/ucm/PandaBoard/PandaBoard.conf
 share/alsa/ucm/PandaBoard/hifi
@@ -144,4 +155,6 @@ share/alsa/ucm/SDP4430/hifiLP
 share/alsa/ucm/SDP4430/record
 share/alsa/ucm/SDP4430/voice
 share/alsa/ucm/SDP4430/voiceCall
+share/alsa/ucm/broadwell-rt286/HiFi
+share/alsa/ucm/broadwell-rt286/broadwell-rt286.conf
 share/alsa/ucm/tegraalc5632/tegraalc5632.conf
diff --git a/audio/alsa-lib/distinfo b/audio/alsa-lib/distinfo
index 62d139a7507..3c158d61f99 100644
--- a/audio/alsa-lib/distinfo
+++ b/audio/alsa-lib/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.19 2015/11/07 19:43:56 dholland Exp $
+$NetBSD: distinfo,v 1.20 2016/02/18 15:15:57 wiz Exp $
 
-SHA1 (alsa-lib-1.0.27.2.tar.bz2) = 9cd50f4b5f07d5e7213dd1277b8673e677804cf8
-RMD160 (alsa-lib-1.0.27.2.tar.bz2) = 6794e626affe9b6b6ec5fb64ff31384526b160c2
-SHA512 (alsa-lib-1.0.27.2.tar.bz2) = 3fa9160e001cf21ddc6332c3748f8aa27bd1b514616fd1a9993c34128fe99d07e2dfc5f1a9177e1c17456d1361496f90bf3552f940fd85c6ea5ac9bbc30fe8ce
-Size (alsa-lib-1.0.27.2.tar.bz2) = 906844 bytes
+SHA1 (alsa-lib-1.1.0.tar.bz2) = 94b9af685488221561a73ae285c4fddaa93663e4
+RMD160 (alsa-lib-1.1.0.tar.bz2) = 0a9ecf05c136ae025df7ab749db907ad81c4db8f
+SHA512 (alsa-lib-1.1.0.tar.bz2) = 2939d0b621c1c619b0a492b05f2e84f354d588c9cc982d93dbcf01c582319258dd5f803ff5c10be52343cd8827d690f671ab5b20ad586a0ee371f0949c9e98f4
+Size (alsa-lib-1.1.0.tar.bz2) = 929874 bytes
 SHA1 (patch-aa) = 5a8e9571ac6fb1f1f6cbd18d3859468a7b64076f
 SHA1 (patch-ab) = 4853bdbdd559c4fa6a9d00dca3e880022d7fc6ba
-SHA1 (patch-ac) = 47f5cad6c436b08161acd726090ec20a9cb50fc8
-SHA1 (patch-ad) = 10beb6cca7cf7c554a13337e8cded23e02bca2c8
-SHA1 (patch-ae) = 6b39426634f1a5c7bb33a2cba1cf1586b606f287
+SHA1 (patch-ad) = 43b9a214626bac91cf5b9afb19b6785b100fd7de
+SHA1 (patch-ae) = c2165e3b3d644eb42a6bc9260fb079adcb0da1ba
 SHA1 (patch-af) = b5d0a48da183c0725367b08abb24bf1fed85cb30
 SHA1 (patch-ag) = bea09d714bf75735f5be6d370f7242c34b73cb95
 SHA1 (patch-ah) = 3d2aa98ba2791c2beb152d7e3a454b8d6bb527d3
@@ -19,7 +18,7 @@ SHA1 (patch-al) = 76de42304d5ba90bf5e8def57f523c1ee910d9df
 SHA1 (patch-am) = 7b5cf015ec0612c1c4a9a864d42d84bba7a78e47
 SHA1 (patch-an) = c7253acaaf2aeb96310d14c9e03853bc4cd4d0cd
 SHA1 (patch-ao) = 25ac431685e033b165a9abdcd44246772c1f99b5
-SHA1 (patch-ap) = deaa53fcf3fc23c7683388b5e37b3d6593776121
+SHA1 (patch-ap) = 3a3c8316b56997052d27f084ed178acbc49d1b17
 SHA1 (patch-aq) = 6a6cf97a17997a9ffc5d269ad2231fc0451bd532
 SHA1 (patch-ar) = 8823c573ac4f6ce038b1067f71a8de91e73bea20
 SHA1 (patch-as) = 946a179a675d6c5e03e0f7734ac97b0592806912
@@ -28,7 +27,7 @@ SHA1 (patch-au) = 3dbf68b4ad655f2b2c91dcce8ca5daac6e80a361
 SHA1 (patch-av) = 5f145c3755bf510be6fb101e30d40e10b8dcbd6d
 SHA1 (patch-aw) = dfad5799001f9e1de7f5892b9a89bc4b6defd9e9
 SHA1 (patch-ax) = cab065c0b4fb697e21c058b3be1fc1665692ffd3
-SHA1 (patch-ay) = 3c5dc895c88354b03df4d9ca516465ce3fdc3465
+SHA1 (patch-ay) = 889656f4627c108fdb8f6db7003c8f823efbc1f8
 SHA1 (patch-az) = 6664cb045360c770c80e8d0a7e8e7192d8267487
 SHA1 (patch-ba) = ab5b3fbd497e29c9b1e548e3f510fce7b994f5f3
 SHA1 (patch-bb) = 300c18e806b090cbe6dca1f133bbaace9625fb91
@@ -41,13 +40,14 @@ SHA1 (patch-bh) = a64e54b14946697fdc15b274238851fe8bd32106
 SHA1 (patch-bi) = b5038db277068034281787c0072201beae8df8ff
 SHA1 (patch-bj) = 5b7a36747e57e41eddb05cd1b1d9771a36b0c4f7
 SHA1 (patch-bk) = 55754e4d0ac947c2e7e59b604a21fb5798ae5b39
-SHA1 (patch-include_iatomic.h) = 30099667b490c0e960a7e8883da52c39f4396b9d
+SHA1 (patch-include_iatomic.h) = 7096f31a6b38c10b2e11a907f8431d33d98cce94
 SHA1 (patch-include_pcm.h) = 9558c5f5c80276632d27e0278cd33ee77d8281a5
-SHA1 (patch-include_sound_asound.h) = 456b8545668294d38a83e98818d76bd2f717df75
-SHA1 (patch-src_compat_hsearch__r.c) = 017bf104203233e85e9f3083f43150de6f341ad5
-SHA1 (patch-src_conf.c) = 43e35f6a133cf297d3309bc8c4846beb295e5242
+SHA1 (patch-include_sound_asoc.h) = d5c274e838f70c22c9e0ba94ef7b7db6f4310e74
+SHA1 (patch-include_sound_asound.h) = dc11957bc69f59a86284afc81c7719b3a955f7ad
+SHA1 (patch-src_conf.c) = 27795c60a05ced40c42dbfb474eed88f3b284cc6
 SHA1 (patch-src_control_control__hw.c) = 07cfe3abe586b32f6b989403cd162599da07e865
-SHA1 (patch-src_pcm_pcm__mmap.c) = 8ce33dae5215ee441196414e0c1ba02e4757e32d
+SHA1 (patch-src_pcm_pcm__mmap.c) = 2d0f05aa53b30cef1ec083aa4f5d559d0a679058
 SHA1 (patch-src_seq_seq__midi__event.c) = 2a5de492d6ca19a0f0c564e8f5a065e5fc57ea5c
-SHA1 (patch-src_shmarea.c) = e6da001119f4e164b606e19a4c12df9aa05caa6a
+SHA1 (patch-src_shmarea.c) = d6d0876ae7911ff16138bb82a3b1c79e795218cf
+SHA1 (patch-src_topology_tplg__local.h) = a0105a243027a1d439d7c450cf20144fe477fecc
 SHA1 (patch-src_ucm_parser.c) = 3c376ae30f11d749ea5e41da89a72269710a3b10
diff --git a/audio/alsa-lib/patches/patch-ac b/audio/alsa-lib/patches/patch-ac
deleted file mode 100644
index e5a1083e6f2..00000000000
--- a/audio/alsa-lib/patches/patch-ac
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2014/03/25 23:06:07 asau Exp $
-
---- include/asoundlib-head.h.orig	2008-12-18 22:01:21.000000000 -0500
-+++ include/asoundlib-head.h
-@@ -34,7 +34,20 @@
- #include <string.h>
- #include <fcntl.h>
- #include <assert.h>
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
-+#include <sys/endian.h>
-+#elif defined(__sun)
-+#include <sys/byteorder.h>
-+#define __LITTLE_ENDIAN 1234
-+#define __BIG_ENDIAN 4321
-+#ifdef _BIG_ENDIAN
-+#define __BYTE_ORDER __BIG_ENDIAN
-+#else
-+#define __BYTE_ORDER __LITTLE_ENDIAN
-+#endif
-+#else
- #include <endian.h>
-+#endif
- #include <sys/poll.h>
- #include <errno.h>
- #include <stdarg.h>
diff --git a/audio/alsa-lib/patches/patch-ad b/audio/alsa-lib/patches/patch-ad
index 1b0b89a5c94..e41e2db9cc6 100644
--- a/audio/alsa-lib/patches/patch-ad
+++ b/audio/alsa-lib/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.5 2015/01/10 10:14:20 rumko Exp $
+$NetBSD: patch-ad,v 1.6 2016/02/18 15:15:57 wiz Exp $
 
---- include/global.h.orig	2013-07-08 12:31:36.000000000 +0000
+--- include/global.h.orig	2015-11-09 07:39:18.000000000 +0000
 +++ include/global.h
 @@ -30,6 +30,13 @@
  
@@ -16,10 +16,10 @@ $NetBSD: patch-ad,v 1.5 2015/01/10 10:14:20 rumko Exp $
  
  #ifdef __cplusplus
  extern "C" {
-@@ -133,7 +140,7 @@ int snd_shm_area_destroy(struct snd_shm_
- 
+@@ -134,7 +141,7 @@ int snd_shm_area_destroy(struct snd_shm_
  int snd_user_file(const char *file, char **result);
  
+ #ifdef __GLIBC__
 -#if !defined(_POSIX_C_SOURCE) && !defined(_POSIX_SOURCE)
 +#if !defined(_POSIX_C_SOURCE) && !defined(_POSIX_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
  struct timeval {
diff --git a/audio/alsa-lib/patches/patch-ae b/audio/alsa-lib/patches/patch-ae
index 478ca53d81f..a43a0a8eb98 100644
--- a/audio/alsa-lib/patches/patch-ae
+++ b/audio/alsa-lib/patches/patch-ae
@@ -1,50 +1,23 @@
-$NetBSD: patch-ae,v 1.6 2015/11/07 19:43:57 dholland Exp $
+$NetBSD: patch-ae,v 1.7 2016/02/18 15:15:57 wiz Exp $
 
  - Handle endian detection for assorted operating systems.
  - Fix up linuxism.
  - Don't assert GNU ld on Solaris, where it might not be true.
 
---- include/local.h.orig	2013-07-08 12:31:36.000000000 +0000
+--- include/local.h.orig	2015-11-09 07:39:18.000000000 +0000
 +++ include/local.h
-@@ -28,11 +28,37 @@
- #include <string.h>
- #include <fcntl.h>
- #include <assert.h>
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || \
-+    defined(__OpenBSD__) || defined(__Bitrig__)
-+#include <sys/endian.h>
-+#elif defined(__APPLE__)
-+#include <machine/endian.h>
-+#elif defined(__sun)
-+#include <sys/byteorder.h>
-+#define __LITTLE_ENDIAN 1234
-+#define __BIG_ENDIAN 4321
-+#ifdef _BIG_ENDIAN
-+#define __BYTE_ORDER __BIG_ENDIAN
-+#else
-+#define __BYTE_ORDER __LITTLE_ENDIAN
-+#endif
-+#else
- #include <endian.h>
-+#endif
-+
-+#if !defined(__BYTE_ORDER) && defined(_BYTE_ORDER)
-+/* Older BSDs */
-+#define __BYTE_ORDER _BYTE_ORDER
-+#define __BIG_ENDIAN _BIG_ENDIAN
-+#define __LITTLE_ENDIAN _LITTLE_ENDIAN
-+#endif
-+
- #include <stdarg.h>
+@@ -50,8 +50,10 @@
  #include <sys/poll.h>
+ #include <sys/types.h>
  #include <errno.h>
 +#if defined(__linux__)
+ #include <linux/types.h>
  #include <linux/ioctl.h>
 +#endif
  
- #include "config.h"
  #ifdef SUPPORT_RESMGR
-@@ -228,7 +254,9 @@ extern snd_lib_error_handler_t snd_err_m
+ #include <resmgr.h>
+@@ -249,7 +251,9 @@ extern snd_lib_error_handler_t snd_err_m
  
  /*
   */
diff --git a/audio/alsa-lib/patches/patch-ap b/audio/alsa-lib/patches/patch-ap
index 81d57a9de9b..c2883155853 100644
--- a/audio/alsa-lib/patches/patch-ap
+++ b/audio/alsa-lib/patches/patch-ap
@@ -1,13 +1,12 @@
-$NetBSD: patch-ap,v 1.5 2014/03/25 23:06:07 asau Exp $
+$NetBSD: patch-ap,v 1.6 2016/02/18 15:15:57 wiz Exp $
 
---- src/pcm/pcm_file.c.orig	2009-05-06 07:07:23.000000000 +0000
+--- src/pcm/pcm_file.c.orig	2015-11-09 07:39:18.000000000 +0000
 +++ src/pcm/pcm_file.c
-@@ -26,8 +26,10 @@
+@@ -26,7 +26,9 @@
   *
   */
    
 +#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <endian.h>
  #include <byteswap.h>
 +#endif
  #include <ctype.h>
diff --git a/audio/alsa-lib/patches/patch-ay b/audio/alsa-lib/patches/patch-ay
index e7e6a1adaab..40343340cad 100644
--- a/audio/alsa-lib/patches/patch-ay
+++ b/audio/alsa-lib/patches/patch-ay
@@ -1,8 +1,8 @@
-$NetBSD: patch-ay,v 1.4 2014/03/25 23:06:07 asau Exp $
+$NetBSD: patch-ay,v 1.5 2016/02/18 15:15:57 wiz Exp $
 
---- src/pcm/pcm_null.c.orig	2008-10-29 08:42:10.000000000 -0400
+--- src/pcm/pcm_null.c.orig	2015-11-09 07:39:18.000000000 +0000
 +++ src/pcm/pcm_null.c
-@@ -26,12 +26,18 @@
+@@ -26,11 +26,17 @@
   *
   */
    
@@ -10,7 +10,6 @@ $NetBSD: patch-ay,v 1.4 2014/03/25 23:06:07 asau Exp $
  #include <byteswap.h>
 +#endif
  #include <limits.h>
- #include <sys/shm.h>
  #include "pcm_local.h"
  #include "pcm_plugin.h"
  
diff --git a/audio/alsa-lib/patches/patch-include_iatomic.h b/audio/alsa-lib/patches/patch-include_iatomic.h
index 85bebf055f7..d112a30d8e3 100644
--- a/audio/alsa-lib/patches/patch-include_iatomic.h
+++ b/audio/alsa-lib/patches/patch-include_iatomic.h
@@ -1,19 +1,19 @@
-$NetBSD: patch-include_iatomic.h,v 1.1 2012/08/02 12:52:33 jperkin Exp $
+$NetBSD: patch-include_iatomic.h,v 1.2 2016/02/18 15:15:57 wiz Exp $
 
 Use __asm__ and __volatile__
 
---- include/iatomic.h.orig	Thu Aug  2 12:47:59 2012
-+++ include/iatomic.h	Thu Aug  2 12:49:53 2012
-@@ -211,9 +211,9 @@
- #define rmb()	mb()
- #define wmb()	__asm__ __volatile__ ("": : :"memory")
- #else
+--- include/iatomic.h.orig	2015-11-09 07:39:18.000000000 +0000
++++ include/iatomic.h
+@@ -9,9 +9,9 @@
+ #endif 
+ 
+ #ifdef __x86_64__
 -#define mb() 	asm volatile("mfence":::"memory")
 -#define rmb()	asm volatile("lfence":::"memory")
 -#define wmb()	asm volatile("sfence":::"memory")
 +#define mb() 	__asm__ __volatile__ ("mfence":::"memory")
 +#define rmb()	__asm__ __volatile__ ("lfence":::"memory")
 +#define wmb()	__asm__ __volatile__ ("sfence":::"memory")
+ #define IATOMIC_DEFINED		1
  #endif
  
- #undef ATOMIC_SMP_LOCK
diff --git a/audio/alsa-lib/patches/patch-include_sound_asoc.h b/audio/alsa-lib/patches/patch-include_sound_asoc.h
new file mode 100644
index 00000000000..860c4344075
--- /dev/null
+++ b/audio/alsa-lib/patches/patch-include_sound_asoc.h
@@ -0,0 +1,21 @@
+$NetBSD: patch-include_sound_asoc.h,v 1.1 2016/02/18 15:15:57 wiz Exp $
+
+--- include/sound/asoc.h.orig	2015-11-09 07:39:18.000000000 +0000
++++ include/sound/asoc.h
+@@ -111,6 +111,16 @@
+  * Block Header.
+  * This header precedes all object and object arrays below.
+  */
++#ifndef __le16
++#define __le16 uint16_t
++#endif
++#ifndef __le32
++#define __le32 uint32_t
++#endif
++#ifndef __le64
++#define __le64 uint64_t
++#endif
++
+ struct snd_soc_tplg_hdr {
+ 	__le32 magic;		/* magic number */
+ 	__le32 abi;		/* ABI version */
diff --git a/audio/alsa-lib/patches/patch-include_sound_asound.h b/audio/alsa-lib/patches/patch-include_sound_asound.h
index 296375943aa..118cdb6cb22 100644
--- a/audio/alsa-lib/patches/patch-include_sound_asound.h
+++ b/audio/alsa-lib/patches/patch-include_sound_asound.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-include_sound_asound.h,v 1.1 2014/06/09 12:21:07 ryoon Exp $
+$NetBSD: patch-include_sound_asound.h,v 1.2 2016/02/18 15:15:57 wiz Exp $
 
---- include/sound/asound.h.orig	2013-07-08 12:31:36.000000000 +0000
+--- include/sound/asound.h.orig	2015-11-09 07:39:18.000000000 +0000
 +++ include/sound/asound.h
 @@ -23,8 +23,14 @@
  #ifndef _UAPI__SOUND_ASOUND_H
@@ -15,6 +15,18 @@ $NetBSD: patch-include_sound_asound.h,v 1.1 2014/06/09 12:21:07 ryoon Exp $
 +typedef uint32_t __u32;
 +typedef int __kernel_pid_t;
 +#endif
+ #ifndef __KERNEL__
+ #include <stdlib.h>
+ #endif
+@@ -415,7 +421,11 @@ struct snd_pcm_sw_params {
  
- /*
-  *  protocol version
+ struct snd_pcm_channel_info {
+ 	unsigned int channel;
++#ifdef __linux__
+ 	__kernel_off_t offset;		/* mmap offset */
++#else
++	off_t offset;		/* mmap offset */
++#endif
+ 	unsigned int first;		/* offset to first sample in bits */
+ 	unsigned int step;		/* samples distance in bits */
+ };
diff --git a/audio/alsa-lib/patches/patch-src_compat_hsearch__r.c b/audio/alsa-lib/patches/patch-src_compat_hsearch__r.c
deleted file mode 100644
index 87a70f1d314..00000000000
--- a/audio/alsa-lib/patches/patch-src_compat_hsearch__r.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_compat_hsearch__r.c,v 1.1 2014/03/25 23:06:07 asau Exp $
-
---- src/compat/hsearch_r.c.orig	2009-12-16 15:18:51.000000000 +0000
-+++ src/compat/hsearch_r.c
-@@ -18,7 +18,7 @@
-    Boston, MA 02111-1307, USA.  */
- 
- #include <errno.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <string.h>
- 
- #define __USE_GNU
diff --git a/audio/alsa-lib/patches/patch-src_conf.c b/audio/alsa-lib/patches/patch-src_conf.c
index 836c09548f2..d423719df37 100644
--- a/audio/alsa-lib/patches/patch-src_conf.c
+++ b/audio/alsa-lib/patches/patch-src_conf.c
@@ -1,48 +1,11 @@
-$NetBSD: patch-src_conf.c,v 1.3 2014/06/26 20:23:14 asau Exp $
+$NetBSD: patch-src_conf.c,v 1.4 2016/02/18 15:15:57 wiz Exp $
 
 * NetBSD has no PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
 * SunOS has no versionsort or dirent d_type
 
---- src/conf.c.orig	2013-07-08 12:31:36.000000000 +0000
+--- src/conf.c.orig	2015-11-09 07:39:18.000000000 +0000
 +++ src/conf.c
-@@ -426,9 +426,12 @@ beginning:</P>
- 
- #ifndef DOC_HIDDEN
- 
--#ifdef HAVE_LIBPTHREAD
-+#if defined(HAVE_LIBPTHREAD) && defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
- static pthread_mutex_t snd_config_update_mutex =
- 				PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-+#else
-+pthread_mutexattr_t attr;
-+pthread_mutex_t _mutex;
- #endif
- 
- struct _snd_config {
-@@ -474,12 +477,22 @@ typedef struct {
- 
- static inline void snd_config_lock(void)
- {
-+#if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
- 	pthread_mutex_lock(&snd_config_update_mutex);
-+#else
-+	pthread_mutexattr_init(&attr);
-+	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-+	pthread_mutex_init(&_mutex, &attr);
-+#endif
- }
- 
- static inline void snd_config_unlock(void)
- {
-+#if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
- 	pthread_mutex_unlock(&snd_config_update_mutex);
-+#else
-+	pthread_mutexattr_destroy(&attr);
-+#endif
- }
- 
- #else
-@@ -3376,11 +3389,19 @@ static int snd_config_hooks(snd_config_t
+@@ -3419,11 +3419,19 @@ static int snd_config_hooks(snd_config_t
  
  static int config_filename_filter(const struct dirent *dirent)
  {
@@ -62,7 +25,7 @@ $NetBSD: patch-src_conf.c,v 1.3 2014/06/26 20:23:14 asau Exp $
  		return 0;
  
  	flen = strlen(dirent->d_name);
-@@ -3506,7 +3527,7 @@ int snd_config_hook_load(snd_config_t *r
+@@ -3549,7 +3557,7 @@ int snd_config_hook_load(snd_config_t *r
  			int n;
  
  #ifndef DOC_HIDDEN
diff --git a/audio/alsa-lib/patches/patch-src_pcm_pcm__mmap.c b/audio/alsa-lib/patches/patch-src_pcm_pcm__mmap.c
index 426f4bb5d6a..95af12a6bc0 100644
--- a/audio/alsa-lib/patches/patch-src_pcm_pcm__mmap.c
+++ b/audio/alsa-lib/patches/patch-src_pcm_pcm__mmap.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_pcm_pcm__mmap.c,v 1.1 2014/03/25 23:06:07 asau Exp $
+$NetBSD: patch-src_pcm_pcm__mmap.c,v 1.2 2016/02/18 15:15:57 wiz Exp $
 
---- src/pcm/pcm_mmap.c.orig	2009-12-16 15:18:51.000000000 +0000
+--- src/pcm/pcm_mmap.c.orig	2015-11-09 07:39:18.000000000 +0000
 +++ src/pcm/pcm_mmap.c
-@@ -19,7 +19,7 @@
-  */
-   
+@@ -20,7 +20,7 @@
+ 
+ #include "config.h"
  #include <stdio.h>
 -#include <malloc.h>
 +#include <stdlib.h>
diff --git a/audio/alsa-lib/patches/patch-src_shmarea.c b/audio/alsa-lib/patches/patch-src_shmarea.c
index 37f61bcad50..85479990461 100644
--- a/audio/alsa-lib/patches/patch-src_shmarea.c
+++ b/audio/alsa-lib/patches/patch-src_shmarea.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_shmarea.c,v 1.1 2014/03/25 23:06:07 asau Exp $
+$NetBSD: patch-src_shmarea.c,v 1.2 2016/02/18 15:15:57 wiz Exp $
 
---- src/shmarea.c.orig	2009-12-16 15:18:51.000000000 +0000
+--- src/shmarea.c.orig	2015-11-09 07:39:18.000000000 +0000
 +++ src/shmarea.c
-@@ -19,7 +19,7 @@
-  */
-   
+@@ -24,7 +24,7 @@
+ #ifdef HAVE_SYS_SHM_H
+ 
  #include <stdio.h>
 -#include <malloc.h>
 +#include <stdlib.h>
diff --git a/audio/alsa-lib/patches/patch-src_topology_tplg__local.h b/audio/alsa-lib/patches/patch-src_topology_tplg__local.h
new file mode 100644
index 00000000000..facd4a82eda
--- /dev/null
+++ b/audio/alsa-lib/patches/patch-src_topology_tplg__local.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_topology_tplg__local.h,v 1.1 2016/02/18 15:15:57 wiz Exp $
+
+--- src/topology/tplg_local.h.orig	2015-11-09 07:39:18.000000000 +0000
++++ src/topology/tplg_local.h
+@@ -12,7 +12,9 @@
+ 
+ #include <limits.h>
+ #include <stdint.h>
++#ifdef __linux__
+ #include <linux/types.h>
++#endif
+ 
+ #include "local.h"
+ #include "list.h"