WebKit Bugzilla
Attachment 372676 Details for
Bug 198080
: webkitgtk 2.24.2 fails to build w/gstreamer 1.12.5
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch.
build.patch (text/plain), 2.89 KB, created by
Mike Gorse
on 2019-06-22 05:03:20 PDT
(
hide
)
Description:
Patch.
Filename:
MIME Type:
Creator:
Mike Gorse
Created:
2019-06-22 05:03:20 PDT
Size:
2.89 KB
patch
obsolete
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index 80896f8e9f8..e14990d4c08 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,17 @@ >+2019-06-22 Mike Gorse <mgorse@suse.com> >+ >+ webkitgtk 2.24.2 fails to build w/gstreamer 1.12.5 >+ https://bugs.webkit.org/show_bug.cgi?id=198080 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ No new tests (build fix only). >+ >+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp: >+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h: >+ Move includes of gst/gl/gl.h and epoxy/gl.h into >+ MediaPlayerPrivateGStreamerBase.h. >+ > 2019-06-21 Sihui Liu <sihui_liu@apple.com> > > openDatabase should return an empty object when WebSQL is disabled >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)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 198080
:
372646
| 372676