git: 48a481f83ecb - main - www/firefox: fix build with sndio
Date: Tue, 26 Apr 2022 18:51:39 UTC
The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=48a481f83ecbb669a22c2c9f9dc3712bf5a7b71c commit 48a481f83ecbb669a22c2c9f9dc3712bf5a7b71c Author: Christoph Moench-Tegeder <cmt@FreeBSD.org> AuthorDate: 2022-04-26 18:49:11 +0000 Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org> CommitDate: 2022-04-26 18:49:11 +0000 www/firefox: fix build with sndio upstream sndio handling was fixed for non-OpenBSD systems: https://bugzilla.mozilla.org/show_bug.cgi?id=1351378 so our own "fixing" actually broke build. PR: 263587 Reported by: Robert Cina, jkim@ --- Mk/bsd.gecko.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index eef9db747685..cee597e4e465 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -270,10 +270,15 @@ MOZ_OPTIONS+= --disable-pulseaudio . if ${PORT_OPTIONS:MSNDIO} BUILD_DEPENDS+= ${LOCALBASE}/include/sndio.h:audio/sndio +MOZ_OPTIONS+= --enable-sndio +. if ${MOZILLA_VER:R:R} < 100 post-patch-SNDIO-on: @${REINPLACE_CMD} -e 's|OpenBSD|${OPSYS}|g' \ -e '/DISABLE_LIBSNDIO_DLOPEN/d' \ ${MOZSRC}/media/libcubeb/src/moz.build +. endif +. else +MOZ_OPTIONS+= --disable-sndio . endif . if ${PORT_OPTIONS:MDEBUG}