svn commit: r430261 - in head: Mk www/firefox

[Jan Beich]

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 <t at tobik.me>

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)