From nobody Tue Mar 29 07:22:53 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 19E661A42F15; Tue, 29 Mar 2022 07:22:54 +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 4KSLcs75hsz4qWZ; Tue, 29 Mar 2022 07:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648538574; 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=yudg13OIHb4t65gHnnjuQ31WHM3M48+Gt+dH75rbHts=; b=ZSW961unOKAXop0Q0zkXaFLvVd2Kd2aNdrs0/szdFQRFFXFFbZ5p3onwo65JJJjYG8tI3c wAD6b2qVi1Uyp9P6LrlmYUJcaXuYX8lJI84dWOIUyERxwVXLoR2+dnr+kQ06xE69sRs2vl EggNZaGKhrY5LNVRyyZ2l/P8HankYYPNszUX0Q3X2TrQXj5tYXDVdh4Hpam+JJ2zMlOYxN rT0yc+eku+TaCXBaQt58VWAWuwdy70YrccEFioA9A5i3O0+MfvMmAfx05aHPWEgZiKpowV opft1O8o+9X86TvRQWBd3b5zxrLk1z5kfRZ/um2Q3QRlmh0rMQE9F+THXeVPQQ== 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 C8DE51A67B; Tue, 29 Mar 2022 07:22:53 +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 22T7MrQ8080645; Tue, 29 Mar 2022 07:22:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22T7MrVt080644; Tue, 29 Mar 2022 07:22:53 GMT (envelope-from git) Date: Tue, 29 Mar 2022 07:22:53 GMT Message-Id: <202203290722.22T7MrVt080644@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: d30fbb69701d - 2022Q1 - www/firefox: update to 99.0 (rc1) 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/2022Q1 X-Git-Reftype: branch X-Git-Commit: d30fbb69701d30f7a512d5de1761b723c25e0353 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648538574; 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=yudg13OIHb4t65gHnnjuQ31WHM3M48+Gt+dH75rbHts=; b=AyZhZ+hJqm6CjTy/rsSsSY90j35XluJ3uc7kznELMZnWN34I2DFYNTwn7QhgvQw2p9TwMl pvtNV4CyIxjKV73PcDCLW9greWdiAooFRrQxfeXUbO8dSt1bP1+tGjaptejw+zSMDledi5 BBHODgVSyAVlQ6OmY129AYyBy8ayB/blyDBcwqo8JL1cFzihQH3/PCvHhhZ9rjBJhT2Lgk HaXEEX/lHXB4mXxt88ndYPjsIq2j3UWWmeoR+GVvyQh1MQ4xUfozzG1aHojMJOMddCZAtd lYkKiUv1Fuh+I0H/K1y0fNp5iAsD088UzTvl2so+cPRJEJKwIvCwvXS4m5NOIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648538574; a=rsa-sha256; cv=none; b=eLtyifpQXn9iGdKfTXUQ7Jxct3DnVvYBZN+LZ55dL2LuPP37yEymI2tCY6TBm8PicBERYI uK2+vAGsKKPXQSXHI0aoF3wFD8ou/Rm8DuQ5RksCq7g2rNZ+yJLEZmxpDeSU9TZNXKJFpA 7fXCTxM0CBuf/loX1wgNtSp/F9tu/m1DVuc+jOCWXMqBhIOCg7jFihkWcLRB2p/JUhg0L5 bzX61NXaQBewVeIvnAAIomfC0KhLBHBmxnehNcqt95dKgurA24rqJCxWJCbO0gDsgBxuVR hRPvLOGNjK6WRtLW/mEcoJXq7UyJH4skew0oow/J4ISNE2POYNL9Ptr1Tjl7Dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=d30fbb69701d30f7a512d5de1761b723c25e0353 commit d30fbb69701d30f7a512d5de1761b723c25e0353 Author: Christoph Moench-Tegeder AuthorDate: 2022-03-29 07:20:50 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2022-03-29 07:22:39 +0000 www/firefox: update to 99.0 (rc1) Release Notes (soon): https://www.mozilla.org/en-US/firefox/99.0/releasenotes/ (cherry picked from commit 65f70bb54dbb613ca719cd1589339f2f3b41aeb4) --- www/firefox/Makefile | 8 +-- www/firefox/distinfo | 6 +-- .../files/patch-media_libcubeb_src_cubeb__oss.c | 63 ---------------------- .../files/patch-tools_profiler_core_patform.cpp | 48 +++++++++++++++++ 4 files changed, 55 insertions(+), 70 deletions(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 3189355f132d..75bfd62963a1 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,21 +1,21 @@ # Created by: Alan Eldridge PORTNAME= firefox -DISTVERSION= 98.0.2 +DISTVERSION= 99.0 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}${DISTVERSIONSUFFIX}-candidates/build1/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.32:devel/nspr \ - nss>=3.75:security/nss \ + nss>=3.76:security/nss \ icu>=70.1:devel/icu \ libevent>=2.1.8:devel/libevent \ - harfbuzz>=3.1.2:print/harfbuzz \ + harfbuzz>=3.4.0:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ png>=1.6.37:graphics/png \ dav1d>=1.0.0:multimedia/dav1d \ diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 80812f32573a..194f29549dad 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1647973707 -SHA256 (firefox-98.0.2.source.tar.xz) = c144b6016aaa8ceab8154b9f0b2bbeee6cbc22ab7f811fcece28d36e49565890 -SIZE (firefox-98.0.2.source.tar.xz) = 479907760 +TIMESTAMP = 1648503963 +SHA256 (firefox-99.0.source.tar.xz) = 440fdb7bf7c4a780e3b7a17a6f1f49cb1290d7e2cf009e24d35842136c74a1a6 +SIZE (firefox-99.0.source.tar.xz) = 481575776 diff --git a/www/firefox/files/patch-media_libcubeb_src_cubeb__oss.c b/www/firefox/files/patch-media_libcubeb_src_cubeb__oss.c deleted file mode 100644 index e3c51232a63f..000000000000 --- a/www/firefox/files/patch-media_libcubeb_src_cubeb__oss.c +++ /dev/null @@ -1,63 +0,0 @@ ---- media/libcubeb/src/cubeb_oss.c.orig 2021-12-18 20:36:16 UTC -+++ media/libcubeb/src/cubeb_oss.c -@@ -97,6 +97,7 @@ struct oss_stream { - int fd; - void * buf; - unsigned int bufframes; -+ unsigned int maxframes; - - struct stream_info { - int channels; -@@ -822,9 +823,9 @@ retry: - pfds[0].fd = s->play.fd; - pfds[1].fd = -1; - goto retry; -- } else if (tnfr > (long)s->play.bufframes) { -+ } else if (tnfr > (long)s->play.maxframes) { - /* too many frames available - limit */ -- tnfr = (long)s->play.bufframes; -+ tnfr = (long)s->play.maxframes; - } - if (nfr > tnfr) { - nfr = tnfr; -@@ -840,9 +841,9 @@ retry: - pfds[0].fd = -1; - pfds[1].fd = s->record.fd; - goto retry; -- } else if (tnfr > (long)s->record.bufframes) { -+ } else if (tnfr > (long)s->record.maxframes) { - /* too many frames available - limit */ -- tnfr = (long)s->record.bufframes; -+ tnfr = (long)s->record.maxframes; - } - if (nfr > tnfr) { - nfr = tnfr; -@@ -1146,8 +1147,19 @@ oss_stream_init(cubeb * context, cubeb_stream ** stream, - else { - s->play.bufframes = (bi.fragsize * bi.fragstotal) / s->play.frame_size; - } -+ int lw; - -- int lw = s->play.frame_size; -+ /* -+ * Force 32 ms service intervals at most, or when recording is -+ * active, use the recording service intervals as a reference. -+ */ -+ s->play.maxframes = (32 * output_stream_params->rate) / 1000; -+ if (s->record.fd != -1 || s->play.maxframes >= s->play.bufframes) { -+ lw = s->play.frame_size; /* Feed data when possible. */ -+ s->play.maxframes = s->play.bufframes; -+ } else { -+ lw = (s->play.bufframes - s->play.maxframes) * s->play.frame_size; -+ } - if (ioctl(s->play.fd, SNDCTL_DSP_LOW_WATER, &lw)) - LOG("Audio device \"%s\" (play) could not set trigger threshold", - s->play.name); -@@ -1166,6 +1178,7 @@ oss_stream_init(cubeb * context, cubeb_stream ** stream, - (bi.fragsize * bi.fragstotal) / s->record.frame_size; - } - -+ s->record.maxframes = s->record.bufframes; - int lw = s->record.frame_size; - if (ioctl(s->record.fd, SNDCTL_DSP_LOW_WATER, &lw)) - LOG("Audio device \"%s\" (record) could not set trigger threshold", diff --git a/www/firefox/files/patch-tools_profiler_core_patform.cpp b/www/firefox/files/patch-tools_profiler_core_patform.cpp new file mode 100644 index 000000000000..e07969fa8f41 --- /dev/null +++ b/www/firefox/files/patch-tools_profiler_core_patform.cpp @@ -0,0 +1,48 @@ +commit 913cfc8ce77818fa44f9086ee44538337930a9ef +Author: Christoph Moench-Tegeder +Date: Mon Mar 28 21:54:35 2022 +0200 + + FreeBSD can use sched_getcpu() from 1400046/1300524 on + +diff --git tools/profiler/core/platform.cpp tools/profiler/core/platform.cpp +index 92bcc1100687..77285f67b62c 100644 +--- tools/profiler/core/platform.cpp ++++ tools/profiler/core/platform.cpp +@@ -111,6 +111,17 @@ + # include + #endif + ++#if defined(GP_OS_freebsd) ++#include ++// "after making CPU_SET macros compatible with glibc" ++# if __FreeBSD_version > 1400045 || (__FreeBSD_version > 1300523 && __FreeBSD_version < 1400000) ++# include ++# else ++// similar cpuid_count() trick as on Darwin, using LLVM ++# include ++# endif ++#endif ++ + #if defined(GP_OS_windows) + # include + +@@ -6368,6 +6379,19 @@ void profiler_mark_thread_awake() { + cpuId = ebx >> 24; + } + # endif ++#elif defined(GP_OS_freebsd) ++# if __FreeBSD_version > 1400045 || (__FreeBSD_version > 1300523 && __FreeBSD_version < 1400000) ++ cpuId = sched_getcpu(); ++# elif defined(__amd64__) ++ unsigned int eax, ebx, ecx, edx; ++ __cpuid_count(1, 0, eax, ebx, ecx, edx); ++ // Check if we have an APIC. ++ if ((edx & (1 << 9))) { ++ // APIC ID is bits 24-31 of EBX ++ cpuId = ebx >> 24; ++ } ++# endif ++// the fallthrough is cpuID = 0 + #else + cpuId = sched_getcpu(); + #endif