aboutsummaryrefslogtreecommitdiff
path: root/www/firefox/files
diff options
context:
space:
mode:
authorChristoph Moench-Tegeder <cmt@FreeBSD.org>2022-09-12 19:24:45 +0000
committerChristoph Moench-Tegeder <cmt@FreeBSD.org>2022-09-12 19:24:45 +0000
commit27b5e1775e9d0732f5d4d5ba802179008992fcce (patch)
tree71a4971b10332f5beb1426caee58224ecf472472 /www/firefox/files
parenta69cb9420e8e7506358dbc17ba52050ac735255a (diff)
downloadports-27b5e1775e9d0732f5d4d5ba802179008992fcce.tar.gz
ports-27b5e1775e9d0732f5d4d5ba802179008992fcce.zip
www/firefox: update to 105.0 (rc1)
Diffstat (limited to 'www/firefox/files')
-rw-r--r--www/firefox/files/patch-bug166411530
-rw-r--r--www/firefox/files/patch-bug1729459_comment1293
-rw-r--r--www/firefox/files/patch-i386-protobuf-alignment29
3 files changed, 15 insertions, 137 deletions
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<const AudioDataValue*>(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 <typename Function, typename... Args>
- 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<AudioDeviceInfo> mSinkInfo;
@@ -78,5 +78,5 @@ created by libcubeb.
- std::atomic<ProfilerThreadId> mAudioThreadId;
- const bool mSandboxed = false;
- MozPromiseHolder<MediaSink::EndedPromise> mEndedPromise GUARDED_BY(mMonitor);
- std::atomic<bool> mPlaybackComplete;
+ MozPromiseHolder<MediaSink::EndedPromise> 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<LifecycleIdAtomic>)) CacheAlignedLifecycleIdGenerator {
- std::atomic<LifecycleIdAtomic> id;
- };
- static CacheAlignedLifecycleIdGenerator lifecycle_id_generator_;