From nobody Mon Jul 08 19:25:56 2024 X-Original-To: dev-commits-ports-main@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 4WHvHN31T5z5QS4p; Mon, 08 Jul 2024 19:26:08 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WHvHN2Thnz4bdZ; Mon, 8 Jul 2024 19:26:08 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720466768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Yg1EI8gwl5J/3odX7TNqSFw8C6HgSEagiIutpfDmBnA=; b=eFkY2F1+IsvB6jxXBxgjTMTyKVl6QtEBVLLzaoVE5GFyn+h2P/MQAlK45Jxd3Npa375M47 E09i6KI9OfzxwKOLnZpqmhoZbp3k/5/PJJR/Lzq43KJReYU6hTfPmzC/73jDI+ljXpEU1G QdryEX9DIxVdzg3Daa4SRK/ONTEenZ/QJtOO8GFxVkWqghKgXTbXDUROeC/Tqb6lYbycBc AVpEUzThOhYem7o59ru7yKMar9ncp2PY5g0iRJSA866aK/OXNpVSPWMyAM5u3IZQykV6Ix LooNNVLyCfD9XgxXCDtjZlXRAzb7pI+xKwr727VBk/DODy7r2htif10CuEK+Kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720466768; a=rsa-sha256; cv=none; b=J3I98Xz2YS2L4xvq/W4qd/Qfc7qcIGofDiJmF8Bk/IyOU67GO1FmvSPuTpPjvg6A9ITuAQ Pah+Gj3lgnI+lXc9YAcDN20SRayBQ4DEVLADlELZy4JMIclSHLXw2W5JvFmWX4CgnKocry UNOFJpQAOr+n9qz1MKZrAOx/1/6B02h6LmZsnHWJXlCpEqKBt0hETI2gN4P0WLz3/wQZBx eWAPGwlLImoUNpp/hASXunNQYvvHyZcDyQ9AFOBtARAcZIK1XRVvxxUxmIhin8PstEaskZ zPvpeiOLhAbEfCTH7PK7oWG8t8TPvlQQT/mPoMhhSjhcR38/sLyLyxYH8acVTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720466768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Yg1EI8gwl5J/3odX7TNqSFw8C6HgSEagiIutpfDmBnA=; b=o8hAUPIJbt2JFI5QslyifMWK8pIDxkSaMemEJt3B7Xgc1eNNJ0Hm5Xhd5kI7/9xF9Ok//R ZgrxLPi8SBhAhMwyQqcZvrZGm2SzR0l4LuCAGsq88exF62N2fHX7YxdhTqoJttVjxKMAGe eObijLuqLBw3D9AqUax+oU1lNp8jURhReXDxSul3eYDzWfORAg+MH1sHq+2ZCewqqL6Ls0 lx4RSC7FpuM9Aa+gv3QhTNv7nMsTUsAb03K5UPNT/Yv61KZE/dkHvG1UO1L9dE1rHslcrq smmcl0jB0f4YtKbSBo6lLHdrecGvccRuC9xefnsZa/Q0mxq05ZOk6kkPo8Ktqg== Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com [209.85.160.177]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4WHvHN1vCBzj2V; Mon, 8 Jul 2024 19:26:08 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qt1-f177.google.com with SMTP id d75a77b69052e-447eefeeb92so7402121cf.0; Mon, 08 Jul 2024 12:26:08 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCVDjcOCOqXFsyiAtaTm5zesrkUKBdmvJotHF8X2JM3qooKLJVo9b8Ugl8Mwz4JNGzEL4/wvrhaflfTK7VhUxd8txY86WupzVgw7WGbnVY0C+0mwaeGVBooUMdn7rdj9bsRBTBIpKKzDcmF4BnPyI2FIIaZ9YEQ= X-Gm-Message-State: AOJu0YzAXUnrR2M8qwtAHW5MU3vI/xYGGZrlX4oWOFAnt7mERW9jZ1Qt bpxm0gl619cVsXuE+YXLDatsLNfB8qLON/qIN/UaA/homtXTIuGxnvm+Zpv1/b02cRq7OFWwdnt uUSc+8Pq/ywekakPxoRD4DFa8J+s= X-Google-Smtp-Source: AGHT+IHnOrN3+DHyStGdmLuBpo3Y62ymGWNym/4Pi0sdd898qD4lX9HZN67Y+bUv5fXI+KKTGkdjNrghkb8/if/9Wkk= X-Received: by 2002:ac8:5f0b:0:b0:447:e2b0:4a3e with SMTP id d75a77b69052e-447faad69bbmr3705951cf.61.1720466767162; Mon, 08 Jul 2024 12:26:07 -0700 (PDT) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 References: <202407072130.467LUGIk073494@gitrepo.freebsd.org> In-Reply-To: <202407072130.467LUGIk073494@gitrepo.freebsd.org> From: Nuno Teixeira Date: Mon, 8 Jul 2024 20:25:56 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 8565550e2557 - main - www/firefox: drop obsolete patch To: Christoph Moench-Tegeder Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000814110061cc1623d" --000000000000814110061cc1623d Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello Christoph, Build and runs fine! Thanks, Christoph Moench-Tegeder escreveu (domingo, 7/07/2024 =C3=A0(s) 22:30): > The branch main has been updated by cmt: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=3D8565550e2557fc339bb8e10f0197c= 6de36a154d1 > > commit 8565550e2557fc339bb8e10f0197c6de36a154d1 > Author: Christoph Moench-Tegeder > AuthorDate: 2024-07-07 21:26:01 +0000 > Commit: Christoph Moench-Tegeder > CommitDate: 2024-07-07 21:26:01 +0000 > > www/firefox: drop obsolete patch > > In Skia m125 all extra ARM feature detection was removed > (ref skia 571b4cf2e359), so we do not have to roll our own. > This also should fix built on ARM, which was failing over > the detection of native CRC32 instructions (which are not used > anymore by Skia, and whose dis-use triggered the whole feature > detection removal) > > Reported by: eduardo@ > --- > .../files/patch-gfx_skia_skia_src_core_SkCpu.cpp | 33 > ---------------------- > 1 file changed, 33 deletions(-) > > diff --git a/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp > b/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp > deleted file mode 100644 > index fe73016d6618..000000000000 > --- a/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp > +++ /dev/null > @@ -1,33 +0,0 @@ > -Regressed by https://svnweb.freebsd.org/changeset/base/324815 > - > -gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of undeclared > identifier 'getauxval' > - uint32_t hwcaps =3D getauxval(AT_HWCAP); > - ^ > - > -diff --git gfx/skia/skia/src/core/SkCpu.cpp > gfx/skia/skia/src/core/SkCpu.cpp > -index cdac7db2be2c..88391138880a 100644 > ---- gfx/skia/skia/src/core/SkCpu.cpp > -+++ gfx/skia/skia/src/core/SkCpu.cpp > -@@ -81,6 +81,22 @@ > - if (hwcap & HWCAP_LOONGARCH_LSX) { features |=3D > SkCpu::LOONGARCH_SX; } > - if (hwcap & HWCAP_LOONGARCH_LASX) { features |=3D > SkCpu::LOONGARCH_ASX; } > - > -+ return features; > -+ } > -+#elif defined(SK_CPU_ARM64) && defined(__FreeBSD__) > -+ #include > -+ #ifndef ID_AA64ISAR0_CRC32_VAL > -+ #define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32 > -+ #endif > -+ > -+ static uint32_t read_cpu_features() { > -+ uint32_t features =3D 0; > -+ uint64_t id_aa64isar0; > -+ > -+ id_aa64isar0 =3D READ_SPECIALREG(id_aa64isar0_el1); > -+ if (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) =3D=3D > ID_AA64ISAR0_CRC32_BASE) { > -+ features |=3D SkCpu::CRC32; > -+ } > - return features; > - } > - #else > --=20 Nuno Teixeira FreeBSD UNIX: Web: https://FreeBSD.org --000000000000814110061cc1623d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello Christoph,

