1818052 - revert mozilla changes to mouse_cursor_monitor_pipewire.{h|cc} made in Bug 1816431

Status: RESOLVED FIXED

(Core :: WebRTC, defect, P2)

Description

[Michael Froman [:mjf]]

The changes made to mouse_cursor_monitor_pipewire.{h|cc} made in Bug 1816431 were a result of a build error cause by a conflict between two headers:

X11/Xlib.h
third_party/libwebrtc/third_party/abseil-cpp/absl/functional/internal/any_invocable.h.

Those changes become unnecessary if third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc is added to the non-unified build list in dom/media/webrtc/third_party_build/gn-configs/webrtc.json

Fixing this will avoid further growing our github patch-stack on top of upstream libwebrtc.

Comment 1

[Michael Froman [:mjf]]

Attachment: Bug 1818052 - pt1 - update files in webrtc.json non_unified_sources r?ng!,grulja!,stransky!

Bug 1816431 made changes to mouse_cursor_monitor_pipewire.{cc|h} to avoid a build
error due to a conflict between these two includes:
X11/Xlib.h
third_party/libwebrtc/third_party/abseil-cpp/absl/functional/internal/any_invocable.h.

Adding third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc
to the non-unified build list will allow us to revert those changes to avoid
modifications to upstream libwebrtc.

Comment 2

[Michael Froman [:mjf]]

Attachment: Bug 1818052 - pt2 - moz.build updates r?ng!

Depends on D170508

Comment 3

[Michael Froman [:mjf]]

Attachment: Bug 1818052 - pt3 - revert changes to mouse_cursor_monitor_pipewire.{h|cc} from Bug 1816431 r?ng!,grulja!,stransky!

These files can be reverted to their original content from upstream
with third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc
no longer included in the unified build.

Depends on D170509

Comment 4

[Michael Froman [:mjf]]

try builds:
https://treeherder.mozilla.org/jobs?repo=try&revision=a20ed7d27a4449592f43f982ac52577a76fc288b

Comment 5

[Michael Froman [:mjf]]

Grulja, would you mind testing one of the builds from the try run in comment 4 above to make sure my change has not broken your fix from Bug 1816431?

Comment 6

[Michael Froman [:mjf]]

Attachment: Bug 1818052 - pt4 - remove accidentally added blank line in mouse_cursor_monitor_linux.cc from Bug 1816431. r?ng!

Depends on D170510

Comment 7

[Jan Grulich]

(In reply to Michael Froman [:mjf] from comment #5)

Grulja, would you mind testing one of the builds from the try run in comment 4 above to make sure my change has not broken your fix from Bug 1816431?

Yes, it seems to work.

Comment 8

[Michael Froman [:mjf]]

(In reply to grulja from comment #7)

(In reply to Michael Froman [:mjf] from comment #5)

Grulja, would you mind testing one of the builds from the try run in comment 4 above to make sure my change has not broken your fix from Bug 1816431?

Yes, it seems to work.

Thank you!

Comment 9

[Nico Grunbaum [:ng, @chew:mozilla.org]]

:stransky, I noticed that there is a pipewire metabug. For the purposes of visibility or tracking should we be marking bugs that alter the pipewire code as blocking?

Comment 10

[Martin Stránský [:stransky] (ni? me)]

(In reply to Nico Grunbaum [:ng, @chew:mozilla.org] from comment #9)

:stransky, I noticed that there is a pipewire metabug. For the purposes of visibility or tracking should we be marking bugs that alter the pipewire code as blocking?

Sure.

Comment 11

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/6f2d46b0149f
pt1 - update files in webrtc.json non_unified_sources r=ng,stransky
https://hg.mozilla.org/integration/autoland/rev/502d213e5b41
pt2 - moz.build updates r=ng,webrtc-reviewers
https://hg.mozilla.org/integration/autoland/rev/73c40683d9de
pt3 - revert changes to mouse_cursor_monitor_pipewire.{h|cc} from Bug 1816431 r=ng,stransky,webrtc-reviewers
https://hg.mozilla.org/integration/autoland/rev/b137aae3b7c5
pt4 - remove accidentally added blank line in mouse_cursor_monitor_linux.cc from Bug 1816431. r=ng,webrtc-reviewers

Comment 12

[Iulian Moraru]

https://hg.mozilla.org/mozilla-central/rev/6f2d46b0149f
https://hg.mozilla.org/mozilla-central/rev/502d213e5b41
https://hg.mozilla.org/mozilla-central/rev/73c40683d9de
https://hg.mozilla.org/mozilla-central/rev/b137aae3b7c5