alsa-plugin-{oss,pulse}: Update to 1.2.2

Changelog:
1.2.2
Not available

1.2.1
Core

    Release v1.2.1

PulseAudio -> ALSA plugin

    pulse: Add DEVICE parameter

1.1.9
Core

    Release v1.1.9
    configure: Fix unexpanded ALSA_DATA_DIR
    configure: use $sysconfdir instead of /etc

Alsa support for Maemo SDK (n770)

    maemo: Fix a few crashing bugs

Documentation

    doc: Add forgotten aaf.txt to EXTRA_DIST

Jack PCM plugin

    jack: use correct port names in 50-jack.conf
    jack: Support to connect multiple JACK ports with same ALSA channel
    jack: Refactoring: Lower indentation
    jack: Removing snd_pcm_jack_format_t as it is not used
    jack: Replacing jack->channels with jack->num_ports
    jack: Moving jack_deactivate() to snd_pcm_jack_hw_free() to speedup the XRUN Recovery
    jack: Move jack_activate() and jack_connect() to snd_pcm_jack_prepare()

1.1.8
Core

    Release v1.1.8
    aaf: AVTPDU transmission periodicity
    aaf: Implement Playback mode support
    aaf: Load configuration parameters
    aaf: Introduce plugin skeleton

/Makefile.am

    aaf: Introduce plugin skeleton

A52 Output plugin

    a52_close: set slave to NULL to avoid double pcm free in open fcn

AVTP Audio Format (AAF) PCM plugin

    aaf: AVTPDU transmission periodicity
    aaf: Tx multiple AVTPDUs per media clock tick
    aaf: Refactor timeout routines
    aaf: Refactor AVTPDU reception routines
    aaf: Refactor AVTPDU transmission routines
    aaf: Add presentation time tolerance
    aaf: do not free twice aaf - snd_pcm_close() is called from snd_pcm_ioplug_delete()
    aaf: Add support for direct read/write transfers
    aaf: Implement dump() ioplug callback
    aaf: Implement Capture mode support
    aaf: Prepare for Capture mode support
    aaf: Implement Playback mode support
    aaf: Load configuration parameters
    aaf: Introduce plugin skeleton

Documentation

    aaf: AVTPDU transmission periodicity
    aaf: Tx multiple AVTPDUs per media clock tick
    aaf: Add presentation time tolerance
    doc: Fix typo in AAF doc
    aaf: Implement Capture mode support
    aaf: Implement Playback mode support
    aaf: Load configuration parameters
    aaf: Introduce plugin skeleton

Jack PCM plugin

    Revert "jack: Fix leaks when jack_set_hw_constraint() fails"

OSS Mixer -> ALSA Control plugin

    Revert "oss: Fix leaks when oss_hw_constraint() fails"

USB stream plugin

    Revert "usb_stream: Fix leaks when us_set_hw_constraint() fails"
    pcm_usb_stream: fix signess issues
    pcm_usb_stream: remove unused parameter in snd_pcm_us_read()
    pcm_usb_stream: fix another leak in snd_pcm_us_open()

1.1.7
Core

    Release v1.1.7
    Fix typo in configure.ac (--disable-libav)
    configure: Require alsa-lib 1.1.6 and newer
    configure: change --with-alsaaddondir to --with-alsagconfdir and --with-alsalconfdir
    Move rate-lavc to rate-lav subdirectory and update to use libavresample
    config/Makefile: make everything modular
    configure: add --with-alsaaddondir, add default config files for plugins

/Makefile.am

    Move rate-lavc to rate-lav subdirectory and update to use libavresample
    config/Makefile: make everything modular

A52 Output plugin

    a52: Fix leaks when a52_set_hw_constraint() fails
    configure: change --with-alsaaddondir to --with-alsagconfdir and --with-alsalconfdir
    Move rate-lavc to rate-lav subdirectory and update to use libavresample
    configure: add --with-alsaaddondir, add default config files for plugins

