Bug 209542

Summary: Bump libwebrtc to M82
Product: WebKit Reporter: youenn fablet <youennf>
Component: WebRTCAssignee: youenn fablet <youennf>
Status: RESOLVED FIXED    
Severity: Normal CC: alex, cdumez, eric.carlson, esprehn+autocc, ews-watchlist, glenn, hta, jer.noble, kondapallykalyan, philipj, pnormand, sergio, tommyw, tsaunier, vjaquez, webkit-bug-importer, youennf
Priority: P2 Keywords: InRadar
Version: WebKit Local Build   
Hardware: Unspecified   
OS: Unspecified   
Attachments:
Description Flags
patch
none
patch
none
patch
none
patch
none
Patch
none
Patch
none
fix-ios
none
Patch
none
Patch
none
patch to make webkitgtk compile
none
Merged patch none

Description youenn fablet 2020-03-25 06:36:59 PDT
Update libwebrtc to M82
Comment 1 youenn fablet 2020-03-25 08:08:12 PDT
Created attachment 394495 [details]
patch
Comment 2 youenn fablet 2020-03-25 09:35:51 PDT
Created attachment 394506 [details]
patch
Comment 3 youenn fablet 2020-03-25 09:55:49 PDT
Created attachment 394509 [details]
patch
Comment 4 youenn fablet 2020-03-25 13:29:43 PDT
Created attachment 394538 [details]
patch
Comment 5 Víctor M. Jáquez L. 2020-03-26 03:54:40 PDT
I'm looking at it for GTK
Comment 6 Víctor M. Jáquez L. 2020-03-26 07:34:11 PDT
it seems that the patch is no longer applicable after r259042 (it just fails on project.pbxproj)
Comment 7 youenn fablet 2020-03-26 08:01:48 PDT
(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.
Comment 8 Víctor M. Jáquez L. 2020-03-26 08:27:36 PDT
It seems there are some removed files messing around

commit cd2a92f8e0b64a05668c8b5a7ea2cffe64b02cf6
Author: Sebastian Jansson <srte@webrtc.org>
Date:   Thu Oct 31 13:53:53 2019 +0100

    Removes RPLR based  FEC controller.
Comment 9 youenn fablet 2020-03-26 08:30:31 PDT
Created attachment 394613 [details]
Patch
Comment 10 youenn fablet 2020-03-26 09:09:55 PDT
I am reverting the changes
Comment 11 Víctor M. Jáquez L. 2020-03-26 09:32:29 PDT
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
Comment 12 youenn fablet 2020-03-27 03:06:22 PDT
(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.
Comment 13 youenn fablet 2020-03-27 03:12:55 PDT
> I am using libwebrtc commit 2dd3f3af62

Chrome tag 82.0.4085.17
Comment 14 youenn fablet 2020-03-27 04:02:02 PDT
Created attachment 394716 [details]
Patch
Comment 15 youenn fablet 2020-03-27 05:03:22 PDT
Created attachment 394718 [details]
fix-ios
Comment 16 Víctor M. Jáquez L. 2020-03-30 04:31:18 PDT
(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?
Comment 17 youenn fablet 2020-03-30 05:27:25 PDT
Created attachment 394906 [details]
Patch
Comment 18 youenn fablet 2020-03-30 05:47:28 PDT
> 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.
Comment 19 youenn fablet 2020-03-30 07:29:54 PDT
Created attachment 394915 [details]
Patch
Comment 20 Víctor M. Jáquez L. 2020-03-31 12:13:21 PDT
Created attachment 395076 [details]
patch to make webkitgtk compile
Comment 21 Víctor M. Jáquez L. 2020-03-31 12:17:40 PDT
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.
Comment 22 youenn fablet 2020-04-01 00:40:20 PDT
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.
Comment 23 youenn fablet 2020-04-01 01:39:40 PDT
Created attachment 395147 [details]
Merged patch
Comment 24 EWS 2020-04-01 08:32:10 PDT
Committed r259345: <https://trac.webkit.org/changeset/259345>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 395147 [details].
Comment 25 Radar WebKit Bug Importer 2020-04-01 08:34:12 PDT
<rdar://problem/61158523>