[Mesa-dev] [PATCH 0/2] scons 2.5.0 support

Brian Paul brianp at vmware.com
Tue May 24 20:27:05 UTC 2016

On 05/24/2016 02:05 PM, Giuseppe Bilotta wrote:
> On Tue, May 24, 2016 at 6:13 PM, Brian Paul <brianp at vmware.com> wrote:
>> For both,
>> Reviewed-by: Brian Paul <brianp at vmware.com>
>> Do you need me to push these for you?
> Well, AFAIK I don't have write access to the mesa git tree so yes
> please ;-) (Possibly with the extra commit lines with the full
> Bugzilla link that Emil posted for patch#2).

Sure.  Unfortunately, the series does not apply cleanly on ToT master:

% git am p[12].txt
Applying: scons: whitespace cleanup
Using index info to reconstruct a base tree...
error: patch failed: src/gallium/state_trackers/wgl/SConscript:12
error: src/gallium/state_trackers/wgl/SConscript: patch does not apply
Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Cannot fall back to three-way merge.
Patch failed at 0001 scons: whitespace cleanup
The copy of the patch that failed is found in:
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Can you update the patches and send them to me?  Thanks.


More information about the mesa-dev mailing list