Arcam AV control plugin

    arcam-av: Add explicit -lpthread to *_LIBADD
    configure: change --with-alsaaddondir to --with-alsagconfdir and --with-alsalconfdir
    configure: add --with-alsaaddondir, add default config files for plugins

Documentation

    doc: fix makefile, the files should be included to the distribution package unconditionally
    Move rate-lavc to rate-lav subdirectory and update to use libavresample
    config/Makefile: make everything modular

Jack PCM plugin

    jack: Fix leaks when jack_set_hw_constraint() fails
    jack: Only allow ALSA periods multiple of JACKd period
    jack: Allow build with older alsa-lib
    jack: Update poll_fd also in draining state
    jack: Avoid call to snd_pcm_avail_update() from JACK thread
    configure: change --with-alsaaddondir to --with-alsagconfdir and --with-alsalconfdir
    configure: add --with-alsaaddondir, add default config files for plugins

OSS Mixer -> ALSA Control plugin

    oss: Fix leaks when oss_hw_constraint() fails
    oss/Makefile.am: fix typo

Rate Converter plugins

    samplerate: fix unused variable warning

USB stream plugin

    usb_stream: Fix leaks when us_set_hw_constraint() fails
    usb_stream: Add explicit -lpthread to *_LIBADD

1.1.6
Core

    Release v1.1.6
    Change FSF address (Franklin Street)

A52 Output plugin

    Change FSF address (Franklin Street)

Arcam AV control plugin

    Change FSF address (Franklin Street)

Jack PCM plugin

    jack: Use correct parameter order for snd_pcm_areas_silence()
    jack: Report Xruns to user application
    jack: Do not Xrun the ALSA buffer
    jack: Use boundary as hw_ptr wrap around
    jack: Write only valid values to the internal hw_ptr
    Change FSF address (Franklin Street)

1.1.5
Core

    Release v1.1.5

PulseAudio -> ALSA plugin

    pulse: prevent double-free when pulse_hw_constraint returns error

1.1.4
Core

    Release v1.1.4
    configure: Fix detection of avcodec.h
    configure: enhancing configuration support for alsa plugins

8 files changed, 61 insertions, 18 deletions

diff --git a/audio/alsa-plugins-oss/Makefile b/audio/alsa-plugins-oss/Makefile
index 379866d034f..5abb831f927 100644
--- a/audio/alsa-plugins-oss/Makefile
+++ b/audio/alsa-plugins-oss/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2016/09/15 20:33:02 wiedi Exp $
+# $NetBSD: Makefile,v 1.13 2021/05/12 14:14:38 ryoon Exp $
 
-DISTNAME=	alsa-plugins-1.1.1
+DISTNAME=	alsa-plugins-1.2.2
 PKGNAME=	${DISTNAME:S/plugins/plugins-oss/}
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.alsa-project.org/pub/plugins/
diff --git a/audio/alsa-plugins-oss/PLIST b/audio/alsa-plugins-oss/PLIST
index 23563a74763..a7e7f93edca 100644
--- a/audio/alsa-plugins-oss/PLIST
+++ b/audio/alsa-plugins-oss/PLIST
@@ -1,3 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/12/19 04:03:22 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/05/12 14:14:38 ryoon Exp $
 lib/alsa-lib/libasound_module_ctl_oss.la
 lib/alsa-lib/libasound_module_pcm_oss.la
+share/alsa/alsa.conf.d/50-oss.conf
+share/alsa/conf.d/50-oss.conf
diff --git a/audio/alsa-plugins-oss/distinfo b/audio/alsa-plugins-oss/distinfo
index f807069de3d..a5f1cd2d8b6 100644
--- a/audio/alsa-plugins-oss/distinfo
+++ b/audio/alsa-plugins-oss/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.8 2016/04/15 09:05:41 wiz Exp $
+$NetBSD: distinfo,v 1.9 2021/05/12 14:14:38 ryoon Exp $
 