Build and r= uns fine!

Thanks,

Christoph Moench-Tegede= r <cmt@freebsd.org> escreveu (= domingo, 7/07/2024 =C3=A0(s) 22:30):
The branch main has been updated by cmt:

URL: https://cgi= t.FreeBSD.org/ports/commit/?id=3D8565550e2557fc339bb8e10f0197c6de36a154d1

commit 8565550e2557fc339bb8e10f0197c6de36a154d1
Author:=C2=A0 =C2=A0 =C2=A0Christoph Moench-Tegeder <cmt@FreeBSD.org>=
AuthorDate: 2024-07-07 21:26:01 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Christoph Moench-Tegeder <cmt@FreeBSD.org>=
CommitDate: 2024-07-07 21:26:01 +0000

=C2=A0 =C2=A0 www/firefox: drop obsolete patch

=C2=A0 =C2=A0 In Skia m125 all extra ARM feature detection was removed
=C2=A0 =C2=A0 (ref skia 571b4cf2e359), so we do not have to roll our own. =C2=A0 =C2=A0 This also should fix built on ARM, which was failing over
=C2=A0 =C2=A0 the detection of native CRC32 instructions (which are not use= d
=C2=A0 =C2=A0 anymore by Skia, and whose dis-use triggered the whole featur= e
=C2=A0 =C2=A0 detection removal)

