cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r471331 r471334

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

Approved by:	ports-secteam blanket
This commit is contained in:
Jan Beich 2018-06-02 00:46:47 +00:00
parent b1d8cb712a
commit 17a0055e4c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2018Q2/; revision=471336
6 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/thunderbird/Makefile
View File

@ -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

3
www/firefox-esr/Makefile
View File

@ -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}|' \

2
www/firefox/Makefile.options
View File

@ -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)

3
www/libxul/Makefile
View File

@ -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

4
www/seamonkey/Makefile
View File

@ -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

3
www/waterfox/Makefile
View File

@ -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}/' \