-SHA1 (alsa-plugins-1.1.1.tar.bz2) = 280eb0d9810e463059747d01760a5ac3f44d7057
-RMD160 (alsa-plugins-1.1.1.tar.bz2) = a37a5d87a9760e6e4a1ac46179e5b19dc2e16ee0
-SHA512 (alsa-plugins-1.1.1.tar.bz2) = 9dd277cb5cce144ce4e5e0010cebcba0f8634c783e7bcd80ce6d04b198d6de5150a2764df3087a39a468b5fb7c4578de2e252095568e811dedaa5e7ffdbeb7c9
-Size (alsa-plugins-1.1.1.tar.bz2) = 366193 bytes
+SHA1 (alsa-plugins-1.2.2.tar.bz2) = d6baf41c0aa10104b4963fe95f46aaca534def35
+RMD160 (alsa-plugins-1.2.2.tar.bz2) = 93daa0c1d7b86af580366eb289ba1f799bec00d9
+SHA512 (alsa-plugins-1.2.2.tar.bz2) = 25a7dfaa64be024447d889b5cde668f1308d197f54880548a82d50beb4ac0dbff33b415da1e26dc5229408c934247a9bd38acfb0f82ca388deac0d77ab3cdadb
+Size (alsa-plugins-1.2.2.tar.bz2) = 406494 bytes
 SHA1 (patch-aa) = ac2169b0a069bcf6ed60ca7ccd199ccd1988357f
 SHA1 (patch-ab) = 9cf0bda9f1928f46d0d5eac9464b790710ea2fda
 SHA1 (patch-ac) = 13da103ce3daad29d3c715f8f7d58dcd7bb9a72c
+SHA1 (patch-oss_Makefile.in) = 9ca6c96d426f7f150c86ad7a3a15fa0999a3cfdd
diff --git a/audio/alsa-plugins-oss/patches/patch-oss_Makefile.in b/audio/alsa-plugins-oss/patches/patch-oss_Makefile.in
new file mode 100644
index 00000000000..31fb39b87ba
--- /dev/null
+++ b/audio/alsa-plugins-oss/patches/patch-oss_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-oss_Makefile.in,v 1.1 2021/05/12 14:14:38 ryoon Exp $
+
+* Install config file for pkgsrc.
+
+--- oss/Makefile.in.orig	2020-02-19 10:26:51.000000000 +0000
++++ oss/Makefile.in
+@@ -218,7 +218,7 @@ ACLOCAL = @ACLOCAL@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_DATA_DIR = @ALSA_DATA_DIR@
+ ALSA_GCONF_DIR = @ALSA_GCONF_DIR@
+-ALSA_LCONF_DIR = @ALSA_LCONF_DIR@
++ALSA_LCONF_DIR = @ALSA_DATA_DIR@/conf.d
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
+ AMTAR = @AMTAR@
diff --git a/audio/alsa-plugins-pulse/Makefile b/audio/alsa-plugins-pulse/Makefile
index 91926ea2188..ac374f4affd 100644
--- a/audio/alsa-plugins-pulse/Makefile
+++ b/audio/alsa-plugins-pulse/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2021/02/07 06:30:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.32 2021/05/12 14:14:38 ryoon Exp $
 
-DISTNAME=	alsa-plugins-1.1.1
+DISTNAME=	alsa-plugins-1.2.2
 PKGNAME=	${DISTNAME:S/plugins/plugins-pulse/}
-PKGREVISION=	11
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.alsa-project.org/pub/plugins/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/alsa-plugins-pulse/PLIST b/audio/alsa-plugins-pulse/PLIST
index 53619c60230..0ded8b5b6ff 100644
--- a/audio/alsa-plugins-pulse/PLIST
+++ b/audio/alsa-plugins-pulse/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2014/06/09 12:42:58 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/05/12 14:14:38 ryoon Exp $
 lib/alsa-lib/libasound_module_conf_pulse.la
 lib/alsa-lib/libasound_module_ctl_pulse.la
 lib/alsa-lib/libasound_module_pcm_pulse.la
 share/alsa/alsa.conf.d/50-pulseaudio.conf
