From nobody Wed Apr 13 13:16:06 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 880EA1B10A1A; Wed, 13 Apr 2022 13:16:06 +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 4KdjlV3LzJz3vdq; Wed, 13 Apr 2022 13:16:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649855766; 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=A8EIlivYBXIFB8oEQLrvkWigXoeVLrCogya0Kslyxho=; b=MEqtQ5n5oDcU8m7slPcvr1mOJ0Gn2ApVCN3c78NBj9f/xzLAOohogpOff1lqFFqiW2LZvT XohJTYmDF8ac47yf9El6dUMprA1OKRJ5hw4Dr9BjhJFNAfFJ+iTDd+IUdbe+xSlewEs3Km 7opGDfNZaryvL6jghNnCBUdNq8Uois5vGJs7kBeDFaoEH+v9DAqfn/4mR+zaxyO1BbsovC DcYhPyfmBqwMAUCUn6lR4aLGaXmm4eZYZp5QsliNuj+79XRmG8s+yg8rUpEqhVwD56nugD Ap2Tr9BlR9kOaL+V9ny7EWDHVYj4Tf1Zrhfyqbm0Ams/Zeji8hqmPuFko1cb2w== 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 4F57543F7; Wed, 13 Apr 2022 13:16:06 +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 23DDG6w5075235; Wed, 13 Apr 2022 13:16:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DDG6lA075234; Wed, 13 Apr 2022 13:16:06 GMT (envelope-from git) Date: Wed, 13 Apr 2022 13:16:06 GMT Message-Id: <202204131316.23DDG6lA075234@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: f70859f0746e - main - www/firefox: fix color regressions after 3090fb28e 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: f70859f0746ecf4a5dd63764560d8db752f0d2d5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649855766; 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=A8EIlivYBXIFB8oEQLrvkWigXoeVLrCogya0Kslyxho=; b=vJNgUmkEhqZKqIG/BR1DX4i7AfFMxiSjMCeOn6jsr7DNapc5l6mNowM2quZxhXariCuRYJ +rVGgORoyBQWuafpReIMeaf20IohBgOT79CkvrOPwL6Q8n+pZSd2jwoYiQL0PLYbdidH0+ BoJpbdWIt4cNJiFkm/gDwB+pgFm5FAtAVOBrVRpNzlDaRoe9IAMlC3AoEAAbpVoIP+Io1W HToVtCb9Gd3KXdLuk6+oOEJKn1InHUCpwzUj095ZbqfNtOw6ahcGEFGEpozpy/KN9+E8ZM Gj/17fEllR/uXuwdH/PslTbBg+mRb/lyY/WsKvPLa711N4H705Y+WXppZTwLEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649855766; a=rsa-sha256; cv=none; b=gFWaQI3/wx7FAcL2hpu1goEnIzfa261yP+90fx8uYRwDB2yhMzpi/UbeSEqgnWNSH7AsNj MeI0ynUIr56qTsuMVcm6nlsNAT4pDdWl/Pru7wWH+Agh1Bj0uYtG/oj/V+WGXseYC3g5+X D0+1HAuRe1Aikq+iafs68nKU2/NxNR7XwdoL226UN8IzPo2ErsFUa/hzvK5c+VA3nacxfD tja8jXlDMn4enz7TwvE/0rZ3YGbUulbFsA7qSKzay1tscLeru5IOg6Vhi141wULkcgtLH6 dfTBUCuRv0XI9m6gOlPB1kEAVEtmRHHE3/zvBblMFDmJy+a0aNwlJjh1QkLi5g== 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=f70859f0746ecf4a5dd63764560d8db752f0d2d5 commit f70859f0746ecf4a5dd63764560d8db752f0d2d5 Author: Christoph Moench-Tegeder AuthorDate: 2022-04-13 13:14:07 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2022-04-13 13:14:07 +0000 www/firefox: fix color regressions after 3090fb28e little endian actually does not need endianess fixing, it only made widgets disappear and weird colors. --- www/firefox/Makefile | 2 +- www/firefox/files/patch-bug1716707 | 67 ++++++++++++++++++-------------------- 2 files changed, 33 insertions(+), 36 deletions(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 9304e52ef059..debea780dcfa 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -2,7 +2,7 @@ PORTNAME= firefox DISTVERSION= 99.0.1 -PORTREVISION= 1 +PORTREVISION= 2 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 index 73e01ebb0eb1..33ff73450b73 100644 --- a/www/firefox/files/patch-bug1716707 +++ b/www/firefox/files/patch-bug1716707 @@ -1,30 +1,13 @@ -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 +commit ce7a2f400d4f599c72e32e2635fee7ea94c0848c +Author: Christoph Moench-Tegeder +Date: Wed Apr 13 14:44:46 2022 +0200 -diff --git a/gfx/webrender_bindings/RenderCompositorSWGL.cpp b/gfx/webrender_bindings/RenderCompositorSWGL.cpp + big-endian color fixes, but without breaking little-endian + + as le is what most people actually use + +diff --git gfx/webrender_bindings/RenderCompositorSWGL.cpp gfx/webrender_bindings/RenderCompositorSWGL.cpp +index dbf137c849ee..243a01ff9cf3 100644 --- gfx/webrender_bindings/RenderCompositorSWGL.cpp +++ gfx/webrender_bindings/RenderCompositorSWGL.cpp @@ -7,6 +7,7 @@ @@ -35,15 +18,7 @@ diff --git a/gfx/webrender_bindings/RenderCompositorSWGL.cpp b/gfx/webrender_bin #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 +@@ -235,6 +236,13 @@ void RenderCompositorSWGL::CommitMappedBuffer(bool aDirty) { } mDT->Flush(); @@ -57,3 +32,25 @@ diff --git a/gfx/webrender_bindings/RenderCompositorSWGL.cpp b/gfx/webrender_bin // Done with the DT. Hand it back to the widget and clear out any trace of it. mWidget->EndRemoteDrawingInRegion(mDT, mDirtyRegion); mDirtyRegion.SetEmpty(); +diff --git image/imgFrame.cpp image/imgFrame.cpp +index e58c3dd5b2d4..c1e7e77c362b 100644 +--- image/imgFrame.cpp ++++ image/imgFrame.cpp +@@ -372,6 +372,17 @@ nsresult imgFrame::InitWithDrawable(gfxDrawable* aDrawable, + return NS_ERROR_OUT_OF_MEMORY; + } + ++#if MOZ_BIG_ENDIAN() ++ 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); ++ } ++ } ++#endif ++ + if (!canUseDataSurface) { + // We used an offscreen surface, which is an "optimized" surface from + // imgFrame's perspective.