From nobody Tue Apr 26 21:25:18 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 71C621999D17; Tue, 26 Apr 2022 21:25:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Knvzy2lY1z4ksr; Tue, 26 Apr 2022 21:25:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651008318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ilT1uxdiZ3fpghowZDJMZPLb29sPIHrMRTry0QbXGlU=; b=TJjOaHu6PoGBQFRh7Eu7X2oQwQJGSFE7WSWxxWgDnKDGVcWwBabhADmYQjfcHF5pRMyekt LT4Zoe0yw6tKL2NkNLsMlGmEaFJgS8G8otuCiiuSkvfU8AEvPg6pBLpAeHQKYRBbAHTS5R /LsiCToZUY3ONujQX0jyx7spWVdjVZ8L/JioKYINUKFW/KasOsJF57jpLcNin5Uw1hRcHa yeiO+DB3SYRfgO6JZuM3aYDZQle3oBhFuApUrBV5EpmjIMoDra/QtlPSrDNErgcUk319mv Za0GNZ5RKOKM5rvtfDIK6mG/bk2hDDFGx5TZTAMSz0vsaqgCvomS6V7MDW5EbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3F0BD1720D; Tue, 26 Apr 2022 21:25:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23QLPIou062193; Tue, 26 Apr 2022 21:25:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23QLPIXG062192; Tue, 26 Apr 2022 21:25:18 GMT (envelope-from git) Date: Tue, 26 Apr 2022 21:25:18 GMT Message-Id: <202204262125.23QLPIXG062192@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: c2258034f179 - 2022Q2 - Mk/bsd.gecko.gk: fix sndio logic List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: c2258034f179dc9888d95a1aefad0a2710c6eb88 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651008318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ilT1uxdiZ3fpghowZDJMZPLb29sPIHrMRTry0QbXGlU=; b=buYjoUasg5AhUr9tUtAfJKsq0kTqQgM7T3VwrpjmpMjlN98VNDXUiViBOeKfVzKUMLCNf2 IqKdob3uBIsFTM68F3TtT/7Bwt4x367HVwoL/7URTaXRakaXtoVabiPw3mrmyAtV0Zzz/9 6akg8xlZaavzBiylkmN8RCXyPunQ+KSr/8F0xuWUFeK0/nBfS49UFyacsBZdRolMmhOAv7 5QrqQpRU7DRp2HJbwqtfDO1fEsfCd9XA4JULxTUduz4rDkxuYuHavSDX9kvLQQz7VOSjwW +3POoWb5DauRYn7yd518ywLPuUTKX6MKk/ec2c0H4d5rxjEpSKf6S69O8QA9Qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651008318; a=rsa-sha256; cv=none; b=YAhKF/7ncPLjD4UK1ZiNlBswLspnruJwt/8SXlh9J+YH/YfXKSacJ8Hv5TkuAMiqpFFxqy ZQDJO4cTdvIqwvdMbdwk8vYXR/v6mYkIF79ZlMnFK1S6x8SGhRouM9R3kOQSwz2J3ySrS8 PrcAVYVjHl5PoxpvUFqLNb9tMYFDxGgDkzVE745pxqc01+bxDioNqfUS4CCD9WFYfbVtEN q1hrEY3UbFSVZz4xxRE1mdCVOxFFJ7evgNlzIH5CdtnWKKTfDe70qFj+gbY+0rXlizO7ha L5ztXG/bU58l4Su+Av5FwAUTBSL8TTLZAVbM6f/4Kpy8O5BtlXuAiic+bDiC2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=c2258034f179dc9888d95a1aefad0a2710c6eb88 commit c2258034f179dc9888d95a1aefad0a2710c6eb88 Author: Christoph Moench-Tegeder AuthorDate: 2022-04-26 21:20:50 +0000 Commit: Christoph Moench-Tegeder 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}