audio/pulseaudio: Update to 16.1

Bump PORTREVISION on consumers. Sponsored by: Serenity Cybersecurity, LLC PR: 262713
2 years ago · b1ecad53b0
201 changed files with 416 additions and 543 deletions
--- a/accessibility/speech-dispatcher/Makefile
+++ b/accessibility/speech-dispatcher/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	speech-dispatcher
 DISTVERSION=	0.11.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	accessibility audio
 MASTER_SITES=	https://github.com/brailcom/speechd/releases/download/${PORTVERSION}/

--- a/audio/alsa-plugins/Makefile
+++ b/audio/alsa-plugins/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	alsa-plugins
 PORTVERSION=	1.2.2
-PORTREVISION=	11
+PORTREVISION=	12
 DISTVERSIONPREFIX=	v
 CATEGORIES=	audio
 MASTER_SITES=	GH
--- a/audio/aqualung/Makefile
+++ b/audio/aqualung/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	aqualung
 PORTVERSION=	1.0
-PORTREVISION=	24
+PORTREVISION=	25
 CATEGORIES=	audio
 MASTER_SITES=	SF

--- a/audio/bambootracker/Makefile
+++ b/audio/bambootracker/Makefile
@ -1,6 +1,7 @@
 PORTNAME=	bambootracker
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/BambooTracker/BambooTracker/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
 DISTNAME=	BambooTracker-src-${DISTVERSIONPREFIX}${DISTVERSION}
--- a/audio/baresip/Makefile
+++ b/audio/baresip/Makefile
@ -1,6 +1,7 @@
 PORTNAME=	baresip
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.12.0
+PORTREVISION=	1
 CATEGORIES=	audio

 MAINTAINER=	ports@FreeBSD.org
--- a/audio/cardinal/Makefile
+++ b/audio/cardinal/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	cardinal
 DISTVERSION=	22.05
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/DISTRHO/Cardinal/releases/download/${DISTVERSION}/

--- a/audio/carla/Makefile
+++ b/audio/carla/Makefile
@ -1,6 +1,7 @@
 PORTNAME=	Carla
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5.6
+PORTREVISION=	1
 CATEGORIES=	audio

 MAINTAINER=	yuri@FreeBSD.org
--- a/audio/cava/Makefile
+++ b/audio/cava/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	cava
 DISTVERSION=	0.7.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio

 MAINTAINER=	vendion@gmail.com
--- a/audio/cli-visualizer/Makefile
+++ b/audio/cli-visualizer/Makefile
@ -2,7 +2,7 @@ PORTNAME=	cli-visualizer
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.8-27
 DISTVERSIONSUFFIX=	-g4fc1552
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio

 MAINTAINER=	yuri@FreeBSD.org
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	cmus
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.10.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio

 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	csound
 DISTVERSION=	6.15.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	audio lang

 MAINTAINER=	yuri@FreeBSD.org
--- a/audio/darkice/Makefile
+++ b/audio/darkice/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	darkice
 PORTVERSION=	1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio net
 MASTER_SITES=	https://github.com/rafael2k/darkice/releases/download/v${PORTVERSION}/

--- a/audio/deadbeef/Makefile
+++ b/audio/deadbeef/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	deadbeef
 PORTVERSION=	0.7.2
-PORTREVISION=	25
+PORTREVISION=	26
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/

--- a/audio/dpf-plugins-lv2/Makefile
+++ b/audio/dpf-plugins-lv2/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	dpf-plugins
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2

--- a/audio/dragonfly-reverb-lv2/Makefile
+++ b/audio/dragonfly-reverb-lv2/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	dragonfly-reverb
 DISTVERSION=	3.2.10
+PORTREVISION=	1
 CATEGORIES=	audio multimedia

 MAINTAINER=	yuri@FreeBSD.org
--- a/audio/drumstick/Makefile
+++ b/audio/drumstick/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	drumstick
 DISTVERSION=	2.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/

--- a/audio/fasttracker2/Makefile
+++ b/audio/fasttracker2/Makefile
@ -1,6 +1,7 @@
 PORTNAME=	fasttracker2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.69
+PORTREVISION=	1
 CATEGORIES=	audio

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@ -1,6 +1,7 @@
 PORTNAME=	fluidsynth
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.3.3
+PORTREVISION=	1
 CATEGORIES=	audio

 MAINTAINER=	multimedia@FreeBSD.org
--- a/audio/fossmixer/Makefile
+++ b/audio/fossmixer/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	fossmixer
 PORTVERSION=	0.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	SF/detroit
 DISTNAME=	detroit-0.2.3
--- a/audio/giada/Makefile
+++ b/audio/giada/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	giada
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.17.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio

 MAINTAINER=	yuri@FreeBSD.org
--- a/audio/gogglesmm/Makefile
+++ b/audio/gogglesmm/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	gogglesmm
 PORTVERSION=	1.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio

 MAINTAINER=	jhale@FreeBSD.org
--- a/audio/gsequencer/Makefile
+++ b/audio/gsequencer/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	gsequencer
 DISTVERSION=	5.4.3
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SAVANNAH/gsequencer/${DISTVERSION:R}.x

--- a/audio/gstreamer1-plugins-pulse/Makefile
+++ b/audio/gstreamer1-plugins-pulse/Makefile
@ -1,4 +1,4 @@
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio

 COMMENT=	GStreamer pulseaudio plugin
--- a/audio/gtick/Makefile
+++ b/audio/gtick/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	gtick
 PORTVERSION=	0.5.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://www.antcom.de/gtick/download/

--- a/audio/harp/Makefile
+++ b/audio/harp/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	harp
 PORTVERSION=	0.6.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio

 MAINTAINER=	heckendorfc@gmail.com
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	hydrogen
 DISTVERSION=	1.2.0
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/hydrogen-music/${PORTNAME}/releases/download/${DISTVERSION}/ \
 		SF/hydrogen/Hydrogen/${DISTVERSION}%20Sources/
--- a/audio/kmix/Makefile
+++ b/audio/kmix/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	kmix
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	audio kde kde-applications

 MAINTAINER=	kde@FreeBSD.org
--- a/audio/kwave/Makefile
+++ b/audio/kwave/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	kwave
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	audio kde kde-applications

 MAINTAINER=	kde@FreeBSD.org
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	libao
 PORTVERSION=	1.2.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	https://downloads.xiph.org/releases/ao/

--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	libcanberra
 PORTVERSION=	0.30
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	audio devel
 MASTER_SITES=	http://0pointer.de/lennart/projects/libcanberra/ \
 		http://pkgs.fedoraproject.org/repo/pkgs/libcanberra/libcanberra-0.30.tar.xz/34cb7e4430afaf6f447c4ebdb9b42072/
--- a/audio/libmatemixer/Makefile
+++ b/audio/libmatemixer/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	libmatemixer
 PORTVERSION=	1.26.0
+PORTREVISION=	1
 CATEGORIES=	audio mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
--- a/audio/libopenmpt/Makefile
+++ b/audio/libopenmpt/Makefile
@ -1,6 +1,7 @@
 PORTNAME=	libopenmpt
 DISTVERSION=	0.7.2
 DISTVERSIONSUFFIX=	+release.autotools
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://lib.openmpt.org/files/libopenmpt/src/ \
 		LOCAL/ehaupt
--- a/audio/lingot/Makefile
+++ b/audio/lingot/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	lingot
 PORTVERSION=	1.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	SAVANNAH

--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	lmms
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.2
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	2
 CATEGORIES=	audio

--- a/audio/mhwaveedit/Makefile
+++ b/audio/mhwaveedit/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	mhwaveedit
 PORTVERSION=	1.4.24
-PORTREVISION=	5
+PORTREVISION=	6
 DISTVERSIONPREFIX=	v
 CATEGORIES=	audio

--- a/audio/mousai/Makefile
+++ b/audio/mousai/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	mousai
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.7.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio

 MAINTAINER=	jbeich@FreeBSD.org
--- a/audio/mumble/Makefile
+++ b/audio/mumble/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	mumble
 DISTVERSION=	1.5.517
