Bug 209542 – Bump libwebrtc to M82

• Status: RESOLVED
• Resolution: FIXED
• Component: WebRTC

[youenn fablet]

Update libwebrtc to M82

[youenn fablet]

Created attachment 394495 [details]
patch

[youenn fablet]

Created attachment 394506 [details]
patch

[youenn fablet]

Created attachment 394509 [details]
patch

[youenn fablet]

Created attachment 394538 [details]
patch

[Víctor M. Jáquez L.]

I'm looking at it for GTK

[Víctor M. Jáquez L.]

it seems that the patch is no longer applicable after r259042 (it just fails on project.pbxproj)

[youenn fablet]

(In reply to Víctor M. Jáquez L. from comment #6)
> it seems that the patch is no longer applicable after r259042 (it just fails
> on project.pbxproj)

Right, I'll rebase it.
Hopefully, most of the work on your side is related to CMake updates.

[Víctor M. Jáquez L.]

It seems there are some removed files messing around

commit cd2a92f8e0b64a05668c8b5a7ea2cffe64b02cf6
Author: Sebastian Jansson <[e-mail]>
Date:   Thu Oct 31 13:53:53 2019 +0100

    Removes RPLR based  FEC controller.

[youenn fablet]

Created attachment 394613 [details]
Patch

[youenn fablet]

I am reverting the changes

[Víctor M. Jáquez L.]

I checked out M82 (branch 4044) and compared the trees with

rsync -Cr --dry-run --itemize-changes --delete /home/vjaquez/src/webrtc-checkout/src/ Source/ThirdParty/libwebrtc/Source/webrtc/ --exclude=build --exclude=tools --exclude=buildtools --exclude=third_party  --exclude=infra | grep deleting 

And there are a lot :S

[youenn fablet]

(In reply to Víctor M. Jáquez L. from comment #11)
> I checked out M82 (branch 4044) and compared the trees with
> 
> rsync -Cr --dry-run --itemize-changes --delete
> /home/vjaquez/src/webrtc-checkout/src/
> Source/ThirdParty/libwebrtc/Source/webrtc/ --exclude=build --exclude=tools
> --exclude=buildtools --exclude=third_party  --exclude=infra | grep deleting 
> 
> And there are a lot :S

I am using libwebrtc commit 2dd3f3af62 which is the one for M82.
M82 is cancelled though so maybe we should go forward with M83 instead.
Let's refresh to this version for now.

[youenn fablet]

> I am using libwebrtc commit 2dd3f3af62

Chrome tag 82.0.4085.17

[youenn fablet]

Created attachment 394716 [details]
Patch

[youenn fablet]

Created attachment 394718 [details]
fix-ios

[Víctor M. Jáquez L.]

(In reply to youenn fablet from comment #12)
> (In reply to Víctor M. Jáquez L. from comment #11)
> > I checked out M82 (branch 4044) and compared the trees with
> > 
> > rsync -Cr --dry-run --itemize-changes --delete
> > /home/vjaquez/src/webrtc-checkout/src/
> > Source/ThirdParty/libwebrtc/Source/webrtc/ --exclude=build --exclude=tools
> > --exclude=buildtools --exclude=third_party  --exclude=infra | grep deleting 
> > 
> > And there are a lot :S
> 
> I am using libwebrtc commit 2dd3f3af62 which is the one for M82.
> M82 is cancelled though so maybe we should go forward with M83 instead.
> Let's refresh to this version for now.

Thanks. Now I'm there:

* 2dd3f3af62 (HEAD -> M82, branch-heads/4085) [DirectX] Fix vector allocation for raw data handling.

And I'm still seeing files in webkit that already were moved or removed in libwebrtc :( (so far I have found these commits in libwebrtc that removed code or moved it around: 03fbace4, 3ce44a35, 1d3008bf, 0e3198e4, 6787f232, 0bad15f2, 0824c6f6 and 01dd8850)

Finally, I see in Source/ThirdParty/libwebrtc/ChangeLog that CMakeLists.txt has been modified, but I can find any modification in the patch. Is it missing?

[youenn fablet]

Created attachment 394906 [details]
Patch

[youenn fablet]

> And I'm still seeing files in webkit that already were moved or removed in
> libwebrtc :( (so far I have found these commits in libwebrtc that removed
> code or moved it around: 03fbace4, 3ce44a35, 1d3008bf, 0e3198e4, 6787f232,
> 0bad15f2, 0824c6f6 and 01dd8850)

These are obsolete files I should have deleted. Done in above patch.

> Finally, I see in Source/ThirdParty/libwebrtc/ChangeLog that CMakeLists.txt
> has been modified, but I can find any modification in the patch. Is it
> missing?

I haven't done any modification to CMakeLists.txt but there will be a need to update it.

[youenn fablet]

Created attachment 394915 [details]
Patch

[Víctor M. Jáquez L.]

Created attachment 395076 [details]
patch to make webkitgtk compile

[Víctor M. Jáquez L.]

youenn,

I have modified CMakeLists.txt following what xcodeproj does and adding what was missing. Fixed a couple issue with the file. alphabetic order.

I had to add missing headers in libwebrtc code (should I have to create a patch for Source/ThirdParty/libwebrtc/WebKit/?)

And had to modify the the path of a couple includes in the source code.

[youenn fablet]

Thanks, I will prepare the patch today!

(In reply to Víctor M. Jáquez L. from comment #21)
> youenn,
> 
> I have modified CMakeLists.txt following what xcodeproj does and adding what
> was missing. Fixed a couple issue with the file. alphabetic order.

Right, I wish we would go to Sources.txt so that we would reduce the size of these changes.

> I had to add missing headers in libwebrtc code (should I have to create a
> patch for Source/ThirdParty/libwebrtc/WebKit/?)

Interesting.
I'll add some '#if defined(WEBRTC_WEBKIT_BUILD)' around them to keep track of them in the source code itself.

It might be useful to upstream these changes to the libwebrtc repo itself.

> And had to modify the the path of a couple includes in the source code.

Sounds good.

[youenn fablet]

Created attachment 395147 [details]
Merged patch

[EWS]

Committed r259345: <https://trac.webkit.org/changeset/259345>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 395147 [details].

[Radar WebKit Bug Importer]

<rdar://problem/61158523>