=C2=A0 =C2=A0 Reported by:=C2=A0 =C2=A0 eduardo@
---
=C2=A0.../files/patch-gfx_skia_skia_src_core_SkCpu.cpp=C2=A0 =C2=A0| 33 ---= -------------------
=C2=A01 file changed, 33 deletions(-)

diff --git a/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp b/www= /firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp
deleted file mode 100644
index fe73016d6618..000000000000
--- a/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-Regressed by https://svnweb.freebsd.org/changeset/b= ase/324815
-
-gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of undeclared identifie= r 'getauxval'
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 uint32_t hwcaps =3D getauxval(AT_HWCAP);
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 ^
-
-diff --git gfx/skia/skia/src/core/SkCpu.cpp gfx/skia/skia/src/core/SkCpu.c= pp
-index cdac7db2be2c..88391138880a 100644
---- gfx/skia/skia/src/core/SkCpu.cpp
-+++ gfx/skia/skia/src/core/SkCpu.cpp
-@@ -81,6 +81,22 @@
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (hwcap & HWCAP_LOONGARCH_LSX)=C2= =A0 { features |=3D SkCpu::LOONGARCH_SX; }
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (hwcap & HWCAP_LOONGARCH_LASX) { = features |=3D SkCpu::LOONGARCH_ASX; }
-
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0 return features;
-+=C2=A0 =C2=A0 }
-+#elif defined(SK_CPU_ARM64) && defined(__FreeBSD__)
-+=C2=A0 =C2=A0 #include <machine/armreg.h>
-+=C2=A0 =C2=A0 #ifndef ID_AA64ISAR0_CRC32_VAL
-+=C2=A0 =C2=A0 #define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32
-+=C2=A0 =C2=A0 #endif
-+
-+=C2=A0 =C2=A0 static uint32_t read_cpu_features() {
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0 uint32_t features =3D 0;
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0 uint64_t id_aa64isar0;
-+
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0 id_aa64isar0 =3D READ_SPECIALREG(id_aa64isar0= _el1);
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) =3D= =3D ID_AA64ISAR0_CRC32_BASE) {
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 features |=3D SkCpu::CRC32;
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0 }
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return features;
-=C2=A0 =C2=A0 =C2=A0}
- #else


--
Nuno Teixeira
FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org
--000000000000814110061cc1623d--