An unfortunate aspect of this is it still uses a closed-source MSFT dll. For trustworthiness purposes, you'll probably want to agree upon the hash of that dll. You can consider the existing one in the repo my vote for the correct version.

Trac:
Cc: N/A to tom

Trac:
Parent: #24631 (moved) to #26203 (moved)
Keywords: N/A deleted, TorBrowserTeam201805 added
Priority: Medium to Very High
Cc: tom to tom, sukhe

CCing the real sukhe

Trac:
Cc: tom, sukhe to tom, sukhbir

#26204 (moved) has a branch that integrates fxc2 and also d3dcompiler_47.dll.

Trac:
Status: new to needs_review

Moving our tickets to June 2018

Trac:
Keywords: TorBrowserTeam201805 deleted, TorBrowserTeam201806 added

IIUC, Firefox autogenerates ps_4_0_level_9_3 which is old SM2. So what's wrong with https://github.com/wine-mirror/wine/tree/master/dlls/d3dcompiler_47?

I am now testing a build with the following changes compared to the patch from branch azadi/bug-26203:

• remove the line pre_pkginst: dpkg --add-architecture i386 as it builds fine without it. https://gitweb.torproject.org/user/boklm/tor-browser-build.git/commit/?h=bug_26203&id=e172a942f2abf3553f14f2de7be20840f5f77334
• don't use xvfb as it seems it is not really needed. https://gitweb.torproject.org/user/boklm/tor-browser-build.git/commit/?h=bug_26203&id=ecea9b7944aa0ea22faf72776e0050c6d9ca1bad
• copy d3dcompiler_47.dll (this change was part of commit Bug 26206: Ship pthread related dll (libwinpthread-1.dll) where needed before) https://gitweb.torproject.org/user/boklm/tor-browser-build.git/commit/?h=bug_26203&id=74da109534fe4c5470a7653ddcba83398c1ac7f4
• Simplify a little the copy of the libwinpthread-1.dll file. https://gitweb.torproject.org/user/boklm/tor-browser-build.git/commit/?h=bug_25837&id=b0f30a7078c145916e0e89b255dd2262fc757730
• Remove the & after wine wineboot -i as I am not sure it is needed. https://gitweb.torproject.org/user/boklm/tor-browser-build.git/commit/?h=bug_25837&id=9d4ab9c0a171be5c38d9f440bb855d92c9b0faa2

Replying to boklm:

I am now testing a build with the following changes compared to the patch from branch azadi/bug-26203:

The build finished correctly. I have now squashed the changes listed in comment 7 in a commit in branch bug_25837_v2: https://gitweb.torproject.org/user/boklm/tor-browser-build.git/commit/?h=bug_25837_v2&id=fdfd5600c985d1aff96a6e822c8138fb4a5dbe95

I also checked that the d3dcompiler_47.dll included in commit 079f5c7b9f6ea0b7e5504bb53abf8709cc92835d from https://github.com/azadi/fxc2.git are the same that I get after downloading the win32 and win64 versions of firefox 60.0.2esr.

Trac:
Keywords: TorBrowserTeam201806 deleted, TorBrowserTeam201806R added

Branch bug_25837_v3 has the some commit rebased on master: https://gitweb.torproject.org/user/boklm/tor-browser-build.git/commit/?h=bug_25837_v3&id=1689bd25bb1edc62c25cb11846bc0dd5b9a8e30c

Replying to boklm:

Branch bug_25837_v3 has the some commit rebased on master: https://gitweb.torproject.org/user/boklm/tor-browser-build.git/commit/?h=bug_25837_v3&id=1689bd25bb1edc62c25cb11846bc0dd5b9a8e30c

Looks good. I merged sukhe's commit and your fixups to master with commit 57693e01837f0fc7c60bb056e5b752f5f67a987b. We are done here, I think.

Trac:
Status: needs_review to closed
Resolution: N/A to fixed