Bug 205616 - Build (unified) failure after adding source files to support media in GPU process
Summary: Build (unified) failure after adding source files to support media in GPU pro...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Media (show other bugs)
Version: Safari 13
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Peng Liu
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2019-12-28 04:18 PST by Peng Liu
Modified: 2020-01-06 15:49 PST (History)
13 users (show)

See Also:


Attachments
Patch (11.35 KB, patch)
2020-01-03 17:28 PST, Peng Liu
no flags Details | Formatted Diff | Diff
[WIP] Fix GTK and WPE build failures (11.84 KB, patch)
2020-01-03 21:02 PST, Peng Liu
no flags Details | Formatted Diff | Diff
WIP patch (13.24 KB, patch)
2020-01-03 22:42 PST, Peng Liu
no flags Details | Formatted Diff | Diff
Patch (13.28 KB, patch)
2020-01-03 22:52 PST, Peng Liu
no flags Details | Formatted Diff | Diff
Patch (13.25 KB, patch)
2020-01-04 22:25 PST, Peng Liu
no flags Details | Formatted Diff | Diff
Rebased patch (14.55 KB, patch)
2020-01-06 11:32 PST, Peng Liu
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Peng Liu 2019-12-28 04:18:36 PST
The Mac OS SDK includes a definition of "Fixed", and the project has WebCore::Fixed. They conflict due to the unified build when we try to add some new CPP files.
Comment 1 Peng Liu 2020-01-03 17:28:23 PST
Created attachment 386734 [details]
Patch
Comment 2 Eric Carlson 2020-01-03 18:42:18 PST
Comment on attachment 386734 [details]
Patch

r=me once the bots are happy
Comment 3 Peng Liu 2020-01-03 21:02:26 PST
Created attachment 386751 [details]
[WIP] Fix GTK and WPE build failures
Comment 4 Peng Liu 2020-01-03 22:42:44 PST
Created attachment 386756 [details]
WIP patch
Comment 5 Peng Liu 2020-01-03 22:52:51 PST
Created attachment 386757 [details]
Patch
Comment 6 Radar WebKit Bug Importer 2020-01-03 22:53:19 PST
<rdar://problem/58314047>
Comment 7 Darin Adler 2020-01-04 20:35:45 PST
Comment on attachment 386757 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=386757&action=review

I don’t understand why we are removing the header and source files from the project file.

> Source/WebCore/Modules/mediastream/UserMediaClient.h:44
> +class Document;

We sort these alphabetically, so this should be up above Page.
Comment 8 Peng Liu 2020-01-04 22:11:33 PST
(In reply to Darin Adler from comment #7)
> Comment on attachment 386757 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=386757&action=review
> 
> I don’t understand why we are removing the header and source files from the
> project file.
Because we are adding them to the unified build. They are still included in the project file (the updated project file still has references to them), but they are not included in the build process directly.

> 
> > Source/WebCore/Modules/mediastream/UserMediaClient.h:44
> > +class Document;
> 
> We sort these alphabetically, so this should be up above Page.
Fixed.
Comment 9 Peng Liu 2020-01-04 22:25:59 PST
Created attachment 386782 [details]
Patch
Comment 10 WebKit Commit Bot 2020-01-06 10:34:07 PST
Comment on attachment 386782 [details]
Patch

Rejecting attachment 386782 [details] from commit-queue.

Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'apply-attachment', '--no-update', '--non-interactive', 386782, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Logging in as commit-queue@webkit.org...
Fetching: https://bugs.webkit.org/attachment.cgi?id=386782&action=edit
Fetching: https://bugs.webkit.org/show_bug.cgi?id=205616&ctype=xml&excludefield=attachmentdata
Processing 1 patch from 1 bug.
Processing patch 386782 from bug 205616.
Fetching: https://bugs.webkit.org/attachment.cgi?id=386782
Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Dean Jackson']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Parsed 6 diffs from patch file(s).
patching file Source/WebCore/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Source/WebKit/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Source/WebCore/Modules/mediastream/UserMediaClient.h
patching file Source/WebKit/Sources.txt
Hunk #2 FAILED at 508.
1 out of 2 hunks FAILED -- saving rejects to file Source/WebKit/Sources.txt.rej
patching file Source/WebKit/SourcesGTK.txt
patching file Source/WebKit/WebKit.xcodeproj/project.pbxproj
Hunk #1 succeeded at 99 (offset 2 lines).
Hunk #2 succeeded at 406 (offset 2 lines).
Hunk #3 succeeded at 10087 (offset 8 lines).
Hunk #4 FAILED at 10247.
Hunk #5 succeeded at 11865 (offset 9 lines).
Hunk #6 FAILED at 11921.
2 out of 6 hunks FAILED -- saving rejects to file Source/WebKit/WebKit.xcodeproj/project.pbxproj.rej

Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Dean Jackson']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Full output: https://webkit-queues.webkit.org/results/13300141
Comment 11 Peng Liu 2020-01-06 11:32:44 PST
Created attachment 386871 [details]
Rebased patch
Comment 12 WebKit Commit Bot 2020-01-06 15:48:38 PST
The commit-queue encountered the following flaky tests while processing attachment 386871 [details]:

transitions/default-timing-function.html bug 138901 (authors: dino@apple.com and graouts@apple.com)
The commit-queue is continuing to process your patch.
Comment 13 WebKit Commit Bot 2020-01-06 15:49:28 PST
Comment on attachment 386871 [details]
Rebased patch

Clearing flags on attachment: 386871

Committed r254093: <https://trac.webkit.org/changeset/254093>
Comment 14 WebKit Commit Bot 2020-01-06 15:49:30 PST
All reviewed patches have been landed.  Closing bug.