Changeset 243591 in webkit

Timestamp:

Mar 27, 2019, 4:50:22 PM (7 years ago)

Author:

Adrian Perez de Castro

Message:

Merged r243538 - Build failure with gstreamer 1.12.5 if USE_GSTREAMER_GL is enabled
​https://bugs.webkit.org/show_bug.cgi?id=196178

Reviewed by Xabier Rodriguez-Calvar.

The gst/gl/gl.h header needs to be included before
GraphicsContext3D.h to avoid declaration conflicts with
OpenGLShims.

Based on a patch from Mike Gorse <​mgorse@suse.com>

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:

(WebCore::GstVideoFrameHolder::GstVideoFrameHolder):

Location:

releases/WebKitGTK/webkit-2.24/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (modified) (3 diffs)

releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-27  Philippe Normand  <pnormand@igalia.com>
+
+        Build failure with gstreamer 1.12.5 if USE_GSTREAMER_GL is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=196178
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        The gst/gl/gl.h header needs to be included before
+        GraphicsContext3D.h to avoid declaration conflicts with
+        OpenGLShims.
+
+        Based on a patch from Mike Gorse <mgorse@suse.com>
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+        (WebCore::GstVideoFrameHolder::GstVideoFrameHolder):
+
 2019-03-26  Philippe Normand  <pnormand@igalia.com>
 

releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp

@@ -30 +30 @@
 #include "GStreamerCommon.h"
 #include "GraphicsContext.h"
-#include "GraphicsContext3D.h"
 #include "ImageGStreamer.h"
 #include "ImageOrientation.h"
@@ -118 +117 @@
 #include "BitmapTextureGL.h"
 #include "BitmapTexturePool.h"
+#include "GraphicsContext3D.h"
 #include "TextureMapperContextAttributes.h"
 #include "TextureMapperGL.h"
@@ -192 +192 @@
                 m_textureID = *reinterpret_cast<GLuint*>(m_videoFrame.data[0]);
         } else
+#else
+        UNUSED_PARAM(flags);
+        UNUSED_PARAM(gstGLEnabled);
 #endif // USE(GSTREAMER_GL)