1137489 - [EME] build failure in gmp-clearkey in non-unified builds

Status: RESOLVED FIXED

(Core :: Audio/Video, defect)

Description

[Chris Pearce [:cpearce (Not reading bugmail)]]

With unified builds disabled on Windows I see a build failure in gmp-clearkey:

11:14.47 base_switches.cc
11:14.47 ClearKeySessionManager.cpp
11:14.47 c:/Users/cpearce/src/mozilla/central/media/gmp-clearkey/0.1/ClearKeySessionManager.cpp(43) : error C2653: 'wmf' : is not a class or namespace name
11:14.48 c:/Users/cpearce/src/mozilla/central/media/gmp-clearkey/0.1/ClearKeySessionManager.cpp(43) : error C3861: 'EnsureLibs': identifier not found
11:14.48
11:14.49 In the directory  /c/Users/cpearce/src/mozilla/central/objdir/media/gmp-clearkey/0.1
11:14.50 The following command failed to execute properly:
11:14.50 c:/Users/cpearce/src/mozilla/central/objdir/_virtualenv/Scripts/python.exe -m mozbuild.action.cl cl -FoClearKeySessionManager.obj -c -DENABLE_WMF -DMOZ_NO_MOZALLOC -DAB_CD=en-US -DNO_NSPR_10_
SUPPORT -Ic:/Users/cpearce/src/mozilla/central/media/gmp-clearkey/0.1 -I. -Ic:/Users/cpearce/src/mozilla/central/dom/media/gmp -I../../../dist/include -Ic:/Users/cpearce/src/mozilla/central/objdir/dis
t/include/nspr -Ic:/Users/cpearce/src/mozilla/central/objdir/dist/include/nss -MT -FI ../../../dist/include/mozilla-config.h -DMOZILLA_CLIENT -TP -nologo -D_HAS_EXCEPTIONS=0 -W3 -Gy -arch:IA32 -FS -wd
4251 -wd4244 -wd4267 -wd4345 -wd4351 -wd4482 -wd4800 -wd4819 -we4553 -GR- -DDEBUG -DTRACING -Zi -Oy- -Fdgenerated.pdb c:/Users/cpearce/src/mozilla/central/media/gmp-clearkey/0.1/ClearKeySessionManager
.cpp
11:14.50 cpu.obj

Comment 1

[Chris Pearce [:cpearce (Not reading bugmail)]]

Attachment: Patch

Comment 2

[Chris Pearce [:cpearce (Not reading bugmail)]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/0c41d373af29

Comment 3

[Chris Pearce [:cpearce (Not reading bugmail)]]

Must uplift...

Comment 4

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/0c41d373af29

Comment 5

[Chris Pearce [:cpearce (Not reading bugmail)]]

https://hg.mozilla.org/releases/mozilla-beta/rev/d56acccf3b69

Comment 6

[Chris Pearce [:cpearce (Not reading bugmail)]]

Attachment: Beta patch

Patch for beta branch as part of EME platform uplift.

Comment 7

[Chris Pearce [:cpearce (Not reading bugmail)]]

Comment on attachment 8572383 [details] [diff] [review]
Beta patch

Requesting retroactive approval for Beta landing as part of EME platform uplift.

Comment 8

[Chris Pearce [:cpearce (Not reading bugmail)]]

https://hg.mozilla.org/releases/mozilla-aurora/rev/1fff78b318d6

Comment 9

[Lawrence Mandel [:lmandel] (use needinfo)]

Comment on attachment 8572383 [details] [diff] [review]
Beta patch

Approved for Beta and Aurora as part of EME platform uplift.