public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/firefox] f45: Merge branch 'rawhide' into f45
@ 2026-08-27 10:09 Martin Stransky
0 siblings, 0 replies; 4+ messages in thread
From: Martin Stransky @ 2026-08-27 10:09 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/firefox
Branch : f45
Commit : b502dd25cb2d78d4ecfdf946bc498a20b103d5f9
Author : Martin Stransky <stransky@redhat.com>
Date : 2026-08-27T12:08:52+02:00
Stats : +85/-215 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/firefox/c/b502dd25cb2d78d4ecfdf946bc498a20b103d5f9?branch=f45
Log:
Merge branch 'rawhide' into f45
---
diff --git a/D317117.1787384850.diff b/D317117.1787384850.diff
deleted file mode 100644
index 9871913..0000000
--- a/D317117.1787384850.diff
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -up firefox-154.0/widget/gtk/nsWaylandDisplay.cpp.D317117 firefox-154.0/widget/gtk/nsWaylandDisplay.cpp
---- firefox-154.0/widget/gtk/nsWaylandDisplay.cpp.D317117 2026-08-12 23:13:46.000000000 +0200
-+++ firefox-154.0/widget/gtk/nsWaylandDisplay.cpp 2026-08-21 09:51:45.131779412 +0200
-@@ -1347,4 +1347,13 @@ void nsWaylandDisplay::Init() {
- }
- }
-
-+bool nsWaylandDisplay::IsTFSupported(int aTF) {
-+ if (aTF < sColorTransfersNum) {
-+ return mSupportedTransfer[aTF] == aTF;
-+ } else {
-+ NS_WARNING("Unknow color transfer function!");
-+ return false;
-+ }
-+}
-+
- } // namespace mozilla::widget
-diff -up firefox-154.0/widget/gtk/nsWaylandDisplay.h.D317117 firefox-154.0/widget/gtk/nsWaylandDisplay.h
---- firefox-154.0/widget/gtk/nsWaylandDisplay.h.D317117 2026-08-12 23:13:46.000000000 +0200
-+++ firefox-154.0/widget/gtk/nsWaylandDisplay.h 2026-08-21 09:51:45.131642320 +0200
-@@ -197,6 +197,8 @@ class nsWaylandDisplay {
- MonitorConfig* GetMonitorConfig(int x, int y);
- bool RemoveMonitorConfig(int aId);
-
-+ bool IsTFSupported(int aTF);
-+
- ~nsWaylandDisplay();
-
- private:
-diff -up firefox-154.0/widget/gtk/WaylandSurface.cpp.D317117 firefox-154.0/widget/gtk/WaylandSurface.cpp
---- firefox-154.0/widget/gtk/WaylandSurface.cpp.D317117 2026-08-12 23:13:47.000000000 +0200
-+++ firefox-154.0/widget/gtk/WaylandSurface.cpp 2026-08-21 09:58:48.531193706 +0200
-@@ -1545,28 +1545,36 @@ bool WaylandSurface::EnableColorManageme
- params, WP_COLOR_MANAGER_V1_PRIMARIES_SRGB);
- break;
- }
-+ uint32_t requiredTF = 0;
- switch (aTransferFunction) {
- case gfx::TransferFunction::PQ:
-- wp_image_description_creator_params_v1_set_tf_named(
-- params, WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_ST2084_PQ);
-+ requiredTF = WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_ST2084_PQ;
- break;
- case gfx::TransferFunction::HLG:
-- wp_image_description_creator_params_v1_set_tf_named(
-- params, WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_HLG);
-+ requiredTF = WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_HLG;
- break;
- case gfx::TransferFunction::BT709:
-- wp_image_description_creator_params_v1_set_tf_named(
-- params, WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_BT1886);
-+ requiredTF = WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_BT1886;
- break;
- case gfx::TransferFunction::SRGB:
-- wp_image_description_creator_params_v1_set_tf_named(
-- params, WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_SRGB);
-+ requiredTF = WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_SRGB;
- break;
- case gfx::TransferFunction::LINEAR:
-- wp_image_description_creator_params_v1_set_tf_named(
-- params, WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_EXT_LINEAR);
-+ requiredTF = WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_EXT_LINEAR;
- break;
- }
-+
-+ if (requiredTF == 0 || !WaylandDisplayGet()->IsTFSupported(requiredTF)) {
-+ LOGWAYLAND("Transfer function %u isn't supported.", requiredTF);
-+
-+ wp_image_description_creator_params_v1_destroy(params);
-+ mColorSurface = nullptr;
-+
-+ return false;
-+ }
-+
-+ wp_image_description_creator_params_v1_set_tf_named(params, requiredTF);
-+
- mImageDescription = wp_image_description_creator_params_v1_create(params);
- // wp_image_description_creator_params_v1_create() consumes params
- params = nullptr;
diff --git a/D318191.1787388141.diff b/D318191.1787388141.diff
index 83e222d..c3a43e3 100644
--- a/D318191.1787388141.diff
+++ b/D318191.1787388141.diff
@@ -1,6 +1,6 @@
-diff -up firefox-154.0/gfx/gl/gtest/moz.build.D318191 firefox-154.0/gfx/gl/gtest/moz.build
---- firefox-154.0/gfx/gl/gtest/moz.build.D318191 2026-08-12 23:13:26.000000000 +0200
-+++ firefox-154.0/gfx/gl/gtest/moz.build 2026-08-21 12:20:33.454753264 +0200
+diff -up firefox-155.0/gfx/gl/gtest/moz.build.D318191 firefox-155.0/gfx/gl/gtest/moz.build
+--- firefox-155.0/gfx/gl/gtest/moz.build.D318191 2026-08-26 23:11:41.000000000 +0200
++++ firefox-155.0/gfx/gl/gtest/moz.build 2026-08-27 11:24:19.402580859 +0200
@@ -6,8 +6,15 @@ LOCAL_INCLUDES += [
"/gfx/gl",
]
@@ -17,9 +17,9 @@ diff -up firefox-154.0/gfx/gl/gtest/moz.build.D318191 firefox-154.0/gfx/gl/gtest
+ ]
+
FINAL_LIBRARY = "xul-gtest"
-diff -up firefox-154.0/gfx/gl/gtest/TestMozFramebuffer.cpp.D318191 firefox-154.0/gfx/gl/gtest/TestMozFramebuffer.cpp
---- firefox-154.0/gfx/gl/gtest/TestMozFramebuffer.cpp.D318191 2026-08-21 12:20:33.454831890 +0200
-+++ firefox-154.0/gfx/gl/gtest/TestMozFramebuffer.cpp 2026-08-21 12:20:33.454831890 +0200
+diff -up firefox-155.0/gfx/gl/gtest/TestMozFramebuffer.cpp.D318191 firefox-155.0/gfx/gl/gtest/TestMozFramebuffer.cpp
+--- firefox-155.0/gfx/gl/gtest/TestMozFramebuffer.cpp.D318191 2026-08-27 11:24:19.402718907 +0200
++++ firefox-155.0/gfx/gl/gtest/TestMozFramebuffer.cpp 2026-08-27 11:24:19.402718907 +0200
@@ -0,0 +1,82 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -103,27 +103,30 @@ diff -up firefox-154.0/gfx/gl/gtest/TestMozFramebuffer.cpp.D318191 firefox-154.0
+}
+
+} // namespace mozilla::gl
-diff -up firefox-154.0/gfx/gl/MozFramebuffer.cpp.D318191 firefox-154.0/gfx/gl/MozFramebuffer.cpp
---- firefox-154.0/gfx/gl/MozFramebuffer.cpp.D318191 2026-08-12 23:13:27.000000000 +0200
-+++ firefox-154.0/gfx/gl/MozFramebuffer.cpp 2026-08-21 12:20:33.454934471 +0200
-@@ -67,35 +67,38 @@ UniquePtr<MozFramebuffer> MozFramebuffer
- return CreateImpl(
- gl, size, samples,
- depthStencil ? DepthAndStencilBuffer::Create(gl, size, samples) : nullptr,
-- colorTarget, colorName);
-+ colorTarget, colorName, ColorBackingOwnership::Owned);
+diff -up firefox-155.0/gfx/gl/MozFramebuffer.cpp.D318191 firefox-155.0/gfx/gl/MozFramebuffer.cpp
+--- firefox-155.0/gfx/gl/MozFramebuffer.cpp.D318191 2026-08-26 23:11:40.000000000 +0200
++++ firefox-155.0/gfx/gl/MozFramebuffer.cpp 2026-08-27 11:29:08.891005510 +0200
+@@ -69,37 +69,41 @@ UniquePtr<MozFramebuffer> MozFramebuffer
+ (depth || stencil) ? DepthAndStencilBuffer::Create(
+ gl, size, samples, depth, stencil)
+ : nullptr,
+- colorTarget, colorName);
++ colorTarget, colorName,
++ ColorBackingOwnership::Owned);
}
UniquePtr<MozFramebuffer> MozFramebuffer::CreateForBacking(
GLContext* const gl, const gfx::IntSize& size, const uint32_t samples,
-- bool depthStencil, const GLenum colorTarget, const GLuint colorName) {
-+ bool depthStencil, const GLenum colorTarget, const GLuint colorName,
+ bool depth, bool stencil, const GLenum colorTarget,
+- const GLuint colorName) {
++ const GLuint colorName,
+ ColorBackingOwnership colorBackingOwnership) {
- return CreateImpl(
- gl, size, samples,
- depthStencil ? DepthAndStencilBuffer::Create(gl, size, samples) : nullptr,
-- colorTarget, colorName);
-+ colorTarget, colorName, colorBackingOwnership);
+ return CreateImpl(gl, size, samples,
+ (depth || stencil) ? DepthAndStencilBuffer::Create(
+ gl, size, samples, depth, stencil)
+ : nullptr,
+- colorTarget, colorName);
++ colorTarget, colorName, colorBackingOwnership);
}
/* static */ UniquePtr<MozFramebuffer>
@@ -151,7 +154,7 @@ diff -up firefox-154.0/gfx/gl/MozFramebuffer.cpp.D318191 firefox-154.0/gfx/gl/Mo
GLuint fb = gl->CreateFramebuffer();
const ScopedBindFramebuffer bindFB(gl, fb);
-@@ -129,7 +132,8 @@ MozFramebuffer::CreateForBackingWithShar
+@@ -137,7 +141,8 @@ MozFramebuffer::CreateForBackingWithShar
}
return UniquePtr<MozFramebuffer>(new MozFramebuffer(
@@ -161,7 +164,7 @@ diff -up firefox-154.0/gfx/gl/MozFramebuffer.cpp.D318191 firefox-154.0/gfx/gl/Mo
}
/* static */ RefPtr<DepthAndStencilBuffer> DepthAndStencilBuffer::Create(
-@@ -174,14 +178,16 @@ MozFramebuffer::CreateForBackingWithShar
+@@ -187,14 +192,16 @@ MozFramebuffer::CreateForBackingWithShar
MozFramebuffer::MozFramebuffer(
GLContext* const gl, const gfx::IntSize& size, GLuint fb,
const uint32_t samples, RefPtr<DepthAndStencilBuffer> depthAndStencilBuffer,
@@ -180,7 +183,7 @@ diff -up firefox-154.0/gfx/gl/MozFramebuffer.cpp.D318191 firefox-154.0/gfx/gl/Mo
MOZ_ASSERT(mColorTarget);
MOZ_ASSERT(mColorName);
}
-@@ -194,7 +200,9 @@ MozFramebuffer::~MozFramebuffer() {
+@@ -207,7 +214,9 @@ MozFramebuffer::~MozFramebuffer() {
gl->DeleteFramebuffer(mFB);
@@ -191,10 +194,10 @@ diff -up firefox-154.0/gfx/gl/MozFramebuffer.cpp.D318191 firefox-154.0/gfx/gl/Mo
}
bool MozFramebuffer::HasDepth() const {
-diff -up firefox-154.0/gfx/gl/MozFramebuffer.h.D318191 firefox-154.0/gfx/gl/MozFramebuffer.h
---- firefox-154.0/gfx/gl/MozFramebuffer.h.D318191 2026-08-12 23:13:27.000000000 +0200
-+++ firefox-154.0/gfx/gl/MozFramebuffer.h 2026-08-21 13:22:27.412567385 +0200
-@@ -42,7 +42,13 @@ class DepthAndStencilBuffer final : publ
+diff -up firefox-155.0/gfx/gl/MozFramebuffer.h.D318191 firefox-155.0/gfx/gl/MozFramebuffer.h
+--- firefox-155.0/gfx/gl/MozFramebuffer.h.D318191 2026-08-26 23:11:41.000000000 +0200
++++ firefox-155.0/gfx/gl/MozFramebuffer.h 2026-08-27 11:26:51.124546166 +0200
+@@ -43,7 +43,13 @@ class DepthAndStencilBuffer final : publ
};
class MozFramebuffer final {
@@ -208,18 +211,18 @@ diff -up firefox-154.0/gfx/gl/MozFramebuffer.h.D318191 firefox-154.0/gfx/gl/MozF
public:
const gfx::IntSize mSize;
-@@ -64,7 +70,9 @@ class MozFramebuffer final {
+@@ -66,7 +72,9 @@ class MozFramebuffer final {
// Assumes that gl is the current context.
static UniquePtr<MozFramebuffer> CreateForBacking(
- GLContext* gl, const gfx::IntSize& size, uint32_t samples,
-- bool depthStencil, GLenum colorTarget, GLuint colorName);
-+ bool depthStencil, GLenum colorTarget, GLuint colorName,
+ GLContext* gl, const gfx::IntSize& size, uint32_t samples, bool depth,
+- bool stencil, GLenum colorTarget, GLuint colorName);
++ bool stencil, GLenum colorTarget, GLuint colorName,
+ ColorBackingOwnership colorBackingOwnership =
+ ColorBackingOwnership::Owned);
// Create a new framebuffer backed by an existing texture or buffer.
// Use the same GLContext, size, and samples as framebufferToShareWith.
-@@ -74,19 +82,23 @@ class MozFramebuffer final {
+@@ -76,19 +84,23 @@ class MozFramebuffer final {
static UniquePtr<MozFramebuffer> CreateForBackingWithSharedDepthAndStencil(
const gfx::IntSize& size, const uint32_t samples, GLenum colorTarget,
GLuint colorName,
@@ -246,9 +249,9 @@ diff -up firefox-154.0/gfx/gl/MozFramebuffer.h.D318191 firefox-154.0/gfx/gl/MozF
public:
~MozFramebuffer();
-diff -up firefox-154.0/gfx/layers/SurfacePoolWayland.cpp.D318191 firefox-154.0/gfx/layers/SurfacePoolWayland.cpp
---- firefox-154.0/gfx/layers/SurfacePoolWayland.cpp.D318191 2026-08-12 23:13:28.000000000 +0200
-+++ firefox-154.0/gfx/layers/SurfacePoolWayland.cpp 2026-08-21 12:20:33.455125046 +0200
+diff -up firefox-155.0/gfx/layers/SurfacePoolWayland.cpp.D318191 firefox-155.0/gfx/layers/SurfacePoolWayland.cpp
+--- firefox-155.0/gfx/layers/SurfacePoolWayland.cpp.D318191 2026-08-26 23:11:40.000000000 +0200
++++ firefox-155.0/gfx/layers/SurfacePoolWayland.cpp 2026-08-27 11:30:02.112072624 +0200
@@ -296,7 +296,8 @@ UniquePtr<MozFramebuffer> SurfacePoolWay
// framebuffer that shares it.
if (auto buffer = GetDepthBufferForSharing(aProofOfLock, aGL, aSize)) {
@@ -259,13 +262,12 @@ diff -up firefox-154.0/gfx/layers/SurfacePoolWayland.cpp.D318191 firefox-154.0/g
}
}
-@@ -304,7 +305,8 @@ UniquePtr<MozFramebuffer> SurfacePoolWay
- // new depth buffer and store a weak pointer to the new depth buffer in
+@@ -305,7 +306,7 @@ UniquePtr<MozFramebuffer> SurfacePoolWay
// mDepthBuffers.
UniquePtr<MozFramebuffer> fb = MozFramebuffer::CreateForBacking(
-- aGL, aSize, 0, aNeedsDepthBuffer, LOCAL_GL_TEXTURE_2D, aTexture);
-+ aGL, aSize, 0, aNeedsDepthBuffer, LOCAL_GL_TEXTURE_2D, aTexture,
-+ MozFramebuffer::ColorBackingOwnership::Borrowed);
+ aGL, aSize, 0, aNeedsDepthBuffer, aNeedsDepthBuffer, LOCAL_GL_TEXTURE_2D,
+- aTexture);
++ aTexture, MozFramebuffer::ColorBackingOwnership::Borrowed);
if (fb && fb->GetDepthAndStencilBuffer()) {
mDepthBuffers.AppendElement(
DepthBufferEntry{aGL, aSize, fb->GetDepthAndStencilBuffer().get()});
diff --git a/firefox.spec b/firefox.spec
index 95fada0..d5f6786 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -255,7 +255,6 @@ Patch242: 0026-Add-KDE-integration-to-Firefox.patch
# Upstream patches
Patch400: mozilla-1196777.patch
Patch401: mozilla-1667096.patch
-Patch402: D317117.1787384850.diff
Patch403: D318191.1787388141.diff
# https://phabricator.services.mozilla.com/D312871
@@ -544,7 +543,6 @@ cat %{SOURCE49} | sed -e "s|LIBCLANG_RT_PLACEHOLDER|`pwd`/wasi-sdk-30/build/sysr
%patch -P400 -p1 -b .1196777
%patch -P401 -p1 -b .1667096
-%patch -P402 -p1 -b .D317117
%patch -P403 -p1 -b .D318191
%patch -P410 -p1 -b .libwebrtc-video-capture-implement-buffer-stride-support-for-pipewire
diff --git a/libwebrtc-video-capture-implement-buffer-stride-support-for-pipewire.patch b/libwebrtc-video-capture-implement-buffer-stride-support-for-pipewire.patch
index bcf8a1b..3056efa 100644
--- a/libwebrtc-video-capture-implement-buffer-stride-support-for-pipewire.patch
+++ b/libwebrtc-video-capture-implement-buffer-stride-support-for-pipewire.patch
@@ -1,49 +1,6 @@
-From 958cc9da5f101c1b4118cf6013e5a9ca15925019 Mon Sep 17 00:00:00 2001
-From: Robert Mader <robert.mader@collabora.com>
-Date: Mon, 17 Aug 2026 13:43:10 +0000
-Subject: [PATCH] Bug 2056029 - WebRTC backport: video_capture: Implement
- buffer stride support for Pipewire r=pehrsons,grulja
-
-Simple backport of https://webrtc-review.googlesource.com/c/src/+/491680
-
-Upstream commit: 5da5a6e4e00c69ef60c7643e99ef34f65f7af51a
-
-From the commit message:
-Add optional buffer stride support to VideoCaptureImpl and use it in
-VideoCaptureModulePipeWire, allowing us to drop the requirement for
-unpadded buffers. This notably improves compatibility with libcamera,
-which supports a wider range of devices than the V4L2 backend - some
-having hardware requirements for stride-alignment.
-
-Extending `ConvertToI420()` in libyuv was rejected on the grounds that
-there are various approaches to stride handling - using a single stride
-value for multiple planes, having explicit values for each one etc. - as
-well as the fact that we might well want to extend the helper further in
-the future - e.g. in order to better handle color spaces such as BT709
-(instead of always assuming BT601).
-
-Thus this patch now adds a local copy of `ConvertToI420()`, supporting
-implicit and a single explicit stride value for now.
-
-Differential Revision: https://phabricator.services.mozilla.com/D312871
----
- third_party/libwebrtc/common_video/BUILD.gn | 4 +
- .../common_video/common_video_gn/moz.build | 1 +
- .../libyuv/include/webrtc_libyuv.h | 16 +
- .../common_video/libyuv/libyuv_unittest.cc | 30 +-
- .../common_video/libyuv/webrtc_libyuv.cc | 320 ++++++++++++++++++
- .../linux/video_capture_pipewire.cc | 54 +--
- .../modules/video_capture/video_capture.h | 3 +
- .../video_capture/video_capture_impl.cc | 18 +-
- .../video_capture/video_capture_impl.h | 6 +
- .../5da5a6e4e0.no-op-cherry-pick-msg | 1 +
- 10 files changed, 393 insertions(+), 60 deletions(-)
- create mode 100644 third_party/libwebrtc/moz-patch-stack/5da5a6e4e0.no-op-cherry-pick-msg
-
-diff --git a/third_party/libwebrtc/common_video/BUILD.gn b/third_party/libwebrtc/common_video/BUILD.gn
-index 868d09a2eb1ea..eb3cc07f948ad 100644
---- a/third_party/libwebrtc/common_video/BUILD.gn
-+++ b/third_party/libwebrtc/common_video/BUILD.gn
+diff -up firefox-155.0/third_party/libwebrtc/common_video/BUILD.gn.libwebrtc-video-capture-implement-buffer-stride-support-for-pipewire firefox-155.0/third_party/libwebrtc/common_video/BUILD.gn
+--- firefox-155.0/third_party/libwebrtc/common_video/BUILD.gn.libwebrtc-video-capture-implement-buffer-stride-support-for-pipewire 2026-08-26 23:11:58.000000000 +0200
++++ firefox-155.0/third_party/libwebrtc/common_video/BUILD.gn 2026-08-27 12:03:57.125421714 +0200
@@ -97,6 +97,10 @@ rtc_library("common_video") {
"../rtc_base/containers:flat_map",
]
@@ -55,10 +12,9 @@ index 868d09a2eb1ea..eb3cc07f948ad 100644
}
rtc_source_set("frame_counts") {
-diff --git a/third_party/libwebrtc/common_video/common_video_gn/moz.build b/third_party/libwebrtc/common_video/common_video_gn/moz.build
-index 731a68d3323c3..16645ce2d192c 100644
---- a/third_party/libwebrtc/common_video/common_video_gn/moz.build
-+++ b/third_party/libwebrtc/common_video/common_video_gn/moz.build
+diff -up firefox-155.0/third_party/libwebrtc/common_video/common_video_gn/moz.build.libwebrtc-video-capture-implement-buffer-stride-support-for-pipewire firefox-155.0/third_party/libwebrtc/common_video/common_video_gn/moz.build
+--- firefox-155.0/third_party/libwebrtc/common_video/common_video_gn/moz.build.libwebrtc-video-capture-implement-buffer-stride-support-for-pipewire 2026-08-26 23:11:57.000000000 +0200
++++ firefox-155.0/third_party/libwebrtc/common_video/common_video_gn/moz.build 2026-08-27 12:03:57.125568098 +0200
@@ -20,6 +20,7 @@ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -67,11 +23,10 @@ index 731a68d3323c3..16645ce2d192c 100644
FINAL_LIBRARY = "xul"
-diff --git a/third_party/libwebrtc/common_video/libyuv/include/webrtc_libyuv.h b/third_party/libwebrtc/common_video/libyuv/include/webrtc_libyuv.h
-index b18957b6be686..a1899dba88b1c 100644
---- a/third_party/libwebrtc/common_video/libyuv/include/webrtc_libyuv.h
-+++ b/third_party/libwebrtc/common_video/libyuv/include/webrtc_libyuv.h
-@@ -84,6 +84,22 @@ int ConvertFromI420(const VideoFrame& src_frame,
+diff -up firefox-155.0/third_party/libwebrtc/common_video/libyuv/include/webrtc_libyuv.h.libwebrtc-video-capture-implement-buffer-stride-support-for-pipewire firefox-155.0/third_party/libwebrtc/common_video/libyuv/include/webrtc_libyuv.h
+--- firefox-155.0/third_party/libwebrtc/common_video/libyuv/include/webrtc_libyuv.h.libwebrtc-video-capture-implement-buffer-stride-support-for-pipewire 2026-08-26 23:11:57.000000000 +0200
++++ firefox-155.0/third_party/libwebrtc/common_video/libyuv/include/webrtc_libyuv.h 2026-08-27 12:03:57.125648087 +0200
+@@ -84,6 +84,22 @@ int ConvertFromI420(const VideoFrame& sr
int dst_sample_size,
uint8_t* dst_frame);
@@ -94,10 +49,9 @@ index b18957b6be686..a1899dba88b1c 100644
scoped_refptr<I420BufferInterface> ScaleVideoFrameBuffer(
const I420BufferInterface& source,
int dst_width,
-diff --git a/third_party/libwebrtc/common_video/libyuv/libyuv_unittest.cc b/third_party/libwebrtc/common_video/libyuv/libyuv_unittest.cc
-index 6b47ec65ea01e..448ace8dfcea1 100644
---- a/third_party/libwebrtc/common_video/libyuv/libyuv_unittest.cc
-+++ b/third_party/libwebrtc/common_video/libyuv/libyuv_unittest.cc
+diff -up firefox-155.0/third_party/libwebrtc/common_video/libyuv/libyuv_unittest.cc.libwebrtc-video-capture-implement-buffer-stride-support-for-pipewire firefox-155.0/third_party/libwebrtc/common_video/libyuv/libyuv_unittest.cc
+--- firefox-155.0/third_party/libwebrtc/common_video/libyuv/libyuv_unittest.cc.libwebrtc-video-capture-implement-buffer-stride-support-for-pipewire 2026-08-26 23:11:57.000000000 +0200
++++ firefox-155.0/third_party/libwebrtc/common_video/libyuv/libyuv_unittest.cc 2026-08-27 12:03:57.125709162 +0200
@@ -172,12 +172,12 @@ TEST_F(TestLibYuv, ConvertTest) {
EXPECT_EQ(0, ConvertFromI420(*orig_frame_, VideoType::kRGB24, 0,
res_rgb_buffer2.get()));
@@ -178,10 +132,9 @@ index 6b47ec65ea01e..448ace8dfcea1 100644
ConvertVideoType(VideoType::kARGB));
EXPECT_EQ(0, ret);
-diff --git a/third_party/libwebrtc/common_video/libyuv/webrtc_libyuv.cc b/third_party/libwebrtc/common_video/libyuv/webrtc_libyuv.cc
-index 9dd12b42f223f..8527f34163b4e 100644
---- a/third_party/libwebrtc/common_video/libyuv/webrtc_libyuv.cc
-+++ b/third_party/libwebrtc/common_video/libyuv/webrtc_libyuv.cc
+diff -up firefox-155.0/third_party/libwebrtc/common_video/libyuv/webrtc_libyuv.cc.libwebrtc-video-capture-implement-buffer-stride-support-for-pipewire firefox-155.0/third_party/libwebrtc/common_video/libyuv/webrtc_libyuv.cc
+--- firefox-155.0/third_party/libwebrtc/common_video/libyuv/webrtc_libyuv.cc.libwebrtc-video-capture-implement-buffer-stride-support-for-pipewire 2026-08-26 23:11:57.000000000 +0200
++++ firefox-155.0/third_party/libwebrtc/common_video/libyuv/webrtc_libyuv.cc 2026-08-27 12:03:57.125835468 +0200
@@ -10,8 +10,10 @@
#include "common_video/libyuv/include/webrtc_libyuv.h"
@@ -201,7 +154,7 @@ index 9dd12b42f223f..8527f34163b4e 100644
#include "third_party/libyuv/include/libyuv/scale.h"
#include "third_party/libyuv/include/libyuv/video_common.h"
-@@ -146,6 +149,323 @@ int ConvertFromI420(const VideoFrame& src_frame,
+@@ -146,6 +149,323 @@ int ConvertFromI420(const VideoFrame& sr
ConvertVideoType(dst_video_type));
}
@@ -525,11 +478,10 @@ index 9dd12b42f223f..8527f34163b4e 100644
scoped_refptr<I420ABufferInterface> ScaleI420ABuffer(
const I420ABufferInterface& buffer,
int target_width,
-diff --git a/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc b/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc
-index 8118f5e2b2a67..5ca96108e9dd7 100644
---- a/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc
-+++ b/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc
-@@ -363,36 +363,6 @@ void VideoCaptureModulePipeWire::OnFormatChanged(const struct spa_pod* format) {
+diff -up firefox-155.0/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc.libwebrtc-video-capture-implement-buffer-stride-support-for-pipewire firefox-155.0/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc
+--- firefox-155.0/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc.libwebrtc-video-capture-implement-buffer-stride-support-for-pipewire 2026-08-26 23:11:59.000000000 +0200
++++ firefox-155.0/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc 2026-08-27 12:05:23.836837038 +0200
+@@ -375,36 +375,6 @@ void VideoCaptureModulePipeWire::OnForma
spa_pod_builder_push_object(&builder, &frame, SPA_TYPE_OBJECT_ParamBuffers,
SPA_PARAM_Buffers);
@@ -566,7 +518,7 @@ index 8118f5e2b2a67..5ca96108e9dd7 100644
const int buffer_types =
(1 << SPA_DATA_DmaBuf) | (1 << SPA_DATA_MemFd) | (1 << SPA_DATA_MemPtr);
spa_pod_builder_add(
-@@ -471,17 +441,6 @@ void VideoCaptureModulePipeWire::ProcessBuffers() {
+@@ -483,17 +453,6 @@ void VideoCaptureModulePipeWire::Process
h = static_cast<struct spa_meta_header*>(
spa_buffer_find_meta_data(spaBuffer, SPA_META_Header, sizeof(*h)));
@@ -581,10 +533,10 @@ index 8118f5e2b2a67..5ca96108e9dd7 100644
- SetApplyRotation(rotation != kVideoRotation_0);
- }
-
- if (h->flags & SPA_META_HEADER_FLAG_CORRUPTED) {
- RTC_LOG(LS_INFO) << "Dropping corruped frame.";
+ if (h && (h->flags & SPA_META_HEADER_FLAG_CORRUPTED)) {
+ RTC_LOG(LS_INFO) << "Dropping corrupted frame.";
pw_stream_queue_buffer(stream_, buffer);
-@@ -496,6 +455,19 @@ void VideoCaptureModulePipeWire::ProcessBuffers() {
+@@ -508,6 +467,19 @@ void VideoCaptureModulePipeWire::Process
continue;
}
@@ -604,11 +556,10 @@ index 8118f5e2b2a67..5ca96108e9dd7 100644
if (spaBuffer->datas[0].type == SPA_DATA_DmaBuf ||
spaBuffer->datas[0].type == SPA_DATA_MemFd) {
ScopedBuf frame;
-diff --git a/third_party/libwebrtc/modules/video_capture/video_capture.h b/third_party/libwebrtc/modules/video_capture/video_capture.h
-index d88b63466eb28..563f00c3da462 100644
---- a/third_party/libwebrtc/modules/video_capture/video_capture.h
-+++ b/third_party/libwebrtc/modules/video_capture/video_capture.h
-@@ -155,6 +155,9 @@ class VideoCaptureModule : public RefCountInterface {
+diff -up firefox-155.0/third_party/libwebrtc/modules/video_capture/video_capture.h.libwebrtc-video-capture-implement-buffer-stride-support-for-pipewire firefox-155.0/third_party/libwebrtc/modules/video_capture/video_capture.h
+--- firefox-155.0/third_party/libwebrtc/modules/video_capture/video_capture.h.libwebrtc-video-capture-implement-buffer-stride-support-for-pipewire 2026-08-26 23:11:57.000000000 +0200
++++ firefox-155.0/third_party/libwebrtc/modules/video_capture/video_capture.h 2026-08-27 12:03:57.126064427 +0200
+@@ -155,6 +155,9 @@ class VideoCaptureModule : public RefCou
// Return whether the rotation is applied or left pending.
virtual bool GetApplyRotation() = 0;
@@ -618,10 +569,9 @@ index d88b63466eb28..563f00c3da462 100644
// Mozilla: TrackingId setter for use in profiler markers.
virtual void SetTrackingId(uint32_t aTrackingIdProcId) {}
-diff --git a/third_party/libwebrtc/modules/video_capture/video_capture_impl.cc b/third_party/libwebrtc/modules/video_capture/video_capture_impl.cc
-index f4f9827ef55ad..ed83ab6e57c48 100644
---- a/third_party/libwebrtc/modules/video_capture/video_capture_impl.cc
-+++ b/third_party/libwebrtc/modules/video_capture/video_capture_impl.cc
+diff -up firefox-155.0/third_party/libwebrtc/modules/video_capture/video_capture_impl.cc.libwebrtc-video-capture-implement-buffer-stride-support-for-pipewire firefox-155.0/third_party/libwebrtc/modules/video_capture/video_capture_impl.cc
+--- firefox-155.0/third_party/libwebrtc/modules/video_capture/video_capture_impl.cc.libwebrtc-video-capture-implement-buffer-stride-support-for-pipewire 2026-08-26 23:11:58.000000000 +0200
++++ firefox-155.0/third_party/libwebrtc/modules/video_capture/video_capture_impl.cc 2026-08-27 12:03:57.126118328 +0200
@@ -31,7 +31,6 @@
#include "rtc_base/time_utils.h"
#include "rtc_base/trace_event.h"
@@ -630,7 +580,7 @@ index f4f9827ef55ad..ed83ab6e57c48 100644
#include "third_party/libyuv/include/libyuv/rotate.h"
namespace webrtc {
-@@ -94,6 +93,7 @@ VideoCaptureImpl::VideoCaptureImpl(Clock* clock)
+@@ -94,6 +93,7 @@ VideoCaptureImpl::VideoCaptureImpl(Clock
_lastProcessFrameTimeNanos(clock->TimeInMicroseconds() * 1000),
_rotateFrame(kVideoRotation_0),
apply_rotation_(false),
@@ -638,7 +588,7 @@ index f4f9827ef55ad..ed83ab6e57c48 100644
clock_(clock) {
_requestedCapability.width = kDefaultWidth;
_requestedCapability.height = kDefaultHeight;
-@@ -230,11 +230,11 @@ int32_t VideoCaptureImpl::IncomingFrame(uint8_t* videoFrame,
+@@ -230,11 +230,11 @@ int32_t VideoCaptureImpl::IncomingFrame(
std::swap(dst_width, dst_height);
}
@@ -653,7 +603,7 @@ index f4f9827ef55ad..ed83ab6e57c48 100644
ConvertVideoType(frameInfo.videoType));
if (conversionResult != 0) {
RTC_LOG(LS_ERROR) << "Failed to convert capture frame from type "
-@@ -300,6 +300,16 @@ bool VideoCaptureImpl::GetApplyRotation() {
+@@ -300,6 +300,16 @@ bool VideoCaptureImpl::GetApplyRotation(
return apply_rotation_;
}
@@ -670,11 +620,10 @@ index f4f9827ef55ad..ed83ab6e57c48 100644
void VideoCaptureImpl::UpdateFrameCount() {
RTC_CHECK_RUNS_SERIALIZED(&capture_checker_);
-diff --git a/third_party/libwebrtc/modules/video_capture/video_capture_impl.h b/third_party/libwebrtc/modules/video_capture/video_capture_impl.h
-index ec404f098d4a3..3ad11498b9767 100644
---- a/third_party/libwebrtc/modules/video_capture/video_capture_impl.h
-+++ b/third_party/libwebrtc/modules/video_capture/video_capture_impl.h
-@@ -70,6 +70,8 @@ class RTC_EXPORT VideoCaptureImpl : public VideoCaptureModule {
+diff -up firefox-155.0/third_party/libwebrtc/modules/video_capture/video_capture_impl.h.libwebrtc-video-capture-implement-buffer-stride-support-for-pipewire firefox-155.0/third_party/libwebrtc/modules/video_capture/video_capture_impl.h
+--- firefox-155.0/third_party/libwebrtc/modules/video_capture/video_capture_impl.h.libwebrtc-video-capture-implement-buffer-stride-support-for-pipewire 2026-08-26 23:11:58.000000000 +0200
++++ firefox-155.0/third_party/libwebrtc/modules/video_capture/video_capture_impl.h 2026-08-27 12:03:57.126176457 +0200
+@@ -70,6 +70,8 @@ class RTC_EXPORT VideoCaptureImpl : publ
int32_t SetCaptureRotation(VideoRotation rotation) override;
bool SetApplyRotation(bool enable) override;
bool GetApplyRotation() override;
@@ -683,7 +632,7 @@ index ec404f098d4a3..3ad11498b9767 100644
const char* CurrentDeviceName() const override;
-@@ -131,6 +133,10 @@ class RTC_EXPORT VideoCaptureImpl : public VideoCaptureModule {
+@@ -131,6 +133,10 @@ class RTC_EXPORT VideoCaptureImpl : publ
// Indicate whether rotation should be applied before delivered externally.
bool apply_rotation_ RTC_GUARDED_BY(api_lock_);
diff --git a/wasi.patch b/wasi.patch
index daf7a2b..9fa7675 100644
--- a/wasi.patch
+++ b/wasi.patch
@@ -6,7 +6,7 @@ diff -up firefox-134.0.1/toolkit/moz.configure.wasi firefox-134.0.1/toolkit/moz.
if wasi_sysroot:
log.info("Using wasi sysroot in %s", wasi_sysroot)
- return ["--sysroot=%s" % wasi_sysroot]
-+ return ["--sysroot=%s" % wasi_sysroot, "-nodefaultlibs", "-lc", "-lwasi-emulated-process-clocks", "-lc++", "-lc++abi", "/home/komat/CVS/firefox/firefox-154.0-build/firefox-154.0/wasi-sdk-30/build/sysroot/install/wasi-resource-dir/lib/wasm32-unknown-wasip1/libclang_rt.builtins.a"]
++ return ["--sysroot=%s" % wasi_sysroot, "-nodefaultlibs", "-lc", "-lwasi-emulated-process-clocks", "-lc++", "-lc++abi", "/home/komat/CVS/firefox/firefox-155.0-build/firefox-155.0/wasi-sdk-30/build/sysroot/install/wasi-resource-dir/lib/wasm32-unknown-wasip1/libclang_rt.builtins.a"]
return []
set_config("WASI_SYSROOT", wasi_sysroot)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [rpms/firefox] f45: Merge branch 'rawhide' into f45
@ 2026-09-10 9:33 Martin Stransky
0 siblings, 0 replies; 4+ messages in thread
From: Martin Stransky @ 2026-09-10 9:33 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/firefox
Branch : f45
Commit : 1fe3adbd80c36c6646a1a421cdf83e27217ffe3d
Author : Martin Stransky <stransky@redhat.com>
Date : 2026-09-10T11:33:09+02:00
Stats : +207/-281 in 7 file(s)
URL : https://src.fedoraproject.org/rpms/firefox/c/1fe3adbd80c36c6646a1a421cdf83e27217ffe3d?branch=f45
Log:
Merge branch 'rawhide' into f45
---
diff --git a/D318191.1787388141.diff b/D318191.1787388141.diff
deleted file mode 100644
index c3a43e3..0000000
--- a/D318191.1787388141.diff
+++ /dev/null
@@ -1,273 +0,0 @@
-diff -up firefox-155.0/gfx/gl/gtest/moz.build.D318191 firefox-155.0/gfx/gl/gtest/moz.build
---- firefox-155.0/gfx/gl/gtest/moz.build.D318191 2026-08-26 23:11:41.000000000 +0200
-+++ firefox-155.0/gfx/gl/gtest/moz.build 2026-08-27 11:24:19.402580859 +0200
-@@ -6,8 +6,15 @@ LOCAL_INCLUDES += [
- "/gfx/gl",
- ]
-
-+include("/ipc/chromium/chromium-config.mozbuild")
-+
- UNIFIED_SOURCES += [
- "TestColorspaces.cpp",
- ]
-
-+if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-+ UNIFIED_SOURCES += [
-+ "TestMozFramebuffer.cpp",
-+ ]
-+
- FINAL_LIBRARY = "xul-gtest"
-diff -up firefox-155.0/gfx/gl/gtest/TestMozFramebuffer.cpp.D318191 firefox-155.0/gfx/gl/gtest/TestMozFramebuffer.cpp
---- firefox-155.0/gfx/gl/gtest/TestMozFramebuffer.cpp.D318191 2026-08-27 11:24:19.402718907 +0200
-+++ firefox-155.0/gfx/gl/gtest/TestMozFramebuffer.cpp 2026-08-27 11:24:19.402718907 +0200
-@@ -0,0 +1,82 @@
-+/* This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+#include "GLContext.h"
-+#include "GLContextProvider.h"
-+#include "MozFramebuffer.h"
-+#include "ScopedGLHelpers.h"
-+#include "gfxPlatform.h"
-+#include "gtest/gtest.h"
-+
-+namespace mozilla::gl {
-+
-+static already_AddRefed<GLContext> CreateTestContext(
-+ nsACString* const aFailureId) {
-+ return GLContextProvider::CreateHeadless({}, aFailureId);
-+}
-+
-+TEST(MozFramebuffer, OwnedColorBackingIsDeletedWithFramebuffer)
-+{
-+ gfxPlatform::GetPlatform();
-+
-+ nsCString failureId;
-+ RefPtr<GLContext> gl = CreateTestContext(&failureId);
-+ ASSERT_TRUE(gl)
-+ << failureId.get();
-+ ASSERT_TRUE(gl->MakeCurrent());
-+
-+ const gfx::IntSize size(16, 16);
-+ GLuint texture = gl->CreateTexture();
-+ {
-+ const ScopedBindTexture bindTexture(gl, texture);
-+ gl->TexParams_SetClampNoMips(LOCAL_GL_TEXTURE_2D);
-+ gl->fTexImage2D(LOCAL_GL_TEXTURE_2D, 0, LOCAL_GL_RGBA, size.width,
-+ size.height, 0, LOCAL_GL_RGBA, LOCAL_GL_UNSIGNED_BYTE,
-+ nullptr);
-+ }
-+ ASSERT_TRUE(gl->fIsTexture(texture));
-+
-+ {
-+ auto framebuffer = MozFramebuffer::CreateForBacking(
-+ gl, size, 0, false, false, LOCAL_GL_TEXTURE_2D, texture);
-+ ASSERT_TRUE(framebuffer);
-+ }
-+
-+ EXPECT_FALSE(gl->fIsTexture(texture));
-+}
-+
-+TEST(MozFramebuffer, BorrowedColorBackingSurvivesFramebufferDestruction)
-+{
-+ gfxPlatform::GetPlatform();
-+
-+ nsCString failureId;
-+ RefPtr<GLContext> gl = CreateTestContext(&failureId);
-+ ASSERT_TRUE(gl)
-+ << failureId.get();
-+ ASSERT_TRUE(gl->MakeCurrent());
-+
-+ const gfx::IntSize size(16, 16);
-+ GLuint texture = gl->CreateTexture();
-+ {
-+ const ScopedBindTexture bindTexture(gl, texture);
-+ gl->TexParams_SetClampNoMips(LOCAL_GL_TEXTURE_2D);
-+ gl->fTexImage2D(LOCAL_GL_TEXTURE_2D, 0, LOCAL_GL_RGBA, size.width,
-+ size.height, 0, LOCAL_GL_RGBA, LOCAL_GL_UNSIGNED_BYTE,
-+ nullptr);
-+ }
-+ ASSERT_TRUE(gl->fIsTexture(texture));
-+
-+ {
-+ auto framebuffer = MozFramebuffer::CreateForBacking(
-+ gl, size, 0, false, false, LOCAL_GL_TEXTURE_2D, texture,
-+ MozFramebuffer::ColorBackingOwnership::Borrowed);
-+ ASSERT_TRUE(framebuffer);
-+ EXPECT_EQ(framebuffer->ColorTex(), texture);
-+ }
-+
-+ EXPECT_TRUE(gl->fIsTexture(texture));
-+ gl->DeleteTexture(texture);
-+}
-+
-+} // namespace mozilla::gl
-diff -up firefox-155.0/gfx/gl/MozFramebuffer.cpp.D318191 firefox-155.0/gfx/gl/MozFramebuffer.cpp
---- firefox-155.0/gfx/gl/MozFramebuffer.cpp.D318191 2026-08-26 23:11:40.000000000 +0200
-+++ firefox-155.0/gfx/gl/MozFramebuffer.cpp 2026-08-27 11:29:08.891005510 +0200
-@@ -69,37 +69,41 @@ UniquePtr<MozFramebuffer> MozFramebuffer
- (depth || stencil) ? DepthAndStencilBuffer::Create(
- gl, size, samples, depth, stencil)
- : nullptr,
-- colorTarget, colorName);
-+ colorTarget, colorName,
-+ ColorBackingOwnership::Owned);
- }
-
- UniquePtr<MozFramebuffer> MozFramebuffer::CreateForBacking(
- GLContext* const gl, const gfx::IntSize& size, const uint32_t samples,
- bool depth, bool stencil, const GLenum colorTarget,
-- const GLuint colorName) {
-+ const GLuint colorName,
-+ ColorBackingOwnership colorBackingOwnership) {
- return CreateImpl(gl, size, samples,
- (depth || stencil) ? DepthAndStencilBuffer::Create(
- gl, size, samples, depth, stencil)
- : nullptr,
-- colorTarget, colorName);
-+ colorTarget, colorName, colorBackingOwnership);
- }
-
- /* static */ UniquePtr<MozFramebuffer>
- MozFramebuffer::CreateForBackingWithSharedDepthAndStencil(
- const gfx::IntSize& size, const uint32_t samples, GLenum colorTarget,
- GLuint colorName,
-- const RefPtr<DepthAndStencilBuffer>& depthAndStencilBuffer) {
-+ const RefPtr<DepthAndStencilBuffer>& depthAndStencilBuffer,
-+ ColorBackingOwnership colorBackingOwnership) {
- auto gl = depthAndStencilBuffer->gl();
- if (!gl || !gl->MakeCurrent()) {
- return nullptr;
- }
- return CreateImpl(gl, size, samples, depthAndStencilBuffer, colorTarget,
-- colorName);
-+ colorName, colorBackingOwnership);
- }
-
- /* static */ UniquePtr<MozFramebuffer> MozFramebuffer::CreateImpl(
- GLContext* const gl, const gfx::IntSize& size, const uint32_t samples,
- const RefPtr<DepthAndStencilBuffer>& depthAndStencilBuffer,
-- const GLenum colorTarget, const GLuint colorName) {
-+ const GLenum colorTarget, const GLuint colorName,
-+ ColorBackingOwnership colorBackingOwnership) {
- GLuint fb = gl->CreateFramebuffer();
- const ScopedBindFramebuffer bindFB(gl, fb);
-
-@@ -137,7 +141,8 @@ MozFramebuffer::CreateForBackingWithShar
- }
-
- return UniquePtr<MozFramebuffer>(new MozFramebuffer(
-- gl, size, fb, samples, depthAndStencilBuffer, colorTarget, colorName));
-+ gl, size, fb, samples, depthAndStencilBuffer, colorTarget, colorName,
-+ colorBackingOwnership));
- }
-
- /* static */ RefPtr<DepthAndStencilBuffer> DepthAndStencilBuffer::Create(
-@@ -187,14 +192,16 @@ MozFramebuffer::CreateForBackingWithShar
- MozFramebuffer::MozFramebuffer(
- GLContext* const gl, const gfx::IntSize& size, GLuint fb,
- const uint32_t samples, RefPtr<DepthAndStencilBuffer> depthAndStencilBuffer,
-- const GLenum colorTarget, const GLuint colorName)
-+ const GLenum colorTarget, const GLuint colorName,
-+ ColorBackingOwnership colorBackingOwnership)
- : mWeakGL(gl),
- mSize(size),
- mSamples(samples),
- mFB(fb),
- mColorTarget(colorTarget),
- mDepthAndStencilBuffer(std::move(depthAndStencilBuffer)),
-- mColorName(colorName) {
-+ mColorName(colorName),
-+ mColorBackingOwnership(colorBackingOwnership) {
- MOZ_ASSERT(mColorTarget);
- MOZ_ASSERT(mColorName);
- }
-@@ -207,7 +214,9 @@ MozFramebuffer::~MozFramebuffer() {
-
- gl->DeleteFramebuffer(mFB);
-
-- DeleteByTarget(gl, mColorTarget, mColorName);
-+ if (mColorBackingOwnership == ColorBackingOwnership::Owned) {
-+ DeleteByTarget(gl, mColorTarget, mColorName);
-+ }
- }
-
- bool MozFramebuffer::HasDepth() const {
-diff -up firefox-155.0/gfx/gl/MozFramebuffer.h.D318191 firefox-155.0/gfx/gl/MozFramebuffer.h
---- firefox-155.0/gfx/gl/MozFramebuffer.h.D318191 2026-08-26 23:11:41.000000000 +0200
-+++ firefox-155.0/gfx/gl/MozFramebuffer.h 2026-08-27 11:26:51.124546166 +0200
-@@ -43,7 +43,13 @@ class DepthAndStencilBuffer final : publ
- };
-
- class MozFramebuffer final {
-+ public:
-+ // A borrowed color backing must outlive the MozFramebuffer that wraps it.
-+ enum class ColorBackingOwnership { Owned, Borrowed };
-+
-+ private:
- const WeakPtr<GLContext> mWeakGL;
-+ const ColorBackingOwnership mColorBackingOwnership;
-
- public:
- const gfx::IntSize mSize;
-@@ -66,7 +72,9 @@ class MozFramebuffer final {
- // Assumes that gl is the current context.
- static UniquePtr<MozFramebuffer> CreateForBacking(
- GLContext* gl, const gfx::IntSize& size, uint32_t samples, bool depth,
-- bool stencil, GLenum colorTarget, GLuint colorName);
-+ bool stencil, GLenum colorTarget, GLuint colorName,
-+ ColorBackingOwnership colorBackingOwnership =
-+ ColorBackingOwnership::Owned);
-
- // Create a new framebuffer backed by an existing texture or buffer.
- // Use the same GLContext, size, and samples as framebufferToShareWith.
-@@ -76,19 +84,23 @@ class MozFramebuffer final {
- static UniquePtr<MozFramebuffer> CreateForBackingWithSharedDepthAndStencil(
- const gfx::IntSize& size, const uint32_t samples, GLenum colorTarget,
- GLuint colorName,
-- const RefPtr<DepthAndStencilBuffer>& depthAndStencilBuffer);
-+ const RefPtr<DepthAndStencilBuffer>& depthAndStencilBuffer,
-+ ColorBackingOwnership colorBackingOwnership =
-+ ColorBackingOwnership::Owned);
-
- private:
- MozFramebuffer(GLContext* gl, const gfx::IntSize& size, GLuint fb,
- uint32_t samples,
- RefPtr<DepthAndStencilBuffer> depthAndStencilBuffer,
-- GLenum colorTarget, GLuint colorName);
-+ GLenum colorTarget, GLuint colorName,
-+ ColorBackingOwnership colorBackingOwnership);
-
- // gl must be the current context when this is called.
- static UniquePtr<MozFramebuffer> CreateImpl(
- GLContext* const gl, const gfx::IntSize& size, const uint32_t samples,
- const RefPtr<DepthAndStencilBuffer>& depthAndStencilBuffer,
-- const GLenum colorTarget, const GLuint colorName);
-+ const GLenum colorTarget, const GLuint colorName,
-+ ColorBackingOwnership colorBackingOwnership);
-
- public:
- ~MozFramebuffer();
-diff -up firefox-155.0/gfx/layers/SurfacePoolWayland.cpp.D318191 firefox-155.0/gfx/layers/SurfacePoolWayland.cpp
---- firefox-155.0/gfx/layers/SurfacePoolWayland.cpp.D318191 2026-08-26 23:11:40.000000000 +0200
-+++ firefox-155.0/gfx/layers/SurfacePoolWayland.cpp 2026-08-27 11:30:02.112072624 +0200
-@@ -296,7 +296,8 @@ UniquePtr<MozFramebuffer> SurfacePoolWay
- // framebuffer that shares it.
- if (auto buffer = GetDepthBufferForSharing(aProofOfLock, aGL, aSize)) {
- return MozFramebuffer::CreateForBackingWithSharedDepthAndStencil(
-- aSize, 0, LOCAL_GL_TEXTURE_2D, aTexture, buffer);
-+ aSize, 0, LOCAL_GL_TEXTURE_2D, aTexture, buffer,
-+ MozFramebuffer::ColorBackingOwnership::Borrowed);
- }
- }
-
-@@ -305,7 +306,7 @@ UniquePtr<MozFramebuffer> SurfacePoolWay
- // mDepthBuffers.
- UniquePtr<MozFramebuffer> fb = MozFramebuffer::CreateForBacking(
- aGL, aSize, 0, aNeedsDepthBuffer, aNeedsDepthBuffer, LOCAL_GL_TEXTURE_2D,
-- aTexture);
-+ aTexture, MozFramebuffer::ColorBackingOwnership::Borrowed);
- if (fb && fb->GetDepthAndStencilBuffer()) {
- mDepthBuffers.AppendElement(
- DepthBufferEntry{aGL, aSize, fb->GetDepthAndStencilBuffer().get()});
diff --git a/D324870.1789116963.diff b/D324870.1789116963.diff
new file mode 100644
index 0000000..10475b5
--- /dev/null
+++ b/D324870.1789116963.diff
@@ -0,0 +1,84 @@
+diff --git a/widget/gtk/nsWindowWayland.h b/widget/gtk/nsWindowWayland.h
+--- a/widget/gtk/nsWindowWayland.h
++++ b/widget/gtk/nsWindowWayland.h
+@@ -234,11 +234,11 @@
+
+ RefPtr<mozilla::WaylandVsyncSource> mWaylandVsyncSource;
+ RefPtr<mozilla::VsyncDispatcher> mWaylandVsyncDispatcher;
+ LayoutDeviceIntPoint mNativeLockedPoint;
+ xdg_toplevel_session_v1* mSessionRestoreToken = nullptr;
+- nsString mSessionID;
++ nsString mWorkspaceID;
+
+ gulong mXdgToplevelRealizedID = 0;
+
+ zwp_locked_pointer_v1* mLockedPointer = nullptr;
+ zwp_relative_pointer_v1* mRelativePointer = nullptr;
+diff --git a/widget/gtk/nsWindowWayland.cpp b/widget/gtk/nsWindowWayland.cpp
+--- a/widget/gtk/nsWindowWayland.cpp
++++ b/widget/gtk/nsWindowWayland.cpp
+@@ -111,11 +111,11 @@
+ LOG("nsWindowWayland::CreateRestoreSession(): failed to get restore "
+ "session, quit.");
+ return false;
+ }
+
+- NS_ConvertUTF16toUTF8 id(mSessionID);
++ NS_ConvertUTF16toUTF8 id(mWorkspaceID);
+ if (aRestoreWindow) {
+ mSessionRestoreToken =
+ xdg_session_v1_restore_toplevel(session, toplevel, id.get());
+ } else {
+ mSessionRestoreToken =
+@@ -126,17 +126,17 @@
+ id.get(), aRestoreWindow, mSessionRestoreToken);
+ return !!mSessionRestoreToken;
+ }
+
+ void nsWindowWayland::GetWorkspaceID(nsAString& workspaceID) {
+- if (mSessionID.IsEmpty() && !GenerateWorkspaceID(mSessionID)) {
++ if (mWorkspaceID.IsEmpty() && !GenerateWorkspaceID(mWorkspaceID)) {
+ return;
+ }
+- workspaceID.Assign(mSessionID);
++ workspaceID.Assign(mWorkspaceID);
+
+ LOG("nsWindowWayland::GetWorkspaceID() ID %s token %p",
+- NS_ConvertUTF16toUTF8(mSessionID).get(), mSessionRestoreToken);
++ NS_ConvertUTF16toUTF8(mWorkspaceID).get(), mSessionRestoreToken);
+
+ if (mSessionRestoreToken) {
+ return;
+ }
+
+@@ -154,11 +154,11 @@
+ };
+ #endif
+
+ void nsWindowWayland::RestoreXdgToplevel() {
+ LOG("nsWindowWayland::RestoreXdgToplevel() ID %s GdkWindow [%p]",
+- NS_ConvertUTF16toUTF8(mSessionID).get(), GetToplevelGdkWindow());
++ NS_ConvertUTF16toUTF8(mWorkspaceID).get(), GetToplevelGdkWindow());
+ if (CreateRestoreSession(/* aRestoreWindow */ true)) {
+ #ifdef MOZ_LOGGING
+ if (LOG_ENABLED()) {
+ xdg_toplevel_session_v1_add_listener(mSessionRestoreToken,
+ &sSessionListener, this);
+@@ -166,14 +166,14 @@
+ #endif
+ }
+ }
+
+ void nsWindowWayland::MoveToWorkspace(const nsAString& workspaceIDStr) {
+- mSessionID.Assign(workspaceIDStr);
++ mWorkspaceID.Assign(workspaceIDStr);
+ LOG("nsWindowWayland::MoveToWorkspace() session ID %s "
+ "mWaitingToSessionRestore %d mNeedsShow %d",
+- NS_ConvertUTF16toUTF8(mSessionID).get(), mWaitingToSessionRestore,
++ NS_ConvertUTF16toUTF8(mWorkspaceID).get(), mWaitingToSessionRestore,
+ mNeedsShow);
+ if (!mWaitingToSessionRestore) {
+ return;
+ }
+ mWaitingToSessionRestore = false;
+
diff --git a/D324871.1789116972.diff b/D324871.1789116972.diff
new file mode 100644
index 0000000..054dd2a
--- /dev/null
+++ b/D324871.1789116972.diff
@@ -0,0 +1,77 @@
+diff --git a/widget/gtk/nsWindowWayland.cpp b/widget/gtk/nsWindowWayland.cpp
+--- a/widget/gtk/nsWindowWayland.cpp
++++ b/widget/gtk/nsWindowWayland.cpp
+@@ -55,30 +55,31 @@
+
+ Likewise we use GetWorkspaceID() to create/save the xdg_toplevel session
+ for later restore.
+ */
+
+-bool GenerateWorkspaceID(nsAString& aName) {
++// Make the GenerateWorkspaceID() failures fatal as missing workspace ID
++// leads to broken profile (Bug 2059617).
++static void GenerateWorkspaceID(nsAString& aName) {
+ nsresult rv;
+ nsCOMPtr<nsIUUIDGenerator> uuidGenerator =
+ do_GetService("@mozilla.org/uuid-generator;1", &rv);
+- if (NS_WARN_IF(NS_FAILED(rv))) {
+- return false;
++ if (NS_FAILED(rv)) {
++ MOZ_CRASH("Missing component!");
+ }
+
+ nsID id;
+ rv = uuidGenerator->GenerateUUIDInPlace(&id);
+- if (NS_WARN_IF(NS_FAILED(rv))) {
+- return false;
++ if (NS_FAILED(rv)) {
++ MOZ_CRASH("GenerateUUIDInPlace() failed!");
+ }
+
+ char chars[NSID_LENGTH];
+ id.ToProvidedString(chars);
+
+ // NSID_LENGTH counts the null terminator.
+ aName.AssignASCII(chars, NSID_LENGTH - 1);
+- return true;
+ }
+
+ static struct xdg_toplevel* GetXdgToplevelFromGdkWindow(GdkWindow* aWindow) {
+ static auto sGdkWaylandWindowGetXdgToplevel =
+ (struct xdg_toplevel * (*)(GdkWindow*))
+@@ -111,10 +112,19 @@
+ LOG("nsWindowWayland::CreateRestoreSession(): failed to get restore "
+ "session, quit.");
+ return false;
+ }
+
++ // If we have old profile / workspace ID just replace it by
++ // UUID to avoid protocol error crash (Bug 2059617).
++ nsresult ret;
++ (void)mWorkspaceID.ToInteger(&ret);
++ if (NS_SUCCEEDED(ret)) {
++ GenerateWorkspaceID(mWorkspaceID);
++ aRestoreWindow = false;
++ }
++
+ NS_ConvertUTF16toUTF8 id(mWorkspaceID);
+ if (aRestoreWindow) {
+ mSessionRestoreToken =
+ xdg_session_v1_restore_toplevel(session, toplevel, id.get());
+ } else {
+@@ -126,12 +136,12 @@
+ id.get(), aRestoreWindow, mSessionRestoreToken);
+ return !!mSessionRestoreToken;
+ }
+
+ void nsWindowWayland::GetWorkspaceID(nsAString& workspaceID) {
+- if (mWorkspaceID.IsEmpty() && !GenerateWorkspaceID(mWorkspaceID)) {
+- return;
++ if (mWorkspaceID.IsEmpty()) {
++ GenerateWorkspaceID(mWorkspaceID);
+ }
+ workspaceID.Assign(mWorkspaceID);
+
+ LOG("nsWindowWayland::GetWorkspaceID() ID %s token %p",
+ NS_ConvertUTF16toUTF8(mWorkspaceID).get(), mSessionRestoreToken);
+
diff --git a/D324876.1789116899.diff b/D324876.1789116899.diff
new file mode 100644
index 0000000..0f7b148
--- /dev/null
+++ b/D324876.1789116899.diff
@@ -0,0 +1,19 @@
+diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp
+--- a/widget/gtk/nsAppShell.cpp
++++ b/widget/gtk/nsAppShell.cpp
+@@ -624,10 +624,14 @@
+ }
+ if (!StaticPrefs::widget_wayland_session_management_enabled_AtStartup()) {
+ LOGW("nsAppShell::IsSessionRestoreSupported(): disabled by pref.");
+ return false;
+ }
++ if (IsGnomeDesktopEnvironment()) {
++ LOGW("nsAppShell::IsSessionRestoreSupported(): disabled due to Bug 2070815.");
++ return false;
++ }
+
+ GType waylandWindowType = g_type_from_name("GdkWaylandWindow");
+ bool supported =
+ waylandWindowType &&
+ g_signal_lookup("xdg-toplevel-realized", waylandWindowType);
+
diff --git a/D324877.1789117000.diff b/D324877.1789117000.diff
new file mode 100644
index 0000000..5be8d62
--- /dev/null
+++ b/D324877.1789117000.diff
@@ -0,0 +1,17 @@
+diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
+--- a/modules/libpref/init/StaticPrefList.yaml
++++ b/modules/libpref/init/StaticPrefList.yaml
+@@ -20896,11 +20896,11 @@
+ mirror: always
+
+ # Use xdg-session-management-v1 for session restore on Wayland.
+ - name: widget.wayland.session-management.enabled
+ type: bool
+- value: @IS_EARLY_BETA_OR_EARLIER@
++ value: true
+ mirror: once
+
+ # Use native D&D session type on Wayland instead of Gtk.
+ # Recently disabled due compositor bugs (Bug 2046911).
+ - name: widget.wayland.native-data-session
+
diff --git a/firefox.spec b/firefox.spec
index 5228f0b..8252391 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -259,11 +259,10 @@ Patch242: 0026-Add-KDE-integration-to-Firefox.patch
# Upstream patches
Patch400: mozilla-1196777.patch
Patch401: mozilla-1667096.patch
-Patch403: D318191.1787388141.diff
-
-# https://phabricator.services.mozilla.com/D312871
-# Drop with Firefox 156
-Patch410: libwebrtc-video-capture-implement-buffer-stride-support-for-pipewire.patch
+Patch402: D324870.1789116963.diff
+Patch403: D324871.1789116972.diff
+Patch404: D324876.1789116899.diff
+Patch405: D324877.1789117000.diff
# PGO/LTO patches
Patch600: pgo.patch
@@ -547,9 +546,11 @@ cat %{SOURCE49} | sed -e "s|LIBCLANG_RT_PLACEHOLDER|`pwd`/wasi-sdk-30/build/sysr
%patch -P400 -p1 -b .1196777
%patch -P401 -p1 -b .1667096
-%patch -P403 -p1 -b .D318191
-%patch -P410 -p1 -b .libwebrtc-video-capture-implement-buffer-stride-support-for-pipewire
+%patch -P402 -p1 -b .D324870
+%patch -P403 -p1 -b .D324871
+%patch -P404 -p1 -b .D324876
+%patch -P405 -p1 -b .D324877
# PGO patches
%if %{build_with_pgo}
@@ -1207,6 +1208,7 @@ fi
%changelog
* Thu Sep 10 2026 Martin Stransky <stransky@redhat.com> - 156.0-1
- Updated to 156.0
+- Enabled session restore on KDE
* Mon Sep 7 2026 Martin Stransky <stransky@redhat.com> - 155.0.1-1
- Updated to 155.0.1
diff --git a/wasi.patch b/wasi.patch
index 9fa7675..1586e3b 100644
--- a/wasi.patch
+++ b/wasi.patch
@@ -6,7 +6,7 @@ diff -up firefox-134.0.1/toolkit/moz.configure.wasi firefox-134.0.1/toolkit/moz.
if wasi_sysroot:
log.info("Using wasi sysroot in %s", wasi_sysroot)
- return ["--sysroot=%s" % wasi_sysroot]
-+ return ["--sysroot=%s" % wasi_sysroot, "-nodefaultlibs", "-lc", "-lwasi-emulated-process-clocks", "-lc++", "-lc++abi", "/home/komat/CVS/firefox/firefox-155.0-build/firefox-155.0/wasi-sdk-30/build/sysroot/install/wasi-resource-dir/lib/wasm32-unknown-wasip1/libclang_rt.builtins.a"]
++ return ["--sysroot=%s" % wasi_sysroot, "-nodefaultlibs", "-lc", "-lwasi-emulated-process-clocks", "-lc++", "-lc++abi", "/home/komat/CVS/firefox/firefox-156.0-build/firefox-156.0/wasi-sdk-30/build/sysroot/install/wasi-resource-dir/lib/wasm32-unknown-wasip1/libclang_rt.builtins.a"]
return []
set_config("WASI_SYSROOT", wasi_sysroot)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [rpms/firefox] f45: Merge branch 'rawhide' into f45
@ 2026-09-10 8:41 Martin Stransky
0 siblings, 0 replies; 4+ messages in thread
From: Martin Stransky @ 2026-09-10 8:41 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/firefox
Branch : f45
Commit : ccc6a543688e447c907332dfbcea5289887285ac
Author : Martin Stransky <stransky@redhat.com>
Date : 2026-09-10T10:41:17+02:00
Stats : +9/-10 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/firefox/c/ccc6a543688e447c907332dfbcea5289887285ac?branch=f45
Log:
Merge branch 'rawhide' into f45
---
diff --git a/.gitignore b/.gitignore
index bcad10d..abaef23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -797,3 +797,5 @@ firefox-3.6.4.source.tar.bz2
/firefox-langpacks-155.0-20260827.tar.xz
/firefox-langpacks-155.0.1-20260907.tar.xz
/firefox-155.0.1.source.tar.xz
+/firefox-156.0.source.tar.xz
+/firefox-langpacks-156.0-20260910.tar.xz
diff --git a/firefox.spec b/firefox.spec
index fb3a806..5228f0b 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -189,14 +189,14 @@ ExcludeArch: i686
Summary: Mozilla Firefox Web browser
Name: firefox
-Version: 155.0.1
+Version: 156.0
Release: 1%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
# Automatically converted from old format: MPLv1.1 or GPLv2+ or LGPLv2+ - review is highly recommended.
License: LicenseRef-Callaway-MPLv1.1 OR GPL-2.0-or-later OR LicenseRef-Callaway-LGPLv2+
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
%if %{with langpacks}
-Source1: firefox-langpacks-%{version}%{?pre_version}-20260907.tar.xz
+Source1: firefox-langpacks-%{version}%{?pre_version}-20260910.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
Source3: dump_syms-vendor.tar.xz
@@ -637,12 +637,6 @@ echo "ac_add_options --with-system-jpeg" >> .mozconfig
echo "ac_add_options --enable-system-pixman" >> .mozconfig
%endif
-%if %{?system_av1}
-#echo "ac_add_options --with-system-av1" >> .mozconfig
-%else
-#echo "ac_add_options --without-system-av1" >> .mozconfig
-%endif
-
%if %{?system_libvpx}
echo "ac_add_options --with-system-libvpx" >> .mozconfig
%else
@@ -1211,6 +1205,9 @@ fi
#---------------------------------------------------------------------
%changelog
+* Thu Sep 10 2026 Martin Stransky <stransky@redhat.com> - 156.0-1
+- Updated to 156.0
+
* Mon Sep 7 2026 Martin Stransky <stransky@redhat.com> - 155.0.1-1
- Updated to 155.0.1
diff --git a/sources b/sources
index 3b245df..e453923 100644
--- a/sources
+++ b/sources
@@ -4,5 +4,5 @@ SHA512 (wasi-sdk-30.tar.gz) = c08b2ddb5d5cf5b48c5baba80c65c485a3049b473d2f2dd2ba
SHA512 (wasm-component-ld-vendor.tar.xz) = 356dc09502052198e99745199b8e10d803da9492ce34e41c6ae02cb8674fcc640cd5eafe68a03e4e61c984f7f6c7c8e5cdc3551251556fb3ae4631a340358fc0
SHA512 (wasm-tools-vendor.tar.xz) = 502be0020d1828b75128e6127eb7bd77835ccebe4e5c179abc38d881bb1d1f8e15d2284796cd83574536c7c919a3e820e0952d323e8a3977e94bdef89cd8266a
SHA512 (cbindgen-vendor.tar.xz) = dfefc3ec4c7b7d9fe1b024289866c5a919475b8b733e09ef1750d8d295ba78969ba187089dbc151d91779bf56a2d7898797c3d19db6e2d1cb84929750e86617d
-SHA512 (firefox-langpacks-155.0.1-20260907.tar.xz) = edc2384f30efe6f29cb5ca8a9ec878beb9fc500f04c29fd5a9e0f8aee23633a502b5fe5ec1b8277808a1b397d60ce126f759ede7aea07ea6a48c9fecec1c4e5f
-SHA512 (firefox-155.0.1.source.tar.xz) = 6d137a7a315cb1d0aac1a3fe314af80fe290c49b7c2e47f8687b25d4720927b2a0dc71a3da9d75f6cab479067db114caa6732d17e888b0abfce99238a8af0f39
+SHA512 (firefox-156.0.source.tar.xz) = 0463304a0898670d248114f66f7c235166ae2397c3989a7c878c96f0c589fbbba1f1c87432daa22633b9fadd94394adf1dc37f0e67d22b066c75efe5eead75ce
+SHA512 (firefox-langpacks-156.0-20260910.tar.xz) = 60123b95c0a90afd57249faedbfb58bc687d162b738970aa8db4d2985355ac9177de3f87e37c1f63528249bb149037060cf1313b3c5528ea0219199f8f8a2c62
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [rpms/firefox] f45: Merge branch 'rawhide' into f45
@ 2026-08-27 9:21 Martin Stransky
0 siblings, 0 replies; 4+ messages in thread
From: Martin Stransky @ 2026-08-27 9:21 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/firefox
Branch : f45
Commit : 447c25529609c1319340d9c0b304e66dbda5a7b8
Author : Martin Stransky <stransky@redhat.com>
Date : 2026-08-27T11:18:31+02:00
Stats : +10/-5 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/firefox/c/447c25529609c1319340d9c0b304e66dbda5a7b8?branch=f45
Log:
Merge branch 'rawhide' into f45
---
diff --git a/.gitignore b/.gitignore
index edca5c4..ddd1987 100644
--- a/.gitignore
+++ b/.gitignore
@@ -793,3 +793,5 @@ firefox-3.6.4.source.tar.bz2
/firefox-langpacks-153.0.3-20260805.tar.xz
/firefox-langpacks-154.0-20260813.tar.xz
/firefox-154.0.source.tar.xz
+/firefox-155.0.source.tar.xz
+/firefox-langpacks-155.0-20260827.tar.xz
diff --git a/firefox.spec b/firefox.spec
index 6dfbb98..95fada0 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -185,14 +185,14 @@ ExcludeArch: i686
Summary: Mozilla Firefox Web browser
Name: firefox
-Version: 154.0
-Release: 6%{?pre_tag}%{?dist}
+Version: 155.0
+Release: 1%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
# Automatically converted from old format: MPLv1.1 or GPLv2+ or LGPLv2+ - review is highly recommended.
License: LicenseRef-Callaway-MPLv1.1 OR GPL-2.0-or-later OR LicenseRef-Callaway-LGPLv2+
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
%if %{with langpacks}
-Source1: firefox-langpacks-%{version}%{?pre_version}-20260813.tar.xz
+Source1: firefox-langpacks-%{version}%{?pre_version}-20260827.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
Source3: dump_syms-vendor.tar.xz
@@ -1214,6 +1214,9 @@ fi
#---------------------------------------------------------------------
%changelog
+* Thu Aug 27 2026 Martin Stransky <stransky@redhat.com> - 155.0-1
+- Updated to 155.0
+
* Wed Aug 26 2026 Martin Stransky <stransky@redhat.com> - 154.0-6
- Use new (layer) compositor mode for HDR
diff --git a/sources b/sources
index eafc378..addef79 100644
--- a/sources
+++ b/sources
@@ -4,5 +4,5 @@ SHA512 (wasi-sdk-30.tar.gz) = c08b2ddb5d5cf5b48c5baba80c65c485a3049b473d2f2dd2ba
SHA512 (wasm-component-ld-vendor.tar.xz) = 356dc09502052198e99745199b8e10d803da9492ce34e41c6ae02cb8674fcc640cd5eafe68a03e4e61c984f7f6c7c8e5cdc3551251556fb3ae4631a340358fc0
SHA512 (wasm-tools-vendor.tar.xz) = 502be0020d1828b75128e6127eb7bd77835ccebe4e5c179abc38d881bb1d1f8e15d2284796cd83574536c7c919a3e820e0952d323e8a3977e94bdef89cd8266a
SHA512 (cbindgen-vendor.tar.xz) = dfefc3ec4c7b7d9fe1b024289866c5a919475b8b733e09ef1750d8d295ba78969ba187089dbc151d91779bf56a2d7898797c3d19db6e2d1cb84929750e86617d
-SHA512 (firefox-langpacks-154.0-20260813.tar.xz) = e753bae64137e77d557a893c80d4449ea1b722e619e22460abcb9d9eb91bb0eadca6b69e203d7b3f60503f382ca2850589c647a1ecfe9eec96cbb92405761dff
-SHA512 (firefox-154.0.source.tar.xz) = a77cd664982add628681167ef5939bd6bf0c894aa380cca66f9b5fb265947874d1e819d42264f1dd07c843f8a6dc020da268cca9ff1e064fca019de91af9b996
+SHA512 (firefox-155.0.source.tar.xz) = 24292681924edb9f0494eb77a7b19994039abbc3a8c0ba304f0e472b49a943838565723de983bc8ef08e019971e02a3014c8d241bb88c645a06a625c8ace0d6a
+SHA512 (firefox-langpacks-155.0-20260827.tar.xz) = 24c6b220397369a0771743dda4a4755118531a7547de19c4f16875e2e9ce48b2928ad533d3c25b53e32b1b73f7fb23ce10deb917b5bc91374b96d2da5a47a0d0
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-09-10 9:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-27 10:09 [rpms/firefox] f45: Merge branch 'rawhide' into f45 Martin Stransky
-- strict thread matches above, loose matches on Subject: below --
2026-09-10 9:33 Martin Stransky
2026-09-10 8:41 Martin Stransky
2026-08-27 9:21 Martin Stransky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox