From nobody Tue Apr 12 18:17:20 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 B195D1AC9DE2; Tue, 12 Apr 2022 18:17:20 +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 4KdDTX4StLz3Fqh; Tue, 12 Apr 2022 18:17:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649787440; 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=KW+QDERWhZ2cHSTGI9QQlDQjFIIPYK2VAEemNI5Jr9c=; b=i+nGlt2I2Ld2ZaGzFQ+xba+fbjjs6AmN/LApbvLH8K+kAYN2zc3cUgrWRqJo7tG5sj+cWQ rve6LEATXdwNLEcL79vt+4+IprhQ1Zh+SjCWRGLZicXL23GZzZ8kp2RcphYJ3LXnfVKSlQ j8XFS1FptsQZCmX/MCGcDcjCdxvgSM4p4SUt2vCCZj9aCux3c/mezJdjUB0mKwTUs4j+nz /QDFRHwTWMjfQ6hbYTab3I1mJ1S3zCr/28NhFdDC/VyA+5lFbHbwqZ9EKtgLPcM7VdIc6j KoaAbiGpHj02mIUkCJk6od7Y9YganOKseBYMY/GKCtT5+NhJmjdw0CVdqaohjg== 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 796F01C564; Tue, 12 Apr 2022 18:17:20 +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 23CIHKd4037820; Tue, 12 Apr 2022 18:17:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23CIHKJ8037819; Tue, 12 Apr 2022 18:17:20 GMT (envelope-from git) Date: Tue, 12 Apr 2022 18:17:20 GMT Message-Id: <202204121817.23CIHKJ8037819@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 3090fb28eeee - main - www/firefox: fix some of color issues on big-endian 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3090fb28eeee869dc7434dfa2a453b6698ec7f43 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649787440; 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=KW+QDERWhZ2cHSTGI9QQlDQjFIIPYK2VAEemNI5Jr9c=; b=SpRyrnIHo+4/v2MIh1IE7YkNG95Ka3SuQ5AgGazlpiyf7gbw5kNxZLEaYTysCB2fBQRzBc NCM4uyizyeR5CQ2TFVA259v8lsD8SGSF2P3Q4xPae5zASKmbDDbVEZCYf5PwWV/p8zi3Cl Zo04M/GKZohBYGJvX8CbgIzQ+gbZ/TLJUzmVx8mir/plxUrh4mKW5d+LQt0rFE7C9G8UeL wK9nH1Y5GAiaPAvtPBI85HrhEzA1PZ1rcqRH/2CgLfR2/K6pZbAvT/f+NsJj2QFkut3xsl N3+/DP0c5c3dxqQB1PzvuZPj1+3jik0deVw/hacQ0wG/I2qrvb8EdUQwYgNrfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649787440; a=rsa-sha256; cv=none; b=jwX3WWEaa8/AWAV7FgkcV6Yt0q9nlw+hiWVjZDhPOJj26dPOmhrusHxa5PZYRcP8GNSzdx XJhzvQxyQP/MY6kq53ZNOGw/0uVFLkOO3SRZl+hDE9mAyj7VWxPtpkNDjp78dg4stQkRRx SYhx208ogs1GkjnBkAV/11Jk1c/+OIPBUGTls8z6l+I4gvkV02czB/5ovZtkBWn+T2P9kn 7YE32QbQLqf1tgkOCMnTmC9HOdhyNLBjDFIsSxYb1waba4VqT9fdWfTwMBY9XXO77XDi6F EzPFiHusK8tL+Eih+EwBeQoHd2hNgHrah1ccM/RiXa/jOpXPt3HLKNEQ5rco+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=3090fb28eeee869dc7434dfa2a453b6698ec7f43 commit 3090fb28eeee869dc7434dfa2a453b6698ec7f43 Author: Piotr Kubaj AuthorDate: 2022-04-12 18:06:17 +0000 Commit: Piotr Kubaj CommitDate: 2022-04-12 18:06:17 +0000 www/firefox: fix some of color issues on big-endian Upstream issue at https://bugzilla.mozilla.org/show_bug.cgi?id=1716707. --- www/firefox/Makefile | 1 + www/firefox/files/patch-bug1716707 | 59 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index ab713a16dfa7..9304e52ef059 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -2,6 +2,7 @@ PORTNAME= firefox DISTVERSION= 99.0.1 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ diff --git a/www/firefox/files/patch-bug1716707 b/www/firefox/files/patch-bug1716707 new file mode 100644 index 000000000000..73e01ebb0eb1 --- /dev/null +++ b/www/firefox/files/patch-bug1716707 @@ -0,0 +1,59 @@ +diff --git a/image/imgFrame.cpp b/image/imgFrame.cpp +--- image/imgFrame.cpp ++++ image/imgFrame.cpp +@@ -372,6 +372,15 @@ nsresult imgFrame::InitWithDrawable(gfxD + return NS_ERROR_OUT_OF_MEMORY; + } + ++ if (aBackend == gfx::BackendType::SKIA && canUseDataSurface) { ++ // SKIA is lying about what format it returns on big endian ++ for (int ii=0; ii < mRawSurface->GetSize().Height()*mRawSurface->Stride() / 4; ++ii) { ++ uint32_t *vals = (uint32_t*)(mRawSurface->GetData()); ++ uint32_t val = ((vals[ii] << 8) & 0xFF00FF00 ) | ((vals[ii] >> 8) & 0xFF00FF ); ++ vals[ii] = (val << 16) | (val >> 16); ++ } ++ } ++ + if (!canUseDataSurface) { + // We used an offscreen surface, which is an "optimized" surface from + // imgFrame's perspective. +# HG changeset patch +# User M. Sirringhaus +# Date 1645518286 -3600 +# Tue Feb 22 09:24:46 2022 +0100 +# Node ID 494640792b4677f6462e95b90a54a4e22aeb738b +# Parent 81832d035e101471dcf52dd91de287268add7a91 + +diff --git a/gfx/webrender_bindings/RenderCompositorSWGL.cpp b/gfx/webrender_bindings/RenderCompositorSWGL.cpp +--- gfx/webrender_bindings/RenderCompositorSWGL.cpp ++++ gfx/webrender_bindings/RenderCompositorSWGL.cpp +@@ -7,6 +7,7 @@ + #include "RenderCompositorSWGL.h" + + #include "mozilla/gfx/Logging.h" ++#include "mozilla/gfx/Swizzle.h" + #include "mozilla/widget/CompositorWidget.h" + + #ifdef MOZ_WIDGET_GTK +@@ -134,6 +135,7 @@ bool RenderCompositorSWGL::AllocateMappe + mMappedData = map.mData; + mMappedStride = map.mStride; + } ++ + MOZ_ASSERT(mMappedData != nullptr && mMappedStride > 0); + wr_swgl_init_default_framebuffer(mContext, bounds.x, bounds.y, bounds.width, + bounds.height, mMappedStride, mMappedData); +@@ -235,6 +237,13 @@ void RenderCompositorSWGL::CommitMappedB + } + mDT->Flush(); + ++#if MOZ_BIG_ENDIAN() ++ // One swizzle to rule them all. ++ gfx::SwizzleData(mMappedData, mMappedStride, gfx::SurfaceFormat::B8G8R8A8, ++ mMappedData, mMappedStride, gfx::SurfaceFormat::A8R8G8B8, ++ mDT->GetSize()); ++#endif ++ + // Done with the DT. Hand it back to the widget and clear out any trace of it. + mWidget->EndRemoteDrawingInRegion(mDT, mDirtyRegion); + mDirtyRegion.SetEmpty();