+PORTREVISION=	1
 CATEGORIES=	audio

 MAINTAINER=	vvd@FreeBSD.org
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	musicpd
 PORTVERSION=	0.23.13
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://www.musicpd.org/download/mpd/${PORTVERSION:R}/
 DISTNAME=	mpd-${PORTVERSION}
--- a/audio/myxer/Makefile
+++ b/audio/myxer/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	myxer
 DISTVERSION=	1.2.1
-PORTREVISION=	24
+PORTREVISION=	25
 CATEGORIES=	audio

 MAINTAINER=	yuri@FreeBSD.org
--- a/audio/ncpamixer/Makefile
+++ b/audio/ncpamixer/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	ncpamixer
 DISTVERSION=	1.3.3.5
+PORTREVISION=	1
 CATEGORIES=	audio

 MAINTAINER=	yuri@FreeBSD.org
--- a/audio/ncspot/Makefile
+++ b/audio/ncspot/Makefile
@ -1,6 +1,7 @@
 PORTNAME=	ncspot
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.13.4
+PORTREVISION=	1
 CATEGORIES=	audio

 MAINTAINER=	rodrigo@FreeBSD.org
--- a/audio/noson-app/Makefile
+++ b/audio/noson-app/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	noson-app
 DISTVERSION=	5.4.1
+PORTREVISION=	1
 CATEGORIES=	audio net

 MAINTAINER=	tcberner@FreeBSD.org
--- a/audio/openal-soft/Makefile
+++ b/audio/openal-soft/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	openal-soft
 PORTVERSION=	1.21.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	https://openal-soft.org/openal-releases/

--- a/audio/owntone/Makefile
+++ b/audio/owntone/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	owntone
 DISTVERSION=	28.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/owntone/owntone-server/releases/download/${DISTVERSION}/

--- a/audio/paman/Makefile
+++ b/audio/paman/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	paman
 PORTVERSION=	0.9.4
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/

--- a/audio/pamixer/Makefile
+++ b/audio/pamixer/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	pamixer
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.4-15
-PORTREVISION=	6
+PORTREVISION=	7
 DISTVERSIONSUFFIX=	-g4ea2594
 CATEGORIES=	audio

--- a/audio/paprefs/Makefile
+++ b/audio/paprefs/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	paprefs
 PORTVERSION=	1.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://freedesktop.org/software/pulseaudio/${PORTNAME}/

--- a/audio/pavucontrol-qt/Makefile
+++ b/audio/pavucontrol-qt/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	pavucontrol-qt
 PORTVERSION= 	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	LXQT/${PORTNAME}

--- a/audio/pavumeter/Makefile
+++ b/audio/pavumeter/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	pavumeter
 PORTVERSION=	0.9.3
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/

--- a/audio/pcaudiolib/Makefile
+++ b/audio/pcaudiolib/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	pcaudiolib
 DISTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/${DISTVERSION}/

