www/firefox: audio_device isn't used by WebRTC after r468751

7 files changed, 20 insertions, 2 deletions

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 853c6d555e0b..41930b2179e2 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -54,6 +54,10 @@ OPTIONS_SINGLE_TOOLKIT=	GTK2 GTK3
 OPTIONS_DEFAULT=BUNDLED_CAIRO CANBERRA GTK3 LIGHTNING
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
+
+# Inconsistent fallback order (libcubeb vs. audio_device)
+SNDIO_PREVENTS=		${OPTIONS_MULTI_AUDIO:NSNDIO}
+
 .include <bsd.port.pre.mk>
 
 MOZSRC:=	${WRKSRC}/mozilla
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index a11a0fb7530e..3fb74cea1dde 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -56,6 +56,9 @@ OPTIONS_SINGLE_TOOLKIT=	GTK2 GTK3
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
+# Inconsistent fallback order (libcubeb vs. audio_device)
+SNDIO_PREVENTS=		${OPTIONS_MULTI_AUDIO:NSNDIO}
+
 post-extract:
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
 		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
diff --git a/www/firefox/Makefile.options b/www/firefox/Makefile.options
index 50ae9f1c4d96..3dfef61f35d2 100644
--- a/www/firefox/Makefile.options
+++ b/www/firefox/Makefile.options
@@ -13,8 +13,6 @@ OPTIONS_MULTI_AUDIO=	ALSA JACK PULSEAUDIO SNDIO
 
 # WebRTC legacy audio library only supports ALSA and PulseAudio
 JACK_IMPLIES=		ALSA
-# No lazy-bindings and inconsistent fallback order (libcubeb vs. audio_device)
-SNDIO_PREVENTS=		${OPTIONS_MULTI_AUDIO:NSNDIO}
 
 # dragonfly, sparc64, riscv
 .if !exists(/usr/sbin/dtrace)
diff --git a/www/libxul/Makefile b/www/libxul/Makefile
index 00ea15a46eb6..3a4ab8f0f293 100644
--- a/www/libxul/Makefile
+++ b/www/libxul/Makefile
@@ -65,6 +65,9 @@ OPTIONS_SINGLE_TOOLKIT=	GTK2 GTK3
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 OPTIONS_MULTI_AUDIO:=	${OPTIONS_MULTI_AUDIO:NJACK}
 
+# Inconsistent fallback order (libcubeb vs. audio_device)
+SNDIO_PREVENTS=		${OPTIONS_MULTI_AUDIO:NSNDIO}
+
 .if ${USE_MOZILLA:M-nss}
 MOZ_PKGCONFIG_FILES+=	mozilla-nss
 .endif
diff --git a/www/palemoon/Makefile b/www/palemoon/Makefile
index c3c774f3cbdb..7d1337de960e 100644
--- a/www/palemoon/Makefile
+++ b/www/palemoon/Makefile
@@ -46,6 +46,9 @@ OPTIONS_EXCLUDE=	DTRACE INTEGER_SAMPLES JACK TEST
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
+# Inconsistent fallback order (libcubeb vs. audio_device)
+SNDIO_PREVENTS=		${OPTIONS_MULTI_AUDIO:NSNDIO}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 2a1dbaae9f10..e2a0f9ec84e2 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -50,6 +50,10 @@ OPTIONS_DEFAULT=CANBERRA GTK3 LDAP LIGHTNING
 LDAP_DESC?=	LDAP support for Mailnews
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
+
+# Inconsistent fallback order (libcubeb vs. audio_device)
+SNDIO_PREVENTS=		${OPTIONS_MULTI_AUDIO:NSNDIO}
+
 .include <bsd.port.options.mk>
 
 MOZSRC:=	${WRKSRC}/mozilla
diff --git a/www/waterfox/Makefile b/www/waterfox/Makefile
index 90354f0a7957..8c0c67664d58 100644
--- a/www/waterfox/Makefile
+++ b/www/waterfox/Makefile
@@ -53,6 +53,9 @@ OPTIONS_DEFAULT=	BUNDLED_CAIRO
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
+# Inconsistent fallback order (libcubeb vs. audio_device)
+SNDIO_PREVENTS=		${OPTIONS_MULTI_AUDIO:NSNDIO}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \
 		-e 's/firefox/${MOZILLA}/' \