rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 79.0

Browse Source
This commit is contained in:
Martin Stransky 2020-07-28 10:23:23 +02:00
commit be0a164909
4 changed files with 87 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
firefox-pipewire-0-3.patch
View File

@ -1,7 +1,6 @@
diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild diff -up firefox-79.0/config/system-headers.mozbuild.firefox-pipewire-0-3 firefox-79.0/config/system-headers.mozbuild
index 2081d0c683a4..641133bf1ea4 100644 --- firefox-79.0/config/system-headers.mozbuild.firefox-pipewire-0-3 2020-07-21 00:49:36.000000000 +0200
--- a/config/system-headers.mozbuild +++ firefox-79.0/config/system-headers.mozbuild 2020-07-28 10:06:59.485481599 +0200
+++ b/config/system-headers.mozbuild
@@ -314,6 +314,7 @@ system_headers = [ @@ -314,6 +314,7 @@ system_headers = [
'Gestalt.h', 'Gestalt.h',
'getopt.h', 'getopt.h',
@ -18,10 +17,9 @@ index 2081d0c683a4..641133bf1ea4 100644
'pixman.h', 'pixman.h',
'pk11func.h', 'pk11func.h',
'pk11pqg.h', 'pk11pqg.h',
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn b/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn diff -up firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn.firefox-pipewire-0-3 firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn
index ba885217b3ba..201d3b755221 100644 --- firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn.firefox-pipewire-0-3 2020-07-20 22:53:33.000000000 +0200
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn +++ firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn 2020-07-28 10:06:59.485481599 +0200
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn
@@ -158,7 +158,7 @@ if (rtc_include_tests) { @@ -158,7 +158,7 @@ if (rtc_include_tests) {
if (is_linux) { if (is_linux) {
if (rtc_use_pipewire) { if (rtc_use_pipewire) {
@ -31,17 +29,15 @@ index ba885217b3ba..201d3b755221 100644
defines = [ "WEBRTC_USE_PIPEWIRE" ] defines = [ "WEBRTC_USE_PIPEWIRE" ]
} }
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build diff -up firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build.firefox-pipewire-0-3 firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
index 90b40431c7e4..d844aa79d591 100644 --- firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build.firefox-pipewire-0-3 2020-07-28 10:06:59.486481593 +0200
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build +++ firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build 2020-07-28 10:11:51.231907101 +0200
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build @@ -174,6 +174,28 @@ if CONFIG["OS_TARGET"] == "Linux":
@@ -194,6 +194,30 @@ if CONFIG["OS_TARGET"] == "Linux":
"/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc" "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc"
] ]
+# PipeWire specific files +# PipeWire specific files
+if CONFIG["OS_TARGET"] == "Linux": +if CONFIG["OS_TARGET"] == "Linux":
+
+ DEFINES["WEBRTC_USE_PIPEWIRE"] = "1" + DEFINES["WEBRTC_USE_PIPEWIRE"] = "1"
+ +
+ OS_LIBS += [ + OS_LIBS += [
@ -62,14 +58,12 @@ index 90b40431c7e4..d844aa79d591 100644
+ "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc" + "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc"
+ ] + ]
+ +
+ if CONFIG["OS_TARGET"] == "Darwin":
if CONFIG["OS_TARGET"] == "NetBSD":
DEFINES["USE_X11"] = "1" DEFINES["CR_XCODE_VERSION"] = "0920"
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h diff -up firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h.firefox-pipewire-0-3 firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
index 1eb8ead26efa..316468eed1fc 100644 --- firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h.firefox-pipewire-0-3 2020-07-20 22:54:16.000000000 +0200
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h +++ firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h 2020-07-28 10:06:59.486481593 +0200
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
@@ -141,7 +141,7 @@ class DesktopCaptureOptions { @@ -141,7 +141,7 @@ class DesktopCaptureOptions {
bool disable_effects_ = true; bool disable_effects_ = true;
bool detect_updated_region_ = false; bool detect_updated_region_ = false;
@ -79,10 +73,9 @@ index 1eb8ead26efa..316468eed1fc 100644
#endif #endif
}; };
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc diff -up firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc.firefox-pipewire-0-3 firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
index 379341c833de..76349f1fbd4d 100644 --- firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc.firefox-pipewire-0-3 2020-07-20 22:54:27.000000000 +0200
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc +++ firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc 2020-07-28 10:06:59.500481514 +0200
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
@@ -15,8 +15,11 @@ @@ -15,8 +15,11 @@
#include <spa/param/format-utils.h> #include <spa/param/format-utils.h>
@ -97,17 +90,20 @@ index 379341c833de..76349f1fbd4d 100644
#include <memory> #include <memory>
#include <utility> #include <utility>
@@ -36,31 +39,36 @@ const char kSessionInterfaceName[] = "org.freedesktop.portal.Session"; @@ -36,32 +39,37 @@ const char kSessionInterfaceName[] = "or
const char kRequestInterfaceName[] = "org.freedesktop.portal.Request"; const char kRequestInterfaceName[] = "org.freedesktop.portal.Request";
const char kScreenCastInterfaceName[] = "org.freedesktop.portal.ScreenCast"; const char kScreenCastInterfaceName[] = "org.freedesktop.portal.ScreenCast";
-// static +
// static
-void BaseCapturerPipeWire::OnStateChanged(void* data, -void BaseCapturerPipeWire::OnStateChanged(void* data,
- pw_remote_state old_state, - pw_remote_state old_state,
- pw_remote_state state, - pw_remote_state state,
- const char* error_message) { - const char* error_message) {
- BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data); - BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
- RTC_DCHECK(that); - RTC_DCHECK(that);
+void BaseCapturerPipeWire::SyncDmaBuf(int fd, uint64_t start_or_end) {
+ struct dma_buf_sync sync = { 0 };
- switch (state) { - switch (state) {
- case PW_REMOTE_STATE_ERROR: - case PW_REMOTE_STATE_ERROR:
@ -119,10 +115,6 @@ index 379341c833de..76349f1fbd4d 100644
- break; - break;
- case PW_REMOTE_STATE_CONNECTING: - case PW_REMOTE_STATE_CONNECTING:
- RTC_LOG(LS_INFO) << "PipeWire remote state: connecting."; - RTC_LOG(LS_INFO) << "PipeWire remote state: connecting.";
+// static
+void BaseCapturerPipeWire::SyncDmaBuf(int fd, uint64_t start_or_end) {
+ struct dma_buf_sync sync = { 0 };
+
+ sync.flags = start_or_end | DMA_BUF_SYNC_READ; + sync.flags = start_or_end | DMA_BUF_SYNC_READ;
+ +
+ while(true) { + while(true) {
@ -141,7 +133,7 @@ index 379341c833de..76349f1fbd4d 100644
} }
} }
+// static // static
+void BaseCapturerPipeWire::OnCoreError(void *data, +void BaseCapturerPipeWire::OnCoreError(void *data,
+ uint32_t id, + uint32_t id,
+ int seq, + int seq,
@ -150,10 +142,11 @@ index 379341c833de..76349f1fbd4d 100644
+ RTC_LOG(LS_ERROR) << "core error: " << message; + RTC_LOG(LS_ERROR) << "core error: " << message;
+} +}
+ +
// static +// static
void BaseCapturerPipeWire::OnStreamStateChanged(void* data, void BaseCapturerPipeWire::OnStreamStateChanged(void* data,
pw_stream_state old_state, pw_stream_state old_state,
@@ -73,76 +81,54 @@ void BaseCapturerPipeWire::OnStreamStateChanged(void* data, pw_stream_state state,
@@ -73,76 +81,54 @@ void BaseCapturerPipeWire::OnStreamState
case PW_STREAM_STATE_ERROR: case PW_STREAM_STATE_ERROR:
RTC_LOG(LS_ERROR) << "PipeWire stream state error: " << error_message; RTC_LOG(LS_ERROR) << "PipeWire stream state error: " << error_message;
break; break;
@ -256,7 +249,7 @@ index 379341c833de..76349f1fbd4d 100644
} }
// static // static
@@ -150,15 +136,25 @@ void BaseCapturerPipeWire::OnStreamProcess(void* data) { @@ -150,15 +136,25 @@ void BaseCapturerPipeWire::OnStreamProce
BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data); BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
RTC_DCHECK(that); RTC_DCHECK(that);
@ -268,12 +261,12 @@ index 379341c833de..76349f1fbd4d 100644
+ while (next_buffer) { + while (next_buffer) {
+ buffer = next_buffer; + buffer = next_buffer;
+ next_buffer = pw_stream_dequeue_buffer(that->pw_stream_); + next_buffer = pw_stream_dequeue_buffer(that->pw_stream_);
+
- if (!(buf = pw_stream_dequeue_buffer(that->pw_stream_))) {
+ if (next_buffer) + if (next_buffer)
+ pw_stream_queue_buffer (that->pw_stream_, buffer); + pw_stream_queue_buffer (that->pw_stream_, buffer);
+ } + }
+
- if (!(buf = pw_stream_dequeue_buffer(that->pw_stream_))) {
+ if (!buffer) { + if (!buffer) {
return; return;
} }
@ -286,7 +279,7 @@ index 379341c833de..76349f1fbd4d 100644
} }
BaseCapturerPipeWire::BaseCapturerPipeWire(CaptureSourceType source_type) BaseCapturerPipeWire::BaseCapturerPipeWire(CaptureSourceType source_type)
@@ -169,38 +165,22 @@ BaseCapturerPipeWire::~BaseCapturerPipeWire() { @@ -169,38 +165,22 @@ BaseCapturerPipeWire::~BaseCapturerPipeW
pw_thread_loop_stop(pw_main_loop_); pw_thread_loop_stop(pw_main_loop_);
} }
@ -329,7 +322,7 @@ index 379341c833de..76349f1fbd4d 100644
if (start_request_signal_id_) { if (start_request_signal_id_) {
g_dbus_connection_signal_unsubscribe(connection_, start_request_signal_id_); g_dbus_connection_signal_unsubscribe(connection_, start_request_signal_id_);
} }
@@ -250,27 +230,35 @@ void BaseCapturerPipeWire::InitPortal() { @@ -250,27 +230,35 @@ void BaseCapturerPipeWire::InitPortal()
void BaseCapturerPipeWire::InitPipeWire() { void BaseCapturerPipeWire::InitPipeWire() {
pw_init(/*argc=*/nullptr, /*argc=*/nullptr); pw_init(/*argc=*/nullptr, /*argc=*/nullptr);
@ -378,32 +371,33 @@ index 379341c833de..76349f1fbd4d 100644
if (pw_thread_loop_start(pw_main_loop_) < 0) { if (pw_thread_loop_start(pw_main_loop_) < 0) {
RTC_LOG(LS_ERROR) << "Failed to start main PipeWire loop"; RTC_LOG(LS_ERROR) << "Failed to start main PipeWire loop";
@@ -278,81 +266,132 @@ void BaseCapturerPipeWire::InitPipeWire() { @@ -278,81 +266,132 @@ void BaseCapturerPipeWire::InitPipeWire(
} }
} }
-void BaseCapturerPipeWire::InitPipeWireTypes() { -void BaseCapturerPipeWire::InitPipeWireTypes() {
- spa_type_map* map = pw_core_type_->map; - spa_type_map* map = pw_core_type_->map;
- pw_type_ = new PipeWireType(); - pw_type_ = new PipeWireType();
- +pw_stream* BaseCapturerPipeWire::CreateReceivingStream() {
+ spa_rectangle pwMinScreenBounds = spa_rectangle{1, 1};
+ spa_rectangle pwMaxScreenBounds = spa_rectangle{INT32_MAX, INT32_MAX};
- spa_type_media_type_map(map, &pw_type_->media_type); - spa_type_media_type_map(map, &pw_type_->media_type);
- spa_type_media_subtype_map(map, &pw_type_->media_subtype); - spa_type_media_subtype_map(map, &pw_type_->media_subtype);
- spa_type_format_video_map(map, &pw_type_->format_video); - spa_type_format_video_map(map, &pw_type_->format_video);
- spa_type_video_format_map(map, &pw_type_->video_format); - spa_type_video_format_map(map, &pw_type_->video_format);
-} -}
- + auto stream = pw_stream_new(pw_core_, "webrtc-pipewire-stream", nullptr);
-void BaseCapturerPipeWire::CreateReceivingStream() { -void BaseCapturerPipeWire::CreateReceivingStream() {
+pw_stream* BaseCapturerPipeWire::CreateReceivingStream() { - spa_rectangle pwMinScreenBounds = spa_rectangle{1, 1};
spa_rectangle pwMinScreenBounds = spa_rectangle{1, 1};
- spa_rectangle pwScreenBounds = - spa_rectangle pwScreenBounds =
- spa_rectangle{static_cast<uint32_t>(desktop_size_.width()), - spa_rectangle{static_cast<uint32_t>(desktop_size_.width()),
- static_cast<uint32_t>(desktop_size_.height())}; - static_cast<uint32_t>(desktop_size_.height())};
+ spa_rectangle pwMaxScreenBounds = spa_rectangle{INT32_MAX, INT32_MAX}; -
- spa_fraction pwFrameRateMin = spa_fraction{0, 1}; - spa_fraction pwFrameRateMin = spa_fraction{0, 1};
- spa_fraction pwFrameRateMax = spa_fraction{60, 1}; - spa_fraction pwFrameRateMax = spa_fraction{60, 1};
+ auto stream = pw_stream_new(pw_core_, "webrtc-pipewire-stream", nullptr); -
- pw_properties* reuseProps = pw_properties_new("pipewire.client.reuse", "1", - pw_properties* reuseProps = pw_properties_new("pipewire.client.reuse", "1",
- /*end of varargs*/ nullptr); - /*end of varargs*/ nullptr);
- pw_stream_ = pw_stream_new(pw_remote_, "webrtc-consume-stream", reuseProps); - pw_stream_ = pw_stream_new(pw_remote_, "webrtc-consume-stream", reuseProps);
@ -439,9 +433,6 @@ index 379341c833de..76349f1fbd4d 100644
- // min and max values and it is undecided (u) to allow negotiation - // min and max values and it is undecided (u) to allow negotiation
- ":", pw_type_->format_video.max_framerate, "Fru", &pwFrameRateMax, 2, - ":", pw_type_->format_video.max_framerate, "Fru", &pwFrameRateMax, 2,
- &pwFrameRateMin, &pwFrameRateMax)); - &pwFrameRateMin, &pwFrameRateMax));
-
- pw_stream_add_listener(pw_stream_, &spa_stream_listener_, &pw_stream_events_,
- this);
+ const spa_pod* params[2]; + const spa_pod* params[2];
+ spa_pod_builder builder = SPA_POD_BUILDER_INIT(buffer, sizeof (buffer)); + spa_pod_builder builder = SPA_POD_BUILDER_INIT(buffer, sizeof (buffer));
+ +
@ -456,7 +447,9 @@ index 379341c833de..76349f1fbd4d 100644
+ &pwMaxScreenBounds), + &pwMaxScreenBounds),
+ 0)); + 0));
+ pw_stream_add_listener(stream, &spa_stream_listener_, &pw_stream_events_, this); + pw_stream_add_listener(stream, &spa_stream_listener_, &pw_stream_events_, this);
+
- pw_stream_add_listener(pw_stream_, &spa_stream_listener_, &pw_stream_events_,
- this);
pw_stream_flags flags = static_cast<pw_stream_flags>( pw_stream_flags flags = static_cast<pw_stream_flags>(
- PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_INACTIVE | - PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_INACTIVE |
- PW_STREAM_FLAG_MAP_BUFFERS); - PW_STREAM_FLAG_MAP_BUFFERS);
@ -499,8 +492,7 @@ index 379341c833de..76349f1fbd4d 100644
+ } else if (spaBuffer->datas[0].type == SPA_DATA_DmaBuf) { + } else if (spaBuffer->datas[0].type == SPA_DATA_DmaBuf) {
+ int fd; + int fd;
+ fd = spaBuffer->datas[0].fd; + fd = spaBuffer->datas[0].fd;
+
- if (!(src = spaBuffer->datas[0].data)) {
+ map = static_cast<uint8_t*>(mmap( + map = static_cast<uint8_t*>(mmap(
+ nullptr, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset, + nullptr, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset,
+ PROT_READ, MAP_PRIVATE, fd, 0)); + PROT_READ, MAP_PRIVATE, fd, 0));
@ -509,7 +501,8 @@ index 379341c833de..76349f1fbd4d 100644
+ RTC_LOG(LS_ERROR) << "Failed to mmap the memory: " << std::strerror(errno); + RTC_LOG(LS_ERROR) << "Failed to mmap the memory: " << std::strerror(errno);
+ return; + return;
+ } + }
+
- if (!(src = spaBuffer->datas[0].data)) {
+ SyncDmaBuf(fd, DMA_BUF_SYNC_START); + SyncDmaBuf(fd, DMA_BUF_SYNC_START);
+ +
+ src = SPA_MEMBER(map, spaBuffer->datas[0].mapoffset, uint8_t); + src = SPA_MEMBER(map, spaBuffer->datas[0].mapoffset, uint8_t);
@ -569,7 +562,7 @@ index 379341c833de..76349f1fbd4d 100644
if (srcStride != (desktop_size_.width() * kBytesPerPixel)) { if (srcStride != (desktop_size_.width() * kBytesPerPixel)) {
RTC_LOG(LS_ERROR) << "Got buffer with stride different from screen stride: " RTC_LOG(LS_ERROR) << "Got buffer with stride different from screen stride: "
<< srcStride << srcStride
@@ -361,21 +400,40 @@ void BaseCapturerPipeWire::HandleBuffer(pw_buffer* buffer) { @@ -361,21 +400,40 @@ void BaseCapturerPipeWire::HandleBuffer(
return; return;
} }
@ -623,7 +616,7 @@ index 379341c833de..76349f1fbd4d 100644
} }
} }
@@ -725,10 +783,7 @@ void BaseCapturerPipeWire::OnStartRequestResponseSignal( @@ -725,10 +783,7 @@ void BaseCapturerPipeWire::OnStartReques
g_variant_get(variant, "(u@a{sv})", &stream_id, &options); g_variant_get(variant, "(u@a{sv})", &stream_id, &options);
RTC_DCHECK(options != nullptr); RTC_DCHECK(options != nullptr);
@ -635,7 +628,7 @@ index 379341c833de..76349f1fbd4d 100644
g_variant_unref(options); g_variant_unref(options);
g_variant_unref(variant); g_variant_unref(variant);
} }
@@ -813,10 +868,15 @@ void BaseCapturerPipeWire::CaptureFrame() { @@ -813,10 +868,15 @@ void BaseCapturerPipeWire::CaptureFrame(
return; return;
} }
@ -654,7 +647,7 @@ index 379341c833de..76349f1fbd4d 100644
if (!result) { if (!result) {
callback_->OnCaptureResult(Result::ERROR_TEMPORARY, nullptr); callback_->OnCaptureResult(Result::ERROR_TEMPORARY, nullptr);
return; return;
@@ -837,4 +897,22 @@ bool BaseCapturerPipeWire::SelectSource(SourceId id) { @@ -837,4 +897,22 @@ bool BaseCapturerPipeWire::SelectSource(
return true; return true;
} }
@ -677,10 +670,9 @@ index 379341c833de..76349f1fbd4d 100644
+} +}
+ +
} // namespace webrtc } // namespace webrtc
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h diff -up firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h.firefox-pipewire-0-3 firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
index 56b101acbaa6..de54157d1a2a 100644 --- firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h.firefox-pipewire-0-3 2020-07-20 22:54:40.000000000 +0200
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h +++ firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h 2020-07-28 10:06:59.501481508 +0200
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
@@ -22,17 +22,13 @@ @@ -22,17 +22,13 @@
namespace webrtc { namespace webrtc {
@ -704,7 +696,7 @@ index 56b101acbaa6..de54157d1a2a 100644
explicit BaseCapturerPipeWire(CaptureSourceType source_type); explicit BaseCapturerPipeWire(CaptureSourceType source_type);
~BaseCapturerPipeWire() override; ~BaseCapturerPipeWire() override;
@@ -43,28 +39,32 @@ class BaseCapturerPipeWire : public DesktopCapturer { @@ -43,28 +39,32 @@ class BaseCapturerPipeWire : public Desk
bool GetSourceList(SourceList* sources) override; bool GetSourceList(SourceList* sources) override;
bool SelectSource(SourceId id) override; bool SelectSource(SourceId id) override;
@ -745,7 +737,7 @@ index 56b101acbaa6..de54157d1a2a 100644
// <-- end of PipeWire types // <-- end of PipeWire types
@@ -78,33 +78,37 @@ class BaseCapturerPipeWire : public DesktopCapturer { @@ -78,33 +78,37 @@ class BaseCapturerPipeWire : public Desk
guint sources_request_signal_id_ = 0; guint sources_request_signal_id_ = 0;
guint start_request_signal_id_ = 0; guint start_request_signal_id_ = 0;
@ -792,10 +784,9 @@ index 56b101acbaa6..de54157d1a2a 100644
static void OnStreamProcess(void* data); static void OnStreamProcess(void* data);
static void OnNewBuffer(void* data, uint32_t id); static void OnNewBuffer(void* data, uint32_t id);
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc diff -up firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc.firefox-pipewire-0-3 firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc
index 26956fc67dc8..3813d697bb38 100644 --- firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc.firefox-pipewire-0-3 2020-07-20 22:53:57.000000000 +0200
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc +++ firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc 2020-07-28 10:06:59.501481508 +0200
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
namespace webrtc { namespace webrtc {
@ -805,10 +796,9 @@ index 26956fc67dc8..3813d697bb38 100644
ScreenCapturerPipeWire::~ScreenCapturerPipeWire() {} ScreenCapturerPipeWire::~ScreenCapturerPipeWire() {}
// static // static
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc diff -up firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc.firefox-pipewire-0-3 firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc
index 35436475cb4d..c43a1f1a0c4e 100644 --- firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc.firefox-pipewire-0-3 2020-07-20 22:54:18.000000000 +0200
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc +++ firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc 2020-07-28 10:06:59.501481508 +0200
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
namespace webrtc { namespace webrtc {
@ -818,11 +808,10 @@ index 35436475cb4d..c43a1f1a0c4e 100644
WindowCapturerPipeWire::~WindowCapturerPipeWire() {} WindowCapturerPipeWire::~WindowCapturerPipeWire() {}
// static // static
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc diff -up firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc.firefox-pipewire-0-3 firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc
index cf8a9dd0e0db..d27fab8d28d9 100644 --- firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc.firefox-pipewire-0-3 2020-07-20 22:54:40.000000000 +0200
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc +++ firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc 2020-07-28 10:06:59.501481508 +0200
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc @@ -26,7 +26,7 @@ std::unique_ptr<DesktopCapturer> Desktop
@@ -26,7 +26,7 @@ std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawScreenCapturer(
const DesktopCaptureOptions& options) { const DesktopCaptureOptions& options) {
#if defined(WEBRTC_USE_PIPEWIRE) #if defined(WEBRTC_USE_PIPEWIRE)
if (options.allow_pipewire() && DesktopCapturer::IsRunningUnderWayland()) { if (options.allow_pipewire() && DesktopCapturer::IsRunningUnderWayland()) {
@ -831,11 +820,10 @@ index cf8a9dd0e0db..d27fab8d28d9 100644
} }
#endif // defined(WEBRTC_USE_PIPEWIRE) #endif // defined(WEBRTC_USE_PIPEWIRE)
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc diff -up firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc.firefox-pipewire-0-3 firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc
index 82359e50c2db..bb9724cf7cc2 100644 --- firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc.firefox-pipewire-0-3 2020-07-20 22:53:32.000000000 +0200
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc +++ firefox-79.0/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc 2020-07-28 10:06:59.501481508 +0200
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc @@ -26,7 +26,7 @@ std::unique_ptr<DesktopCapturer> Desktop
@@ -26,7 +26,7 @@ std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawWindowCapturer(
const DesktopCaptureOptions& options) { const DesktopCaptureOptions& options) {
#if defined(WEBRTC_USE_PIPEWIRE) #if defined(WEBRTC_USE_PIPEWIRE)
if (options.allow_pipewire() && DesktopCapturer::IsRunningUnderWayland()) { if (options.allow_pipewire() && DesktopCapturer::IsRunningUnderWayland()) {

24
firefox.spec
View File

@ -87,7 +87,7 @@ ExcludeArch: s390x
%if %{?system_nss} %if %{?system_nss}
%global nspr_version 4.21 %global nspr_version 4.21
%global nspr_build_version %{nspr_version} %global nspr_build_version %{nspr_version}
%global nss_version 3.52 %global nss_version 3.54
%global nss_build_version %{nss_version} %global nss_build_version %{nss_version}
%endif %endif
@ -179,7 +179,6 @@ Patch412: mozilla-1337988.patch
Patch415: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch Patch415: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
Patch417: bug1375074-save-restore-x28.patch Patch417: bug1375074-save-restore-x28.patch
Patch422: mozilla-1580174-webrtc-popup.patch Patch422: mozilla-1580174-webrtc-popup.patch
Patch423: mozilla-1651701.patch
# Wayland specific upstream patches # Wayland specific upstream patches
Patch574: firefox-pipewire-0-2.patch Patch574: firefox-pipewire-0-2.patch
@ -188,7 +187,6 @@ Patch575: firefox-pipewire-0-3.patch
#VA-API patches #VA-API patches
Patch584: firefox-disable-ffvpx-with-vapi.patch Patch584: firefox-disable-ffvpx-with-vapi.patch
Patch585: firefox-vaapi-extra-frames.patch Patch585: firefox-vaapi-extra-frames.patch
Patch589: mozilla-1634213.patch
# PGO/LTO patches # PGO/LTO patches
Patch600: pgo.patch Patch600: pgo.patch
@ -242,13 +240,17 @@ BuildRequires: nodejs
BuildRequires: nasm >= 1.13 BuildRequires: nasm >= 1.13
BuildRequires: libappstream-glib BuildRequires: libappstream-glib
%if 0%{?big_endian}
BuildRequires: icu
%endif
Requires: mozilla-filesystem Requires: mozilla-filesystem
Requires: p11-kit-trust Requires: p11-kit-trust
%if %{?system_nss} %if %{?system_nss}
Requires: nspr >= %{nspr_build_version} Requires: nspr >= %{nspr_build_version}
Requires: nss >= %{nss_build_version} Requires: nss >= %{nss_build_version}
%endif %endif
BuildRequires: python2-devel BuildRequires: python3-devel
%if !0%{?flatpak} %if !0%{?flatpak}
Requires: u2f-hidraw-policy Requires: u2f-hidraw-policy
%endif %endif
@ -360,7 +362,7 @@ This package contains results of tests executed during build.
%if 0%{?big_endian} %if 0%{?big_endian}
%patch26 -p1 -b .icu %patch26 -p1 -b .icu
%endif %endif
%patch46 -p1 -b .nss-version #%patch46 -p1 -b .nss-version
%patch47 -p1 -b .fedora-shebang %patch47 -p1 -b .fedora-shebang
%patch48 -p1 -b .build-arm-wasm %patch48 -p1 -b .build-arm-wasm
%patch49 -p1 -b .build-arm-libaom %patch49 -p1 -b .build-arm-libaom
@ -381,7 +383,6 @@ This package contains results of tests executed during build.
%ifarch %{arm} %ifarch %{arm}
%patch415 -p1 -b .1238661 %patch415 -p1 -b .1238661
%endif %endif
%patch423 -p1 -b .mozilla-1651701
# Wayland specific upstream patches # Wayland specific upstream patches
@ -393,7 +394,6 @@ This package contains results of tests executed during build.
%patch584 -p1 -b .firefox-disable-ffvpx-with-vapi %patch584 -p1 -b .firefox-disable-ffvpx-with-vapi
%patch585 -p1 -b .firefox-vaapi-extra-frames %patch585 -p1 -b .firefox-vaapi-extra-frames
%patch589 -p1 -b .mozilla-1634213
# PGO patches # PGO patches
%patch600 -p1 -b .pgo %patch600 -p1 -b .pgo
@ -529,9 +529,9 @@ export PATH=`pwd`/.cargo/bin:$PATH
%endif %endif
cd - cd -
echo "Generate big endian version of config/external/icu/data/icud58l.dat" echo "Generate big endian version of config/external/icu/data/icudt67l.dat"
%if 0%{?big_endian} %if 0%{?big_endian}
./mach python intl/icu_sources_data.py . icupkg -tb config/external/icu/data/icudt67l.dat config/external/icu/data/icudt67b.dat
ls -l config/external/icu/data ls -l config/external/icu/data
rm -f config/external/icu/data/icudt*l.dat rm -f config/external/icu/data/icudt*l.dat
%endif %endif
@ -973,6 +973,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Mon Jul 27 2020 Martin Stransky <stransky@redhat.com> - 79.0-1
- Update to 79.0
* Thu Jul 23 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 78.0-4
- Use python3 instead of python2 for build
* Tue Jul 21 2020 Martin Stransky <stransky@redhat.com> - 78.0-3 * Tue Jul 21 2020 Martin Stransky <stransky@redhat.com> - 78.0-3
- Added fix for mozbz#1651701/rhbz#1855730 - Added fix for mozbz#1651701/rhbz#1855730

96
mozilla-1634213.patch
View File

@ -1,96 +0,0 @@
diff --git a/gfx/gl/GLScreenBuffer.cpp b/gfx/gl/GLScreenBuffer.cpp
--- a/gfx/gl/GLScreenBuffer.cpp
+++ b/gfx/gl/GLScreenBuffer.cpp
@@ -88,10 +88,14 @@
#if defined(XP_MACOSX)
factory = SurfaceFactory_IOSurface::Create(gl, caps, ipcChannel, flags);
#elif defined(MOZ_WAYLAND)
- if (gl->GetContextType() == GLContextType::EGL) {
- if (gfxPlatformGtk::GetPlatform()->UseWaylandDMABufWebGL()) {
- factory =
- MakeUnique<SurfaceFactory_DMABUF>(gl, caps, ipcChannel, flags);
+ if (gl->GetContextType() == GLContextType::EGL &&
+ gfxPlatformGtk::GetPlatform()->UseWaylandDMABufWebGL()) {
+ auto DMABUFFactory =
+ MakeUnique<SurfaceFactory_DMABUF>(gl, caps, ipcChannel, flags);
+ if (DMABUFFactory && DMABUFFactory->CanCreateSurface()) {
+ factory = std::move(DMABUFFactory);
+ } else {
+ gfxPlatformGtk::GetPlatform()->DisableWaylandDMABufWebGL();
}
}
#elif defined(MOZ_X11)
diff --git a/gfx/gl/SharedSurfaceDMABUF.h b/gfx/gl/SharedSurfaceDMABUF.h
--- a/gfx/gl/SharedSurfaceDMABUF.h
+++ b/gfx/gl/SharedSurfaceDMABUF.h
@@ -71,6 +71,11 @@
bool hasAlpha = mReadCaps.alpha;
return SharedSurface_DMABUF::Create(mGL, mFormats, size, hasAlpha);
}
+
+ bool CanCreateSurface() {
+ UniquePtr<SharedSurface> test = CreateShared(gfx::IntSize(1, 1));
+ return test != nullptr;
+ }
};
} // namespace gl
diff --git a/gfx/thebes/gfxPlatformGtk.h b/gfx/thebes/gfxPlatformGtk.h
--- a/gfx/thebes/gfxPlatformGtk.h
+++ b/gfx/thebes/gfxPlatformGtk.h
@@ -88,7 +88,8 @@
#ifdef MOZ_WAYLAND
bool UseWaylandDMABufTextures();
- bool UseWaylandDMABufWebGL();
+ bool UseWaylandDMABufWebGL() { return mUseWebGLDmabufBackend; }
+ void DisableWaylandDMABufWebGL() { mUseWebGLDmabufBackend = false; }
bool UseWaylandHardwareVideoDecoding();
#endif
@@ -110,6 +111,9 @@
#ifdef MOZ_X11
Display* mCompositorDisplay;
#endif
+#ifdef MOZ_WAYLAND
+ bool mUseWebGLDmabufBackend;
+#endif
};
#endif /* GFX_PLATFORM_GTK_H */
diff --git a/gfx/thebes/gfxPlatformGtk.cpp b/gfx/thebes/gfxPlatformGtk.cpp
--- a/gfx/thebes/gfxPlatformGtk.cpp
+++ b/gfx/thebes/gfxPlatformGtk.cpp
@@ -116,6 +116,9 @@
Factory::ReleaseFTLibrary(gPlatformFTLibrary);
gPlatformFTLibrary = nullptr;
+
+ mUseWebGLDmabufBackend =
+ IsWaylandDisplay() && nsWaylandDisplay::IsDMABufWebGLEnabled();
}
void gfxPlatformGtk::FlushContentDrawing() {
@@ -725,9 +728,6 @@
bool gfxPlatformGtk::UseWaylandDMABufTextures() {
return IsWaylandDisplay() && nsWaylandDisplay::IsDMABufTexturesEnabled();
}
-bool gfxPlatformGtk::UseWaylandDMABufWebGL() {
- return IsWaylandDisplay() && nsWaylandDisplay::IsDMABufWebGLEnabled();
-}
bool gfxPlatformGtk::UseWaylandHardwareVideoDecoding() {
return IsWaylandDisplay() && nsWaylandDisplay::IsDMABufVAAPIEnabled() &&
gfxPlatform::CanUseHardwareVideoDecoding();
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
@@ -9111,7 +9111,7 @@
# Use DMABuf backend for WebGL on Wayland.
- name: widget.wayland-dmabuf-webgl.enabled
type: RelaxedAtomicBool
- value: false
+ value: true
mirror: always
# Use VA-API for video playback on Wayland.

18
mozilla-1651701.patch
View File

@ -1,18 +0,0 @@
diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp
--- a/security/sandbox/linux/SandboxFilter.cpp
+++ b/security/sandbox/linux/SandboxFilter.cpp
@@ -711,6 +711,13 @@
return Error(EPERM);
#endif
+ // Bug 1651701: an API for restartable atomic sequences and
+ // per-CPU data; exposing information about CPU numbers and
+ // when threads are migrated or preempted isn't great but the
+ // risk should be relatively low.
+ case __NR_rseq:
+ return Allow();
+
#ifdef MOZ_ASAN
// ASAN's error reporter wants to know if stderr is a tty.
case __NR_ioctl: {