Date: Sat, 2 Jun 2018 00:33:29 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471331 - in head: mail/thunderbird www/firefox www/firefox-esr www/libxul www/palemoon www/seamonkey www/waterfox Message-ID: <201806020033.w520XTs0060675@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sat Jun 2 00:33:29 2018 New Revision: 471331 URL: https://svnweb.freebsd.org/changeset/ports/471331 Log: www/firefox: audio_device isn't used by WebRTC after r468751 Modified: head/mail/thunderbird/Makefile (contents, props changed) head/www/firefox-esr/Makefile (contents, props changed) head/www/firefox/Makefile.options (contents, props changed) head/www/libxul/Makefile (contents, props changed) head/www/palemoon/Makefile (contents, props changed) head/www/seamonkey/Makefile (contents, props changed) head/www/waterfox/Makefile (contents, props changed) Modified: head/mail/thunderbird/Makefile ============================================================================== --- head/mail/thunderbird/Makefile Sat Jun 2 00:33:13 2018 (r471330) +++ head/mail/thunderbird/Makefile Sat Jun 2 00:33:29 2018 (r471331) @@ -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: head/www/firefox-esr/Makefile ============================================================================== --- head/www/firefox-esr/Makefile Sat Jun 2 00:33:13 2018 (r471330) +++ head/www/firefox-esr/Makefile Sat Jun 2 00:33:29 2018 (r471331) @@ -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: head/www/firefox/Makefile.options ============================================================================== --- head/www/firefox/Makefile.options Sat Jun 2 00:33:13 2018 (r471330) +++ head/www/firefox/Makefile.options Sat Jun 2 00:33:29 2018 (r471331) @@ -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: head/www/libxul/Makefile ============================================================================== --- head/www/libxul/Makefile Sat Jun 2 00:33:13 2018 (r471330) +++ head/www/libxul/Makefile Sat Jun 2 00:33:29 2018 (r471331) @@ -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: head/www/palemoon/Makefile ============================================================================== --- head/www/palemoon/Makefile Sat Jun 2 00:33:13 2018 (r471330) +++ head/www/palemoon/Makefile Sat Jun 2 00:33:29 2018 (r471331) @@ -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 Modified: head/www/seamonkey/Makefile ============================================================================== --- head/www/seamonkey/Makefile Sat Jun 2 00:33:13 2018 (r471330) +++ head/www/seamonkey/Makefile Sat Jun 2 00:33:29 2018 (r471331) @@ -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: head/www/waterfox/Makefile ============================================================================== --- head/www/waterfox/Makefile Sat Jun 2 00:33:13 2018 (r471330) +++ head/www/waterfox/Makefile Sat Jun 2 00:33:29 2018 (r471331) @@ -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}/' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806020033.w520XTs0060675>