From nobody Tue Apr 26 18:53:26 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 13C03199602F; Tue, 26 Apr 2022 18:53:27 +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 4Knrck71PFz3mRV; Tue, 26 Apr 2022 18:53:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650999207; 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=3XTSxX1ywPYgh9EVqEBDrpnuilAdLMDhsPqJzmS+A3I=; b=oWzeVaFI+JV5goHV78Cccx1Wt9j3UOIzU0oCYomvD7drQac9hNa5DKHq36bnuAzqKAbEvW 6iKTszFHJJ2zBPnKxl7XjhhggqxuDomZmVOsrwdXjEskZ6JBBERh0nRJYf36tsvCCZCcSn pxVJMjVDQD2Z8j1iBRYEObmsaPL2K8eypvNDg9JDDFCn2WJMpipP9OfvoaLklfy3O0PsfU EysJhCQF6HkHfHjbi8CWOco54n1bhmeB0jVVgkz3mr2qkJQlQ2u2ckzPRg2TP28yXrTTfT aiikxnDLHucMrkcYJlxqkLYMIzbwkuHrfaySeUvntTK4O06NDewei/tezXUS6g== 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 D0F0715097; Tue, 26 Apr 2022 18:53:26 +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 23QIrQuC056479; Tue, 26 Apr 2022 18:53:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23QIrQPA056478; Tue, 26 Apr 2022 18:53:26 GMT (envelope-from git) Date: Tue, 26 Apr 2022 18:53:26 GMT Message-Id: <202204261853.23QIrQPA056478@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: dc17c19f15da - 2022Q2 - www/firefox: fix build with sndio 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: dc17c19f15dab57c22d2967a525573d4b8020930 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650999207; 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=3XTSxX1ywPYgh9EVqEBDrpnuilAdLMDhsPqJzmS+A3I=; b=iIOW3Y0HD3bEISan6HDAYKjElF+3t8Wgn6GR8GaTvCn9qk8kY/2eMz7Iak2jBT6aZULE5W R/E8RT/wGIhxqkXyMdTp0kaXmC0i5U/avxSPeJFV1vjJJa4rBSGOmHNNSxofqEQNhGmjSR 9MjQfwSS8DNgeK+HR04POnzcRpUXJJuEVce5wqC4ARQqx031KZiJid6eAWG1kwbqB42ZRU hX+P7aXIjfOgEnUrAVntXID8W7lLH/drxrvezBZgjJM2L6ODGxPR+ezuuW1ewTZ3oqKsss +Mz72Oirq8TXdS5as3my+9RNXUPTJYczMLqXY/2TURC5Eeek7e1RgU8MA69HmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650999207; a=rsa-sha256; cv=none; b=AuO5nIWsw8z0ywhIUjoi4MeyL6VqJ4T/QIPCIo3IywUWL+7LT8+3IvY253ySZtbGKsY8Q1 RthGiAQBAo7o9MygyCcLWwgghBBXOSWSMV1iTrykbrVGvklVirh8x+zf+zaatszQRhyASx fyUu9JCUPkEZPquZjJ1paivarDyxc0Mj4Uzct+o506OiPSLeOY3bay1H2gIL2y/jUi6Ds0 lo/Iy5rtby4qZ3CXToEHwg/89sal0WtGulVxknZDeHwTUYVXNeZjjYA9OpfhpgbCRGbHKr IXexZYYOUEn19HHSbL+iqWyO59G+jLGF4AcultTa+YX2ufrj8QoiBQ1WUc5wNg== 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=dc17c19f15dab57c22d2967a525573d4b8020930 commit dc17c19f15dab57c22d2967a525573d4b8020930 Author: Christoph Moench-Tegeder AuthorDate: 2022-04-26 18:49:11 +0000 Commit: Christoph Moench-Tegeder 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