--- a/audio/plasma5-plasma-pa/Makefile
+++ b/audio/plasma5-plasma-pa/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	plasma-pa
 DISTVERSION=	${KDE_PLASMA_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio kde kde-plasma

 MAINTAINER=	kde@FreeBSD.org
--- a/audio/psindustrializer/Makefile
+++ b/audio/psindustrializer/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	psindustrializer
 DISTVERSION=	0.2.7
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	SF/industrializer/

--- a/audio/pulseaudio-module-sndio/Makefile
+++ b/audio/pulseaudio-module-sndio/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	pulseaudio-module-sndio
 DISTVERSION=	13.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/t6/pulseaudio-module-sndio/releases/download/${DISTVERSION}/

--- a/audio/pulseaudio-module-xrdp/Makefile
+++ b/audio/pulseaudio-module-xrdp/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	pulseaudio-module-xrdp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 DIST_SUBDIR=	xrdp

--- a/audio/pulseaudio-qt/Makefile
+++ b/audio/pulseaudio-qt/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	pulseaudio-qt
 DISTVERSION=	1.3
 MASTER_SITES=	KDE/stable/${PORTNAME}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio kde

 MAINTAINER=	kde@FreeBSD.org
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@ -3,8 +3,7 @@
 # PORTREVISION bumps of depending ports.

 PORTNAME=	pulseaudio
-DISTVERSION=	14.2
-PORTREVISION=	5
+DISTVERSION=	16.1
 CATEGORIES=	audio
 MASTER_SITES=	https://freedesktop.org/software/pulseaudio/releases/

@ -23,85 +22,67 @@ LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
 		libltdl.so:devel/libltdl \
 		libck-connector.so:sysutils/consolekit2

-USES=		compiler:c11 cpe gettext gmake gnome iconv libtool:build localbase:ldflags \
-		pathfix pkgconfig python:run shebangfix ssl tar:xz
+USES=		compiler:c11 cpe gettext-tools gmake gnome iconv localbase:ldflags \
+		meson pathfix pkgconfig python:run shebangfix ssl tar:xz

 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	PTHREAD_LIBS="-lpthread" \
-		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
-		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" \
-		LIBS="-lm -lintl" \
-		ac_cv_header_linux_input_h=""
-INSTALL_TARGET=	install-strip
-
-SHEBANG_FILES=	shell-completion/bash/pulseaudio \
+
+SHEBANG_FILES=	shell-completion/bash/pactl \
 		src/utils/pa-info \
 		src/utils/qpaeq
 bash_CMD=	${SETENV} bash
 SUB_FILES=	pkg-message

-CONFIGURE_ARGS=	--localstatedir=/var \
-		--without-caps \
-		--disable-esound \
-		--disable-udev \
-		--disable-gtk3 \
-		--disable-gconf \
-		--disable-systemd-daemon \
-		--disable-systemd-journal \
-		--disable-systemd-login \
-		--disable-neon-opt \
-		--disable-lirc # untested
-
 USERS=		pulse
 GROUPS=		pulse pulse-access pulse-rt

 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	AVAHI GSETTINGS SIMD TEST X11
 OPTIONS_DEFAULT=AVAHI SIMD SIMPLE SOXR SPEEX WEBRTC_AEC X11
-AVAHI_CONFIGURE_ENABLE=	avahi
+AVAHI_MESON_ENABLED=	avahi
 AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 GSETTINGS_DESC=	GSettings configuration backend support
-GSETTINGS_CONFIGURE_ENABLE=	gsettings
+GSETTINGS_MESON_ENABLED=	gsettings
 GSETTINGS_VARS=	GLIB_SCHEMAS=org.freedesktop.pulseaudio.gschema.xml
-SIMD_CONFIGURE_ENABLE=	orc
+SIMD_MESON_ENABLED=	orc
 SIMD_LIB_DEPENDS=	liborc-0.4.so:devel/orc
-TEST_TEST_TARGET=	check
-TEST_CONFIGURE_ENABLE=	tests default-build-tests
+TEST_MESON_TRUE=	tests
 TEST_BUILD_DEPENDS=	check>0:devel/check
-X11_CONFIGURE_ENABLE=	x11
+X11_MESON_ENABLED=	x11
 X11_USES=	xorg
 X11_USE=	XORG=ice,sm,x11,xcb,xtst

 OPTIONS_GROUP=	AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA JACK SOXR SPEEX WEBRTC_AEC
 AUDIO_DESC=	Audio support
-ALSA_CONFIGURE_ENABLE=	alsa
+ALSA_MESON_ENABLED=	alsa
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
-JACK_CONFIGURE_ENABLE=	jack
+JACK_MESON_ENABLED=	jack
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
-SOXR_CONFIGURE_WITH=	soxr
+SOXR_MESON_ENABLED=	soxr
 SOXR_LIB_DEPENDS=	libsoxr.so:audio/libsoxr
 SPEEX_DESC=	Speex resampler and AEC support
-SPEEX_CONFIGURE_WITH=	speex
+SPEEX_MESONP_ENABLED=	speex
 SPEEX_LIB_DEPENDS=	libspeexdsp.so:audio/speexdsp
 WEBRTC_AEC_DESC=	WebRTC-based echo canceller
 WEBRTC_AEC_LIB_DEPENDS=	libwebrtc_audio_processing.so:audio/webrtc-audio-processing0
-WEBRTC_AEC_CONFIGURE_ENABLE=	webrtc-aec
+WEBRTC_AEC_MESON_ENABLED=	webrtc-aec

 OPTIONS_SINGLE=	DATABASE
 OPTIONS_SINGLE_DATABASE=	TDB GDBM SIMPLE
 DATABASE_DESC=	Database support
 GDBM_DESC=	GNU database manager support
-GDBM_CONFIGURE_ON=	--with-database=gdbm
+GDBM_MESON_ON=	-Ddatabase=gdbm
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 SIMPLE_DESC=	Simple database support
-SIMPLE_CONFIGURE_ON=	--with-database=simple
+SIMPLE_MESON_ON=	-Ddatabase=simple
 TDB_DESC=	Trivial database support
-TDB_CONFIGURE_ON=	--with-database=tdb
+TDB_MESON_ON=	-Ddatabase=tdb
 TDB_LIB_DEPENDS=	libtdb.so:databases/tdb

+MESON_ARGS=	-Db_lundef=false -Dasyncns=disabled -Dbluez5=disabled -Dbluez5-gstreamer=disabled -Ddoxygen=false -Delogind=disabled -Dgstreamer=disabled -Dgtk=disabled -Dlirc=disabled -Dsystemd=disabled -Dvalgrind=disabled
+
 PULSE_VERSION=	${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PLIST_SUB=	PULSE_VERSION=${PULSE_VERSION}

@ -111,20 +92,15 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' \
 		-e 's|--directory|-d|g' \
 		${WRKSRC}/src/utils/pa-info
-	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
-		-e 's|main ()|main (void)|g' \
-		${WRKSRC}/configure
-
-pre-install-TEST-on: do-test

 post-install:
+	${RM} -r ${STAGEDIR}/lib
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/pulse
 .for ii in default.pa daemon.conf client.conf system.pa
-	${INSTALL_DATA} ${WRKSRC}/src/${ii} \
+	${MV} ${STAGEDIR}${PREFIX}/etc/pulse/${ii} \
 		${STAGEDIR}${PREFIX}/etc/pulse/${ii}.sample
 .endfor
 # Delete ${STAGEDIR}${PREFIX}/libexec/pulse directory, if it's empty
-	@(cd ${STAGEDIR}${PREFIX}/libexec && \
-		${FIND} * -maxdepth 0 -type d -empty -name pulse -delete)
+	${RMDIR} ${STAGEDIR}${PREFIX}/libexec || ${TRUE}

 .include <bsd.port.mk>
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1568380928
-SHA256 (pulseaudio-14.2.tar.xz) = 75d3f7742c1ae449049a4c88900e454b8b350ecaa8c544f3488a2562a9ff66f1
-SIZE (pulseaudio-14.2.tar.xz) = 1951300
+TIMESTAMP = 1691308577
+SHA256 (pulseaudio-16.1.tar.xz) = 8eef32ce91d47979f95fd9a935e738cd7eb7463430dabc72863251751e504ae4
+SIZE (pulseaudio-16.1.tar.xz) = 1545596
--- a/audio/pulseaudio/files/patch-configure
+++ b/audio/pulseaudio/files/patch-configure
@ -1,22 +0,0 @@
-Use gm4 instead of m4; this is probably just a work-around
-for some cross-build issues on ARM. However, it also means
-that we use the same GNU m4 as upstream developers presumably
-also use for processing these files and avoids future surprises.
-
--- configure.orig	2020-06-23 06:37:52 UTC
-+++ configure
-@@ -32212,10 +32212,10 @@ _LT_EOF
-  ;;
-     "src/esdcompat":F) chmod +x src/esdcompat ;;
-     "src/start-pulseaudio-x11":F) chmod +x src/start-pulseaudio-x11 ;;
-    "src/daemon.conf":F) m4 src/daemon.conf > src/daemon.conf.gen && mv src/daemon.conf.gen src/daemon.conf ;;
-    "src/default.pa":F) m4 src/default.pa > src/default.pa.gen && mv src/default.pa.gen src/default.pa ;;
-    "src/system.pa":F) m4 src/system.pa > src/system.pa.gen && mv src/system.pa.gen src/system.pa ;;
-    "PulseAudioConfig.cmake":F) m4 PulseAudioConfig.cmake > PulseAudioConfig.cmake.gen && mv PulseAudioConfig.cmake.gen PulseAudioConfig.cmake ;;
-+    "src/daemon.conf":F) gm4 src/daemon.conf > src/daemon.conf.gen && mv src/daemon.conf.gen src/daemon.conf ;;
-+    "src/default.pa":F) gm4 src/default.pa > src/default.pa.gen && mv src/default.pa.gen src/default.pa ;;
-+    "src/system.pa":F) gm4 src/system.pa > src/system.pa.gen && mv src/system.pa.gen src/system.pa ;;
-+    "PulseAudioConfig.cmake":F) gm4 PulseAudioConfig.cmake > PulseAudioConfig.cmake.gen && mv PulseAudioConfig.cmake.gen PulseAudioConfig.cmake ;;
- 
-   esac
- done # for ac_tag
--- a/audio/pulseaudio/files/patch-src_modules_echo-cancel_meson.build
+++ b/audio/pulseaudio/files/patch-src_modules_echo-cancel_meson.build
@ -0,0 +1,11 @@
+--- src/modules/echo-cancel/meson.build.orig	2022-06-21 10:54:48 UTC
+++ src/modules/echo-cancel/meson.build
+@@ -15,7 +15,7 @@ libwebrtc_util = shared_library('webrtc-util',
+   cpp_args : [pa_c_args, server_c_args],
+   include_directories : [configinc, topinc],
+   dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libatomic_ops_dep, webrtc_dep, libintl_dep],
+-  link_args : [nodelete_link_args, '-Wl,--unresolved-symbols=ignore-in-object-files'],
+  link_args : [nodelete_link_args],
+   install : true,
+   install_rpath : privlibdir,
+   install_dir : modlibexecdir,
--- a/audio/pulseaudio/files/patch-src_modules_meson.build
+++ b/audio/pulseaudio/files/patch-src_modules_meson.build
@ -0,0 +1,11 @@
+--- src/modules/meson.build.orig	2022-06-21 10:54:48 UTC
+++ src/modules/meson.build
+@@ -209,7 +209,7 @@ endif
+   ]
+ endif
+ 
+-if udev_dep.found()
+if udev_dep.found() and host_machine.system() != 'freebsd'
+   all_modules += [ [ 'module-udev-detect', 'module-udev-detect.c', [], [], [udev_dep] ] ]
+   if get_option('hal-compat')
+     all_modules += [ [ 'module-hal-detect', 'module-hal-detect-compat.c' ] ]
--- a/audio/pulseaudio/files/patch-src_modules_module-detect.c
+++ b/audio/pulseaudio/files/patch-src_modules_module-detect.c
@ -1,45 +0,0 @@
--- src/modules/module-detect.c.orig	2018-05-11 11:43:30 UTC
-+++ src/modules/module-detect.c
-@@ -160,11 +160,40 @@ static int detect_oss(pa_core *c, int ju
-                 continue;
- 
-         } else if (sscanf(line, "pcm%u: ", &device) == 1) {
-            /* FreeBSD support, the devices are named /dev/dsp0.0, dsp0.1 and so on */
-            pa_snprintf(args, sizeof(args), "device=/dev/dsp%u.0", device);
-+            pa_snprintf(args, sizeof(args), "device=/dev/dsp%u", device);
- 
-             if (pa_module_load(&m, c, "module-oss", args) < 0)
-                 continue;
-+
-+            if (!pa_endswith(line, "default"))
-+                continue;
-+
-+            const char *p = strrchr(line, '(');
-+
-+            if (!p)
-+                continue;
-+
-+            if (!c->configured_default_sink && (strstr(p, "play") || (strstr(p, "p:") && !strstr(p, "(0p:")))) {
-+                uint32_t idx = PA_IDXSET_INVALID;
-+                pa_sink *s;
-+                PA_IDXSET_FOREACH(s, c->sinks, idx) {
-+                    if (s->module == m) {
-+                        pa_core_set_configured_default_sink(c, s->name);
-+                        break;
-+                    }
-+                }
-+            }
-+
-+            if (!c->configured_default_source && (strstr(p, "rec") || (strstr(p, "r:") && !strstr(p, "/0r:")))) {
-+                uint32_t idx = PA_IDXSET_INVALID;
-+                pa_source *s;
-+                PA_IDXSET_FOREACH(s, c->sources, idx) {
-+                    if (s->module == m) {
-+                        pa_core_set_configured_default_source(c, s->name);
-+                        break;
-+                    }
-+                }
-+            }
-         }
- 
-         n++;
--- a/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c
+++ b/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c
@ -1,4 +1,4 @@
--- src/modules/oss/module-oss.c.orig	2021-01-16 17:26:36 UTC
+--- src/modules/oss/module-oss.c.orig	2022-06-21 10:54:48 UTC
 +++ src/modules/oss/module-oss.c
