60 lines
2.1 KiB
Diff
60 lines
2.1 KiB
Diff
|
diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
|
||
|
|
index 205ee4bd296..51089792283 100644
|
||
|
|
--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
|
||
|
|
+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
|
||
|
|
@@ -66,24 +66,6 @@
|
||
|
|
|
||
|
|
#include <gst/app/gstappsink.h>
|
||
|
|
|
||
|
|
-#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>
|
||
|
|
-#undef GST_USE_UNSTABLE_API
|
||
|
|
|
||
|
|
#include "GLContext.h"
|
||
|
|
#if USE(GLX)
|
||
|
|
diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h
|
||
|
|
index 59afdfcc01b..980ea1986c4 100644
|
||
|
|
--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h
|
||
|
|
+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h
|
||
|
|
@@ -37,6 +37,25 @@
|
||
|
|
#include <wtf/RunLoop.h>
|
||
|
|
#include <wtf/WeakPtr.h>
|
||
|
|
|
||
|
|
+#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>
|
||
|
|
+#undef GST_USE_UNSTABLE_API
|
||
|
|
+
|
||
|
|
#if USE(TEXTURE_MAPPER_GL)
|
||
|
|
#include "TextureMapperGL.h"
|
||
|
|
#if USE(NICOSIA)
|