Attachment 340389 Details for Bug 185639 – Patch

[patch] Patch

bug-185639-20180515050820.patch (text/plain), 2.14 KB, created by Carlos Alberto Lopez Perez on 2018-05-14 20:08:22 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Alberto Lopez Perez

Created: 2018-05-14 20:08:22 PDT

Size: 2.14 KB

patch

obsolete

>Subversion Revision: 231782
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index f883c040fc11d3da1dff9da879251b33bc500a10..d72944d5d25f82a067f1d7566b0593ef3a740a14 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-05-14  Carlos Alberto Lopez Perez  <clopez@igalia.com>
>+
>+        [WPE] Build failure with RPi userland drivers and gstreamer-gl
>+        https://bugs.webkit.org/show_bug.cgi?id=185639
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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.
>+
>+        No new tests, no behavior change. It is a build fix.
>+
>+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
>+
> 2018-05-14  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC] FormattingContext:computeOutOfFlowNonReplacedHeight/Width should use the computed margins/paddings/borders
>diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>index 2c1ec6d6f84804aac44729fe83bb1ff5ab97c0e3..50ed1b784d5f17f0008bbf89e8f09c695d1cf6d1 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>@@ -69,7 +69,14 @@
> #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>
>+#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 // USE(LIBEPOXY)
> 
> #define GST_USE_UNSTABLE_API
> #include <gst/gl/gl.h>

Actions: View | Formatted Diff | Diff

Attachments on bug 185639: 340389 | 340405