From nobody Tue Apr 26 18:51:39 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 2D5E01994DDA; Tue, 26 Apr 2022 18:51:40 +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 4KnrZh0pbzz3lX3; Tue, 26 Apr 2022 18:51:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650999100; 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=dW19yw+ayqfb4DwWH8s7Yca08nox42XV2FA2bRrpP1o=; b=HegQu2mYqQGLcoPvg6pOMG7Sp5cKvGFY4AOP34KGBc7/Me76dbbWMvZS/KChJJXf1KeqJB szAw9SgzGKlGFjTWmYcBlv5ssR6pZQIeUCANQJZ3mhTCfrCr7ed7DF2xCBOovRaIcJRURJ 4WFtfVEX2aHPDn0nm+CJTPnXOct2AZ2e/J55EKa7bzubansQxPOT5afmwKZtnKKvUruoEN yHR5TTBbseOaJR9zjqhPy+DhyxXy2Gj99OweIOt/eQ0dfUV+4ET2C2ql0GfF6gEltJ3pC4 3V/CRouhwBrPPmcYFXDp5KlEEr9kBwwv/BijScqoFn7yGFVlabaJ8BdSwLix3A== 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 EFB0214C7F; Tue, 26 Apr 2022 18:51:39 +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 23QIpdiQ055151; Tue, 26 Apr 2022 18:51:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23QIpdlL055150; Tue, 26 Apr 2022 18:51:39 GMT (envelope-from git) Date: Tue, 26 Apr 2022 18:51:39 GMT Message-Id: <202204261851.23QIpdlL055150@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: 48a481f83ecb - main - 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/main X-Git-Reftype: branch X-Git-Commit: 48a481f83ecbb669a22c2c9f9dc3712bf5a7b71c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650999100; 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=dW19yw+ayqfb4DwWH8s7Yca08nox42XV2FA2bRrpP1o=; b=kOTLCWZxFm4Wa1xh4jlOKdjleUDjqgg0uy2Zzo4b1VXLzxg44pQE/RtdsAxn2UFIWXCB1b bUJJmoQ1grANGrzy8Bc4aClDAsCHo+jZ1hRRhukj5GZkoF7Hko6XmE2eZEP7MP8wuLghoG I5RU3SzBzkIX++tIPSsENXHgpIUURfCeiC/uv1b1M0OJwH3lzTMQv2RQ+aTvRD170BdQ+5 WpGlwELNUyf5bL2Jp9lMUcoTER6UAfnvpee/gmrTA6bYZcRj2ndElqmGjv1+r2ngOZyfcV WzxOZd9eHGzadBlFACoKc5IbkCo7GyI/lGOtupGFDGrca5dVpBeiN5+2BM2rNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650999100; a=rsa-sha256; cv=none; b=wIMq61QS+tJ8gaYzecAttMt6uK8oCabIoJ/SXY7IDShJ7rwr3nV7h4iaefROfatz5IIeCz WuDGzKrktviYK+Ukbfgzs/mGygqdFLL1Bd+mPDg5HTmejL/f7GfivATdi6mJgogf8kQhBD mLsOi7ytoH/j4TIFyXFZ7CKbISeiCo5QmqBt0shZLL+TjMy8c1RoW78e53GMPTHoWY8CTs ElLComcnjU1BFvvR+W9g7/0/fnihvnB1Dh/a3aRf89HOPQcR19tajEjkBY6Cq11L+69K5w 8TWYnf44Z8mKSuLxdP8WQI90lDzXff17/8rohTeSb74Y9OeRIPORzFQQDuDVNA== 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=48a481f83ecbb669a22c2c9f9dc3712bf5a7b71c commit 48a481f83ecbb669a22c2c9f9dc3712bf5a7b71c Author: Christoph Moench-Tegeder AuthorDate: 2022-04-26 18:49:11 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2022-04-26 18:49:11 +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@ --- Mk/bsd.gecko.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index eef9db747685..cee597e4e465 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -270,10 +270,15 @@ 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 +. else +MOZ_OPTIONS+= --disable-sndio . endif . if ${PORT_OPTIONS:MDEBUG}