From owner-svn-ports-all@freebsd.org Sat Jun 2 00:46:49 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7BDDBF768D9; Sat, 2 Jun 2018 00:46:49 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 26BF780310; Sat, 2 Jun 2018 00:46:49 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 018B53E6; Sat, 2 Jun 2018 00:46:49 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w520kmBB066845; Sat, 2 Jun 2018 00:46:48 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w520klWE066839; Sat, 2 Jun 2018 00:46:47 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201806020046.w520klWE066839@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 2 Jun 2018 00:46:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r471336 - in branches/2018Q2: mail/thunderbird www/firefox www/firefox-esr www/libxul www/seamonkey www/waterfox X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2: mail/thunderbird www/firefox www/firefox-esr www/libxul www/seamonkey www/waterfox X-SVN-Commit-Revision: 471336 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Jun 2018 00:46:49 -0000 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 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 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}/' \