-share/alsa/alsa.conf.d/99-pulseaudio-default.conf.example
+share/alsa/conf.d/50-pulseaudio.conf
+share/alsa/conf.d/99-pulseaudio-default.conf.example
diff --git a/audio/alsa-plugins-pulse/distinfo b/audio/alsa-plugins-pulse/distinfo
index 857aff0b574..55bd8e029b3 100644
--- a/audio/alsa-plugins-pulse/distinfo
+++ b/audio/alsa-plugins-pulse/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.9 2016/04/15 09:05:41 wiz Exp $
+$NetBSD: distinfo,v 1.10 2021/05/12 14:14:38 ryoon Exp $
 
-SHA1 (alsa-plugins-1.1.1.tar.bz2) = 280eb0d9810e463059747d01760a5ac3f44d7057
-RMD160 (alsa-plugins-1.1.1.tar.bz2) = a37a5d87a9760e6e4a1ac46179e5b19dc2e16ee0
-SHA512 (alsa-plugins-1.1.1.tar.bz2) = 9dd277cb5cce144ce4e5e0010cebcba0f8634c783e7bcd80ce6d04b198d6de5150a2764df3087a39a468b5fb7c4578de2e252095568e811dedaa5e7ffdbeb7c9
-Size (alsa-plugins-1.1.1.tar.bz2) = 366193 bytes
+SHA1 (alsa-plugins-1.2.2.tar.bz2) = d6baf41c0aa10104b4963fe95f46aaca534def35
+RMD160 (alsa-plugins-1.2.2.tar.bz2) = 93daa0c1d7b86af580366eb289ba1f799bec00d9
+SHA512 (alsa-plugins-1.2.2.tar.bz2) = 25a7dfaa64be024447d889b5cde668f1308d197f54880548a82d50beb4ac0dbff33b415da1e26dc5229408c934247a9bd38acfb0f82ca388deac0d77ab3cdadb
+Size (alsa-plugins-1.2.2.tar.bz2) = 406494 bytes
 SHA1 (patch-aa) = ac2169b0a069bcf6ed60ca7ccd199ccd1988357f
 SHA1 (patch-ab) = fdcb834dbac03fc52ab482e722452243a6c859e9
+SHA1 (patch-pulse_Makefile.in) = 44abe2470ee6a3bb9941c4c26a53333d21402946
diff --git a/audio/alsa-plugins-pulse/patches/patch-pulse_Makefile.in b/audio/alsa-plugins-pulse/patches/patch-pulse_Makefile.in
new file mode 100644
index 00000000000..0e23cff32cf
--- /dev/null
+++ b/audio/alsa-plugins-pulse/patches/patch-pulse_Makefile.in
@@ -0,0 +1,24 @@
+$NetBSD: patch-pulse_Makefile.in,v 1.1 2021/05/12 14:14:38 ryoon Exp $
+
+* Install config files for pkgsrc.
+
+--- pulse/Makefile.in.orig	2020-02-19 10:26:51.000000000 +0000
++++ pulse/Makefile.in
+@@ -230,7 +230,7 @@ ACLOCAL = @ACLOCAL@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_DATA_DIR = @ALSA_DATA_DIR@
+ ALSA_GCONF_DIR = @ALSA_GCONF_DIR@
+-ALSA_LCONF_DIR = @ALSA_LCONF_DIR@
++ALSA_LCONF_DIR = @ALSA_DATA_DIR@/conf.d
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
+ AMTAR = @AMTAR@
+@@ -380,7 +380,7 @@ asound_module_pcmdir = @ALSA_PLUGIN_DIR@
+ asound_module_ctldir = @ALSA_PLUGIN_DIR@
+ asound_module_confdir = @ALSA_PLUGIN_DIR@
+ asound_module_gconfdir = @ALSA_GCONF_DIR@
+-asound_module_lconfdir = @ALSA_LCONF_DIR@
++asound_module_lconfdir = @ALSA_DATA_DIR@/conf.d
+ AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ $(PTHREAD_CFLAGS) $(pulseaudio_CFLAGS) -D_GNU_SOURCE
+ AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED)
+ libasound_module_pcm_pulse_la_SOURCES = pcm_pulse.c pulse.c pulse.h