webkitgtk 2.24.2 fails to build w/gstreamer 1.12.5

• Component: WebKitGTK
• Status: RESOLVED FIXED

[Mike Gorse]

I am trying to build webkitgtk on openSUSE Leap 15.0, which has gstreamer 1.12.5. With USE_GSTREAMER_GL, I get the following error, similar to bug 196178:

In file included from Source/WebCore/platform/graphics/texmap/TextureMapperGLHeaders.h:34:0,
                 from Source/WebCore/platform/graphics/texmap/TextureMapperGL.h:31,
                 from Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:41,
                 from Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:26:
Source/WebCore/platform/graphics/OpenGLShims.h:259:67: error: expected type-specifier before 'glActiveTexture'
 #define glActiveTexture                        LOOKUP_GL_FUNCTION(glActiveTexture)
                                                                   ^
followed by many other errors. Probably related to this commit:
https://trac.webkit.org/changeset/245119/webkit

[Alberto Garcia]

This is probably not the cleanest fix, but here's a very quick
workaround that I used to make it build in my environment:

--- webkitgtk.orig/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h
+++ webkitgtk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h
@@ -38,6 +38,9 @@
 #include <wtf/WeakPtr.h>
 
 #if USE(TEXTURE_MAPPER_GL)
+#define GST_USE_UNSTABLE_API
+#include <gst/gl/gl.h>
+#undef GST_USE_UNSTABLE_API
 #include "TextureMapperGL.h"
 #if USE(NICOSIA)
 #include "NicosiaContentLayerTextureMapperImpl.h"

[Mike Gorse]

I'm not super familiar with gstreamer / don't know whether this is the
right fix or not, but I just noticed that it wouldn't be the only place
where we do this. mediaPlayerPrivateGStreamerBase.cpp has this:
#define GST_USE_UNSTABLE_API
#include <gst/gl/gl.h>
#undef GST_USE_UNSTABLE_API

We could also condition it with #if !GST_CHECK_VERSION(1, 14, 0)

[Philippe Normand]

(In reply to Mike Gorse from comment #2)
> I'm not super familiar with gstreamer / don't know whether this is the
> right fix or not, but I just noticed that it wouldn't be the only place
> where we do this. mediaPlayerPrivateGStreamerBase.cpp has this:
> #define GST_USE_UNSTABLE_API
> #include <gst/gl/gl.h>
> #undef GST_USE_UNSTABLE_API
> 
> We could also condition it with #if !GST_CHECK_VERSION(1, 14, 0)

That include is already wrapped by #if USE(GSTREAMER_GL). I know the ifdef soup there is already confusing enough.

[Mike Gorse]

Created attachment 372646 [details]
Patch.

This is the patch that Alberto posted in comment 1, along with a ChangeLog entry. It fixes the build for me.

[Philippe Normand]

Comment on attachment 372646 [details]
Patch.

Can the same include be removed from the cpp file then?

[Mike Gorse]

Created attachment 372676 [details]
Patch.

Removed gst/gl/gl.h from the source file. Also moved include of epoxy header, since I think that that needs to be included first.

[WebKit Commit Bot]

Comment on attachment 372676 [details]
Patch.

Clearing flags on attachment: 372676

Committed r246710: <https://trac.webkit.org/changeset/246710>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.