Bug 81993 – UserMediaClientGtk.h content not contained in #if ENABLE(MEDIA_STREAM)

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKitGTK

[Alban Browaeys]

Created attachment 133388 [details]
sample of how I fixed the missing ENABLE(MEDIA_STREAM) 

Build fails due to content of Source/WebKit/gtk/WebCoreSupport/UserMediaClientGtk.h not being protected by #if ENABLE(MEDIA_STREAM)

  CXX    Source/WebKit/gtk/WebCoreSupport/libwebkitgtk_3_0_la-UserMediaClientGtk.lo
In file included from Source/WebKit/gtk/WebCoreSupport/UserMediaClientGtk.cpp:22:0:
Source/WebKit/gtk/WebCoreSupport/UserMediaClientGtk.h:27:35: erreur: ‘WebCore’ has not been declared
Source/WebKit/gtk/WebCoreSupport/UserMediaClientGtk.h:27:44: erreur: expected ‘{’ before ‘UserMediaClient’
Source/WebKit/gtk/WebCoreSupport/UserMediaClientGtk.h:27:60: erreur: invalid type in declaration before ‘{’ token
Source/WebKit/gtk/WebCoreSupport/UserMediaClientGtk.h:27:60: attention : extended initializer lists only available with -std=c++0x or -std=gnu++0x [enabled by default]
Source/WebKit/gtk/WebCoreSupport/UserMediaClientGtk.h:28:1: erreur: expected primary-expression before ‘public’
Source/WebKit/gtk/WebCoreSupport/UserMediaClientGtk.h:28:1: erreur: expected ‘}’ before ‘public’
Source/WebKit/gtk/WebCoreSupport/UserMediaClientGtk.h:28:1: erreur: expected ‘,’ or ‘;’ before ‘public’
Source/WebKit/gtk/WebCoreSupport/UserMediaClientGtk.h:30:33: erreur: declaration of ‘~WebKit::UserMediaClientGtk’ as non-member
Source/WebKit/gtk/WebCoreSupport/UserMediaClientGtk.h:32:32: erreur: ‘virtual’ outside class declaration
Source/WebKit/gtk/WebCoreSupport/UserMediaClientGtk.h:33:40: erreur: ‘virtual’ outside class declaration
Source/WebKit/gtk/WebCoreSupport/UserMediaClientGtk.h:33:40: erreur: variable or field ‘requestUserMedia’ declared void
Source/WebKit/gtk/WebCoreSupport/UserMediaClientGtk.h:33:35: erreur: ‘PassRefPtr’ is not a member of ‘WTF’
Source/WebKit/gtk/WebCoreSupport/UserMediaClientGtk.h:33:51: erreur: ‘WebCore’ has not been declared
Source/WebKit/gtk/WebCoreSupport/UserMediaClientGtk.h:33:77: erreur: expected primary-expression before ‘,’ token
Source/WebKit/gtk/WebCoreSupport/UserMediaClientGtk.h:33:79: erreur: expected primary-expression before ‘const’
Source/WebKit/gtk/WebCoreSupport/UserMediaClientGtk.h:33:120: erreur: expected primary-expression before ‘const’
In file included from Source/WebKit/gtk/WebCoreSupport/UserMediaClientGtk.cpp:22:0:
Source/WebKit/gtk/WebCoreSupport/UserMediaClientGtk.h:34:41: erreur: ‘virtual’ outside class declaration
Source/WebKit/gtk/WebCoreSupport/UserMediaClientGtk.h:34:41: erreur: variable or field ‘cancelUserMediaRequest’ declared void
Source/WebKit/gtk/WebCoreSupport/UserMediaClientGtk.h:34:41: erreur: ‘WebCore’ has not been declared
Source/WebKit/gtk/WebCoreSupport/UserMediaClientGtk.h:34:67: erreur: expected primary-expression before ‘)’ token
Source/WebKit/gtk/WebCoreSupport/UserMediaClientGtk.h:37:1: erreur: expected declaration before ‘}’ token

[Jeremy Mao]

(In reply to comment #0)
> Created an attachment (id=133388) [details]
> sample of how I fixed the missing ENABLE(MEDIA_STREAM) 
> 
> Build fails due to content of Source/WebKit/gtk/WebCoreSupport/UserMediaClientGtk.h not being protected by #if ENABLE(MEDIA_STREAM)
> 

Do you manually disable MEDIA_STREAM when building webkit? But add this macro checking seems good and reasonable, and other feature may need macro protection like this too.

[Alban Browaeys]

I do not tweak the MEDIA_STREAMER manually. I use https://bugs.webkit.org/show_bug.cgi?id=77087 and build against gstreamer 0.11 in jhbuild for gnome 3.4.

[Alban Browaeys]

Fixed by r111838 with the same remedy.