From nobody Tue Apr 26 21:22:32 2022 X-Original-To: dev-commits-ports-main@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 581C51998934; Tue, 26 Apr 2022 21:22:32 +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 4Knvwm1tX0z4kYk; Tue, 26 Apr 2022 21:22:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651008152; 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=B0YqfIQUNoaf9CT7fIEqT0nc9rFxRkIgUsbsnLdzerw=; b=q7rl//MOmXUwnkisJcCqcFmjXaQgYfY788IecOopKB3VdJlL1ieWRTg0yUiFPHwEOCqY5q +VqnyIJ5sr/fKUfApdzQmMZvoRL3NpyP0S+7MOn6NagiKxaH/Zo/7Slb7upnbCDtwv0gg4 bl7zefrAB8/9Ncxvb1a5x27HLBuqENDIN0Cq61gxtFN6D7rDdgOKgJ+Z8zd4lT/sKH0ez9 mANUlqLNHDxO5J9fH1jo1U7jeM0R0w07Xq1JZdPPtM5aNp6N/Wlbtndl9QThS2yX9OdSsJ p2GvtEg38hIXxT99wrRf3cnhZjI2GRVKQM4+IkgPL5kutUX9I+zFvzQYhvDPLA== 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 205EF17061; Tue, 26 Apr 2022 21:22:32 +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 23QLMWk3061773; Tue, 26 Apr 2022 21:22:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23QLMWVG061772; Tue, 26 Apr 2022 21:22:32 GMT (envelope-from git) Date: Tue, 26 Apr 2022 21:22:32 GMT Message-Id: <202204262122.23QLMWVG061772@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 21791843fe99 - main - Mk/bsd.gecko.gk: fix sndio logic List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 21791843fe99d04a53c4631aa3c917b3ede3a86e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651008152; 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=B0YqfIQUNoaf9CT7fIEqT0nc9rFxRkIgUsbsnLdzerw=; b=xQepFuwfwWgyn9XfWE5xLNRy68KCKzBNqujH1yj7SDWZBXjJ7QwGZ2hZnKzzw+SpZAdq+m bwqabOm3yWp1wBTTf8WTlZoudSaW3xerMO0d2NiJ6sPpoPKxxEaheahI4XCsiJPlQUtlmn 0MT0rjXlnnIgYNOzHwFOzWn5eSBOhc+fmTC1hFunQh5DJt07tDbt8yNCGxoVpD2sd5+Z+P XOGiBBawEfMXcN0LHPnIv0tqIGIK/WCFBKGSTS4riLJ8WypBFZ/FkvVRt3Bamj25uW2xze rN2OTBBpp5E/8vDSytLroAKLe7C9/JswTbD2gfkPeyHDoDoOK/j6feYUXXwSZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651008152; a=rsa-sha256; cv=none; b=oUo1FFhBBMGo/cwx3zgnW9ki2W9NN9p4+2SvpZizw4qDatjdrbVrvfnKOnYUJJS3si75bB 1tCHiERIE7FeUQQbMFmYI2nyfB9H84eeEZJYN3FTfbcWKRfhI/ILd+lrfZWfoLcpAyQIfl j9XGLndUy82iI5l+owP+lYtIbkXpG6vQ2vFJhkxlp6ZcXsnWj9nd5ez5yx0LzZibAc6/pa HFISlYuHu2lJqWIgBP/REvvP8TvnbamP3zciHbhrRqs2Grt4RNqghHrWg7Asc6OGLQLrtq eQg7dqtH0i9iCxsxeUKXUiu/QmmJe41p1escdfwMgoD/zrZPvrLRqmkt1PdL9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=21791843fe99d04a53c4631aa3c917b3ede3a86e commit 21791843fe99d04a53c4631aa3c917b3ede3a86e Author: Christoph Moench-Tegeder AuthorDate: 2022-04-26 21:20:50 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2022-04-26 21:20:50 +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. --- 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 cee597e4e465..af3e496a05c5 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}