alsa-lib: update to 1.2.6.1.

1.2.6.1

Core

    Release v1.2.6.1

Configuration

    conf: fix the device parsing when arguments has no defaults
    conf: accept '_' character in the variable name

1.2.6

Core

    Release v1.2.6
    conf: add safe_strtoll_base() like safe_strtol_base()
    conf: introduce safe_strtol_base()
    configure: bumb version to 1.2.6pre1 (for alsactl/alsa-utils)
    fix build with --disable-ucm

Config API

    conf: introduce snd_config_load_string()
    conf: add possibility to evaluate simple integer math expressions

Control API

    control: remap - assign right name to the child handle for no-op (2nd case)
    control: remap - assign right name to the child handle for no-op
    control: Minor documentation fixes.
    control: Add documentation for snd_ctl_card_* and friends.
    control: empty - fix the static build

PCM API

    pcm: softvol - mark _snd_pcm_parse_control_id as static
    pcm: partially revert "pcm: softvol - make snd_pcm_parse_control_id private"
    pcm: multi plugin - adjust appl_ptr on rewind/forward operations
    pcm: add a note about return values of snd_pcm_state()
    pcm: rate - fix some gcc warnings
    pcm: direct plugins - fix bad memory access when channel bindings do not match hw
    pcm: Move snd_pcm_channel_area_addr() and _step() to public header
    pcm: direct plugins - fix hw_ptr in the status callback
    pcm: dmix - use pcm_frame_diff() in snd_pcm_dmix_sync_ptr0()
    pcm: improve docs for snd_pcm_sw_params_get_avail_min() and snd_pcm_status_get_avail_max()
    pcm: rate: Improve the support multiple formats
    pcm: rate: Refactoring temporary buffer allocations

RawMidi API

    rawmidi: allocate the read buffer in the params call
    rawmidi: free framing read bufffer when the framing mode becomes inactive
    rawmidi: add support for SNDRV_RAWMIDI_IOCTL_USER_PVERSION
    rawmidi: return ENOTSUP when timestamp reads are not supported by plugins
    rawmidi: allow timestamp reads only for the appropriate read mode
    rawmidi: doc - fix the framing / read mode section
    rawmidi: rename enum snd_rawmidi_framing to snd_rawmidi_read_mode
    rawmidi: define more abstract API for the timestamp reads
    rawmidi: initialize the reserved space in snd_rawmidi_params_default()
    rawmidi: Add rawmidi framing API

Rawmidi API

    rawmidi: rename enum snd_rawmidi_framing to snd_rawmidi_read_mode
    rawmidi: define more abstract API for the timestamp reads
    rawmidi: Use the standard types for snd_rawmidi_framing_tstamp_t definition
    rawmidi: Add rawmidi framing API

Topology API

    topology: do not call strtol directly

Use Case Manager API

    ucm: add initial doxygen documenation
    conf: introduce snd_config_load_string()
    ucm: add ${eval:EXPR} substitution (Syntax 5)
    ucm: fix parsing of the internal hexadecimal card identifier (2)
    ucm: fix parsing of the internal hexadecimal card identifier
    ucm: fix DeviceModifier parser
    conf: introduce safe_strtol_base()
    ucm: suppress the no device (no UCM card) errors on request
    ucm: substitute the before/after identifiers
    ucm: fix the parsing of the hexadecimal prefix
    ucm: avoid zero card instance number

/src/Makefile.am

    conf: add possibility to evaluate simple integer math expressions

Configuration

    conf: introduce snd_config_load_string()
    conf: confeval - fix _to_integer error code
    conf: improve simple integer math expressions - brackets
    ucm: add ${eval:EXPR} substitution (Syntax 5)
    conf: add possibility to evaluate simple integer math expressions
    conf: add safe_strtoll_base() like safe_strtol_base()
    conf: introduce safe_strtol_base()

Documentation

    ucm: add initial doxygen documenation

Dynamic Loader helpers

    dlmisc.c: Avoid double unlock in snd_dlobj_cache_get0()

External PCM Plugin SDK

    pcm: partially revert "pcm: softvol - make snd_pcm_parse_control_id private"

External Rate Converter Plugin SDK

    pcm: rate: Improve the support multiple formats

Kernel Headers

    rawmidi: add support for SNDRV_RAWMIDI_IOCTL_USER_PVERSION
    asound.h: fix the __packed use for the out-of-kernel code
    rawmidi: Add rawmidi framing API

