From owner-svn-ports-all@freebsd.org Sun Jan 1 16:25:00 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B0089C97F38; Sun, 1 Jan 2017 16:25:00 +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 mx1.freebsd.org (Postfix) with ESMTPS id 675181D6B; Sun, 1 Jan 2017 16:25:00 +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 v01GOxts075158; Sun, 1 Jan 2017 16:24:59 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v01GOxim075156; Sun, 1 Jan 2017 16:24:59 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701011624.v01GOxim075156@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 1 Jan 2017 16:24:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r430261 - in head: Mk www/firefox X-SVN-Group: ports-head 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.23 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: Sun, 01 Jan 2017 16:25:00 -0000 Author: jbeich Date: Sun Jan 1 16:24:59 2017 New Revision: 430261 URL: https://svnweb.freebsd.org/changeset/ports/430261 Log: www/firefox: add SNDIO option PR: 212028 Submitted by: Tobias Kortkamp Modified: head/Mk/bsd.gecko.mk (contents, props changed) head/www/firefox/Makefile.options (contents, props changed) Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Sun Jan 1 15:58:22 2017 (r430260) +++ head/Mk/bsd.gecko.mk Sun Jan 1 16:24:59 2017 (r430261) @@ -372,6 +372,19 @@ MOZ_OPTIONS+= --enable-pulseaudio MOZ_OPTIONS+= --disable-pulseaudio .endif +.if ${PORT_OPTIONS:MSNDIO} +LIB_DEPENDS+= libsndio.so:audio/sndio +post-patch-SNDIO-on: + @${REINPLACE_CMD} -e 's|OpenBSD|${OPSYS}|g' \ + ${MOZSRC}/media/libcubeb/src/moz.build \ + ${MOZSRC}/media/libcubeb/tests/moz.build \ + ${MOZSRC}/toolkit/library/moz.build + @${REINPLACE_CMD} -e 's|OS==\"openbsd\"|OS==\"${OPSYS:tl}\"|g' \ + ${MOZSRC}/media/webrtc/trunk/webrtc/build/common.gypi + @${ECHO} "OS_LIBS += ['sndio']" >> \ + ${MOZSRC}/media/webrtc/signaling/test/common.build +.endif + .if ${PORT_OPTIONS:MRUST} BUILD_DEPENDS+= rustc:${RUST_PORT} RUST_PORT?= lang/rust Modified: head/www/firefox/Makefile.options ============================================================================== --- head/www/firefox/Makefile.options Sun Jan 1 15:58:22 2017 (r430260) +++ head/www/firefox/Makefile.options Sun Jan 1 16:24:59 2017 (r430261) @@ -5,11 +5,14 @@ OPTIONS_DEFINE+= BUNDLED_CAIRO CANBERRA OPTIMIZED_CFLAGS PGO PROFILE TEST OPTIONS_DEFAULT+= DBUS DTRACE FFMPEG OPTIMIZED_CFLAGS \ - ${OPTIONS_MULTI_AUDIO} \ + ALSA PULSEAUDIO \ ${MACHINE_CPU:Msoftfp:C/.+/INTEGER_SAMPLES/} OPTIONS_MULTI+= AUDIO -OPTIONS_MULTI_AUDIO= ALSA PULSEAUDIO +OPTIONS_MULTI_AUDIO= ALSA PULSEAUDIO SNDIO + +# 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)