Title: [243591] releases/WebKitGTK/webkit-2.24/Source/WebCore
- Revision
- 243591
- Author
- ape...@igalia.com
- Date
- 2019-03-27 16:50:22 -0700 (Wed, 27 Mar 2019)
Log 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 <mgo...@suse.com>
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::GstVideoFrameHolder::GstVideoFrameHolder):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog (243590 => 243591)
--- releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog 2019-03-27 23:48:07 UTC (rev 243590)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog 2019-03-27 23:50:22 UTC (rev 243591)
@@ -1,3 +1,19 @@
+2019-03-27 Philippe Normand <pnorm...@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 <mgo...@suse.com>
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+ (WebCore::GstVideoFrameHolder::GstVideoFrameHolder):
+
2019-03-26 Philippe Normand <pnorm...@igalia.com>
[GStreamer] Sound loop with Google Hangouts and WhatsApp notifications
Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (243590 => 243591)
--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2019-03-27 23:48:07 UTC (rev 243590)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2019-03-27 23:50:22 UTC (rev 243591)
@@ -29,7 +29,6 @@
#include "GStreamerCommon.h"
#include "GraphicsContext.h"
-#include "GraphicsContext3D.h"
#include "ImageGStreamer.h"
#include "ImageOrientation.h"
#include "IntRect.h"
@@ -117,6 +116,7 @@
#if USE(TEXTURE_MAPPER_GL)
#include "BitmapTextureGL.h"
#include "BitmapTexturePool.h"
+#include "GraphicsContext3D.h"
#include "TextureMapperContextAttributes.h"
#include "TextureMapperGL.h"
#include "TextureMapperPlatformLayerBuffer.h"
@@ -191,6 +191,9 @@
if (m_isMapped)
m_textureID = *reinterpret_cast<GLuint*>(m_videoFrame.data[0]);
} else
+#else
+ UNUSED_PARAM(flags);
+ UNUSED_PARAM(gstGLEnabled);
#endif // USE(GSTREAMER_GL)
{
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