Test/Example code

    conf: introduce snd_config_load_string()
    conf: fix test/lsb/config.c
    conf: improve simple integer math expressions - brackets
    conf: add possibility to evaluate simple integer math expressions
    rawmidi: rename enum snd_rawmidi_framing to snd_rawmidi_read_mode
    rawmidi: define more abstract API for the timestamp reads
    test: rawmidi: Add test for rawmidi framing API

3 files changed, 6 insertions, 18 deletions

diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile
index a0dc9528e78..c3af7511608 100644
--- a/audio/alsa-lib/Makefile
+++ b/audio/alsa-lib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2021/11/20 23:38:12 hauke Exp $
+# $NetBSD: Makefile,v 1.27 2022/01/24 10:05:37 wiz Exp $
 
-DISTNAME=	alsa-lib-1.2.5.1
-PKGREVISION=	2
+DISTNAME=	alsa-lib-1.2.6.1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.alsa-project.org/pub/lib/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/alsa-lib/distinfo b/audio/alsa-lib/distinfo
index 4b213f022c3..7e37cd2a18e 100644
--- a/audio/alsa-lib/distinfo
+++ b/audio/alsa-lib/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.34 2021/11/20 23:38:12 hauke Exp $
+$NetBSD: distinfo,v 1.35 2022/01/24 10:05:37 wiz Exp $
 
-BLAKE2s (alsa-lib-1.2.5.1.tar.bz2) = e5212f8be6654397b93d9163942c75f9ec8eba53fb5502c8d4cb32829589afac
-SHA512 (alsa-lib-1.2.5.1.tar.bz2) = 01998ffa449e925ff552c13aea47f9540903afdc533086067c78dcaba4d239c347180d3d28bb0000e6d19b7779c7249fcc77a30057930ca22d18ba55e163fa1c
-Size (alsa-lib-1.2.5.1.tar.bz2) = 1069073 bytes
+BLAKE2s (alsa-lib-1.2.6.1.tar.bz2) = efef5241c5060a795b451199dd0724b233fed3cdbdee84192c0f65ca1b8b26d2
+SHA512 (alsa-lib-1.2.6.1.tar.bz2) = 70e539cf092b5d43e00e4134d8a3e184f0dc34312823e4b58a574320cbf06cb7369bc3251ecb1858033756a7a8c35d36faa8da48d49f6efe0cec905784adbd45
+Size (alsa-lib-1.2.6.1.tar.bz2) = 1079670 bytes
 SHA1 (patch-ad) = 79a0f048751899247ec12990cd02332b977af248
 SHA1 (patch-ae) = 7ad3a3c3ee4be2c80fa6b0a2ea28563efd399a60
 SHA1 (patch-af) = 257b06f10616c04c2724e30777b027e5e7e443f9
@@ -15,7 +15,6 @@ SHA1 (patch-bk) = 55754e4d0ac947c2e7e59b604a21fb5798ae5b39
 SHA1 (patch-configure.ac) = cc034d07eab13caa5ff8748e8eea37ae9dd367f5
 SHA1 (patch-include_error.h) = 9e92d4a51badda1d46305d1e5e36b8197788aa89
 SHA1 (patch-include_output.h) = 0a073b53c40293aa7cfa250586c087084002eefe
-SHA1 (patch-include_sound_asound.h) = 5d85d804fec62250d2a3e5d269397641e13bc957
 SHA1 (patch-include_sound_type__compat.h) = a5dea86a0fd998d35147820269786d2cf8eff5e0
 SHA1 (patch-include_sound_uapi_asoc.h) = 5f1da418a2ad4ae066b34c75c9106108711b5d3d
 SHA1 (patch-include_sound_uapi_asound.h) = 051616bbbab3339d20818ddb40cde8502295a026
diff --git a/audio/alsa-lib/patches/patch-include_sound_asound.h b/audio/alsa-lib/patches/patch-include_sound_asound.h
deleted file mode 100644
index 18697ec2d00..00000000000
--- a/audio/alsa-lib/patches/patch-include_sound_asound.h
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-include_sound_asound.h,v 1.6 2021/05/12 14:12:13 ryoon Exp $
-
---- include/sound/asound.h.orig	2020-06-29 10:51:08.000000000 +0000
-+++ include/sound/asound.h
-@@ -8,4 +8,5 @@
- #define __kernel_long_t long
- #endif
- 
-+#include <alsa/sound/type_compat.h>
- #include <alsa/sound/uapi/asound.h>