Title: [231801] trunk/Source/WebCore
- Revision
- 231801
- Author
- [email protected]
- Date
- 2018-05-15 08:14:12 -0700 (Tue, 15 May 2018)
Log Message
[WPE] Build failure with RPi userland drivers and gstreamer-gl
https://bugs.webkit.org/show_bug.cgi?id=185639
Reviewed by Philippe Normand.
When building for the RPi with userland drivers (dispmanx) override the
value of GST_GL_HAVE_GLSYNC to 1 to avoid that the gstreamer-gl headers
try to redefine the GLsync type that is already defined in libepoxy.
Defining __gl2_h_ is also needed to avoid other conflicting type
definitions that happen between libepoxy and RPi GLES2 userland
headers when the gstreamer-gl headers are included.
The issue doesn't happen with 1.14.0, so a check for that is added
as well.
No new tests, no behavior change. It is a build fix.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (231800 => 231801)
--- trunk/Source/WebCore/ChangeLog 2018-05-15 14:24:10 UTC (rev 231800)
+++ trunk/Source/WebCore/ChangeLog 2018-05-15 15:14:12 UTC (rev 231801)
@@ -1,3 +1,25 @@
+2018-05-15 Carlos Alberto Lopez Perez <[email protected]>
+
+ [WPE] Build failure with RPi userland drivers and gstreamer-gl
+ https://bugs.webkit.org/show_bug.cgi?id=185639
+
+ Reviewed by Philippe Normand.
+
+ When building for the RPi with userland drivers (dispmanx) override the
+ value of GST_GL_HAVE_GLSYNC to 1 to avoid that the gstreamer-gl headers
+ try to redefine the GLsync type that is already defined in libepoxy.
+
+ Defining __gl2_h_ is also needed to avoid other conflicting type
+ definitions that happen between libepoxy and RPi GLES2 userland
+ headers when the gstreamer-gl headers are included.
+
+ The issue doesn't happen with 1.14.0, so a check for that is added
+ as well.
+
+ No new tests, no behavior change. It is a build fix.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+
2018-05-15 Michael Catanzaro <[email protected]>
Unreviewed, rolling out r230749
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (231800 => 231801)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2018-05-15 14:24:10 UTC (rev 231800)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2018-05-15 15:14:12 UTC (rev 231801)
@@ -69,7 +69,17 @@
#if USE(LIBEPOXY)
// Include the <epoxy/gl.h> header before <gst/gl/gl.h>.
#include <epoxy/gl.h>
+
+// Workaround build issue with RPi userland GLESv2 headers and libepoxy <https://webkit.org/b/185639>
+#if !GST_CHECK_VERSION(1, 14, 0)
+#include <gst/gl/gstglconfig.h>
+#if defined(GST_GL_HAVE_WINDOW_DISPMANX) && GST_GL_HAVE_WINDOW_DISPMANX
+#define __gl2_h_
+#undef GST_GL_HAVE_GLSYNC
+#define GST_GL_HAVE_GLSYNC 1
#endif
+#endif // !GST_CHECK_VERSION(1, 14, 0)
+#endif // USE(LIBEPOXY)
#define GST_USE_UNSTABLE_API
#include <gst/gl/gl.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
