Media/WebRTC/libwebrtc Update Process/automation plan: Difference between revisions

Media/WebRTC/libwebrtc Update Process/automation plan (view source)

1,190 bytes added , 4 March 2022

add new info to generating patches made after vendoring

119

edits

@@ Line 168: / Line 168: @@
      --exclude 'third_party/libwebrtc/third_party' \
      third_party/libwebrtc
+:- While the above command works, when used within the fast foward script it requires reapplication of fixes for merge conflicts with each new advance in the webrtc.org changesets.  It makes more sense to reuse the [https://searchfox.org/mozilla-central/rev/d4ebb53e719b913afdbcf7c00e162f0e96574701/dom/media/webrtc/third_party_build/extract-for-git.py extract-for-git.py] script to build a patch set of changes we can apply on top of our current patch stack residing in [https://github.com/mozilla/libwebrtc moz-libwebrtc].  That command looks like:
+ cd dom/media/webrtc/third_party_build && \
+ python3 extract-for-git.py 587c40771588::2b187d932ca1
+:- where <code>587c40771588</code> is the moz-central vendoring commit and <code>2b187d932ca1</code> is the current tip of moz-central
+:- extract-for-git produces a file named <code>mailbox.patch</code> which can be applied in moz-libwebrtc with:
+ git am mailbox.patch
+:- Note, fixes were required during the <code>git am</code> process.  These were dealing with a couple places were we imported directories into moz-central from webrtc.org after the vendoring commit, and a couple cases of Windows vs Linux line endings causing conflicts.
 === patches on top of upstream github moz-libwebrtc commit ===