svn commit: r471336 - in branches/2018Q2: mail/thunderbird www/firefox www/firefox-esr www/libxul www/seamonkey www/waterfox

[Jan Beich]

Author: jbeich
Date: Sat Jun  2 00:46:47 2018
New Revision: 471336
URL: https://svnweb.freebsd.org/changeset/ports/471336

Log:
  MFH: r471331 r471334
  
  www/firefox: audio_device isn't used by WebRTC after r468751
  
  Approved by:	ports-secteam blanket

Modified:
  branches/2018Q2/mail/thunderbird/Makefile
  branches/2018Q2/www/firefox-esr/Makefile
  branches/2018Q2/www/firefox/Makefile.options
  branches/2018Q2/www/libxul/Makefile
  branches/2018Q2/www/seamonkey/Makefile
  branches/2018Q2/www/waterfox/Makefile
Directory Properties:
  branches/2018Q2/   (props changed)

Modified: branches/2018Q2/mail/thunderbird/Makefile
==============================================================================
--- branches/2018Q2/mail/thunderbird/Makefile	Sat Jun  2 00:39:17 2018	(r471335)
+++ branches/2018Q2/mail/thunderbird/Makefile	Sat Jun  2 00:46:47 2018	(r471336)
@@ -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

Modified: branches/2018Q2/www/firefox-esr/Makefile
==============================================================================
--- branches/2018Q2/www/firefox-esr/Makefile	Sat Jun  2 00:39:17 2018	(r471335)
+++ branches/2018Q2/www/firefox-esr/Makefile	Sat Jun  2 00:46:47 2018	(r471336)
@@ -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}|' \

Modified: branches/2018Q2/www/firefox/Makefile.options
==============================================================================
--- branches/2018Q2/www/firefox/Makefile.options	Sat Jun  2 00:39:17 2018	(r471335)
+++ branches/2018Q2/www/firefox/Makefile.options	Sat Jun  2 00:46:47 2018	(r471336)
@@ -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)

Modified: branches/2018Q2/www/libxul/Makefile
==============================================================================
--- branches/2018Q2/www/libxul/Makefile	Sat Jun  2 00:39:17 2018	(r471335)
+++ branches/2018Q2/www/libxul/Makefile	Sat Jun  2 00:46:47 2018	(r471336)
@@ -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

Modified: branches/2018Q2/www/seamonkey/Makefile
==============================================================================
--- branches/2018Q2/www/seamonkey/Makefile	Sat Jun  2 00:39:17 2018	(r471335)
+++ branches/2018Q2/www/seamonkey/Makefile	Sat Jun  2 00:46:47 2018	(r471336)
@@ -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

Modified: branches/2018Q2/www/waterfox/Makefile
==============================================================================
--- branches/2018Q2/www/waterfox/Makefile	Sat Jun  2 00:39:17 2018	(r471335)
+++ branches/2018Q2/www/waterfox/Makefile	Sat Jun  2 00:46:47 2018	(r471336)
@@ -54,6 +54,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}/' \