1882824 - libwebrtc patch-stack needs some maintenance

Status: RESOLVED FIXED

(Core :: WebRTC, task, P2)

Description

[Michael Froman [:mjf]]

We have a couple issues that have cropped up in the libwebrtc patch-stack that should be cleaned up.

1. 'Bug 1864008 - Move libvpx to libgkcodecs' changed webrtc.gni and then 'Bug 1875201 - Add method for conditionally including "media/libvpx/libvpx"' reverted the change. These two patches result in a no-op on the stack and can be removed.
2. 'Bug 1810949 - cherry-pick upstream libwebrtc commit 91d5fc2ed6' and 'Bug 1847074 - Vendor libwebrtc from 91d5fc2ed6' both added the same code in slightly different locations because Bug 1810949 did not include a no-op commit file. We can remove the duplicate code and remove a patch from the stack in git.
3. During the libwebrtc update for v121, we ran into a fairly rare situation where we'd cherry-picked an upstream commit 6a992129fb, and then during the update, upstream cherry-picked the same commit in their release branch. This patch should removed from the stack to avoid errors during restore or prep_repo.

I may find others that will be detailed in the patch commit message.

Comment 1

[Michael Froman [:mjf]]

Attachment: Bug 1882824 - pt1 - remove duplicate defines in device_info_v4l2.cc. r?dbaker!

Comment 2

[Michael Froman [:mjf]]

Attachment: Bug 1882824 - pt2 - updated libwebrtc patch stack. r?dbaker!

1.'Bug 1864008 - Move libvpx to libgkcodecs' changed webrtc.gni and then
'Bug 1875201 - Add method for conditionally including "media/libvpx/libvpx"'
reverted the change. These two patches result in a no-op on the stack and can
be removed.
2.'Bug 1810949 - cherry-pick upstream libwebrtc commit 91d5fc2ed6' and
'Bug 1847074 - Vendor libwebrtc from 91d5fc2ed6' both added the same code in
slightly different locations because Bug 1810949 did not include a no-op commit
file. We can remove the duplicate code and remove a patch from the stack in git.
3.During the libwebrtc update for v121, we ran into a fairly rare situation where
we'd cherry-picked an upstream commit 6a992129fb, and then during the update,
upstream cherry-picked the same commit in their release branch. This patch should
removed from the stack to avoid errors during restore or prep_repo.
4.Rollup 2 patches:
Bug 1876843 - (fix-082cb56ee7) remove mozilla dependency on pc:media_factory.
Bug 1876843 - (fix-b29ff000da) remove mozilla dependency on api:enable_media
into our:
Bug 1654112 - Tweak upstream gn files for Firefox build.

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/b302a6f7096a
pt1 - remove duplicate defines in device_info_v4l2.cc. r=dbaker,webrtc-reviewers
https://hg.mozilla.org/integration/autoland/rev/efdc6eb50c75
pt2 - updated libwebrtc patch stack. r=dbaker,webrtc-reviewers

Comment 4

[Cristian Tuns]

Backed out for causing lint failures

• Backout link
• Push with failures
• Failure Log
• Failure line: TEST-UNEXPECTED-ERROR | /builds/worker/checkouts/gecko/None:0 | PerfDocs are outdated, run ./mach lint -l perfdocs --fix .` to update them. You can also apply the perfdocs.diff patch file produced from this reviewbot test to fix the issue. (Flawless performance docs (unknown file))

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/1e051c569f03
pt1 - remove duplicate defines in device_info_v4l2.cc. r=dbaker,webrtc-reviewers
https://hg.mozilla.org/integration/autoland/rev/a8edd6789af7
pt2 - updated libwebrtc patch stack. r=dbaker,webrtc-reviewers

Comment 6

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

https://hg.mozilla.org/mozilla-central/rev/1e051c569f03
https://hg.mozilla.org/mozilla-central/rev/a8edd6789af7