Changeset 231801 in webkit


Ignore:
Timestamp:
May 15, 2018 8:14:12 AM (6 years ago)
Author:
clopez@igalia.com
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:
Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r231800 r231801  
     12018-05-15  Carlos Alberto Lopez Perez  <clopez@igalia.com>
     2
     3        [WPE] Build failure with RPi userland drivers and gstreamer-gl
     4        https://bugs.webkit.org/show_bug.cgi?id=185639
     5
     6        Reviewed by Philippe Normand.
     7
     8        When building for the RPi with userland drivers (dispmanx) override the
     9        value of GST_GL_HAVE_GLSYNC to 1 to avoid that the gstreamer-gl headers
     10        try to redefine the GLsync type that is already defined in libepoxy.
     11
     12        Defining __gl2_h_ is also needed to avoid other conflicting type
     13        definitions that happen between libepoxy and RPi GLES2 userland
     14        headers when the gstreamer-gl headers are included.
     15
     16        The issue doesn't happen with 1.14.0, so a check for that is added
     17        as well.
     18
     19        No new tests, no behavior change. It is a build fix.
     20
     21        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
     22
    1232018-05-15  Michael Catanzaro  <mcatanzaro@igalia.com>
    224
  • trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp

    r231759 r231801  
    7070// Include the <epoxy/gl.h> header before <gst/gl/gl.h>.
    7171#include <epoxy/gl.h>
    72 #endif
     72
     73// Workaround build issue with RPi userland GLESv2 headers and libepoxy <https://webkit.org/b/185639>
     74#if !GST_CHECK_VERSION(1, 14, 0)
     75#include <gst/gl/gstglconfig.h>
     76#if defined(GST_GL_HAVE_WINDOW_DISPMANX) && GST_GL_HAVE_WINDOW_DISPMANX
     77#define __gl2_h_
     78#undef GST_GL_HAVE_GLSYNC
     79#define GST_GL_HAVE_GLSYNC 1
     80#endif
     81#endif // !GST_CHECK_VERSION(1, 14, 0)
     82#endif // USE(LIBEPOXY)
    7383
    7484#define GST_USE_UNSTABLE_API
Note: See TracChangeset for help on using the changeset viewer.