Changeset 246710 in webkit


Ignore:
Timestamp:
Jun 22, 2019 8:51:00 AM (5 years ago)
Author:
commit-queue@webkit.org
Message:

webkitgtk 2.24.2 fails to build w/gstreamer 1.12.5
​https://bugs.webkit.org/show_bug.cgi?id=198080

Patch by Mike Gorse <​mgorse@suse.com> on 2019-06-22
Reviewed by Philippe Normand.

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.

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r246707 r246710  
     12019-06-22  Mike Gorse  <mgorse@suse.com>
     2
     3        webkitgtk 2.24.2 fails to build w/gstreamer 1.12.5
     4        https://bugs.webkit.org/show_bug.cgi?id=198080
     5
     6        Reviewed by Philippe Normand.
     7
     8        No new tests (build fix only).
     9
     10        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
     11        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
     12        Move includes of gst/gl/gl.h and epoxy/gl.h into
     13        MediaPlayerPrivateGStreamerBase.h.
     14
    1152019-06-21  Sihui Liu  <sihui_liu@apple.com>
    216

  • trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp

    r246677 r246710  
    6767#include <gst/app/gstappsink.h>
    6868
    69 #if USE(LIBEPOXY)
    70 // Include the <epoxy/gl.h> header before <gst/gl/gl.h>.
    71 #include <epoxy/gl.h>
    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)
    83 
    84 #define GST_USE_UNSTABLE_API
    85 #include <gst/gl/gl.h>
    86 #undef GST_USE_UNSTABLE_API
    8769
    8870#include "GLContext.h"

  • trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h

    r246677 r246710  
    3838#include <wtf/WeakPtr.h>
    3939
     40#if USE(LIBEPOXY)
     41// Include the <epoxy/gl.h> header before <gst/gl/gl.h>.
     42#include <epoxy/gl.h>
     43
     44// Workaround build issue with RPi userland GLESv2 headers and libepoxy <https://webkit.org/b/185639>
     45#if !GST_CHECK_VERSION(1, 14, 0)
     46#include <gst/gl/gstglconfig.h>
     47#if defined(GST_GL_HAVE_WINDOW_DISPMANX) && GST_GL_HAVE_WINDOW_DISPMANX
     48#define __gl2_h_
     49#undef GST_GL_HAVE_GLSYNC
     50#define GST_GL_HAVE_GLSYNC 1
     51#endif
     52#endif // !GST_CHECK_VERSION(1, 14, 0)
     53#endif // USE(LIBEPOXY)
     54
     55#define GST_USE_UNSTABLE_API
     56#include <gst/gl/gl.h>
     57#undef GST_USE_UNSTABLE_API
     58
    4059#if USE(TEXTURE_MAPPER_GL)
    4160#include "TextureMapperGL.h"
Note: See TracChangeset for help on using the changeset viewer.