@@ -121,9 +121,6 @@ struct userdata {
     int fd;
@ -9,8 +9,8 @@
 -
     int nfrags, frag_size, orig_frag_size;
 
-     bool use_mmap;
-@@ -817,76 +814,146 @@ static int source_set_state_in_io_thread_cb(pa_source 
+     bool shutdown;
+@@ -819,75 +816,145 @@ static int source_set_state_in_io_thread_cb(pa_source 
     return 0;
 }
 
@ -68,7 +68,7 @@
 -            return;
 +    if (mixer_devmask & SOUND_MASK_VOLUME)
 +        if (pa_oss_get_volume(mixer_fd, SOUND_MIXER_READ_VOLUME, &s->sample_spec, &s->real_volume) >= 0)
-+	    goto done;
+            goto done;
 
 -    if (u->mixer_devmask & SOUND_MASK_PCM)
 -        if (pa_oss_get_volume(u->mixer_fd, SOUND_MIXER_READ_PCM, &s->sample_spec, &s->real_volume) >= 0)
@ -98,21 +98,15 @@
 +        return;
 
 -    if (u->mixer_devmask & SOUND_MASK_VOLUME)
-        if (pa_oss_set_volume(u->mixer_fd, SOUND_MIXER_WRITE_VOLUME, &s->sample_spec, &s->real_volume) >= 0)
-            return;
+-        (void) pa_oss_set_volume(u->mixer_fd, SOUND_MIXER_WRITE_VOLUME, &s->sample_spec, &s->real_volume);
 +    if (mixer_devmask & SOUND_MASK_VOLUME)
-+        if (pa_oss_set_volume(mixer_fd, SOUND_MIXER_WRITE_VOLUME, &s->sample_spec, &s->real_volume) >= 0)
-+            goto done;
+        (void) pa_oss_set_volume(mixer_fd, SOUND_MIXER_WRITE_VOLUME, &s->sample_spec, &s->real_volume);
 
 -    if (u->mixer_devmask & SOUND_MASK_PCM)
-        if (pa_oss_get_volume(u->mixer_fd, SOUND_MIXER_WRITE_PCM, &s->sample_spec, &s->real_volume) >= 0)
-            return;
+-        (void) pa_oss_set_volume(u->mixer_fd, SOUND_MIXER_WRITE_PCM, &s->sample_spec, &s->real_volume);
 +    if (mixer_devmask & SOUND_MASK_PCM)
-+        if (pa_oss_set_volume(mixer_fd, SOUND_MIXER_WRITE_PCM, &s->sample_spec, &s->real_volume) >= 0)
-+            goto done;
- 
-     pa_log_info("Device doesn't support writing mixer settings: %s", pa_cstrerror(errno));
-+done:
+        (void) pa_oss_set_volume(mixer_fd, SOUND_MIXER_WRITE_PCM, &s->sample_spec, &s->real_volume);
+
 +    pa_close(mixer_fd);
 }
 
@ -124,11 +118,11 @@
 +
     pa_assert_se(u = s->userdata);
 
-    pa_assert(u->mixer_devmask & (SOUND_MASK_IGAIN|SOUND_MASK_RECLEV));
+-    pa_assert(u->mixer_devmask & (SOUND_MASK_MIC|SOUND_MASK_IGAIN|SOUND_MASK_RECLEV));
 +    mixer_fd = open_mixer(u, &mixer_devmask);
 +    if (mixer_fd < 0) {
-+      oss_get_dummy_volume(&s->sample_spec, &s->real_volume);
-+      return;
+        oss_get_dummy_volume(&s->sample_spec, &s->real_volume);
+        return;
 +    }
 
 -    if (u->mixer_devmask & SOUND_MASK_IGAIN)
@ -145,6 +139,13 @@
 +        if (pa_oss_get_volume(mixer_fd, SOUND_MIXER_READ_RECLEV, &s->sample_spec, &s->real_volume) >= 0)
 +                goto done;
 
+-    if (u->mixer_devmask & SOUND_MASK_MIC)
+-        if (pa_oss_get_volume(u->mixer_fd, SOUND_MIXER_READ_MIC, &s->sample_spec, &s->real_volume) >= 0)
+-            return;
+    if (mixer_devmask & SOUND_MASK_MIC)
+        if (pa_oss_get_volume(mixer_fd, SOUND_MIXER_READ_MIC, &s->sample_spec, &s->real_volume) >= 0)
+                goto done;
+ 
 +    oss_get_dummy_volume(&s->sample_spec, &s->real_volume);
 +
     pa_log_info("Device doesn't support reading mixer settings: %s", pa_cstrerror(errno));
@ -160,47 +161,57 @@
 +
     pa_assert_se(u = s->userdata);
 
-    pa_assert(u->mixer_devmask & (SOUND_MASK_IGAIN|SOUND_MASK_RECLEV));
+-    pa_assert(u->mixer_devmask & (SOUND_MASK_MIC|SOUND_MASK_IGAIN|SOUND_MASK_RECLEV));
 +    mixer_fd = open_mixer(u, &mixer_devmask);
 +    if (mixer_fd < 0)
 +        return;
 
 -    if (u->mixer_devmask & SOUND_MASK_IGAIN)
-        if (pa_oss_set_volume(u->mixer_fd, SOUND_MIXER_WRITE_IGAIN, &s->sample_spec, &s->real_volume) >= 0)
-            return;
+-        (void) pa_oss_set_volume(u->mixer_fd, SOUND_MIXER_WRITE_IGAIN, &s->sample_spec, &s->real_volume);
 +    if (mixer_devmask & SOUND_MASK_IGAIN)
-+        if (pa_oss_set_volume(mixer_fd, SOUND_MIXER_WRITE_IGAIN, &s->sample_spec, &s->real_volume) >= 0)
-+            goto done;
+        (void) pa_oss_set_volume(mixer_fd, SOUND_MIXER_WRITE_IGAIN, &s->sample_spec, &s->real_volume);
 
 -    if (u->mixer_devmask & SOUND_MASK_RECLEV)
-        if (pa_oss_get_volume(u->mixer_fd, SOUND_MIXER_WRITE_RECLEV, &s->sample_spec, &s->real_volume) >= 0)
-            return;
+-        (void) pa_oss_set_volume(u->mixer_fd, SOUND_MIXER_WRITE_RECLEV, &s->sample_spec, &s->real_volume);
 +    if (mixer_devmask & SOUND_MASK_RECLEV)
-+        if (pa_oss_set_volume(mixer_fd, SOUND_MIXER_WRITE_RECLEV, &s->sample_spec, &s->real_volume) >= 0)
-+            goto done;
+        (void) pa_oss_set_volume(mixer_fd, SOUND_MIXER_WRITE_RECLEV, &s->sample_spec, &s->real_volume);
 
-     pa_log_info("Device doesn't support writing mixer settings: %s", pa_cstrerror(errno));
-+done:
+-    if (u->mixer_devmask & SOUND_MASK_MIC)
+-        (void) pa_oss_set_volume(u->mixer_fd, SOUND_MIXER_WRITE_MIC, &s->sample_spec, &s->real_volume);
+    if (mixer_devmask & SOUND_MASK_MIC)
+        (void) pa_oss_set_volume(mixer_fd, SOUND_MIXER_WRITE_MIC, &s->sample_spec, &s->real_volume);
+
 +    pa_close(mixer_fd);
 }
 
 static void thread_func(void *userdata) {
-@@ -1235,10 +1302,14 @@ int pa__init(pa_module*m) {
-         use_mmap = false;
+@@ -1158,16 +1225,6 @@ static void thread_func(void *userdata) {
+             revents = pollfd->revents;
+         } else
+             revents = 0;
+-
+-        /* check for mixer shutdown, if any */
+-        if ((revents & (POLLOUT | POLLIN)) == 0) {
+-            int mixer_fd = u->mixer_fd;
+-            int devmask;
+-            if (mixer_fd > -1 && ioctl(mixer_fd, SOUND_MIXER_READ_DEVMASK, &devmask) < 0) {
+-                pa_log("Mixer shutdown.");
+-                goto fail;
+-            }
+-        }
+     }
+ 
+ fail:
+@@ -1245,6 +1302,8 @@ int pa__init(pa_module*m) {
     }
 
-+#ifndef __FreeBSD__
-+/* Disable mmap. The OSS on FreeBSD doesn't support read & write on 
+ #ifndef __FreeBSD__
+/* Disable mmap. The OSS on FreeBSD doesn't support read & write on
 +   the same socket */
     if (use_mmap && mode == O_WRONLY) {
         pa_log_info("Device opened for playback only, cannot do memory mapping, falling back to UNIX write() mode.");
         use_mmap = false;
-     }
-+#endif
- 
-     if (pa_oss_get_hw_description(dev, hwdesc, sizeof(hwdesc)) >= 0)
-         pa_log_info("Hardware name is '%s'.", hwdesc);
-@@ -1266,8 +1337,6 @@ int pa__init(pa_module*m) {
+@@ -1277,8 +1336,6 @@ int pa__init(pa_module*m) {
     u->module = m;
     m->userdata = u;
     u->fd = fd;
@ -209,7 +220,7 @@
     u->use_getospace = u->use_getispace = true;
     u->use_getodelay = true;
     u->mode = mode;
-@@ -1438,36 +1507,19 @@ int pa__init(pa_module*m) {
+@@ -1449,36 +1506,19 @@ int pa__init(pa_module*m) {
             u->out_mmap_memblocks = pa_xnew0(pa_memblock*, u->out_nfrags);
     }
 
@ -227,7 +238,7 @@
 -                do_close = false;
 -            }
 -
-            if (u->source && (u->mixer_devmask & (SOUND_MASK_RECLEV|SOUND_MASK_IGAIN))) {
+-            if (u->source && (u->mixer_devmask & (SOUND_MASK_MIC|SOUND_MASK_RECLEV|SOUND_MASK_IGAIN))) {
 -                pa_log_debug("Found hardware mixer track for recording.");
 -                pa_source_set_get_volume_callback(u->source, source_get_volume);
 -                pa_source_set_set_volume_callback(u->source, source_set_volume);
@ -257,7 +268,7 @@
 go_on:
 
     pa_assert(u->source || u->sink);
-@@ -1582,9 +1634,6 @@ void pa__done(pa_module*m) {
+@@ -1594,9 +1634,6 @@ void pa__done(pa_module*m) {
 
     if (u->fd >= 0)
         pa_close(u->fd);
--- a/audio/pulseaudio/files/patch-src_modules_oss_oss-util.c
+++ b/audio/pulseaudio/files/patch-src_modules_oss_oss-util.c
@ -1,7 +1,7 @@
 Support 24bit audio see Comment 6 of 
 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=198567

--- src/modules/oss/oss-util.c.orig	2018-07-13 19:06:14 UTC
+--- src/modules/oss/oss-util.c.orig	2022-06-21 10:54:48 UTC
 +++ src/modules/oss/oss-util.c
@@ -39,6 +39,22 @@
 
@ -24,66 +24,5 @@ https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=198567
 +#endif
 +
 int pa_oss_open(const char *device, int *mode, int* pcaps) {
+     static const int nonblock_io = 1;
     int fd = -1;
-     int caps;
-@@ -164,8 +180,8 @@ int pa_oss_auto_format(int fd, pa_sample
-         [PA_SAMPLE_FLOAT32BE] = AFMT_QUERY, /* not supported */
-         [PA_SAMPLE_S32LE] = AFMT_QUERY, /* not supported */
-         [PA_SAMPLE_S32BE] = AFMT_QUERY, /* not supported */
-        [PA_SAMPLE_S24LE] = AFMT_QUERY, /* not supported */
-        [PA_SAMPLE_S24BE] = AFMT_QUERY, /* not supported */
-+        [PA_SAMPLE_S24LE] = AFMT_S24_LE,
-+        [PA_SAMPLE_S24BE] = AFMT_S24_BE,
-         [PA_SAMPLE_S24_32LE] = AFMT_QUERY, /* not supported */
-         [PA_SAMPLE_S24_32BE] = AFMT_QUERY, /* not supported */
-     };
-@@ -348,7 +364,7 @@ int pa_oss_get_hw_description(const char
-     }
- 
-     while (!feof(f)) {
-        char line[64];
-+        char line[1024];
-         int device;
- 
-         if (!fgets(line, sizeof(line), f))
-@@ -357,14 +373,22 @@ int pa_oss_get_hw_description(const char
-         line[strcspn(line, "\r\n")] = 0;
- 
-         if (!b) {
-+#ifdef __FreeBSD__
-+            b = pa_streq(line, "Installed devices:");
-+#else
-             b = pa_streq(line, "Audio devices:");
-+#endif
-             continue;
-         }
- 
-         if (line[0] == 0)
-             break;
- 
-+#ifdef __FreeBSD__
-+        if (sscanf(line, "pcm%i: ", &device) != 1)
-+#else
-         if (sscanf(line, "%i: ", &device) != 1)
-+#endif
-             continue;
- 
-         if (device == n) {
-@@ -376,7 +400,16 @@ int pa_oss_get_hw_description(const char
-             if (pa_endswith(k, " (DUPLEX)"))
-                 k[strlen(k)-9] = 0;
- 
-            pa_strlcpy(name, k, l);
-+            if (*k == '<') {
-+                char *e = strrchr(k, '>');
-+
-+                if (e) {
-+                    *e = 0;
-+                    ++k;
-+                }
-+            }
-+            // Include the number to disambiguate devices with the same name
-+            pa_snprintf(name, l, "%d: %s", device, k);
-             r = 0;
-             break;
-         }
--- a/audio/pulseaudio/files/patch-src_pulse_util.c
+++ b/audio/pulseaudio/files/patch-src_pulse_util.c
@ -1,4 +1,4 @@
--- src/pulse/util.c.orig	2015-12-29 00:56:00 UTC
+--- src/pulse/util.c.orig	2022-06-21 10:54:48 UTC
 +++ src/pulse/util.c
@@ -30,6 +30,10 @@
 #include <time.h>
@ -11,35 +11,3 @@
 
 #ifdef HAVE_PWD_H
 #include <pwd.h>
-@@ -200,7 +204,7 @@ char *pa_get_binary_name(char *s, size_t
-     }
- #endif
- 
-#if defined(__linux__) || defined(__FreeBSD_kernel__)
-+#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__))
-     {
-         char *rp;
-         /* This works on Linux and Debian/kFreeBSD */
-@@ -215,13 +219,17 @@ char *pa_get_binary_name(char *s, size_t
- 
- #ifdef __FreeBSD__
-     {
-        char *rp;
-+        int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid()};
-+        struct kinfo_proc kp;
-+        size_t sz = sizeof(kp);
- 
-        if ((rp = pa_readlink("/proc/curproc/file"))) {
-            pa_strlcpy(s, pa_path_get_filename(rp), l);
-            pa_xfree(rp);
-            return s;
-+        if (sysctl(mib, 4, &kp, &sz, NULL, 0) == 0)
-+        {
-+          pa_strlcpy(s, kp.ki_comm, l);
-+          return kp.ki_comm;
-         }
-+        else
-+          return NULL;
-     }
- #endif
- 
--- a/audio/pulseaudio/files/patch-src_pulsecore_atomic.h
+++ b/audio/pulseaudio/files/patch-src_pulsecore_atomic.h
@ -1,51 +0,0 @@
--- src/pulsecore/atomic.h.orig	2020-07-17 12:11:11.000000000 +0200
-+++ src/pulsecore/atomic.h	2021-01-23 21:16:28.683759000 +0100
-@@ -117,7 +117,7 @@
- }
- 
- static inline void pa_atomic_ptr_store(pa_atomic_ptr_t *a, void* p) {
-    __atomic_store_n(&a->value, (unsigned long) p, __ATOMIC_SEQ_CST);
-+    __atomic_store_n(&a->value, (uintptr_t) p, __ATOMIC_SEQ_CST);
- }
- 
- #else
-@@ -217,39 +217,6 @@
- #include <sys/types.h>
- #include <sys/param.h>
- #include <machine/atomic.h>
-
-#if __FreeBSD_version < 600000
-#if defined(__i386__) || defined(__amd64__)
-#if defined(__amd64__)
-#define atomic_load_acq_64      atomic_load_acq_long
-#endif
-static inline u_int atomic_fetchadd_int(volatile u_int *p, u_int v) {
-    __asm __volatile(
-            "   " __XSTRING(MPLOCKED) "         "
-            "   xaddl   %0, %1 ;        "
-            "# atomic_fetchadd_int"
-            : "+r" (v),
-            "=m" (*p)
-            : "m" (*p));
-
-    return (v);
-}
-#elif defined(__sparc__) && defined(__arch64__)
-#define atomic_load_acq_64      atomic_load_acq_long
-#define atomic_fetchadd_int     atomic_add_int
-#elif defined(__ia64__)
-#define atomic_load_acq_64      atomic_load_acq_long
-static inline uint32_t
-atomic_fetchadd_int(volatile uint32_t *p, uint32_t v) {
-    uint32_t value;
-
-    do {
-        value = *p;
-    } while (!atomic_cmpset_32(p, value, value + v));
-    return (value);
-}
-#endif
-#endif
- 
- typedef struct pa_atomic {
-     volatile unsigned long value;
--- a/audio/pulseaudio/files/patch-src_pulsecore_proplist-util.c
+++ b/audio/pulseaudio/files/patch-src_pulsecore_proplist-util.c
@ -0,0 +1,22 @@
+--- src/pulsecore/proplist-util.c.orig	2022-06-21 10:54:48 UTC
+++ src/pulsecore/proplist-util.c
+@@ -24,6 +24,10 @@
+ #include <string.h>
+ #include <locale.h>
+ 
+#ifdef __FreeBSD__
+#include <dlfcn.h>
+#endif
+
+ #ifdef ENABLE_NLS
+ #include <libintl.h>
+ #endif
+@@ -31,6 +35,8 @@
+ #ifdef __APPLE__
+ #include <crt_externs.h>
+ #define environ (*_NSGetEnviron())
+#elif defined(__FreeBSD__)
+#define environ dlsym(RTLD_DEFAULT, "environ")
+ #elif !HAVE_DECL_ENVIRON
+ extern char **environ;
+ #endif
--- a/audio/pulseaudio/files/patch-src_utils_padsp.c
+++ b/audio/pulseaudio/files/patch-src_utils_padsp.c
@ -1,14 +0,0 @@
-# Revert some changes after following commit:
-# https://github.com/pulseaudio/pulseaudio/commit/66885ad633db0f371693475c72133e91f1e09ee5
-
--- src/utils/padsp.c.orig	2018-05-11 11:43:31 UTC
-+++ src/utils/padsp.c
-@@ -2394,7 +2394,7 @@ fail:
-     return ret;
- }
- 
-#ifndef __GLIBC__
-+#ifdef sun
- int ioctl(int fd, int request, ...) {
- #else
- int ioctl(int fd, unsigned long request, ...) {
--- a/audio/pulseaudio/pkg-plist
+++ b/audio/pulseaudio/pkg-plist
@ -17,6 +17,7 @@ etc/dbus-1/system.d/pulseaudio-system.conf
@sample etc/pulse/daemon.conf.sample
@sample etc/pulse/default.pa.sample
@sample etc/pulse/system.pa.sample
+%%X11%%etc/xdg/Xwayland-session.d/00-pulseaudio-x11
 %%X11%%etc/xdg/autostart/pulseaudio.desktop
 include/pulse/cdecl.h
 include/pulse/channelmap.h
@ -60,92 +61,93 @@ lib/libpulse-simple.so.0
 lib/libpulse-simple.so.0.1.1
 lib/libpulse.so
 lib/libpulse.so.0
-lib/libpulse.so.0.23.0
-%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so
-%%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/libalsa-util.so
-lib/pulse-%%PULSE_VERSION%%/modules/libcli.so
-lib/pulse-%%PULSE_VERSION%%/modules/liboss-util.so
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-cli.so
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-http.so
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-native.so
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-simple.so
-lib/pulse-%%PULSE_VERSION%%/modules/libraop.so
-lib/pulse-%%PULSE_VERSION%%/modules/librtp.so
-%%WEBRTC_AEC%%lib/pulse-%%PULSE_VERSION%%/modules/libwebrtc-util.so
-%%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/module-allow-passthrough.so
-%%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/module-alsa-card.so
-%%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/module-alsa-sink.so
-%%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/module-alsa-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-always-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-always-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-augment-properties.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-card-restore.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-tcp.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-unix.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-cli.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-combine-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-combine.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-console-kit.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-dbus-protocol.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-default-device-restore.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-detect.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-device-restore.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-echo-cancel.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-equalizer-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-filter-apply.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-filter-heuristics.so
-%%GSETTINGS%%lib/pulse-%%PULSE_VERSION%%/modules/module-gsettings.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-tcp.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-unix.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-intended-roles.so
-%%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jackdbus-detect.so
-%%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-sink.so
-%%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-ladspa-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-loopback.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-match.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-fd.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-tcp.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-unix.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-null-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-null-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-oss.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-position-event-sounds.so
-%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-raop-discover.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-raop-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-remap-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-remap-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-rescue-streams.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-role-cork.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-role-ducking.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-recv.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-send.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-rygel-media-server.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-tcp.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-unix.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-sine-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-sine.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-stream-restore.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-suspend-on-idle.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-switch-on-connect.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-switch-on-port-available.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-sink-new.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-source-new.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-virtual-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-virtual-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-virtual-surround-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-volume-restore.so
-%%X11%%lib/pulse-%%PULSE_VERSION%%/modules/module-x11-bell.so
-%%X11%%lib/pulse-%%PULSE_VERSION%%/modules/module-x11-cork-request.so
-%%X11%%lib/pulse-%%PULSE_VERSION%%/modules/module-x11-publish.so
-%%X11%%lib/pulse-%%PULSE_VERSION%%/modules/module-x11-xsmp.so
-%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-discover.so
-%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-publish.so
+lib/libpulse.so.0.24.2
+%%AVAHI%%lib/pulseaudio/modules/libavahi-wrap.so
+%%ALSA%%lib/pulseaudio/modules/libalsa-util.so
+lib/pulseaudio/modules/libcli.so
+lib/pulseaudio/modules/liboss-util.so
+lib/pulseaudio/modules/libprotocol-cli.so
+lib/pulseaudio/modules/libprotocol-http.so
+lib/pulseaudio/modules/libprotocol-native.so
+lib/pulseaudio/modules/libprotocol-simple.so
+lib/pulseaudio/modules/libraop.so
+lib/pulseaudio/modules/librtp.so
+%%WEBRTC_AEC%%lib/pulseaudio/modules/libwebrtc-util.so
+%%ALSA%%lib/pulseaudio/modules/module-allow-passthrough.so
+%%ALSA%%lib/pulseaudio/modules/module-alsa-card.so
+%%ALSA%%lib/pulseaudio/modules/module-alsa-sink.so
+%%ALSA%%lib/pulseaudio/modules/module-alsa-source.so
+lib/pulseaudio/modules/module-always-sink.so
+lib/pulseaudio/modules/module-always-source.so
+lib/pulseaudio/modules/module-augment-properties.so
+lib/pulseaudio/modules/module-card-restore.so
+lib/pulseaudio/modules/module-cli-protocol-tcp.so
+lib/pulseaudio/modules/module-cli-protocol-unix.so
+lib/pulseaudio/modules/module-cli.so
+lib/pulseaudio/modules/module-combine-sink.so
+lib/pulseaudio/modules/module-combine.so
+lib/pulseaudio/modules/module-console-kit.so
+lib/pulseaudio/modules/module-dbus-protocol.so
+lib/pulseaudio/modules/module-default-device-restore.so
+lib/pulseaudio/modules/module-detect.so
+lib/pulseaudio/modules/module-devd-detect.so
+lib/pulseaudio/modules/module-device-manager.so
+lib/pulseaudio/modules/module-device-restore.so
+lib/pulseaudio/modules/module-echo-cancel.so
+lib/pulseaudio/modules/module-equalizer-sink.so
+lib/pulseaudio/modules/module-filter-apply.so
+lib/pulseaudio/modules/module-filter-heuristics.so
+%%GSETTINGS%%lib/pulseaudio/modules/module-gsettings.so
+lib/pulseaudio/modules/module-http-protocol-tcp.so
+lib/pulseaudio/modules/module-http-protocol-unix.so
+lib/pulseaudio/modules/module-intended-roles.so
+%%JACK%%lib/pulseaudio/modules/module-jackdbus-detect.so
+%%JACK%%lib/pulseaudio/modules/module-jack-sink.so
+%%JACK%%lib/pulseaudio/modules/module-jack-source.so
+lib/pulseaudio/modules/module-ladspa-sink.so
+lib/pulseaudio/modules/module-loopback.so
+lib/pulseaudio/modules/module-match.so
+lib/pulseaudio/modules/module-native-protocol-fd.so
+lib/pulseaudio/modules/module-native-protocol-tcp.so
+lib/pulseaudio/modules/module-native-protocol-unix.so
+lib/pulseaudio/modules/module-null-sink.so
+lib/pulseaudio/modules/module-null-source.so
+lib/pulseaudio/modules/module-oss.so
+lib/pulseaudio/modules/module-pipe-sink.so
+lib/pulseaudio/modules/module-pipe-source.so
+lib/pulseaudio/modules/module-position-event-sounds.so
+%%AVAHI%%lib/pulseaudio/modules/module-raop-discover.so
+lib/pulseaudio/modules/module-raop-sink.so
+lib/pulseaudio/modules/module-remap-sink.so
+lib/pulseaudio/modules/module-remap-source.so
+lib/pulseaudio/modules/module-rescue-streams.so
+lib/pulseaudio/modules/module-role-cork.so
+lib/pulseaudio/modules/module-role-ducking.so
+lib/pulseaudio/modules/module-rtp-recv.so
+lib/pulseaudio/modules/module-rtp-send.so
+lib/pulseaudio/modules/module-rygel-media-server.so
+lib/pulseaudio/modules/module-simple-protocol-tcp.so
+lib/pulseaudio/modules/module-simple-protocol-unix.so
+lib/pulseaudio/modules/module-sine-source.so
+lib/pulseaudio/modules/module-sine.so
+lib/pulseaudio/modules/module-stream-restore.so
+lib/pulseaudio/modules/module-suspend-on-idle.so
+lib/pulseaudio/modules/module-switch-on-connect.so
+lib/pulseaudio/modules/module-switch-on-port-available.so
+lib/pulseaudio/modules/module-tunnel-sink-new.so
+lib/pulseaudio/modules/module-tunnel-sink.so
+lib/pulseaudio/modules/module-tunnel-source-new.so
+lib/pulseaudio/modules/module-tunnel-source.so
+lib/pulseaudio/modules/module-virtual-sink.so
+lib/pulseaudio/modules/module-virtual-source.so
+lib/pulseaudio/modules/module-virtual-surround-sink.so
+lib/pulseaudio/modules/module-volume-restore.so
+%%X11%%lib/pulseaudio/modules/module-x11-bell.so
+%%X11%%lib/pulseaudio/modules/module-x11-cork-request.so
+%%X11%%lib/pulseaudio/modules/module-x11-publish.so
+%%X11%%lib/pulseaudio/modules/module-x11-xsmp.so
+%%AVAHI%%lib/pulseaudio/modules/module-zeroconf-discover.so
+%%AVAHI%%lib/pulseaudio/modules/module-zeroconf-publish.so
 lib/pulseaudio/libpulsecommon-%%PULSE_VERSION%%.so
 lib/pulseaudio/libpulsecore-%%PULSE_VERSION%%.so
 lib/pulseaudio/libpulsedsp.so
@ -190,6 +192,7 @@ share/locale/da/LC_MESSAGES/pulseaudio.mo
 share/locale/de/LC_MESSAGES/pulseaudio.mo
 share/locale/de_CH/LC_MESSAGES/pulseaudio.mo
 share/locale/el/LC_MESSAGES/pulseaudio.mo
+share/locale/eo/LC_MESSAGES/pulseaudio.mo
 share/locale/es/LC_MESSAGES/pulseaudio.mo
 share/locale/fi/LC_MESSAGES/pulseaudio.mo
 share/locale/fr/LC_MESSAGES/pulseaudio.mo
@ -202,6 +205,7 @@ share/locale/hu/LC_MESSAGES/pulseaudio.mo
 share/locale/id/LC_MESSAGES/pulseaudio.mo
 share/locale/it/LC_MESSAGES/pulseaudio.mo
 share/locale/ja/LC_MESSAGES/pulseaudio.mo
+share/locale/ka/LC_MESSAGES/pulseaudio.mo
 share/locale/kk/LC_MESSAGES/pulseaudio.mo
 share/locale/kn/LC_MESSAGES/pulseaudio.mo
 share/locale/ko/LC_MESSAGES/pulseaudio.mo
@ -217,6 +221,7 @@ share/locale/pl/LC_MESSAGES/pulseaudio.mo
 share/locale/pt/LC_MESSAGES/pulseaudio.mo
 share/locale/pt_BR/LC_MESSAGES/pulseaudio.mo
 share/locale/ru/LC_MESSAGES/pulseaudio.mo
+share/locale/si/LC_MESSAGES/pulseaudio.mo
 share/locale/sk/LC_MESSAGES/pulseaudio.mo
 share/locale/sr/LC_MESSAGES/pulseaudio.mo
 share/locale/sr@latin/LC_MESSAGES/pulseaudio.mo
@ -244,6 +249,7 @@ share/locale/zh_TW/LC_MESSAGES/pulseaudio.mo
 %%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-input-video.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-input.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-input.conf.common
+%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-output-chat.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-output-headphones-2.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-output-headphones.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-output-lineout.conf
@ -254,12 +260,15 @@ share/locale/zh_TW/LC_MESSAGES/pulseaudio.mo
 %%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-output.conf.common
 %%ALSA%%%%DATADIR%%/alsa-mixer/paths/hdmi-output-0.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/paths/hdmi-output-1.conf
+%%ALSA%%%%DATADIR%%/alsa-mixer/paths/hdmi-output-10.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/paths/hdmi-output-2.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/paths/hdmi-output-3.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/paths/hdmi-output-4.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/paths/hdmi-output-5.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/paths/hdmi-output-6.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/paths/hdmi-output-7.conf
+%%ALSA%%%%DATADIR%%/alsa-mixer/paths/hdmi-output-8.conf
+%%ALSA%%%%DATADIR%%/alsa-mixer/paths/hdmi-output-9.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/paths/iec958-stereo-input.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/paths/iec958-stereo-output.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/paths/steelseries-arctis-output-chat-common.conf
@ -267,23 +276,30 @@ share/locale/zh_TW/LC_MESSAGES/pulseaudio.mo
 %%ALSA%%%%DATADIR%%/alsa-mixer/paths/usb-gaming-headset-input.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/paths/usb-gaming-headset-output-mono.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/paths/usb-gaming-headset-output-stereo.conf
+%%ALSA%%%%DATADIR%%/alsa-mixer/paths/virtual-surround-7.1.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/audigy.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/cmedia-high-speed-true-hdaudio.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/default.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/dell-dock-tb16-usb-audio.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/force-speaker-and-int-mic.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/force-speaker.conf
+%%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/hp-tbt-dock-120w-g2.conf
+%%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/hp-tbt-dock-audio-module.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/kinect-audio.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/maudio-fasttrack-pro.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/native-instruments-audio4dj.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/native-instruments-audio8dj.conf
+%%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/native-instruments-komplete-audio6.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/native-instruments-korecontroller.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/native-instruments-traktor-audio10.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/native-instruments-traktor-audio2.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/native-instruments-traktor-audio6.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/native-instruments-traktorkontrol-s4.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/sb-omni-surround-5.1.conf
+%%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/sennheiser-gsx.conf
+%%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/simple-headphones-mic.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/steelseries-arctis-common-usb-audio.conf
+%%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/texas-instruments-pcm2902.conf
 %%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/usb-gaming-headset.conf
 share/vala/vapi/libpulse-mainloop-glib.deps
 share/vala/vapi/libpulse-mainloop-glib.vapi
--- a/audio/py-pocketsphinx/Makefile
+++ b/audio/py-pocketsphinx/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	pocketsphinx
 PORTVERSION=	0.1.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/audio/py-pulsectl/Makefile
+++ b/audio/py-pulsectl/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	pulsectl
 DISTVERSION=	23.5.2
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/audio/rezound/Makefile
+++ b/audio/rezound/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	rezound
 DISTVERSION=	0.13.1beta
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/ReZound/${DISTVERSION}

--- a/audio/rhvoice/Makefile
+++ b/audio/rhvoice/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	RHVoice
 DISTVERSION=	1.2.4
+PORTREVISION=	1
 CATEGORIES=	audio

 MAINTAINER=	yuri@FreeBSD.org
--- a/audio/rtaudio/Makefile
+++ b/audio/rtaudio/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	rtaudio
 DISTVERSION=	6.0.0
+PORTREVISION=	1
 CATEGORIES=	audio

 MAINTAINER=	yuri@FreeBSD.org
--- a/audio/shairport-sync/Makefile
+++ b/audio/shairport-sync/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	shairport-sync
 DISTVERSION=	4.2
+PORTREVISION=	1
 CATEGORIES=	audio

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/audio/sidplayfp/Makefile
+++ b/audio/sidplayfp/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	sidplayfp
 DISTVERSION=	2.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/lib${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/

--- a/audio/siren/Makefile
+++ b/audio/siren/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	siren
 PORTVERSION=	0.10
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://www.kariliq.nl/${PORTNAME}/dist/

--- a/audio/sonic-visualiser/Makefile
+++ b/audio/sonic-visualiser/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	sonic-visualiser
 DISTVERSION=	4.0.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	audio
 MASTER_SITES=	https://code.soundsoftware.ac.uk/attachments/download/2607/

--- a/audio/sonivox-eas/Makefile
+++ b/audio/sonivox-eas/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	sonivox-eas
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio

 MAINTAINER=	yuri@FreeBSD.org
--- a/audio/soundtracker/Makefile
+++ b/audio/soundtracker/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	soundtracker
 DISTVERSION=	1.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/

--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	sox
 DISTVERSION=	14.4.2.20210509
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	https://dev.gentoo.org/~fordfrog/distfiles/
 DISTNAME=	sox-code-42b3557e13e0fe01a83465b672d89faddbe65f49
--- a/audio/spotify-player/Makefile
+++ b/audio/spotify-player/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	spotify-player
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.10.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio

 MAINTAINER=	jfree@FreeBSD.org
--- a/audio/spotifyd/Makefile
+++ b/audio/spotifyd/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	spotifyd
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.3
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	audio

 MAINTAINER=	rodrigo@FreeBSD.org
--- a/audio/strawberry/Makefile
+++ b/audio/strawberry/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	strawberry
 DISTVERSION=	1.0.18
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/strawberrymusicplayer/${PORTNAME}/releases/download/${DISTVERSION}/ \
 		https://files.jkvinge.net/packages/strawberry/
--- a/audio/vban/Makefile
+++ b/audio/vban/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	vban
 DISTVERSION=	g20201011
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-tools

--- a/audio/webrtc-audio-processing/Makefile
+++ b/audio/webrtc-audio-processing/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	webrtc-audio-processing
 DISTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://freedesktop.org/software/pulseaudio/${PORTNAME}/

--- a/audio/webrtc-audio-processing0/Makefile
+++ b/audio/webrtc-audio-processing0/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	webrtc-audio-processing
 PORTVERSION=	0.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	https://freedesktop.org/software/pulseaudio/${PORTNAME}/
 PKGNAMESUFFIX=	0
--- a/audio/wolf-shaper-lv2/Makefile
+++ b/audio/wolf-shaper-lv2/Makefile
@ -1,6 +1,7 @@
 PORTNAME=	wolf-shaper
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	audio multimedia

 MAINTAINER=	yuri@FreeBSD.org
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	xfce4-mixer
 PORTVERSION=	4.18.1
+PORTREVISION=	1
 CATEGORIES=	audio xfce
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
--- a/audio/xfce4-pulseaudio-plugin/Makefile
+++ b/audio/xfce4-pulseaudio-plugin/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	xfce4-pulseaudio-plugin
 PORTVERSION=	0.4.7
+PORTREVISION=	1
 CATEGORIES=	audio xfce
 MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	xmp
 PORTVERSION=	4.2.0
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/libxmp/xmp-cli/releases/download/${PORTNAME}-${PORTVERSION}/
--- a/audio/zam-plugins-lv2/Makefile
+++ b/audio/zam-plugins-lv2/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	zam-plugins
 DISTVERSION=	4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2

--- a/audio/zrythm/Makefile
+++ b/audio/zrythm/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	zrythm
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.0-alpha.26.0.13
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	audio

 MAINTAINER=	yuri@FreeBSD.org
--- a/comms/cubicsdr/Makefile
+++ b/comms/cubicsdr/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	cubicsdr
 PORTVERSION=	0.2.5
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	comms hamradio

 MAINTAINER=	hamradio@FreeBSD.org
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	fldigi
 DISTVERSION=	4.1.23
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.w1hkj.com/files/fldigi/

--- a/comms/morse/Makefile
+++ b/comms/morse/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	morse
 PORTVERSION=	2.5
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.catb.org/~esr/morse/ \
 		LOCAL/db
--- a/comms/multimon-ng/Makefile
+++ b/comms/multimon-ng/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	multimon-ng
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	comms hamradio

 MAINTAINER=	kevans@FreeBSD.org
--- a/comms/qsstv/Makefile
+++ b/comms/qsstv/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	qsstv
 PORTVERSION=	9.5.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://users.telenet.be/on4qz/qsstv/downloads/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
--- a/comms/quisk/Makefile
+++ b/comms/quisk/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	quisk
 DISTVERSION=	4.2.19
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	PYPI

--- a/comms/twpsk/Makefile
+++ b/comms/twpsk/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	twpsk
 PORTVERSION=	4.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://wa0eir.bcts.info/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
--- a/comms/unixcw/Makefile
+++ b/comms/unixcw/Makefile
@ -3,7 +3,7 @@

 PORTNAME?=	unixcw
 PORTVERSION=	3.5.1
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/unixcw/unixcw-${PORTVERSION}
 DISTNAME=	unixcw_${PORTVERSION}.orig