Date: Tue, 26 Apr 2022 18:53:26 GMT From: Christoph Moench-Tegeder <cmt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: dc17c19f15da - 2022Q2 - www/firefox: fix build with sndio Message-ID: <202204261853.23QIrQPA056478@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2022Q2 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=dc17c19f15dab57c22d2967a525573d4b8020930 commit dc17c19f15dab57c22d2967a525573d4b8020930 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:53:05 +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@ (cherry picked from commit 48a481f83ecbb669a22c2c9f9dc3712bf5a7b71c) --- Mk/bsd.gecko.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index acd930def68c..8473c10a2c1f 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -270,11 +270,16 @@ 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 +. endif +. else +MOZ_OPTIONS+= --disable-sndio +. endif .if ${PORT_OPTIONS:MDEBUG} MOZ_OPTIONS+= --enable-debug --disable-release
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202204261853.23QIrQPA056478>