git: c2258034f179 - 2022Q2 - Mk/bsd.gecko.gk: fix sndio logic
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 26 Apr 2022 21:25:18 UTC
The branch 2022Q2 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=c2258034f179dc9888d95a1aefad0a2710c6eb88 commit c2258034f179dc9888d95a1aefad0a2710c6eb88 Author: Christoph Moench-Tegeder <cmt@FreeBSD.org> AuthorDate: 2022-04-26 21:20:50 +0000 Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org> CommitDate: 2022-04-26 21:25:05 +0000 Mk/bsd.gecko.gk: fix sndio logic my previous attempt at handling both firefox >= 100 and firefox-esr/ thunderbird at 91.x suffered a thinko. (cherry picked from commit 21791843fe99d04a53c4631aa3c917b3ede3a86e) --- Mk/bsd.gecko.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 8473c10a2c1f..4d7df905a8c0 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -270,15 +270,18 @@ 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 +. else +MOZ_OPTIONS+= --enable-sndio . endif . else +. if ${MOZILLA_VER:R:R} >= 100 MOZ_OPTIONS+= --disable-sndio +. endif . endif .if ${PORT_OPTIONS:MDEBUG}