From nobody Mon Sep 12 19:25:17 2022 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 4MRGlK5Wxyz4c5p7; Mon, 12 Sep 2022 19:25:17 +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 4MRGlK3zFrz3XKW; Mon, 12 Sep 2022 19:25:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663010717; 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=93phmwFvxfwJs3xkjAfOmRBIBh76ORNuKyNmdMpMcqs=; b=DHGOvr57cvQKRf1rzVKwBRxhf2edBbfvxQkYqLoyZmoX7VMrHxyWGxQuud2xrr9tQiRa1c erAsslvdK3hbq4tyz7CcpDGHflj2sT3JDssUF7+PiW0RIZMsmHAYCdtp41FY0axO3U75TF UdiWC43veRgXihJiNtSNn+9ZpTneF/ybCX2TUvXJypFPmz+fPaICAcA+0L/bm7p5qpNk/u fRFWgLorLZF4JmuKCrkc60x8DvGtP3Rz6XlBroj25V1sH1h/Y3q9+FGBYY0rnYg/PqZe3/ hFb3NaGg1A935UKBQeocryerVXa/Vd5xSabtrCQU2pMViqL8SSzdc6eg6N4gVg== 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 4MRGlK33xpz155l; Mon, 12 Sep 2022 19:25:17 +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 28CJPHk0088367; Mon, 12 Sep 2022 19:25:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28CJPHbp088366; Mon, 12 Sep 2022 19:25:17 GMT (envelope-from git) Date: Mon, 12 Sep 2022 19:25:17 GMT Message-Id: <202209121925.28CJPHbp088366@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: 27b5e1775e9d - main - www/firefox: update to 105.0 (rc1) 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 27b5e1775e9d0732f5d4d5ba802179008992fcce Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663010717; 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=93phmwFvxfwJs3xkjAfOmRBIBh76ORNuKyNmdMpMcqs=; b=xOdH4YfOo7ks2Xwjw86doy+Ch7RjmfbKE2+jVkayMYxMhOkpcH+yWC9JPpU5SZdbFoM9DL vQ/QnIfJAsEwd4GcL/FkZlHoWP/nO3Sfbn158R5Um1RAJ6DQyj/369Ioc1n5n4/6yz8LeJ 8sv7gfWXETeJNAP42/7EsilFttkwSO1JtxJg734zSm5ako6A1iyCYsFv/uBifqgif/kLL5 7ONGjqPoIPv7HSe60eB7Udiyedb5dOeqtzKAhRpoe0sm6OdQTVocicnIMg2J9gZGC4gbFa nv9YDJLZU9LAuK0WtZg6p+QzqahPYWwYHqnes8fXCjB1QxDypFmu1qnHVMYMNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663010717; a=rsa-sha256; cv=none; b=lq7qfOdpRl8Ab2RG9D4WV/SqHvg8Mw9MiLWYuzOxmSpBRrZ+IplOsC/ghO9pqzFhoaJe6H MXO4yDGJsXNf4jzAEVHcXnTER1XOdDKF0+c4mL5jkFpRXLt5hg8fuF+4O0TKWKLagdCXp3 6AUV6peiGfp4wUoDubKPkFuFw9RIozEd7wIUXNoeQvm/PrrcsFs/BTXxGwSq5+JBa9Yy1X 7Es7AYLw5inwC+dYKnon7yo1RJVOqXE1XsHM0EaeEVYnuGgvnp5ix8uyw9O9DXKE+2hmzj JGnDO74GOv9DSkLMQhBH8UI4LQYZiBkzF0mWxVcfquabdoDQay9cZsMPhkEjUQ== 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=27b5e1775e9d0732f5d4d5ba802179008992fcce commit 27b5e1775e9d0732f5d4d5ba802179008992fcce Author: Christoph Moench-Tegeder AuthorDate: 2022-09-12 19:24:45 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2022-09-12 19:24:45 +0000 www/firefox: update to 105.0 (rc1) Release Notes (soon): https://www.mozilla.org/en-US/firefox/105.0/releasenotes/ --- www/firefox/Makefile | 2 +- www/firefox/distinfo | 6 +- www/firefox/files/patch-bug1664115 | 30 ++++---- www/firefox/files/patch-bug1729459_comment12 | 93 ------------------------- www/firefox/files/patch-i386-protobuf-alignment | 29 -------- 5 files changed, 19 insertions(+), 141 deletions(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index f4ad170160ea..b527c8c9f908 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,5 +1,5 @@ PORTNAME= firefox -DISTVERSION= 104.0.2 +DISTVERSION= 105.0 PORTEPOCH= 2 CATEGORIES= www wayland MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \ diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 4ce8555571eb..e5bf6760abeb 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1662375435 -SHA256 (firefox-104.0.2.source.tar.xz) = 72bba06f04e7745f6b02951906413eb1c15a7e253e06e373302162c6219f286a -SIZE (firefox-104.0.2.source.tar.xz) = 478270500 +TIMESTAMP = 1663006996 +SHA256 (firefox-105.0.source.tar.xz) = df3e6077fcfbd785f21e12292687b2b06563e37168d2861d557a49b5d2b038e3 +SIZE (firefox-105.0.source.tar.xz) = 482490432 diff --git a/www/firefox/files/patch-bug1664115 b/www/firefox/files/patch-bug1664115 index 3be934a8c04e..72b25acd1a6c 100644 --- a/www/firefox/files/patch-bug1664115 +++ b/www/firefox/files/patch-bug1664115 @@ -3,8 +3,8 @@ using any cubeb backends other than pulse-rust to play media. The loss of such change will be that users will not be able to do profiling on threads created by libcubeb. ---- dom/media/AudioStream.cpp.orig 2022-04-19 19:43:36.505544000 +0200 -+++ dom/media/AudioStream.cpp 2022-04-19 19:47:53.111474000 +0200 +--- dom/media/AudioStream.cpp.orig 2022-09-08 21:05:37.835865000 +0200 ++++ dom/media/AudioStream.cpp 2022-09-08 21:12:51.417935000 +0200 @@ -27,7 +27,6 @@ #endif #include "Tracing.h" @@ -21,8 +21,8 @@ created by libcubeb. - mSandboxed(CubebUtils::SandboxEnabled()), mPlaybackComplete(false), mPlaybackRate(1.0f), - mPreservesPitch(true) {} -@@ -552,17 +549,6 @@ + mPreservesPitch(true), +@@ -554,17 +551,6 @@ aWriter.Available()); } @@ -40,7 +40,7 @@ created by libcubeb. void AudioStream::AssertIsOnAudioThread() const { // This can be called right after CheckThreadIdChanged, because the audio // thread can change when not sandboxed. -@@ -591,9 +577,6 @@ +@@ -593,9 +579,6 @@ } long AudioStream::DataCallback(void* aBuffer, long aFrames) { @@ -48,9 +48,9 @@ created by libcubeb. - CubebUtils::GetAudioThreadRegistry()->Register(mAudioThreadId); - } WebCore::DenormalDisabler disabler; - - TRACE_AUDIO_CALLBACK_BUDGET(aFrames, mAudioClock.GetInputRate()); -@@ -648,9 +631,6 @@ + if (!mCallbacksStarted) { + mCallbacksStarted = true; +@@ -653,9 +636,6 @@ mDumpFile.Write(static_cast(aBuffer), aFrames * mOutChannels); @@ -60,17 +60,17 @@ created by libcubeb. return aFrames - writer.Available(); } ---- dom/media/AudioStream.h.orig 2022-04-19 19:43:45.457171000 +0200 -+++ dom/media/AudioStream.h 2022-04-19 19:45:30.463633000 +0200 -@@ -329,7 +329,6 @@ +--- dom/media/AudioStream.h.orig 2022-09-08 21:13:08.562133000 +0200 ++++ dom/media/AudioStream.h 2022-09-08 21:15:22.121196000 +0200 +@@ -339,7 +339,6 @@ template - int InvokeCubeb(Function aFunction, Args&&... aArgs) REQUIRES(mMonitor); + int InvokeCubeb(Function aFunction, Args&&... aArgs) MOZ_REQUIRES(mMonitor); - bool CheckThreadIdChanged(); void AssertIsOnAudioThread() const; soundtouch::SoundTouch* mTimeStretcher; -@@ -368,9 +367,6 @@ +@@ -378,9 +377,6 @@ // the default device is used. It is set // during the Init() in decoder thread. RefPtr mSinkInfo; @@ -78,5 +78,5 @@ created by libcubeb. - std::atomic mAudioThreadId; - const bool mSandboxed = false; - MozPromiseHolder mEndedPromise GUARDED_BY(mMonitor); - std::atomic mPlaybackComplete; + MozPromiseHolder mEndedPromise + MOZ_GUARDED_BY(mMonitor); diff --git a/www/firefox/files/patch-bug1729459_comment12 b/www/firefox/files/patch-bug1729459_comment12 deleted file mode 100644 index dda42170f71b..000000000000 --- a/www/firefox/files/patch-bug1729459_comment12 +++ /dev/null @@ -1,93 +0,0 @@ ---- modules/fdlibm/src/math_private.h.orig 2021-09-30 19:32:33.764224000 +0200 -+++ modules/fdlibm/src/math_private.h 2021-10-02 22:15:33.265122000 +0200 -@@ -30,7 +30,11 @@ - * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t - */ - --typedef double __double_t; -+#ifdef __LP64__ -+typedef double __double_t; -+#else -+typedef long double __double_t; -+#endif - typedef __double_t double_t; - - /* -@@ -630,7 +634,37 @@ - return ((double)(x + 0x1.8p52) - 0x1.8p52); - } - -+static inline float -+rnintf(__float_t x) -+{ -+ /* -+ * As for rnint(), except we could just call that to handle the -+ * extra precision case, usually without losing efficiency. -+ */ -+ return ((float)(x + 0x1.8p23F) - 0x1.8p23F); -+} -+ -+#ifdef LDBL_MANT_DIG - /* -+ * The complications for extra precision are smaller for rnintl() since it -+ * can safely assume that the rounding precision has been increased from -+ * its default to FP_PE on x86. We don't exploit that here to get small -+ * optimizations from limiting the rangle to double. We just need it for -+ * the magic number to work with long doubles. ld128 callers should use -+ * rnint() instead of this if possible. ld80 callers should prefer -+ * rnintl() since for amd64 this avoids swapping the register set, while -+ * for i386 it makes no difference (assuming FP_PE), and for other arches -+ * it makes little difference. -+ */ -+static inline long double -+rnintl(long double x) -+{ -+ return (x + __CONCAT(0x1.8p, LDBL_MANT_DIG) / 2 - -+ __CONCAT(0x1.8p, LDBL_MANT_DIG) / 2); -+} -+#endif /* LDBL_MANT_DIG */ -+ -+/* - * irint() and i64rint() give the same result as casting to their integer - * return type provided their arg is a floating point integer. They can - * sometimes be more efficient because no rounding is required. -@@ -644,6 +678,39 @@ - sizeof(x) == sizeof(long double) ? irintl(x) : (int)(x)) - #else - #define irint(x) ((int)(x)) -+#endif -+ -+#define i64rint(x) ((int64_t)(x)) /* only needed for ld128 so not opt. */ -+ -+#if defined(__i386__) && defined(__GNUCLIKE_ASM) -+static __inline int -+irintf(float x) -+{ -+ int n; -+ -+ __asm("fistl %0" : "=m" (n) : "t" (x)); -+ return (n); -+} -+ -+static __inline int -+irintd(double x) -+{ -+ int n; -+ -+ __asm("fistl %0" : "=m" (n) : "t" (x)); -+ return (n); -+} -+#endif -+ -+#if (defined(__amd64__) || defined(__i386__)) && defined(__GNUCLIKE_ASM) -+static __inline int -+irintl(long double x) -+{ -+ int n; -+ -+ __asm("fistl %0" : "=m" (n) : "t" (x)); -+ return (n); -+} - #endif - - #ifdef DEBUG diff --git a/www/firefox/files/patch-i386-protobuf-alignment b/www/firefox/files/patch-i386-protobuf-alignment deleted file mode 100644 index de5cdb723ce2..000000000000 --- a/www/firefox/files/patch-i386-protobuf-alignment +++ /dev/null @@ -1,29 +0,0 @@ -# On FreeBSD/i386's LLVM, actual alignment for atomic types requires -# stricter alignment rules, mostly on 8 byte boundaries instead of 4 byte -# as indicated by max_align_t. -# Patch for arenastring.cc borrowed from devel/protobuf/files/patch-i386 - ---- toolkit/components/protobuf/src/google/protobuf/arenastring.cc.orig 2022-08-20 22:07:01.600662000 +0200 -+++ toolkit/components/protobuf/src/google/protobuf/arenastring.cc 2022-08-20 22:07:55.969192000 +0200 -@@ -64,7 +64,8 @@ - #endif - constexpr size_t kStringAlign = alignof(std::string); - --static_assert((kStringAlign > kNewAlign ? kStringAlign : kNewAlign) >= 8, ""); -+// this does not hold with llvm on FreeBSD/i386 -+// static_assert((kStringAlign > kNewAlign ? kStringAlign : kNewAlign) >= 8, ""); - static_assert(alignof(ExplicitlyConstructedArenaString) >= 8, ""); - - } // namespace - ---- ./toolkit/components/protobuf/src/google/protobuf/arena_impl.h.orig 2022-08-20 20:07:57.096818000 +0200 -+++ ./toolkit/components/protobuf/src/google/protobuf/arena_impl.h 2022-08-20 21:40:47.821690000 +0200 -@@ -640,7 +640,7 @@ - #ifdef _MSC_VER - #pragma warning(disable : 4324) - #endif -- struct alignas(kCacheAlignment) CacheAlignedLifecycleIdGenerator { -+ struct alignas(alignof(std::atomic)) CacheAlignedLifecycleIdGenerator { - std::atomic id; - }; - static CacheAlignedLifecycleIdGenerator lifecycle_id_generator_;