From nobody Mon Jul 25 21:59:38 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 4LsDV25rT5z4WvFp; Mon, 25 Jul 2022 21:59:38 +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 4LsDV25K2Fz3wTS; Mon, 25 Jul 2022 21:59:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658786378; 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=VDQwrIPtMFe2tAoc9ArBqoi6Eh2U0VlFJ1eSBRWGLO4=; b=hGKMr22C2W1t+cb/1vFXl9n7c4e73wO7xOhA3CxbARBhD+7RB8pTgrPvsLcpspttModdq8 0ol2fLjjAymEszqbcbk7ZEPJNe1Azea+Lu7yRZk3byj4jys6OkU2KOeRYA/1CPIurH2dJQ so6jOUab7XVmPsDDvQyojczOfAqNi8K2YBr4zRuUeKV8tNScCsdj6F5US+E26zeJIrjPan +DNHdFP4KgYbCH71ZfVVZv5iV0PFgJkXcdzcISd0q73KUbsE6ochgxDxMQZbWiCwZoeIHw HbB3yjmv3ZbGwjCG6ICqVVDfE8M9gbyDslxwXplkOqKL/+5SnDODIutRJZZmFw== 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 4LsDV24M6bz1CgJ; Mon, 25 Jul 2022 21:59:38 +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 26PLxcIY071787; Mon, 25 Jul 2022 21:59:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26PLxcFd071786; Mon, 25 Jul 2022 21:59:38 GMT (envelope-from git) Date: Mon, 25 Jul 2022 21:59:38 GMT Message-Id: <202207252159.26PLxcFd071786@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: 5b6b698c8da2 - 2022Q3 - www/firefox: uplift patch for bmo#1779425 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/2022Q3 X-Git-Reftype: branch X-Git-Commit: 5b6b698c8da2227b6f274d5f9dc1a560ad3fda5b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658786378; 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=VDQwrIPtMFe2tAoc9ArBqoi6Eh2U0VlFJ1eSBRWGLO4=; b=OBi0nmSWE5tMWiijMeWsniVeAwpnbkuawS2bCFoTmBWveCAeKv53u11M3ha6Yrpts/29jj PKcvAiCC/HvoDzS/pAImcsucV/CVBMQXX+gsrLDwmr8yHatyXTqkgjE/J5Yruotfi+Mor/ yJE5crWq1rD/nIq0oh6K2oze0EH/ojxAMH6YBjfQ6rnxQ5ha0JDHOp7+/PfFEgRekCmkkc h5U+sqvtn5BLEy37hXNcBRJvS5MY83ha6OcDF8hwx3U510FVYuMgZxuzomgsijrrcUWyVM 686sJd0hFjNt4QTCIzrIfsnwI5+mfn5sH2cZ9ANCb9x4NovwDeL06o2UNzBCCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658786378; a=rsa-sha256; cv=none; b=krNzPEceVb7zNJqnFRbpMb6jg/NGQSJdzWXtY9nJGgrJeN4eY/3GcksYt2s6pVfkp+oNT8 AcawgPseCDsZRMQ9K6grOgKB7i1W09WKIAz3ea7T20ILjcOUjlRW8GXLflTTNWVYY4eqvM f5shtSmuXkEm4OvDm3RNwZCB6mI0KK1L8duwrrVOSpQ9E/VDq4KybnofmOoyK5oryF1yv3 jgE12Kc9Y8EXvyBVEEEPHw+oX0Nv3R8xwgKh8i3Q7zZH2/rqJ8yv/X3CIXckPyzxQLWCuS VAjDSgQynm5nF7kI/yLcVqJxArwX46zBWjnw/nluMRFQW7FWWH6thctoXkhzuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=5b6b698c8da2227b6f274d5f9dc1a560ad3fda5b commit 5b6b698c8da2227b6f274d5f9dc1a560ad3fda5b Author: Christoph Moench-Tegeder AuthorDate: 2022-07-25 21:55:37 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2022-07-25 21:59:27 +0000 www/firefox: uplift patch for bmo#1779425 at least with some video cards (I only have one) but not with software rendering, tabs supposed to display WebGL things may crash instead. With this patch I can at least watch the cube spin and the fishys swim, fwiw. (cherry picked from commit e9cf87dba5ea6097da725e6184c17462dc1ee75d) --- www/firefox/Makefile | 1 + www/firefox/files/patch-bug1779425 | 48 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index e996d41ba97c..9b2efbe2fb8a 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -2,6 +2,7 @@ PORTNAME= firefox DISTVERSION= 103.0 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \ diff --git a/www/firefox/files/patch-bug1779425 b/www/firefox/files/patch-bug1779425 new file mode 100644 index 000000000000..9ab5f99d3b6d --- /dev/null +++ b/www/firefox/files/patch-bug1779425 @@ -0,0 +1,48 @@ +commit 9583d02e454318568191e5c31c51c34fd1332182 +Author: Robert Mader +Date: Tue Jul 19 21:52:04 2022 +0000 + + Bug 1779425 - Check for GbmDevice before using it, r=stransky,jgilbert + + In some non-standard configurations we unexpectedly end up in this paths + without a GBM device - one example being the GPU process. Fail cleanly + instead of crashing in those cases, triggering fallback paths. + + Context: in the past DMABuf usage was tightly coupled to GBM. Since the + introduction of the surfaceless and device EGL platforms that is not + longer the case, thus we can't make checks like `IsDMABufWebGLEnabled()` + depend on the presence of a GBM device. + + Optimally all affected cases get fixed eventually. Until then and also + for future cases it makes sense to fail softly. + + Differential Revision: https://phabricator.services.mozilla.com/D152173 + +diff --git widget/gtk/DMABufSurface.cpp widget/gtk/DMABufSurface.cpp +index 92c8e75218f8..7fddb32c7cda 100644 +--- widget/gtk/DMABufSurface.cpp ++++ widget/gtk/DMABufSurface.cpp +@@ -382,6 +382,11 @@ bool DMABufSurfaceRGBA::Create(int aWidth, int aHeight, + LOGDMABUF(("DMABufSurfaceRGBA::Create() UID %d size %d x %d\n", mUID, mWidth, + mHeight)); + ++ if (!GetDMABufDevice()->GetGbmDevice()) { ++ LOGDMABUF((" Missing GbmDevice!")); ++ return false; ++ } ++ + mGmbFormat = GetDMABufDevice()->GetGbmFormat(mSurfaceFlags & DMABUF_ALPHA); + if (!mGmbFormat) { + // Requested DRM format is not supported. +@@ -1025,6 +1030,11 @@ bool DMABufSurfaceYUV::CreateYUVPlane(int aPlane, int aWidth, int aHeight, + LOGDMABUF(("DMABufSurfaceYUV::CreateYUVPlane() UID %d size %d x %d", mUID, + aWidth, aHeight)); + ++ if (!GetDMABufDevice()->GetGbmDevice()) { ++ LOGDMABUF((" Missing GbmDevice!")); ++ return false; ++ } ++ + mWidth[aPlane] = aWidth; + mHeight[aPlane] = aHeight; + mDrmFormats[aPlane] = aDrmFormat;